IRCloggy #git 2014-08-28

Provider of IRC logs since 2005.

WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

	2014-08-28
	→ jottr_ joined	00:01
	← thiago left	00:01
	← fakewaffle left	00:01
	→ rjhunter joined	00:02
	→ awsation joined	00:02
	← devbug left	00:03
	→ thiago joined	00:04
	→ fakewaffle joined	00:05
	→ kriks joined	00:05
	→ kentaro0919 joined	00:06
	← imachuchu left	00:06
	← fakewaffle left	00:06
	← ockham1 left	00:06
	→ kcj joined	00:06
	← awsation left	00:06
	← fstd left	00:08
	→ fstd joined	00:08
	→ sgen joined	00:08
	← ianbrandt left	00:09
	← Fandekasp left	00:10
	← jonmorehouse left	00:11
	← jheg left	00:12
	← mfmfmfmfmfmf left	00:12
	← aidalgol left	00:12
	→ TititaTitutu_ joined	00:12
	← TititaTitutu left	00:13
	→ mfmfmfmfmfmf joined	00:13
	→ aidalgol joined	00:13
	→ p4sh4 joined	00:14
	→ NegativeForty joined	00:14
	→ hyperair joined	00:14
	← montchr left	00:15
	← punchagan left	00:15
	→ punchagan joined	00:15
	← metts left	00:16
	← Sicp left	00:16
	← DeathIncarnate left	00:18
	← p4sh4 left	00:18
	← Quevin_ left	00:19
	→ gregsmith joined	00:19
	← smw left	00:20
	→ ropav joined	00:20
	← lieber left	00:21
	→ lowkeyli_ joined	00:22
	← gregsmith left	00:24
	→ Polymorphism joined	00:25
	→ kline joined	00:25
	← lowkeyliesmyth left	00:25
kline	is there a way of passing an identity file to git as a once-off for a clone?	00:25
	→ d10n-work joined	00:26
kline	my ssh config file would normally handle this, but its in a git repo itself, so i need to once-off manually pass the identity file to bootstrap getting the complete ssh config	00:26
	← ropav left	00:26
	← lowkeyli_ left	00:26
	← Hecter left	00:26
	→ jftf joined	00:27
	→ Godie joined	00:27
	→ ropav joined	00:28
	→ Quevin joined	00:29
	← Polymorphism left	00:29
	← hyperair left	00:29
	→ Pyrogerg joined	00:29
ojacobson	kline: set GIT_SSH to something useful, IIRC	00:30
kline	thanks	00:30
ojacobson	man git or man git-fetch may be enlightening	00:30
gitinfo	the git manpage is available at http://jk.gs/git.html	00:30
	the git-fetch manpage is available at http://jk.gs/git-fetch.html	00:30
ojacobson	that's where I'd look, anyways	00:30
	→ sandr8 joined	00:30
	← jftf left	00:31
	→ P4_Denis joined	00:31
	← ropav left	00:33
	← Quevin left	00:34
kline	thanks :)	00:34
	→ iamjarvo joined	00:34
	← sandr8 left	00:35
	→ epifanio joined	00:35
	← P4_Denis left	00:36
	→ listochkin joined	00:36
	← Pyrogerg left	00:36
	→ jonmorehouse joined	00:37
	→ s2013 joined	00:39
	→ sinkensabe joined	00:39
	→ eletuchy joined	00:39
	→ ropav joined	00:41
	← listochkin left	00:41
	← AlexZan left	00:41
	← EminenceHC left	00:41
	→ nbrosnahan joined	00:42
	kcj → kcj_	00:42
	← nbrosnahan left	00:42
	→ EminenceHC joined	00:42
	← diegoviola left	00:42
	→ nbrosnahan joined	00:42
	← nbrosnahan left	00:42
	→ nbrosnahan joined	00:43
	← nbrosnahan left	00:43
	→ nbrosnahan joined	00:43
	← nbrosnahan left	00:44
	← sinkensabe left	00:44
	→ nbrosnahan joined	00:44
	← eletuchy left	00:44
	← pizzaprty left	00:44
	→ UmbraMalison joined	00:44
	→ nerdfiles joined	00:44
	← EminenceHC left	00:46
	← a_le left	00:47
	← s2013 left	00:47
	← kcj_ left	00:48
	→ awsation joined	00:49
	→ asofaoil joined	00:52
	→ akim joined	00:52
	gitinfo set mode: +v	00:53
	← m0viefreak left	00:54
asofaoil	I'm using Git Bash on Windows. I stored my username and password on a local file (maybe .netrc or .authinfo or something like that) a long time ago, and now my password has changed. I can't find where I put the file. It's not in any of my git directories. Is there an easy way to find what file Git is using for my password/username? I want to replace it...	00:54
	← sohail` left	00:54
	→ Riviera joined	00:54
	→ sohail` joined	00:55
preaction	asofaoil: http username/password? might be .git/config in the repo root dir, or it might be your global ~/.gitconfig	00:56
	→ Polymorphism joined	00:56
	← nfk left	00:56
	← akim_ left	00:56
	← ropav left	00:56
	← iamjarvo left	00:57
	→ tmcmahon joined	00:57
	→ diegoviola joined	00:58
	← TititaTitutu_ left	00:58
	→ fold joined	00:58
	→ weiyang joined	00:58
	← Polymorphism left	01:00
	← splud left	01:00
	→ Pyrogerg joined	01:01
asofaoil	preaction: thanks. where would the global gitconfig be on Windows?	01:01
	it's not in the repo root dir	01:01
	← Sasazuka left	01:01
preaction	in the gitbash window, type "cd" and hit enter. then type "pwd" and hit enter	01:01
	→ ropav joined	01:02
	→ rchavik joined	01:02
	← sohail` left	01:03
	→ sohail joined	01:04
	→ cagedwisdom joined	01:04
	→ Vampire0_ joined	01:04
	→ Ankhers joined	01:05
	← Hydroperoxy left	01:05
	← kballou left	01:06
	← mechanicalduck left	01:07
	← pweaver_ left	01:07
	← Gamecubic left	01:07
	→ Gamecubic joined	01:08
	→ a_le joined	01:09
	← Ankhers left	01:09
	← kriks left	01:10
	← the_hugme left	01:11
	→ nurey joined	01:11
	← rnsanchez left	01:12
	→ zivester joined	01:12
	→ seanmerron joined	01:13
	→ teran joined	01:13
	← seanmerron left	01:14
	← CheckDavid left	01:14
	← ropav left	01:14
	← fstd left	01:14
	→ fstd joined	01:15
	← cxz left	01:15
	→ ropav joined	01:16
	← FatDarrel left	01:16
	← teran left	01:18
	← kadoban left	01:18
	→ Arpho joined	01:18
	→ rnsanchez joined	01:19
	→ justinrixx joined	01:19
	→ gregsmith joined	01:20
	← tmcmahon left	01:20
	← ropav left	01:20
	→ Ankhers joined	01:20
	→ kadoban joined	01:20
	← Tuna-Fish left	01:21
	→ klausson joined	01:21
	← spareproject left	01:21
asofaoil	preaction: perfect, ok, i found the .gitconfig file but it looks like it doesn't actually have the password...interestiing...	01:21
	← nurey left	01:22
	← gregsmith left	01:24
	→ k_sze[work] joined	01:26
	← a_le left	01:26
	← justinrixx left	01:26
asofaoil	ok i installed git-credential-winstore helper and it works now	01:26
	phew	01:26
	→ justinrixx joined	01:27
	→ jftf joined	01:27
	→ Tuna-Fish joined	01:28
	→ eletuchy joined	01:28
	→ a_le joined	01:29
	← Pyrogerg left	01:30
	← devoldmx3 left	01:30
	→ devoldmx27 joined	01:30
	→ Goplat joined	01:31
	← asofaoil left	01:31
	← jftf left	01:32
	← eletuchy left	01:33
	← Noldorin left	01:33
	← Beardless_One left	01:33
	← akim left	01:36
	→ jonr22 joined	01:36
	→ Polymorphism joined	01:37
	→ axilaris joined	01:37
axilaris	hi, how do i use .gitignore ?	01:38
	i did created .gitignore using vi	01:38
	→ Pyrogerg joined	01:38
axilaris	and added the directory i want to ignore	01:38
	→ gregsmith joined	01:38
preaction	is it in the root of your repository?	01:38
axilaris	but when i enter the command git status, its still listing the ignored directory files as modified	01:38
	→ echo-area joined	01:39
axilaris	yes ?	01:39
preaction	was that directory already part of the index?	01:39
	← gregsmith left	01:39
axilaris	yes .gitignore is at the root of the repo	01:39
preaction	(rather, were files in that directory already part of the index?)	01:39
axilaris	directory part of the index, what do you mean ?	01:39
	how do i know that ?	01:39
	let me check if those files were added already	01:40
preaction	if they're showing up as "modified", they're already in the repo	01:40
axilaris	i believe so if its showing modified	01:40
imMute	axilaris: .gitignore has absolutely no effect on files that git is tracking.	01:40
preaction	so in order for them to be ignored, you have to remove them from the repo	01:40
axilaris	oh	01:40
	preaction: so u suggest i remove those files first	01:40
	→ Garen joined	01:40
preaction	if that's what you want	01:41
	→ fried1 joined	01:41
axilaris	possibly	01:41
	atleast i dont want anything from that directory to be checked in	01:41
	← reim left	01:41
	← Polymorphism left	01:41
preaction	even the stuff that is already in there?	01:41
axilaris	preaction: not sure. but i also dont want git status to keep tracking that directory	01:42
preaction	okay, let's back up, what are you trying to accomplish?	01:42
axilaris	what do u suggest ? just remove that directory content ?	01:42
	im developing 3d game using Unity3D	01:43
	← Pyrogerg left	01:43
	← jonr22 left	01:43
axilaris	there is this directory called Library	01:43
	which contains dlls, and temp stuff...	01:43
	dlls a bit of concern, temp stuff i dont care	01:43
	but i believe it doesnt matter	01:43
	→ daito joined	01:43
axilaris	so that Library i dont want git to be tracking it	01:43
	thats my objective	01:44
	simple aint it :)	01:44
preaction	so add Library to your gitignore, and then remove all the files that you don't want to track anymore (git rm)	01:44
	→ AlexZan joined	01:44
	← epifanio left	01:44
	→ hyperair joined	01:45
	→ tokik joined	01:45
	← jottr_ left	01:45
	→ pizzaprty joined	01:45
	→ fairuz joined	01:46
	→ shinnya joined	01:46
	→ gregsmith joined	01:46
	← gregsmith left	01:46
	← a_le left	01:47
	← darkbasic left	01:47
	→ darkbasic joined	01:47
	→ rnsanchez_ joined	01:48
fried1	iv'e got a bunch of git repos that I also store on google drive. anyone have any good solutions for getting rid of Icon? files that get dropped in there on OS X, other than just `find . \| grep Icon \| xargs rm`	01:48
axilaris	preaction: ok	01:49
	fried1 → noituloveand	01:49
	← JosephFerano left	01:50
	→ gregsmith joined	01:50
	← rnsanchez left	01:51
	← justinrixx left	01:51
	← noituloveand left	01:52
	→ noituloveand joined	01:52
	→ sgambino joined	01:52
	← LucasTT left	01:53
	← Ankhers left	01:53
	→ tranzfuse joined	01:54
	← tranzfuse left	01:55
	→ Literphor joined	01:55
	← kaendfinger left	01:55
	→ _ikke_ joined	01:56
	← k_sze[work] left	01:58
	← fairuz left	01:58
	→ endiruna1 joined	01:58
	→ jftf joined	02:01
	← anth0ny left	02:02
	← endiruna left	02:02
	← Literphor left	02:02
	→ hj2014 joined	02:02
	→ anth0ny_ joined	02:04
	← jftf left	02:05
	→ bdavenport joined	02:06
	→ johnny2600 joined	02:06
	← gregsmith left	02:07
	→ k_sze[work] joined	02:07
	← k_sze[work] left	02:07
	← endiruna1 left	02:08
	← punchagan left	02:08
	→ endiruna1 joined	02:08
	→ Beardless_One joined	02:09
	→ sword joined	02:09
	→ Cervantes joined	02:10
	→ Lyqyd joined	02:11
	← shinnya left	02:11
	→ SjB joined	02:12
Cervantes	hi guys, why can't i get my .gitignore working to ignore ".metadata" directory? I've edited the .gitgnore correctly following other's setting for Eclipse environment. I commited the changes of .gitignore, and push it to repo. But .metadata is still there, and my git status still keep track of .metadata changes.	02:12
	any solution?	02:12
	→ luc__ joined	02:13
	→ punchagan joined	02:14
	← BSaboia left	02:14
noituloveand	Cervantes: guessing you don't have the quotes in the file, right?	02:14
	→ wrouesnel1 joined	02:15
Cervantes	noituloveand: no, hmm. i think i solved it by using "git rm -r --cached ."	02:16
noituloveand	Cervantes: so it was tracked in the past or something?	02:17
Cervantes	noituloveand: yeah, when i make the repo, i had nothing in the .gitignore yet.	02:18
	→ _rnsanchez_ joined	02:18
	← endiruna1 left	02:18
Cervantes	noituloveand: i thought that adding certain things in .gitignore auto-untrack the stuffs.	02:18
	→ endiruna1 joined	02:18
ojacobson	nope	02:19
preaction	no. you can always add things that are normally ignored	02:19
noituloveand	Cervantes: nope.	02:19
ojacobson	git will never ignore tracked files	02:19
	← nerdfiles left	02:19
Cervantes	ah, ok. thanks	02:19
	→ Ankhers joined	02:20
noituloveand	Cervantes: thought I had seen this before: https://stackoverflow.com/questions/1139762/ignore-files-that-have-already-been-committed-to-a-git-repository	02:20
	← Cervantes left	02:20
	→ carvantes joined	02:21
	← Arpho left	02:21
	→ Arpho joined	02:21
	← rnsanchez_ left	02:21
	← Arpho left	02:21
	→ BuffyNZ joined	02:22
	→ flowerhack joined	02:22
BuffyNZ	Hi folks, is it possible to find out what branch a commit was initally made to, without listing all the branches it has been merged into?	02:23
	→ Friss joined	02:23
	→ td123 joined	02:23
td123	I committed twice before updating my system time, I fixed the latest commits date with git commit --amend --reset-author, but does anyone know how I can do that to the previous commit?	02:24
	→ supernaut joined	02:25
	→ Literphor joined	02:26
	← Literphor left	02:26
	← devoldmx27 left	02:26
	← thiago left	02:27
	→ Literphor joined	02:29
	→ teran joined	02:29
zumba_addict	hey guys, we have an existing repo called dev-ui. I am able to create different branches. Now, I'd like to create a new branch but the files will be new, it will be the build code. However, I still would like to put the branch under the same repo, dev-ui. Is that possible? I couldn't remember how we did it when we were still using svn	02:29
	gitinfo set mode: +v	02:30
skorgon	td123: !fixup	02:30
gitinfo	td123: So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!	02:30
noituloveand	BuffyNZ: git branch --contains? or git log --graph? must have merges, though, not fast forwards	02:30
	→ Quevin joined	02:31
skorgon	BuffyNZ: no, the branch is probably not even existing anymore	02:31
BuffyNZ	noituloveand: Thanks, I tried git branch --contains, but it lists all the branches it has been merged into since it was commited, I am after the branch it was insitally commited to.	02:31
	→ sandr8 joined	02:32
	→ P4_Denis joined	02:32
	→ tmcmahon joined	02:33
noituloveand	BuffyNZ: hmm. it's not the oldest one? how about git log --merges?	02:33
td123	skorgon: thanks	02:34
	← tmcmahon left	02:34
	← paul424 left	02:34
	← teran left	02:34
	← johnny2600 left	02:34
	→ DeathIncarnate joined	02:34
	← Quevin left	02:35
	→ listochkin joined	02:36
	← sandr8 left	02:36
	← SjB left	02:36
	← P4_Denis left	02:36
	→ SjB joined	02:37
	→ devoldmx joined	02:39
	→ sinkensabe joined	02:40
	← davispuh left	02:41
	→ alekseyp joined	02:41
	← alekseyp left	02:41
	← aidalgol left	02:41
	← listochkin left	02:41
	← eliasr left	02:42
	← jonmorehouse left	02:42
	→ EminenceHC joined	02:43
	← adriankal left	02:43
	← carvantes left	02:44
	← sinkensabe left	02:44
	← Lyqyd left	02:45
	← bdavenport left	02:45
	← EminenceHC left	02:47
	→ spareproject joined	02:47
	← _rnsanchez_ left	02:47
	← klausson left	02:48
	→ the_hugme joined	02:48
	→ a_le joined	02:48
	→ _rnsanchez_ joined	02:48
	← salamanderrake left	02:49
	← spareproject left	02:50
	← a_le left	02:50
	→ a_le joined	02:50
	← amikiri left	02:51
	← endiruna1 left	02:51
	← darkbasic left	02:52
	→ therealGent joined	02:53
	← therealGent left	02:53
	→ aidalgol joined	02:54
	→ darkbasic joined	02:54
	← _rnsanchez_ left	02:54
BuffyNZ	noituloveand: Thanks for the tip, I couldnt get git log --merges to give me what I was after. And git branch --contains lists the branches in alphabetically order, so I cant easily tell which branch is the oldest	02:54
	→ _rnsanchez_ joined	02:55
	← Literphor left	02:55
noituloveand	BuffyNZ: hmmm.	02:55
	← pizzaprty left	02:55
	← the_hugme left	02:56
	→ Mobutils joined	02:56
	← ivan left	02:56
	→ pizzaprty joined	02:57
BuffyNZ	noituloveand: We are migrating from hg to git, and one of the devs wants to know how to tell which branch a commit was on. Its a 1Gb repo with 10k+ commits and 20 or so branches, and 30 active devs, so manual trawling is... character building.	02:58
noituloveand	BuffyNZ: good gawd.	02:58
Hello71	git rev-parse --symbolic	02:59
noituloveand	BuffyNZ: have you looked on stack?	02:59
	← _rnsanchez_ left	03:00
BuffyNZ	noituloveand: Yeah, I have been poking around at this off and on for a couple of days. I did a few stack specific searches, but quite possibly missed something.	03:01
noituloveand	BuffyNZ: just skimmed this one - maybe there's something if you've not seen it: https://stackoverflow.com/questions/1527234/finding-a-branch-point-with-git	03:01
	→ _rnsanchez_ joined	03:02
Hello71	hm, maybe I'm thinking of a different command	03:02
	→ jftf joined	03:02
Hello71	git describe --all	03:02
	→ thumpba_ joined	03:03
	→ CraigyDavi`` joined	03:03
	← toothrot left	03:03
	→ Derega joined	03:03
skorgon	you can't get that information and it's meaningless. branches can be created, removed, renamed. all that doesn't affect the commits. there is no branch information in commits	03:04
ojacobson	BuffyNZ: named branches are a thing git doesn't have an equivalent for	03:04
	← kentaro0919 left	03:05
ojacobson	Git branches are morally equivalent to hg bookmarks, not to hg branches	03:05
BuffyNZ	The dev suggested that during the migration we set up a pre-commit hook to put the source branch in the commit comment.	03:05
ojacobson	(Git workflows generally take this into account.)	03:05
	← thumpba_ left	03:05
	← CraigyDavi` left	03:06
	← jftf left	03:06
	← wrouesnel3 left	03:07
	← dreiss left	03:08
	← thibaultcha left	03:08
	← sgen left	03:08
	← wrouesnel1 left	03:09
	← bitkiller left	03:11
	← Vivekananda_y510 left	03:11
	← nedbat left	03:12
	← _rnsanchez_ left	03:12
	→ pweaver_ joined	03:13
	→ Pyrogerg joined	03:13
BuffyNZ	Thanks all, I appreciate the pointers.	03:13
	← mfmfmfmfmfmf left	03:14
	→ mfmfmfmfmfmf joined	03:15
	→ otter768 joined	03:15
	→ Vivekananda_y510 joined	03:16
	→ montchr joined	03:16
	← Ankhers left	03:17
	← montchr left	03:18
	← punchagan left	03:18
	→ digital-shokunin joined	03:18
	← alvaro_o_ left	03:18
	← pizzaprty left	03:18
	← mfmfmfmfmfmf left	03:19
	→ fission6 joined	03:20
	← AlexZan left	03:22
	→ watabou joined	03:25
	← Pyrogerg left	03:29
	→ Pyrogerg joined	03:29
	← supernaut left	03:30
	→ supernaut joined	03:31
	→ JosephFerano joined	03:31
	← bartman`` left	03:34
	→ zumba_ad_ joined	03:39
	← JosephFerano left	03:41
	→ AdrianGuenter joined	03:41
	← axilaris left	03:42
	→ nour joined	03:43
zumba_ad_	I remember preaction, you told me that tag is similar to commit. Correct?	03:44
	→ johnkevinmbasco joined	03:45
	← zivester left	03:46
zumba_ad_	and folks, tell me if I remember correctly that when I consider the code to be solid, stable and free from any error, that's the time I should make a tag	03:47
	← aidalgol left	03:47
	→ irqq joined	03:47
BuffyNZ	That just means the bugs have become more subtle and cunning.. :)	03:48
	← sgambino left	03:48
	→ aidalgol joined	03:48
zumba_ad_	k	03:49
	is this a good branching model to follow? http://nvie.com/posts/a-successful-git-branching-model/	03:49
BuffyNZ	Yes, that is what we follow.	03:49
zumba_ad_	ok	03:49
	looks like I need to make another branch called develop	03:49
BuffyNZ	Kind of depends on your team size though	03:49
zumba_ad_	then all of us should be pushign to develop branch	03:49
BuffyNZ	And the expected longevity of your project	03:50
zumba_ad_	longterm	03:50
	we are not in the 5th month of the app	03:50
	not/now	03:50
BuffyNZ	Yeah, adopt a good branching strategy now.	03:50
zumba_ad_	k	03:50
	← otter768 left	03:51
	→ punchagan joined	03:52
zumba_ad_	although I haven't completed reading that link yet, I'm assuming(i know it's bad) that once develop has reached stable level, merge it into master then create a new branch and maybe call it MyApp-Stable-August27	03:52
	→ s2013 joined	03:52
	→ saurabh joined	03:53
	saurabh → Guest96472	03:53
zumba_ad_	I think I should use git tag rather than git commit so we won't be able to add updates to that stable branch. Correct?	03:53
	→ _0xff joined	03:53
	→ abnvp joined	03:53
	→ bezet joined	03:54
	→ montchr joined	03:54
	← fission6 left	03:55
	← madewokherd left	03:56
zumba_ad_	Hmm, "Finishing a release branch" is confusing. Why does it need to be merged back into master if we have already merged develop into master?	03:57
	← deric_skibotn left	03:58
	← bezet left	03:59
	→ jko_ joined	03:59
	← yacks left	03:59
	→ Junior joined	04:00
	→ teran joined	04:00
BuffyNZ	zumba_ad_: Deploy never gets merged into master directly	04:01
zumba_ad_	k	04:01
BuffyNZ	zumba_ad_: You create a release branch from deploy, which frees deploy up for further integrations, you test the release branch, and apply any bug fixes to the release branch, and when it is okay you merge the release branch to deploy and master	04:02
	→ anli joined	04:02
	→ bartman`` joined	04:02
	← DeathIncarnate left	04:02
	→ jftf joined	04:03
zumba_ad_	oh, so we still git commit and push to release branches	04:03
BuffyNZ	zumba_ad_: You may choose to merge the release branch back into deploy more often, depending on the bug.	04:03
	For bug fixes to that release, yes	04:03
zumba_ad_	i was under the impression that the word release means "it's the most stable, let's put it on the new server"	04:03
	so when does one team decide, "hey it's time to create a release branch?"	04:04
	→ yacks joined	04:04
	← kermit left	04:04
BuffyNZ	We use the concept of : Master follows what is in production	04:04
zumba_ad_	k	04:04
	→ moberberger joined	04:04
	→ wrouesnel1 joined	04:04
	→ kermit joined	04:04
	→ thibaultcha joined	04:04
BuffyNZ	When does a team decide to release? When all the pre-release tests past, its passed through qa, uat etc.	04:05
	← moberberger left	04:05
	← teran left	04:05
zumba_ad_	got it	04:05
	uat is after qa right?	04:05
BuffyNZ	Putting aside other business requirements like downtimes, release cycles etc.	04:05
	→ kpreid joined	04:05
BuffyNZ	Usually, it can depend on the company	04:06
zumba_ad_	got it	04:06
BuffyNZ	We go: Unit Tests -> Dev Tests -> QA Feature Tests -> Integration Tests -> Staging tests -> Uat tests -> Prod	04:06
zumba_ad_	Wow, that's nowhere what we are doing :D	04:07
BuffyNZ	The uat tests are done by the account managers and frontline support staff	04:07
zumba_ad_	k	04:07
	← s2013 left	04:07
	← jftf left	04:07
	← specing left	04:07
zumba_ad_	what's the difference between QA and Integration test? It's because where I work, it looks like QA and Integration are the same	04:08
	our QA tester uses integration web site to conduct her testings	04:08
	→ beautifulmind joined	04:08
zumba_ad_	we only have dev server, integration server and prod server	04:08
	← thibaultcha left	04:09
BuffyNZ	Our QA Feature tests are around testing specific features that are new or changes in this feature. The Intergration tests are checking that the product is still stable after being merged into develop.	04:09
zumba_ad_	got it	04:10
	so it includes testing of previously created features	04:10
	to check if it got affected	04:10
BuffyNZ	We do two types of tests for integration, we ahev automated tests we run, and we identify specific areas of concern for more targeted/in depth human testing	04:11
	→ ^Mike joined	04:11
	← Dreadnaught left	04:11
	→ lowkeyliesmyth joined	04:12
zumba_ad_	ah, so outputs like tooltips that got moved 15pixels to the left will be hard to detect by automated test. Correct?	04:12
	→ JosephFerano joined	04:12
^Mike	How can I edit the commit message for a merge commit? I was going to do `rebase -i HEAD~3` and use reword for that commit, but I see all the commits from the branch that got merged instead of the merge commit	04:12
	→ Ankhers joined	04:12
	→ oojacoboo joined	04:12
	→ specing joined	04:13
zumba_ad_	meaning the tooltip still showed correct values like "Incorrect values" however, it's not at the right location anymore	04:13
	← specing left	04:13
	→ specing joined	04:13
BuffyNZ	zumba_ad_: Depends on the testing framework, I guess. It is not my area...	04:13
zumba_ad_	k	04:13
BuffyNZ	I am just a build monkey.	04:13
zumba_ad_	:)	04:13
	← beautifulmind left	04:13
	← flugo left	04:14
	→ beautifulmind joined	04:16
BuffyNZ	^Mike: See if !fixup helps	04:17
gitinfo	^Mike: So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!	04:17
^Mike	nice	04:18
	→ thiago joined	04:19
BuffyNZ	^Mike:Answer your question?	04:19
	← beautifulmind left	04:19
	→ rishabh_kwt joined	04:20
	← jorisros__ left	04:20
	→ josefroy joined	04:20
	→ jorisros__ joined	04:20
^Mike	BuffyNZ: yep, thanks	04:20
	← ^Mike left	04:21
	→ Dreadnaught joined	04:22
	← Dreadnaught left	04:22
	→ Dreadnaught joined	04:22
	← Ankhers left	04:23
	← josefroy left	04:23
	→ beautifulmind joined	04:23
	→ josefroy joined	04:23
	→ snuffeluffegus joined	04:24
	→ s2013 joined	04:24
josefroy	Just a quick one here. If I wanted to ignore all the generated files inside stylesheets/.sass-cache/, then I just have to type "stylesheets/.sass-cache/" on one line in .gitignore, right?	04:24
	← jorisros__ left	04:25
	→ sgen_ joined	04:26
	← sgen_ left	04:26
josefroy	nvm, got it	04:26
	← josefroy left	04:27
	→ GT4066 joined	04:28
	→ Nicholas_Rishel joined	04:28
	→ smw joined	04:28
	← rfreemanw left	04:29
	← daito left	04:29
	← hahuang65 left	04:30
	→ Quevin joined	04:31
	← lindenle left	04:32
	→ P4_Denis joined	04:33
	→ lindenle joined	04:34
	→ rfreemanw joined	04:34
	→ str joined	04:35
	← BuffyNZ left	04:35
	→ Lyqyd joined	04:35
	← irqq left	04:36
	← Quevin left	04:36
	← lowkeyliesmyth left	04:36
	→ LeMike joined	04:36
	← P4_Denis left	04:37
	← Sleepy63_ left	04:38
str	Hi everyone!	04:38
	→ Sleepy63 joined	04:38
	→ OffTheRails_ joined	04:39
str	When I run gitk I see some remote branches that were already deleted in origin. When I try to use the auto complete "git checkout [tab]" I also see them listed, but as I said, they were deleted in origin.	04:39
	How do I remove them from my local?	04:39
Eugene	!prune	04:39
	Uh.... man git fetch; see --prune? I forget.	04:39
gitinfo	the git-fetch manpage is available at http://jk.gs/git-fetch.html	04:39
Eugene	Yup, that's the one	04:39
	→ subhojit777 joined	04:40
	→ sinkensabe joined	04:40
str	--prune... ohhh. thank you very much	04:41
	now, I'm using git flow, and everytime I do a git flow hotfix finish, I need to do: git checkout develop; git push; git checkout master; git push; git push --tags	04:42
	I don't want to keep doing that; how do I tell git push to push all local branches that already exist in origin?	04:43
	→ EminenceHC joined	04:43
	→ pr0ton joined	04:44
Eugene	man git-config; push.default	04:45
gitinfo	the git-config manpage is available at http://jk.gs/git-config.html	04:45
	← sinkensabe left	04:45
Eugene	You probably want matching	04:45
	← pweaver_ left	04:46
	← Gamecubic left	04:46
Eugene	Alternately; `git push $REMOTE branch1 branch2 branch3`	04:46
	→ megawac joined	04:46
	← a_le left	04:46
	← iaaah left	04:46
ojacobson	"You probably want matching" out of context, but in this channel, that's ... odd to see	04:47
Eugene	/topic	04:47
	→ a_le joined	04:47
ojacobson	rather	04:47
	ChanServ set mode: +o	04:47
	→ Sauvin joined	04:47
str	git config push.default matching thank you	04:47
	← Sauvin left	04:47
	Eugene changed the topic to: Welcome to #git, the place for git help and nihilistic tendenceies \| Current stable version: 2.1.0 \| Start here: http://jk.gs/git \| Getting "cannot send to channel"? /msg gitinfo .voice \| All those commits will be lost in time... Like tears in rain... Time to gc	04:47
	Eugene changed the topic to: Welcome to #git, the place for git help and nihilistic tendencies \| Current stable version: 2.1.0 \| Start here: http://jk.gs/git \| Getting "cannot send to channel"? /msg gitinfo .voice \| All those commits will be lost in time... Like tears in rain... Time to gc	04:47
Eugene	Helps if I can spell	04:47
	Eugene set mode: -o	04:47
	→ _thumpba joined	04:47
	← EminenceHC left	04:48
	→ Tommy[D] joined	04:48
	→ mennea joined	04:49
	→ Sauvin joined	04:49
	→ iaaah joined	04:50
	→ nilg joined	04:50
	→ TititaTitutu joined	04:50
	→ dreiss joined	04:51
	→ AnujSharma joined	04:51
	→ arup_r joined	04:52
	← ivan\ left	04:52
	← lindenle left	04:52
	← jko_ left	04:53
	→ lindenle joined	04:54
	→ Literphor joined	04:55
	← Literphor left	04:55
	→ jorisros__ joined	04:57
	→ User458764 joined	04:58
	← wrouesnel1 left	05:00
	→ teran joined	05:01
	← UmbraMalison left	05:01
	→ UmbraMalison joined	05:02
	← OffTheRails_ left	05:03
	← Nicholas_Rishel left	05:03
	← TititaTitutu left	05:03
	→ jftf joined	05:03
	→ whyy joined	05:03
	→ hahuang65 joined	05:05
	← str left	05:05
	← teran left	05:06
	→ visceral joined	05:06
	← jftf left	05:08
	→ koderok joined	05:08
	← koderok left	05:09
	→ zz_unglid joined	05:09
	→ CraigyDavi joined	05:10
	→ mfmfmfmfmfmf joined	05:10
	← nnyk left	05:11
	← lindenle left	05:11
	→ TititaTitutu joined	05:13
	← CraigyDavi`` left	05:13
	← Lyqyd left	05:13
	← ojacobson left	05:14
	→ fstd_ joined	05:15
	→ M-ou-se_ joined	05:16
	→ zoso joined	05:16
	→ kcm1700 joined	05:16
	← fstd left	05:17
	fstd_ → fstd	05:17
	→ thierryp joined	05:19
	← punchagan left	05:19
	← jmpp left	05:20
	→ nnyk joined	05:21
	→ pizzaprty joined	05:21
	← sin3t_ left	05:22
	→ `mist joined	05:22
	← aidalgol left	05:22
	→ sin3t_ joined	05:22
`mist	hey guys, i'm new to git and it seems i have failed somehow, i did a commit -ma 'message'	05:23
	then a git pull on another server	05:23
	→ AshyIsMe joined	05:23
	→ aismail joined	05:23
	← Tuna-Fish left	05:23
`mist	but the two are not identical	05:23
	← preaction left	05:23
AshyIsMe	is there a way to checkout the commit before the currently checkoud out one?	05:23
	← NegativeForty left	05:23
AshyIsMe	im trying to go back through the history so if i'm already a fair few commits back, how do i just go back one more commit?	05:24
	or do i have to go through git log and find the commit id?	05:24
	→ daito joined	05:24
`mist	aha... found the issue	05:25
	=x	05:25
	← `mist left	05:25
	← megawac left	05:25
	→ kopparam joined	05:26
	→ NegativeForty joined	05:26
	← Rastus_Vernon left	05:26
	→ h0bbit joined	05:26
	← mugenzebra left	05:28
	← mennea left	05:29
	→ lindenle joined	05:29
	→ TititaTitutu_ joined	05:30
	← TititaTitutu left	05:30
	→ kyb3r_ joined	05:30
	→ mugenzebra joined	05:31
	← a_le left	05:31
	→ ws2k33 joined	05:33
	→ Tuna-Fish joined	05:34
	← awsation left	05:35
	→ hoschi joined	05:35
	← veebers left	05:35
	← polyzen left	05:35
	← hj2014 left	05:38
	→ polyzen joined	05:40
	→ hj2014 joined	05:40
	→ Xethron joined	05:40
	← Xethron left	05:40
	→ Xethron joined	05:40
	→ sandr8 joined	05:40
	→ vrishab joined	05:41
	← starkhalo left	05:43
	NegativeForty → FreezingCold	05:43
	← supernaut left	05:43
	← lindenle left	05:44
	→ Tashi_l joined	05:44
	→ pantsman- joined	05:44
	→ lite_ joined	05:45
	→ jonmorehouse joined	05:47
	→ supernaut joined	05:47
	→ sinkensabe joined	05:49
	→ raven-au joined	05:50
	→ dccc_ joined	05:51
	→ cbr_ joined	05:51
	← TititaTitutu_ left	05:52
	← watabou left	05:52
	← kopparam left	05:53
	→ kopparam joined	05:53
	← dccc__ left	05:54
	← johnkevinmbasco left	05:54
	← snuffeluffegus left	05:55
	→ bezet joined	05:55
	← whyy left	05:57
	→ bhws joined	05:57
	← kopparam left	05:58
	← sinkensabe left	05:58
	← bezet left	05:59
	→ Neptu joined	06:00
	← weiyang left	06:00
	→ koi joined	06:01
	→ JakeSays_ joined	06:01
	← JosephFerano left	06:01
	→ teran joined	06:02
	← gfixler left	06:02
	→ mariuscc joined	06:03
	← pantsman- left	06:04
	→ jftf joined	06:04
	→ papegaaij joined	06:04
	→ thibaultcha joined	06:05
	← dreiss left	06:05
	← JakeSays left	06:05
	← asakura left	06:05
	← Junior left	06:06
	← teran left	06:06
	→ TititaTitutu joined	06:07
	→ Marcus_ joined	06:07
	→ asakura joined	06:07
	← abnvp left	06:07
	→ Raging_Hog joined	06:09
	← jftf left	06:09
	← tpollard left	06:10
	→ KevinTS joined	06:10
	← _0xff left	06:10
	→ tarkus joined	06:11
	→ stodan joined	06:12
	← mariuscc left	06:13
	→ mlechner joined	06:13
	← gain left	06:13
	→ weiyang joined	06:14
	← thiago left	06:14
	→ mariuscc2 joined	06:15
	→ mariuscc joined	06:15
	← thibaultcha left	06:15
	→ eletuchy joined	06:15
	→ RaviTezu joined	06:15
RaviTezu	Hi, I have a git server with gitolite installed on it. Recently, we started seeing Out of memory issues on the server and this results in failed clones. Server was having 2GB of RAM and we bumped it up to 4GB. But, still the problem persists.	06:16
	← beautifulmind left	06:16
RaviTezu	Today, I have checked the RAM usage when users complained that they were unable to clone. But it was using only 600MB of 4GB RAM.	06:16
	← smw left	06:16
RaviTezu	I suspect, something wrong with the git configuration. Can some one help?	06:16
	← jonmorehouse left	06:18
	→ hoege joined	06:18
	→ acolson joined	06:18
milki	RaviTezu: do you have any custom configurations on the server side?	06:19
	→ dreiss joined	06:19
	→ jonmorehouse joined	06:19
milki	has your repos ever had large files committed ever	06:20
RaviTezu	milki: No. We didn't even make any recent changes to it..	06:20
	→ roelmonnens joined	06:20
RaviTezu	repos are just around 2MB	06:20
milki	have you run gc on them yet?	06:20
	→ wrouesnel joined	06:20
milki	are you running a recent version of git?	06:21
	→ cmn joined	06:21
RaviTezu	But, When load is high... I see many gitolite-shell processes. But I don't this is relevant.	06:21
	Tashi_l → Tashi	06:21
RaviTezu	git version 1.7.1	06:21
	→ gv joined	06:21
milki	have you disabled autogc?	06:22
	→ sinkensabe joined	06:22
	→ dmilith joined	06:22
RaviTezu	milki: I am not sure about it, can you please tell me how to check that?	06:22
	→ gluten_hell joined	06:22
	→ kdlv joined	06:22
milki	dump your git config -l as the gitolite hosting user	06:23
RaviTezu	gitolite@git01:~ $ git config -l	06:23
	color.diff=True	06:23
	color.branch=True	06:23
milki	from within the repo that broke	06:23
RaviTezu	ok	06:23
milki	also	06:23
	!paste	06:23
gitinfo	Please paste snippets longer than one line at a pastebin site, such as https://gist.github.com/ rather than in-channel.	06:23
RaviTezu	ok	06:23
	→ mennea joined	06:25
	→ Wiz_KeeD joined	06:25
	→ kopparam joined	06:25
	→ ajf- joined	06:25
RaviTezu	milki: https://gist.github.com/RaviTezu/fc8cadff860df2ef7136	06:25
milki	ok, so no tuning was done and gc shoudl be running normally	06:26
RaviTezu	and btw, we were not able to clone/pull/push on every repo.	06:26
	we had to restart the host to get back everything	06:26
	← digital-shokunin left	06:27
milki	well, once you overlaod the server, everything grinds to a halt and the server gets really sad	06:27
	→ abnvp joined	06:27
milki	RaviTezu: did you see the child processes of those gitolite-shell's?	06:27
RaviTezu	I have even added a 2GB swap to it. But it is not at all used.	06:27
	milki doenst know how swap gets used at all	06:27
RaviTezu	Yes. I can see some gitolite-shell processes.	06:27
milki	theres nothing wrong with your configuration, but its not tuned	06:28
	→ Embassy joined	06:28
RaviTezu	They are pulls/clones processes..	06:28
milki	RaviTezu: what are the child proceses when your clone hangs?	06:28
	RaviTezu: do you have pstree?	06:28
	← mariuscc2 left	06:28
milki	i would suspect its hanging during git repack	06:28
	→ _tpavel joined	06:28
milki	which would mean git gc should also be having issues on that repo	06:28
	→ freimatz joined	06:29
milki	a possible issue could be you have several clones that all end up trying to gc the same repo 100 times over	06:29
	pstree and htop will be able to show you those child processes	06:29
RaviTezu	git shell -c git-upload-pack '/var/lib/gitolite/repositories/puppet.git'	06:29
	→ pweaver_ joined	06:30
RaviTezu	milki: Server is having 4GB and I see around 10 gitolite-shell processes..	06:30
	only 580MB of RAM was used at that time..	06:30
	→ tvw joined	06:30
RaviTezu	and load was aroung 17.0	06:30
	→ Amandil joined	06:31
milki	you are missing 7 processes then	06:31
	o.O	06:31
	at minimum	06:31
	→ OffTheRails_ joined	06:31
RaviTezu	Do I need to bump the max. processes for gitolite user?	06:31
	← thierryp left	06:32
	← sohail left	06:32
	→ Quevin joined	06:32
RaviTezu	milki: max processes are 1024	06:32
milki	that sounds reasonable	06:33
	and max open files	06:33
	← vrishab left	06:33
RaviTezu	4096	06:33
	→ P4_Denis joined	06:33
milki	you will have a ton of short lived ssh sessions	06:33
RaviTezu	milki: will that help if I bump any of these?	06:34
milki	they shouldnt be related to Out of Memory though	06:34
	those would fix symptoms of Remote peer disconnected or somethign	06:34
	← s2013 left	06:35
RaviTezu	ok, we didn't see such errors.. when the host is under high load.. I see OOM errors on the console and clones hang.	06:35
milki	whats the output of pstree -u <gitolite user> -p	06:35
	→ Zeno` joined	06:36
RaviTezu	milki: sshd(27340)───gitolite-shell(27347)───git(27353)───git(27354)───git-upload-pack(27356)───git(27381	06:36
Zeno`	hi. I have a branch called 'test'. Is there a way to squash the commits in that branch? (I don't want to affect master)	06:36
	→ teran joined	06:36
RaviTezu	milki: I don't see any clone running now, so I triggered one	06:37
milki	Zeno`: squashing is done with interactive rebase. see !fixup	06:37
gitinfo	Zeno`: So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!	06:37
	← OffTheRails left	06:37
	← Quevin left	06:37
Zeno`	looking... thanks	06:37
	← P4_Denis left	06:37
milki	RaviTezu: o, use pstree -u user -ap	06:37
	→ Macaveli joined	06:38
	→ thierryp joined	06:39
RaviTezu	milki: http://bpaste.net/show/0213a9793bba	06:39
	→ glebihan_ joined	06:40
milki	RaviTezu: ya, so upload-pack will generate a couple subprocesses	06:40
	you should watch that during a hang and see what process it was doing	06:40
	→ jheg joined	06:40
	← d10n-work left	06:40
	← thierryp left	06:41
milki	htop will let you visualize both cpu and mem usage at the same time along with the familiar top information too	06:41
	→ jontmorehouse joined	06:41
milki	if gc is the problem, i sugguest disabling autogc and manually running gc in a cron job	06:42
	if its not...you'll need to learn how to tune git packing	06:42
	← mariuscc left	06:42
RaviTezu	milki: thanks for your time. Will check that next time.	06:42
	→ Gizburdt joined	06:43
milki	RaviTezu: also, you could upgrade git	06:43
	← nbrosnahan left	06:43
milki	RaviTezu: but do note that git is cpu and ram intensive	06:43
	← jonmorehouse left	06:43
Zeno`	I don't get it	06:44
milki	more of those would always help	06:44
Zeno`	I've pushed the branch and its commits	06:44
	I just want to squash them into one commit	06:44
	← visceral left	06:44
	← noituloveand left	06:44
	→ EminenceHC joined	06:44
Zeno`	I don't want to discard anything	06:44
milki	squashing is discarding	06:44
	o.O	06:45
	you cant squash without discarding	06:45
Zeno`	yeah, well the commit messages	06:45
	maybe it's not possible	06:45
RaviTezu	Zeno`: Tried git rebase -i?	06:45
Zeno`	I want to turn 3 commits into 1 in branch 'test'	06:45
milki	try explaining what you want to do	06:45
Zeno`	I haven't tried that... should I?	06:45
milki	maybe you are misusing the term	06:45
	← gluten_hell left	06:46
	← OffTheRails_ left	06:46
milki	Zeno`: that command _is_ an interactive rebase	06:46
RaviTezu	Zeno`: switch to test branch and you may try running git rebase -i.	06:46
	← jontmorehouse left	06:47
	← User458764 left	06:47
Zeno`	hmm	06:48
	→ Hecter joined	06:48
milki	o	06:49
	Zeno`: try !perfect	06:49
gitinfo	Zeno`: [!postproduction] So, you want to make your commit history look pretty before pushing? http://sethrobertson.github.com/GitPostProduction talks you through how to use 'rebase -i' to do this.	06:49
	← EminenceHC left	06:49
Zeno`	reading now	06:49
	← jheg left	06:50
	→ jontmorehouse joined	06:50
	→ jargon joined	06:51
	→ OffTheRails joined	06:53
	← weiyang left	06:54
	← glebihan_ left	06:55
	← hoege left	06:56
	→ glebihan joined	06:56
	← nour left	06:56
	→ MithrilTuxedo joined	06:57
	→ hebz0rl joined	06:57
	← diegoviola left	06:58
	→ MithrilTux joined	06:58
Zeno`	ok I think that worked	06:58
	thankyou milki	06:59
	← jorisros__ left	06:59
	→ jorisros__ joined	07:00
	← ifdm_ left	07:00
	← arup_r left	07:00
milki	cool	07:01
	i forgot which trigger it was	07:01
	>.>	07:01
	← MithrilTuxedo left	07:02
	← devoldmx left	07:03
	→ devoldmx joined	07:03
	→ ifdm_ joined	07:04
	← jorisros__ left	07:04
	→ arup_r joined	07:04
	→ jnavila joined	07:05
	← tvw left	07:06
	← jontmorehouse left	07:06
	→ AlexDenisov joined	07:07
	→ paddymahoney joined	07:07
	→ weiyang joined	07:08
	← Dreadnaught left	07:08
	← _thumpba left	07:09
	→ TomyWork joined	07:10
	← mugenzebra left	07:10
	← bartman`` left	07:10
	← glebihan left	07:10
	→ glebihan joined	07:11
	→ encod3 joined	07:11
	→ maqr joined	07:12
	→ jagob joined	07:13
	← pweaver_ left	07:15
	→ rath joined	07:15
	← ifdm_ left	07:15
	← abnvp left	07:16
	→ Gonzo89 joined	07:16
	→ Kicer86 joined	07:16
	→ atamanroman joined	07:16
	← kopparam left	07:17
	← Goplat left	07:17
	→ jdmf joined	07:17
	→ abnvp joined	07:17
	← abnvp left	07:17
	→ kopparam joined	07:17
	→ elbeardmorez joined	07:18
	→ knalf joined	07:19
	→ ag4ve_ joined	07:19
	← Hecter left	07:20
	← dreiss left	07:20
	→ numdig joined	07:21
	← anli left	07:21
	← kopparam left	07:22
	← LeMike left	07:23
	→ Deele joined	07:23
Deele	hello	07:23
gitinfo	Deele: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	07:24
	→ mariuscc joined	07:24
Deele	is it possible to change namespace/group of git project? I'm using gitlab	07:24
	← todd_dsm left	07:24
	→ Junior joined	07:24
	← arup_r left	07:24
	← glebihan left	07:26
	→ avvs joined	07:26
	→ devoldmx3 joined	07:26
	← devoldmx left	07:26
	→ devoldmx joined	07:26
	→ glebihan joined	07:26
RaviTezu	Deele: Check in #gitlab	07:27
	→ ifdm_ joined	07:28
	← teran left	07:28
	→ abnvp joined	07:30
	← Zeno` left	07:30
	← elbeardmorez left	07:30
	← Marcus_ left	07:30
	← devoldmx3 left	07:30
	→ Sicp joined	07:31
	← devoldmx left	07:31
	→ devoldmx joined	07:32
	→ elbeardmorez joined	07:32
	← eletuchy left	07:32
	→ devoldmx3 joined	07:32
	← AlexDenisov left	07:32
	→ eburcat joined	07:32
Deele	RaviTezu thx	07:34
	→ seanmerron joined	07:35
	← abnvp left	07:36
	← devoldmx left	07:36
	→ hamster joined	07:37
	→ fstd_ joined	07:38
	← RaviTezu left	07:39
	← AshyIsMe left	07:40
	→ lindenle joined	07:41
	← fstd left	07:41
	fstd_ → fstd	07:41
	→ sylon joined	07:42
sylon	hi - how do i tell gitignore to ignore an extension but not a directory that matches the same rule ?	07:43
	e.g. I have this in my gitignore file: *.data	07:43
	but it is ignoring everything in ~/stuff/report.data/*	07:43
	instead of ignoring just files that end with *.data	07:44
osse	*.data and then !report.data/	07:44
sylon	so i must whitlist everything rather than having a more restrictive blacklist rule?	07:44
	← lindenle left	07:46
osse	just the directory	07:46
sylon	but what if i have another directory somewhere with a .data in its name	07:46
	i must whitelist that too	07:47
	→ mozzarella joined	07:47
jast	this whitelists only literally report.data	07:47
sylon	yea	07:47
jast	if you want to whitelist all of them, try: .data and !.data/	07:47
osse	!*.data/ then	07:47
sylon	which is why i was wondering if i could do something like *.data$ or some regex	07:47
	for gitignore	07:47
	→ abnvp joined	07:48
sylon	osse: that wont help if its reports.data.something/	07:48
	haha sorry	07:48
	→ LeMike joined	07:48
sylon	i dont have anything like that	07:48
	← Sleepy63 left	07:48
jast	even if so, the ignore pattern '*.data' doesn't match that in the first place, so it never gets ignored	07:48
sylon	ah	07:49
jast	the ignore patterns work pretty much like shell glob patterns	07:49
	not so much like regular expressions	07:49
	you were probably thinking of .data :)	07:49
sylon	anyways thanks for the info, i will go with the whitelisting for now	07:49
	→ drjeats joined	07:51
	→ ferreum joined	07:51
	← hamster left	07:51
	← Gizburdt left	07:51
	→ Gizburdt joined	07:52
	→ hamster joined	07:52
	→ nour joined	07:53
	← Sicp left	07:53
	← sylon left	07:53
	← maxorator left	07:53
	→ teran joined	07:53
	→ maxorator joined	07:54
	← abnvp left	07:54
	→ jceb joined	07:54
	← Vivekananda_y510 left	07:54
	← TititaTitutu left	07:54
	→ dr_lepper joined	07:54
	← Vile left	07:54
	→ bezet joined	07:55
	→ kopparam joined	07:55
	← hj2014 left	07:55
	← iaaah left	07:55
	→ epifanio joined	07:56
	→ hj2014 joined	07:56
	→ crydust joined	07:56
	→ harish joined	07:57
	→ arup_r joined	07:58
	→ hj2014_ joined	07:58
	→ zanchoPansa joined	07:58
	← jceb left	07:58
	→ gfixler joined	07:59
	← hj2014_ left	07:59
	→ ghostlines joined	07:59
	← bezet left	07:59
	→ hj2014_ joined	07:59
	→ sdrfnord1 joined	08:00
	→ sandorjanssen joined	08:01
	→ iaaah joined	08:01
	→ cxz joined	08:01
	← hj2014 left	08:02
	→ bartman`` joined	08:02
	→ mikecmpbll joined	08:02
	← bhws left	08:03
	← pr0ton left	08:03
	← darkbasic left	08:03
	→ darkbasic joined	08:03
	→ shuaib joined	08:04
	→ Marcus_ joined	08:04
	→ psoo joined	08:05
	→ TititaTitutu joined	08:06
	← rjhunter left	08:07
	→ rjhunter joined	08:07
	→ aidalgol joined	08:07
	← Gizburdt left	08:08
	← daito left	08:08
	→ irqq joined	08:09
	← Embassy left	08:09
	← rjhunter left	08:11
	← TititaTitutu left	08:12
	← hj2014_ left	08:12
	→ jceb joined	08:12
	→ Embassy joined	08:12
	→ j416 joined	08:12
	← harish left	08:12
	→ hj2014 joined	08:12
	← antispaceman left	08:14
	→ antispaceman joined	08:14
	→ flugo joined	08:14
	→ Jenser joined	08:15
	← Jenser left	08:15
	→ punchagan joined	08:15
	→ daito joined	08:16
	← nilg left	08:18
	← AnujSharma left	08:19
	→ nilg joined	08:19
	← ifdm_ left	08:19
	→ rjhunter joined	08:20
	← mfmfmfmfmfmf left	08:20
	← punchagan left	08:20
	→ Not_Whatever joined	08:21
	← Asiajey left	08:22
	→ Asiajey joined	08:22
	← rjhunter left	08:23
	← Macaveli left	08:24
	← flugo left	08:24
	← kline left	08:25
	→ P4_Denis joined	08:27
	→ CheckDavid joined	08:28
	→ BaNzounet joined	08:28
BaNzounet	Hey, if i did git reset --soft commitId is it possible to revert this operation?	08:29
osse	BaNzounet: git reset --soft <branch name>	08:29
	← GT4066 left	08:32
BaNzounet	osse: okay, thank you :)	08:33
osse	no	08:33
	no no	08:33
	wrong, sorry.	08:33
	BaNzounet: git reset --soft <branch name>@{1}	08:33
BaNzounet	okay :D	08:33
	→ Quevin joined	08:33
	→ Mr_Sheesh joined	08:35
	← h0bbit left	08:35
	gitinfo set mode: +v	08:35
	← nilg left	08:36
	→ King_Hual joined	08:36
	→ regreg joined	08:36
	→ palcu joined	08:36
	→ nilg joined	08:37
	→ ifdm_ joined	08:37
	→ W0rmDr1nk joined	08:37
	→ BSaboia joined	08:38
	← Quevin left	08:38
	← avvs left	08:39
	← rfreemanw left	08:40
	← dccc_ left	08:41
	← joki left	08:41
	→ EminenceHC joined	08:45
	→ sgen_ joined	08:46
Arahael	Hey, I've a peculiar issue with git, I'm trying to do the following: git --git-dir=../foo MYTAG path/to/file	08:47
	However, it checks it out relative to my current directory, which is fine (but surprising), however, it doesn't appear to check the right one out?	08:47
	→ joki joined	08:47
Arahael	Sorry: That command should be: git --git-dir=../foo checkout MYTAG path/to/file	08:48
	→ klausson joined	08:48
osse	Arahael: you can specify where to check out with --work-tree	08:48
	that it checks the wrong one out I find hard to believe though :p	08:49
Arahael	osse: Now that I'm looking, I don't see that syntax in the docs, so nto that hard to believe. Wondering how I should do it though.	08:49
	← EminenceHC left	08:49
	→ amcsi_work joined	08:50
	← darkbasic left	08:50
	← kopparam left	08:50
	← numdig left	08:50
	→ numdig joined	08:51
	→ kopparam joined	08:51
	→ Gizburdt joined	08:51
	→ darkbasic joined	08:51
osse	Arahael: which syntax are you referring to?	08:52
	→ avvs joined	08:52
	→ petersr joined	08:53
Arahael	osse: I'm basically trying to do: git checkout [-p\|--patch] [<tree-ish>] [--] [<paths>…]	08:53
	But where the "tree-ish" is a commit, not a tree object.	08:53
osse	a tag is a tree-ish so that's fine	08:53
	→ rfreeman_w joined	08:53
osse	tree-ish means "a tree, or anything that can resolve to one"	08:53
Arahael	Ah, good.	08:53
	I suspect it's checking it out from the index despite the treeish.	08:54
	→ abnvp joined	08:54
	← Not_Whatever left	08:54
	← hamster left	08:55
	→ grawity joined	08:55
	← kopparam left	08:56
	← Mobutils left	08:57
	← abnvp left	08:58
	← asakura left	08:59
	→ abnvp joined	08:59
	← epifanio left	09:00
	→ asakura joined	09:00
	← antispaceman left	09:00
	→ antispaceman joined	09:01
	← darkbasic left	09:01
	→ darkbasic joined	09:01
	→ Enzo_S joined	09:03
	→ bezet joined	09:04
	← seg left	09:04
	→ Arson1de joined	09:04
finster	j	09:05
Sajbar	k ?	09:06
	→ ockham joined	09:06
Mr_Sheesh	Hey all; I'm new to git, used other SCCS' before. Trying to grab an RPi source set using "git clone git://git.code.sf.net/p/starminer/code starminer-code" and being told "warning: You appear to have cloned an empty repository." - On XP here. Trying to get source so I can suggest some changes :)	09:06
	← Ars0nide left	09:07
	→ Skapadapaduu joined	09:07
	→ tmz joined	09:08
	← paddymahoney left	09:08
	→ moritzs joined	09:09
	→ endiruna1 joined	09:09
	← sdrfnord1 left	09:09
	→ jottr joined	09:10
Arahael	osse: I hate it when this happens. I've found a hint to my problem. :( See, what I really wanted to do was use 'git show'.	09:11
canton7	Mr_Sheesh, looking at http://sourceforge.net/p/starminer/code/commit_browser, it indeed looks like he hasn't pushed any code	09:11
Mr_Sheesh	OK TY at least I am not doing it completely wrong, then :p	09:12
Arahael	However, it provides a completely wrong file in PowersShell. If I do it in bash, works perfectly.	09:12
	→ tgunr joined	09:12
Mr_Sheesh	I'm a CLI type so I'll just use bash	09:13
	← knalf left	09:15
Riviera	SCCS, wow. :)	09:15
Mr_Sheesh	:)	09:16
tgunr	Not sure if this is the right channel but will start here. I often use emacs and magit when working on remote servers with tramp, but on my local machine I prefer to use Sourcetree and Deltawalker as my diff tool. Trying to understand how to setup my .gitconfig file to use ediff if I am using magit in emacs, and deltawalker if I am using sourcetree. Is this even possible?	09:16
	→ knalf joined	09:17
tgunr	Right now I toggle (comment out) the `external' line for deltawalker when using magit but there must be an eiaser way I hope.	09:17
	→ h0bbit joined	09:17
	→ harish joined	09:17
	← AdrianGuenter left	09:19
	→ Hounddog joined	09:20
	→ ropav joined	09:21
	← mikecmpbll left	09:22
	→ _thumpba joined	09:23
	→ AlecTaylor joined	09:23
	→ mikecmpbll joined	09:23
canton7	tgunr, can you make either tool call difftool -t ?	09:23
	→ ropav_ joined	09:25
	→ hj2014_ joined	09:26
	← hj2014 left	09:26
	← ropav_ left	09:26
	← ropav left	09:26
tgunr	not sure, i see entries for [difftool "sourcetree"] and [difftool "deltawalker"], each has a cmd line pointing to a app, I just don't know how to make one for emacs	09:26
	→ jds joined	09:27
	← nilg left	09:27
	← polyzen left	09:28
	← Mr_Sheesh left	09:28
	← antispaceman left	09:28
canton7	ok, I misunderstood the question a bit	09:28
	→ nilg joined	09:29
	→ ockham1 joined	09:29
	← ockham left	09:29
canton7	how do you invoke the difftool in all scenarios?	09:30
	← Enzo_S left	09:30
	← atamanroman left	09:30
	← glebihan left	09:30
	→ darkbasic_ joined	09:31
	← darkbasic left	09:31
	→ ropav joined	09:31
	→ glebihan joined	09:31
	← drjeats left	09:31
	→ kopparam joined	09:32
Arahael	osse: Well, whatever I was doing works perfectly in bash, so I give up. For windows, I'll do things stupidly. :)	09:32
	→ gittish joined	09:32
	→ listochkin joined	09:32
tgunr	I am presuming somehow git knows how to invoke sourcetree tool if I'm using sourcetree, so maybe the question is how would git know I'm using emacs?	09:33
	→ martinklepsch joined	09:34
tgunr	Arahael: Isn;t that usually the case? :)	09:34
canton7	I suspect the sourcetree tool is invoking the sourcetree difftool automatically?	09:34
Arahael	tgunr: No comment.	09:34
	→ Mr_Sheesh joined	09:34
tgunr	:) retired Apple engineer	09:34
	→ AlexDenisov joined	09:34
	← petersr left	09:35
	← numdig left	09:35
Arahael	tgunr: Don't boast, I can't figure out how to use emacs in Terminal.app. :)	09:36
tgunr	I use Aquamacs, too much muscle memory to use plain emacs	09:36
	→ schubam joined	09:36
	→ numdig joined	09:36
tgunr	Makes emacs behave like a normal Mac edittor	09:37
	← ropav left	09:37
Arahael	tgunr: Still nice to be able to use tmux and cousins.	09:37
	← _thumpba left	09:37
tgunr	and I don't use Terminal anymore gasp, switched to iTerm and never looked back	09:38
	iTerm has tmux support built in	09:38
Arahael	tgunr: Granted, I use mac for os x, which is pretty good (no full-screen though), and iterm as well, but my point stands. :)	09:38
	→ ropav joined	09:39
	→ darkbasic joined	09:39
tgunr	Yeah, to use Termianl you need to do some massaging of the keys	09:39
	← darkbasic_ left	09:40
	→ a_l_e joined	09:40
	→ tvw joined	09:41
	← ropav left	09:41
	→ hexagoxel joined	09:42
	→ kerrick_ joined	09:43
Arahael	All-in-all, it's a much nicer dev environment.	09:43
	← shuaib left	09:43
tgunr	amen	09:43
	→ Hecter joined	09:44
	← weiyang left	09:44
	← kopparam left	09:44
	← daito left	09:45
	→ ropav joined	09:45
	→ kopparam joined	09:45
	→ jorj joined	09:45
	→ LucasTT joined	09:45
	← bezet left	09:45
	→ nettoweb joined	09:49
	← kopparam left	09:49
	← knalf left	09:50
	→ solker joined	09:50
	← rishabh_kwt left	09:50
Arahael	tgunr: I might go home, windows is being stupid. "Unlink of file... failed. Should I try again?"	09:50
	→ knalf joined	09:50
	← palcu left	09:51
tgunr	only if you enjoy pain	09:51
	← Arson1de left	09:52
	← solker_ left	09:52
	→ daito joined	09:53
Arahael	tgunr: Perhaps I need a new job.	09:53
tgunr	My job requires me to use all three, fortunately I do most on my Mac.	09:54
	← Eins_ left	09:54
	→ Vivekananda_y510 joined	09:54
tgunr	What IS your job BTW?	09:54
Arahael	tgunr: I work in windows dev, for a hardware company.	09:55
	← Gizburdt left	09:56
	→ davegb3 joined	09:56
	← Asiajey left	09:56
tgunr	what kind of hardware, I used to work close to the metal myself	09:56
	← kyb3r_ left	09:56
	→ stamina joined	09:56
	→ shuaib joined	09:57
Arahael	tgunr: Oh, I do applications dev, but the company does hardware. :)	09:57
	tgunr: I'd rather not say too publically, although I'd tell everything if we were in a cafe...	09:57
	← Hecter left	09:58
tgunr	rog, I used to run the Openfirmware dept at Apple now basically working on things I like	09:59
	→ ocbtec joined	09:59
	← ocbtec left	10:00
	→ stellarhopper_ joined	10:00
	← ropav left	10:01
	→ muep joined	10:02
	→ Nizumzen joined	10:02
	→ ropav joined	10:02
	← stellarhopper left	10:03
	→ guardian joined	10:04
guardian	hello, is there a way to log on a remote when a branch gets deleted?	10:04
canton7	unless the reflog's started logging branch deletions, I don't think so no	10:04
	unless you implement your own hook	10:04
tgunr	I suppose you "could" cook up some kind of hook	10:05
	→ NanoArro1 joined	10:05
tgunr	hmm, if you have it sending email, you could set up an email rule to run an app?	10:05
guardian	I have enabled logAllRefUpdates but that doesn't cut it	10:06
Deele	hey, there is no channel for tortoisegit, so I will ask it here. I just installed it and it complains, that it cant find "Git.exe", and I think that it has bug, because there is git.exe, just with small letter G, is there a way to fix this?	10:07
Skapadapaduu	is there a way to list files which are modified before you do "git add ." ? ofc I can do then "git status" -> "git reset .", but I am just curious.	10:07
	← ropav left	10:07
tgunr	whats wrong with just `git status'?	10:08
Deele	should I create soft link "Git.exe" which leads to "git.exe"?	10:08
tgunr	Try it and see Deele	10:09
	← aidalgol left	10:09
Arahael	Deele: My rule for windows products is usually to install all defaults. Unless you've downloaded from sourceforge, in which case, never use the defaults.	10:09
	→ ropav joined	10:09
	→ arup_r_ joined	10:09
	← Beardless_One left	10:10
	← solker left	10:10
	→ solker joined	10:10
	← schubam left	10:10
	→ kopparam joined	10:10
	→ Raydiation joined	10:11
Raydiation	ive cloned a repo and theres only master in it	10:11
	git fetch --all doesnt work	10:12
	← arup_r left	10:12
canton7	Skapadapaduu, 'git status' doesn't change anything	10:12
	Raydiation, 'git branch -a' / 'git branch -r'	10:12
	all remote branches are fetched as !remote_tracking_branches	10:12
	ack, !rtb	10:12
gitinfo	[!remote_tracking_branch] Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the corresponding branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a new local branch based on a remote-tracking branch using e.g. 'git checkout -b <branch> <remote	10:12
	← tvw left	10:12
canton7	you can create local branches based off those remote-tracking branches as and when you need them	10:12
	← B1x1t0 left	10:13
	← ag4ve_ left	10:14
Raydiation	canton7: i see, thanks :)	10:15
Deele	Arahael, I got it from code.google.com, same rule applies to that? :)	10:16
	→ nfk joined	10:17
	→ Asiajey joined	10:18
	← Asiajey left	10:18
	→ Asiajey joined	10:18
	← ropav left	10:19
	← Tashi left	10:19
Arahael	Deele: Those seem to be safer, but I was very irritated when sf.net started giving out spyware.	10:21
	→ beautifulmind joined	10:21
	→ ropav joined	10:21
	← knalf left	10:23
	→ knalf joined	10:24
	← echo-area left	10:25
	→ antispaceman joined	10:28
	→ sohail joined	10:29
	→ rishabh_kwt joined	10:29
	← arup_r_ left	10:30
	← nnyk left	10:31
	→ tvw joined	10:31
	← sohail left	10:33
	→ flugo joined	10:34
cbreak	google hosting spyware? I heard they even released a 64 bit version for windows, finally :D	10:35
	→ thierryp joined	10:35
	→ Gizburdt joined	10:35
	→ salamanderrake joined	10:35
	→ mark06 joined	10:37
	→ anli joined	10:37
Deele	I sent an issue to their google code site... hope they will fix it	10:37
	→ Tashi joined	10:38
	← mark06 left	10:38
	← jnavila left	10:40
	← ropav left	10:41
	→ ropav joined	10:43
	→ Macaveli joined	10:43
	→ aspiers joined	10:44
	→ mikeric joined	10:44
	← beautifulmind left	10:44
	← pizzaprty left	10:45
	→ nedbat joined	10:45
	→ dccc joined	10:46
	→ EminenceHC joined	10:46
	← Gizburdt left	10:46
	→ CussBot joined	10:47
	→ dsirijus joined	10:48
	← hyperair left	10:48
dsirijus	hey, is it possible to somehow list files that took up most space throughout history of a repo?	10:48
	← daito left	10:49
	→ AlexZan joined	10:50
	← EminenceHC left	10:51
	→ arup_r joined	10:51
	← luc__ left	10:52
	→ luc__ joined	10:53
	→ gccostabr joined	10:53
	← AlecTaylor left	10:53
	→ lyxus joined	10:53
	← martinklepsch left	10:54
	→ beastd joined	10:54
lyxus	hello I am trying to look for a particular commit on the current branch, i know the command git branch --contains; but is there anyway to restrict it to only one branch	10:55
	← ropav left	10:56
	→ martinklepsch joined	10:57
	→ jdi joined	10:57
	← abnvp left	10:57
	← luc__ left	10:57
	← AlexDenisov left	10:57
	→ amikiri joined	10:58
	→ abnvp joined	10:58
	→ netcarver joined	10:58
	→ KevinTS_ joined	10:59
	→ thibaultcha joined	10:59
	← LeMike left	11:01
tobiasvl	lyxus: how will it pick the branch? just show the first one?	11:01
	← dsirijus left	11:01
tobiasvl	or do you mean that you want to know for a specific branch whether or not it contains the commit	11:01
lyxus	tobiasvl, I want to know for a specific branch	11:02
	← abnvp left	11:02
	← KevinTS left	11:02
	← tokik left	11:02
tobiasvl	can't you just do `git --contains SHA1 \| grep BRANCH_NAME`	11:03
jast	git rev-list mybranch \| grep mycommit	11:03
hegge	Or git branch --contains <commit> <branchname>	11:03
	← Tashi left	11:03
tobiasvl	hehe, nice hegge	11:04
lyxus	tobiasvl, That's what I am doing now, was just wondering if there was something cleaner	11:04
	→ pizzaprty joined	11:04
	→ Tashi joined	11:04
	← thibaultcha left	11:04
lyxus	tobiasvl, hegge thanks I wish the exit code was different between a match and not	11:05
	→ Polymorphism joined	11:05
	← Polymorphism left	11:05
	→ kbyrne joined	11:05
	→ Polymorphism joined	11:06
	→ vurma joined	11:10
	← kopparam left	11:11
	← jottr left	11:11
	→ kopparam joined	11:11
	← knalf left	11:12
	← nedbat left	11:13
	→ knalf joined	11:15
	→ ropav joined	11:16
	→ aartist joined	11:16
	← ropav left	11:17
cagedwisdom	man....	11:18
	for the life of me I cannot get a bash prompt with an embedded GIT_PS1 that somehow does not F up my prompt	11:18
	→ ropav joined	11:18
tobiasvl	cagedwisdom: how so?	11:18
	← vurma left	11:18
tobiasvl	how is it fucked up?	11:19
	I use this one https://github.com/magicmonty/bash-git-prompt, works great	11:19
cagedwisdom	tobiasvl, my old problem was that it would always wrap the line and then i would start overwriting my currently entered text	11:19
	tobiasvl, my new problem is sometimes I can inexplicably backspace over my prompt	11:19
	ill try that one	11:19
	← zanchoPansa left	11:19
	→ pierre1_ joined	11:19
	← maxorator left	11:20
	→ maxorator joined	11:20
tobiasvl	sounds like an encoding problem maybe? those prompts usually use esoteric unicode characters that span several bytes	11:20
	← freimatz left	11:20
cagedwisdom	yeah i think so	11:20
tobiasvl	check your terminal's encoding	11:21
cagedwisdom	tobiasvl, how do I do that? Im using xfce4-terminal, though ive had the same problem with gnome terminal	11:21
	oh it's UTF-8	11:22
	seems pretty std	11:22
tobiasvl	should be standard, yeah	11:22
	→ toothrot joined	11:24
	→ sdrfnord1 joined	11:24
	→ eliasr joined	11:24
	← klausson left	11:25
	← Tuna-Fish left	11:25
	→ Tuna-Fish joined	11:26
	← Xethron left	11:26
	→ klausson joined	11:26
cagedwisdom	i think i found the bug when i installed the thing you showed me	11:26
	I found a PROMPT_COMMAND directive in my largish .bashrc	11:27
	as well as a PS1	11:27
	← pizzaprty left	11:27
cagedwisdom	anyway, a chance to try out magicmonty's one :p	11:27
	thanks for your help	11:27
tobiasvl	np, gl	11:28
	← StefanLehmann left	11:28
	→ freimatz joined	11:30
	→ adriankal joined	11:30
	← arup_r left	11:31
	← ropav left	11:31
	→ wrouesnel2 joined	11:32
	→ basiclaser joined	11:32
	→ ropav joined	11:32
	→ logix812 joined	11:32
	→ asedeno joined	11:32
	← amikiri left	11:33
	← nuck left	11:33
	→ Xethron joined	11:33
	→ regreg_ joined	11:33
	← regreg left	11:34
	← regreg_ left	11:34
	→ regreg joined	11:34
	→ nuck joined	11:35
	← ropav left	11:36
	→ ropav joined	11:36
	→ jitendravyas joined	11:36
	← Raging_Hog left	11:36
	→ jottr joined	11:37
	→ freestyl3r joined	11:37
	← Tashi left	11:38
	→ Tashi joined	11:38
	← Emperor_Earth left	11:40
	← ropav left	11:40
	← fold left	11:41
	→ mtk joined	11:41
	← regreg left	11:41
	→ Emperor_Earth joined	11:41
	← kopparam left	11:42
	→ kopparam joined	11:43
	← jottr left	11:43
	← CheckDavid left	11:44
	→ bezet joined	11:46
	→ Gizburdt joined	11:46
	← KevinTS_ left	11:47
	← kopparam left	11:48
	← antispaceman left	11:48
	→ lsiv568 joined	11:49
	→ daito joined	11:50
	← bezet left	11:50
	← Gizburdt left	11:51
	→ Gizburdt joined	11:51
	← stamina left	11:53
	← anli left	11:53
	← mtk left	11:53
	← daito left	11:54
	→ KevinTS joined	11:57
	← darkbasic left	11:57
	→ darkbasic joined	11:57
	← StolenToast left	11:59
	→ StolenToast joined	11:59
	← StolenToast left	11:59
	→ luc__ joined	12:00
	→ StolenToast joined	12:00
	← StolenToast left	12:00
	→ StolenToast joined	12:00
	← StolenToast left	12:00
	→ StolenToast joined	12:01
	← StolenToast left	12:01
	→ StolenToast joined	12:01
	← jitendravyas left	12:03
	→ jottr joined	12:04
	→ Bruno__ joined	12:04
	→ arup_r joined	12:05
	← BSaboia left	12:06
	← flowerhack left	12:06
	→ d0nkeyBOB joined	12:06
	→ jitendravyas joined	12:07
	← d0nkeyBOB left	12:07
	← shuaib left	12:07
	→ Droolio joined	12:07
	→ d0nkeyBOB joined	12:08
	← Guest96472 left	12:08
	→ spareproject joined	12:08
	→ shuaib joined	12:09
	→ ejnahc joined	12:09
	→ cannonball joined	12:09
	→ gluten_hell joined	12:09
	← jottr left	12:09
	→ str joined	12:11
	← tvw left	12:11
	← str left	12:11
	← maxorator left	12:11
	→ simong joined	12:13
simong	I have a remote branch and tag of the same name and I need to get rid of the branch	12:13
	→ kopparam joined	12:14
	→ maxorator joined	12:14
	→ tvw joined	12:14
simong	git push origin --delete branchName results in error: dst refspec branchName matches more than one	12:14
	which is logical	12:14
	← listochkin left	12:14
	← SjB left	12:15
	→ listochkin joined	12:15
	→ sgambino joined	12:15
	→ antispaceman joined	12:15
	→ bollullera joined	12:16
	→ darkbasic_ joined	12:16
	→ SjB joined	12:16
	← antispaceman left	12:16
	← darkbasic left	12:17
	→ BSaboia joined	12:18
	→ qwyeth joined	12:19
	→ epifanio joined	12:19
	← listochkin left	12:19
	→ dc_33 joined	12:19
	→ Guest96472 joined	12:20
	← kopparam left	12:20
	← Bruno__ left	12:20
	→ mkaesz joined	12:21
	← lsiv568 left	12:21
	→ lieber joined	12:22
	→ jnavila joined	12:22
	→ flowerhack joined	12:22
	→ oriba joined	12:22
	→ listochkin joined	12:23
	→ kopparam joined	12:23
	← freestyl3r left	12:24
rath	simong: try `git push origin --delete refs/heads/branchName`	12:24
	→ rjc joined	12:25
	→ Bruno_ joined	12:25
	→ nnyk joined	12:25
	→ Gamecubic joined	12:25
	→ d10n-work joined	12:26
	→ lsiv568 joined	12:26
	← BSaboia left	12:26
	→ CheckDavid joined	12:27
	← Guest96472 left	12:28
	← JDHawke left	12:29
	→ lieber_ joined	12:30
	→ bvi joined	12:31
	← rypeck left	12:31
	← flowerhack left	12:31
	→ AlexDenisov joined	12:32
	← lieber_ left	12:32
	→ teran_ joined	12:33
	← arup_r left	12:34
	→ palcu joined	12:34
	→ mechanicalduck joined	12:34
	← kopparam left	12:34
	← nnyk left	12:34
	→ Quevin joined	12:35
	→ kopparam joined	12:35
	→ jottr joined	12:35
	← Bruno_ left	12:35
	→ antispaceman joined	12:36
	→ BSaboia joined	12:36
	← teran left	12:36
	← moritzs left	12:37
	→ JDHawke joined	12:37
Skapadapaduu	if I want to apply ignore patterns to tracked files and do "git rm -r --cached myFolder" and after that write down myFolder to .gitignore does other developers git still track those files and their git wants to push those removed files despite .gitignore ?	12:37
	→ nnyk joined	12:39
	← Quevin left	12:39
	← kopparam left	12:39
	← jottr left	12:40
canton7	when they merge in your changes, those folders will be deleted from their local copies, iirc	12:40
	→ Guest96472 joined	12:41
	→ fission6 joined	12:41
	→ Noldorin joined	12:43
	→ devoldmx joined	12:43
	← montchr left	12:43
	← epifanio left	12:43
	→ devoldmx27 joined	12:44
	← devoldmx3 left	12:45
	→ arup_r joined	12:45
	← dsdeiz left	12:46
	← lieber left	12:47
	→ EminenceHC joined	12:47
	← Gizburdt left	12:47
	← fstd left	12:47
	→ fstd joined	12:47
	→ maroloccio joined	12:47
	← devoldmx left	12:47
	→ lieber joined	12:48
	← martinklepsch left	12:48
	→ punchagan joined	12:50
	← hoschi left	12:50
	← antispaceman left	12:51
	← EminenceHC left	12:51
	← xSmurf left	12:51
	← cagedwisdom left	12:51
	→ WAA4004 joined	12:51
	→ IrishPrime joined	12:52
	→ abnvp joined	12:53
	← aartist left	12:53
	→ moritzs joined	12:53
	→ hoschi joined	12:53
	← moritzs left	12:54
	→ _0xff joined	12:54
	→ martinklepsch joined	12:55
	← arup_r left	12:56
	→ antispaceman joined	12:56
	→ Arahael_Twin joined	12:56
	← listochkin left	12:57
	→ xSmurf joined	12:57
	→ Corey84 joined	12:57
	→ arup_r joined	12:58
	← abnvp left	12:58
	→ bitkiller joined	12:58
	→ thibaultcha joined	12:59
	← simong left	13:00
	← israelpattison left	13:00
	→ simong joined	13:01
	→ israelpattison joined	13:01
	→ wlvrn joined	13:02
	→ abnvp joined	13:02
	→ intellix joined	13:03
	← Tuna-Fish left	13:03
	← hj2014_ left	13:03
intellix	is it possible to declare the clone location in a config and then just run "git clone" from the directory or so?	13:03
	← wrouesnel2 left	13:04
osse	no but you can give the location to the git clone command itself	13:04
	→ akim joined	13:04
intellix	mmm ok, I didn't want to hardcode that into the command but in a file really :D I suppose I could have a bash script or so	13:04
	→ it0a joined	13:05
osse	what's the use case?	13:05
	← punchagan left	13:05
	→ Not_Whatever joined	13:05
	← thibaultcha left	13:05
intellix	I have a Dockerfile, wanted to have it run "git clone" as the last command to pull in the repository	13:05
	if I put the URL into the Dockerfile, it's no longer agnostic	13:05
	← abnvp left	13:06
	← bollullera left	13:06
	→ buffal0 joined	13:06
	→ AaronMT joined	13:06
	← it0a left	13:06
	→ nickpresta joined	13:07
	← KevinTS left	13:07
intellix	I suppose I can just create a run.sh and run that	13:08
	→ it0a joined	13:08
	→ lindenle joined	13:08
	→ Tuna-Fish joined	13:10
	→ taylanub joined	13:10
taylanub	where can I read about what subtrees offer over simply having a repo in a repo?	13:11
	→ KevinTS joined	13:11
	← KevinTS left	13:12
	← subhojit777 left	13:12
	→ KevinTS joined	13:12
	← lindenle left	13:12
	← Corey84 left	13:12
	→ wrouesnel3 joined	13:14
	← klausson left	13:14
	← oriba left	13:14
	→ livingstn joined	13:14
	← endiruna1 left	13:14
	← simong left	13:15
	→ simong joined	13:15
	→ etpuis joined	13:16
	← thierryp left	13:16
	→ gargola joined	13:16
	→ thierryp joined	13:16
	← KevinTS left	13:17
	← simong left	13:17
	→ teran joined	13:17
	← arup_r left	13:18
	← teran_ left	13:19
	← enleeten_ left	13:19
	← Polymorphism left	13:19
	→ noituloveand joined	13:20
	→ enleeten joined	13:23
	← fstd left	13:24
	→ fstd joined	13:24
	← lsiv568 left	13:26
	→ teran_ joined	13:26
	← spareproject left	13:26
	→ aarkerio joined	13:27
	→ davividal joined	13:27
	→ teran__ joined	13:27
	← darkbasic_ left	13:27
Deele	I have assets directory in my repo, it contains temporary files. How do I add all directory content to .gitignore?	13:27
aarkerio	hi! Can I delete a file from an old commit using: $ git reset cc9637b config/deploy.rb ??	13:27
Deele	:)	13:27
osse	aarkerio: no	13:28
	→ hyperair joined	13:28
	← lite_ left	13:28
osse	Deele: hmm, do you want to ignore everything?	13:28
	in yhe dir i mean	13:28
	→ darkbasic joined	13:28
Deele	inside assets dir, yes	13:29
	→ rypeck joined	13:29
	→ carandraug joined	13:29
	← teran left	13:29
osse	Deele: you can put 'asset/v then	13:29
	→ p4sh4 joined	13:29
osse	'asset/'	13:29
aarkerio	there is a way to delete a file from an old commit?	13:30
	← bvi left	13:30
	→ n-st joined	13:30
	→ lsiv568 joined	13:31
	← teran_ left	13:31
	→ knalf_ joined	13:31
Deele	osse, if I add '/htdocs/assets/' inside .gitignore, that resides in repository root, will it work?	13:31
osse	Deele: yes	13:32
	← Nizumzen left	13:32
Deele	thank you	13:32
osse	aarkerio: using rebase -i, but counts as rewriting history	13:32
	→ devoldmx joined	13:32
	→ darkbasic_ joined	13:33
	← knalf left	13:33
	← darkbasic left	13:33
aarkerio	but the file still will be on the branch	13:34
osse	not any more	13:34
	not after that commit	13:34
	→ akim_ joined	13:34
	→ abnvp joined	13:34
	→ thevishy joined	13:34
	→ metts joined	13:35
	→ klausson_ joined	13:35
aarkerio	ok, thanks osse	13:36
	← mikeric left	13:36
	→ moritzs joined	13:36
	← aarkerio left	13:36
	← moritzs left	13:36
	← devoldmx27 left	13:36
	← Marcus_ left	13:36
	→ LeMike joined	13:37
	→ moritzs joined	13:38
	← akim left	13:38
	← maroloccio left	13:38
	→ Polymorphism joined	13:38
	← Polymorphism left	13:38
	← moritzs left	13:38
	→ Polymorphism joined	13:39
	→ Sceorem joined	13:39
	→ moritzs joined	13:39
	← moritzs left	13:39
	← etpuis left	13:39
	← abnvp left	13:40
	→ Nizumzen joined	13:40
	→ moritzs joined	13:40
	← moritzs left	13:40
	→ listochkin joined	13:41
	→ moritzs joined	13:41
	← moritzs left	13:41
	→ moritzs joined	13:42
	← Pyrogerg left	13:42
	← moritzs left	13:42
	→ moritzs joined	13:43
	← darkbasic_ left	13:43
	→ ZujkisNx joined	13:43
	→ darkbasic joined	13:44
	← ZujkisNx left	13:44
	→ punchagan joined	13:44
	← livingstn left	13:44
	→ LyndsySimon joined	13:45
	← Raydiation left	13:45
	← eburcat left	13:46
	→ eburcat joined	13:46
	→ danemacmillan joined	13:46
	→ bezet joined	13:46
	→ NCS_One joined	13:46
	→ vlovgr joined	13:46
NCS_One	hi	13:46
	← jstimm left	13:46
	→ shinnya joined	13:47
	→ rjhunter joined	13:47
NCS_One	to unstage changes is it ok to do "git reset HEAD some-folder/*"?	13:47
	→ FortySix2 joined	13:48
	→ hj2014 joined	13:48
	→ sohail joined	13:49
osse	yes	13:49
	← devoldmx left	13:49
	← Sceorem left	13:49
	← zoso left	13:49
	→ DrShoggoth joined	13:49
	← bezet left	13:50
	→ arghvark joined	13:51
	→ cuppscakes joined	13:51
	← thevishy left	13:52
	← cuppscakes left	13:52
	→ cuppscakes joined	13:52
	← cuppscakes left	13:52
	gitinfo set mode: +v	13:52
arghvark	Does anyone know of a set of instructions for setting up git for personal use without an external server? The git documentation does not have this, at least not that I could find.	13:53
NCS_One	osse: ty	13:53
	→ cuppscakes joined	13:53
ToxicFrog	arghvark: you don't need a server to use git, just "git init" and away you go. That's kind of the point of DVCS.	13:53
	→ Diemuzi joined	13:54
	gitinfo set mode: +v	13:54
arghvark	ToxicFrog: it won't keep telling me that my staging area is out of sync iwth the server?	13:54
ToxicFrog	What server?	13:54
	← danemacmillan left	13:54
arghvark	git is based on the assumption that there are three areas where code lives, and one of them is on a server. It won't be bothered that I don't have one?	13:54
ToxicFrog	What? No it isn't.	13:55
	Where did you hear that?	13:55
	→ adryan joined	13:55
arghvark	Hear what? about 3 areas? That part is in the git documents. local, staging, server	13:55
ToxicFrog	Link?	13:55
	→ zoso joined	13:55
arghvark	Um, don't have one handy -- used git for 6 months in a previous job, 'commit' was used to move things from staging to server, and there was a status for files that were changed but not committed.	13:56
ToxicFrog	A server can be useful -- it is, for example, easier to have multiple people pushing/pulling from a server rather than directly from one another's working repos -- but it is not mandatory, especially if you're the only person using it.	13:57
	By "server" do you perhaps mean "repo"?	13:57
	→ gluten_hell_ joined	13:57
arghvark	oh, ok. sorry, didn't have the term right	13:57
	→ lpax joined	13:57
ToxicFrog	Yeah, the repo is not a server.	13:57
	It's in your .git dir.	13:57
	← lpax left	13:57
	← listochkin left	13:58
	→ lpax joined	13:58
arghvark	What, exactly, is in "my .git dir"?	13:58
osse	arghvark: it's literally a dir named .git. at the top level	13:58
	← lpax left	13:58
	→ mtk joined	13:58
	→ achadwick joined	13:58
	← gluten_hell left	13:58
	← moritzs left	13:58
	→ danemacmillan joined	13:59
ToxicFrog	arghvark: when you "git init" in a directory, it creates a subdirectory called ".git". That contains all of the git repo information -- configuration, remotes (if any), the index, the commit history, etc.	13:59
	← mlechner left	13:59
	→ lpax joined	13:59
ToxicFrog	It's self-contained.	13:59
	← nikita left	13:59
	→ endiruna1 joined	13:59
	← logix812 left	13:59
osse	arghvark: run ''git rev-parse --git-dir'' to see where it is	13:59
arghvark	ok, so 'clone' copies a set of files from a central place, and there is some other command I don't remember to sync your files with the central files ?	14:00
ToxicFrog	When you make changes to your code, it becomes "changes not staged for commit"; "git add" adds those changes to the index as "changes to be committed"; "git commit" takes the index, turns it into a commit, and stores that in .git.	14:00
osse	arghvark: fetch, push and pull	14:00
ToxicFrog	At no point in this process is there any communication with a server.	14:00
	"git clone" is used to make a local copy of a remote repo; "git push", "git fetch", and "git pull" are used to sync commits to/from a remote repo.	14:00
arghvark	ok. so there's something else that does the communication with a central repository. Some kind of synchronization, I'm remembering lists of changes to merge.	14:01
	→ Neozonz\|Disc joined	14:01
	← Neozonz\|Disc left	14:01
	→ Neozonz\|Disc joined	14:01
ToxicFrog	arghvark: yes, read what osse and I just said about fetch/push/pull	14:01
	→ Nicholas_Rishel joined	14:02
	← adriankal left	14:02
arghvark	ok, guess the part I had missed was that commit was not a server communication operation	14:02
	← shuaib left	14:03
arghvark	Thanks for the help.	14:03
ToxicFrog	Yeah, commit is entirely local, like most git operations.	14:03
tobiasvl	!book	14:03
gitinfo	There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	14:03
	→ dsdeiz joined	14:03
	← rjhunter left	14:03
	→ abnvp joined	14:03
	→ mark06 joined	14:04
	← metts left	14:04
mark06	Seveas: hi, are you there	14:04
	hub still have errors: http://vpaste.net/pexwK	14:04
Wiz_KeeD	git is like complex shizzle driving me nuts	14:04
	I just made a fork added the remote, fetch --all git checkout fork/branch-name and it saysno branch rebasing on 8.0	14:05
mark06	Seveas: that was on git hub create	14:05
	← abnvp left	14:05
	→ rjhunter joined	14:05
	→ listochkin joined	14:05
	← endiruna1 left	14:05
Wiz_KeeD	why can't i checkout a branch from remote I just added?	14:06
	← jas4711 left	14:06
tobiasvl	Wiz_KeeD: do you really want to checkout the !remote_tracking_branch ?	14:06
gitinfo	Wiz_KeeD: Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the corresponding branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a new local branch based on a remote-tracking branch using e.g. 'git checkout -b <branch> <remote>/<branch>'	14:06
	→ Pyrogerg joined	14:06
	← Macaveli left	14:06
	→ abnvp joined	14:07
Wiz_KeeD	ahh like that?	14:07
	→ astaves joined	14:07
	→ hcc23 joined	14:07
Wiz_KeeD	ahh so you create a new branch and the command after it just copies the information	14:07
	→ jas4711 joined	14:07
tobiasvl	yes, you need to create a local branch. fork/branch-name is not a branch you can work on locally.	14:08
	→ Doyle joined	14:08
tobiasvl	it's just a copy of the actual branch on the fork	14:08
	← mtk left	14:08
	→ adriankal joined	14:08
	→ thevishy joined	14:08
Wiz_KeeD	tobiasvl, thank you for the clarification	14:09
	so I have made the change and I did git commit -am "message" then git push fork branch and it says everything up to date :\	14:09
	ah wait I should create a new branch I guess	14:09
arghvark	quit	14:09
	← arghvark left	14:10
	← wrouesnel3 left	14:10
	→ endiruna1 joined	14:10
	→ nedbat joined	14:10
	← lsiv568 left	14:11
	→ nikita joined	14:11
	← rath left	14:11
tobiasvl	Wiz_KeeD: git status	14:12
	→ darkbasic_ joined	14:12
	→ jftf joined	14:12
	← darkbasic left	14:13
	→ lindenle joined	14:13
tobiasvl	if you commited on the remote-tracking branch, you are on a detached head and cannot push	14:13
	hard for me to say what the problem is, but look at git status	14:14
	→ pandeiro joined	14:14
	Vampire0_ → Vampire0	14:14
	← abnvp left	14:14
	→ DaisyTheCow joined	14:15
	→ gain joined	14:15
	← DaisyTheCow left	14:15
	→ iamjarvo joined	14:15
fission6	can i do git rebase master on a topic branch if i communicate with a colleague to not make any changes or commits before i do the rebase and then push it up for them to pull, or do i risk still running into issues?	14:16
	→ m0ltar joined	14:16
fission6	(i know a rule thumb is not to rebase a public topic branch but feel the above would be fine right?)	14:16
	← adriankal left	14:17
tobiasvl	sure, but other colleagues might have fetched that branch	14:17
	→ livingstn joined	14:17
tobiasvl	or even merged it and done work on it	14:17
	← livingstn left	14:17
	← Nicholas_Rishel left	14:17
	→ livingstn joined	14:17
	Guest8343 → Will\|	14:17
	Will\| → Will\|_	14:17
	Will\|_ → Will\|	14:17
	← dccc left	14:18
	→ abnvp joined	14:18
	→ kriks joined	14:19
	→ fr33domlover joined	14:19
	→ ehmatthes joined	14:19
	→ angrycodr joined	14:19
	→ lsiv568 joined	14:20
	→ shuaib joined	14:20
	← papegaaij left	14:23
	← Embassy left	14:23
	← lsiv568 left	14:24
	→ tank100 joined	14:25
	← angrycodr left	14:25
	→ polyzen joined	14:25
	→ SumDude joined	14:26
	→ tranzfuse joined	14:26
	→ Raging_Hog joined	14:28
	→ Manny joined	14:28
	← nnyk left	14:29
	← Manny left	14:29
	← darkbasic_ left	14:29
	→ darkbasic joined	14:29
	→ Marcus_ joined	14:29
	→ lsiv568 joined	14:30
	← luc__ left	14:30
	→ devoldmx joined	14:30
	→ xnrand joined	14:30
	→ anli joined	14:31
	← Guest96472 left	14:32
	→ eletuchy joined	14:33
	→ BigWillie joined	14:33
	→ bauruine joined	14:34
	← taylanub left	14:36
	→ taylanub joined	14:36
	→ Quevin joined	14:36
	→ subhojit777 joined	14:36
	→ pweaver_ joined	14:36
	← martinklepsch left	14:37
	→ B1x1t0 joined	14:38
	→ regreg joined	14:38
fission6	its just one other colleague tobiasvl	14:38
	across my desk	14:38
	← lieber left	14:38
	→ jottr joined	14:39
	← tgunr left	14:39
	→ killtheliterate joined	14:40
	→ trung joined	14:40
	→ talmuth joined	14:40
	← Quevin left	14:40
	← _Vi left	14:40
	→ AnujSharma joined	14:40
	← rishabh_kwt left	14:40
	← AnujSharma left	14:41
	→ droy_ joined	14:41
	← lsiv568 left	14:41
	→ kpease joined	14:42
	→ s2013 joined	14:42
	→ zequence joined	14:42
	→ nicksloan joined	14:42
	← danemacmillan left	14:42
	→ danemacmillan joined	14:43
	← nicksloan left	14:43
	→ treehug88 joined	14:44
	← jottr left	14:44
	→ acharlieh joined	14:44
	→ dreiss joined	14:44
	→ nnyk joined	14:46
	→ arup_r_ joined	14:46
	→ sonicparke\|bradm joined	14:46
	← s2013 left	14:47
	← arup_r_ left	14:47
	→ EminenceHC joined	14:47
	← abnvp left	14:48
	← stodan left	14:48
	← droy_ left	14:48
	→ moritzs joined	14:48
	→ reyha joined	14:48
	← danemacmillan left	14:48
	← moritzs left	14:48
	→ danemacmillan joined	14:49
	→ abnvp joined	14:49
	→ moritzs joined	14:49
	← gittish left	14:49
	← moritzs left	14:49
	← rchavik left	14:49
	→ moritzs joined	14:50
	← listochkin left	14:50
	← moritzs left	14:50
	→ lsiv568 joined	14:50
	← mark06 left	14:50
	→ petersr joined	14:50
	→ moritzs joined	14:51
	← moritzs left	14:51
	→ angrycodr joined	14:51
	→ moritzs joined	14:51
	→ mfmfmfmfmfmf joined	14:51
	← moritzs left	14:52
	← EminenceHC left	14:52
	← shuaib left	14:54
	→ Embassy joined	14:54
	→ nekyian_ joined	14:55
	← jitendravyas left	14:56
	← rfreeman_w left	14:56
	→ jitendravyas joined	14:57
	→ rfreeman_w joined	14:57
	← pweaver_ left	14:57
	→ bambams_ joined	14:57
	← psoo left	14:59
	→ thibaultcha joined	14:59
	→ listochkin joined	14:59
	← roelmonnens left	15:00
	→ Corey84 joined	15:00
	← nedbat left	15:00
	← devoldmx left	15:00
	→ EminenceHC joined	15:00
	→ Annak joined	15:00
	gitinfo set mode: +v	15:00
	← mennea left	15:01
	→ devoldmx joined	15:01
	→ StefanLehmann joined	15:01
	← thevishy left	15:01
	→ TititaTitutu joined	15:01
	← FortySix2 left	15:01
	→ Chuk joined	15:02
	→ Mitchbones joined	15:02
	← Chuk left	15:02
	← sdrfnord1 left	15:02
	→ nedbat joined	15:02
	→ Chuk joined	15:02
	← abnvp left	15:03
	← Diemuzi left	15:03
	← m0ltar left	15:04
	← ghostlines left	15:04
	→ starkhalo joined	15:04
	← thibaultcha left	15:04
	→ Diemuzi joined	15:04
	← darkbasic left	15:05
	gitinfo set mode: +v	15:05
	→ Marcus___ joined	15:05
	→ darkbasic joined	15:05
	← regreg left	15:05
	→ regreg joined	15:05
	← acolson left	15:05
	→ Zifre_ joined	15:05
	→ lowkeyliesmyth joined	15:06
	JakeSays_ → JakeSays	15:07
	← Annak left	15:07
	← BigWillie left	15:08
	← Marcus_ left	15:08
	← TomyWork left	15:09
	→ a_le joined	15:09
	← Zifre left	15:09
	← angrycodr left	15:10
	← basiclaser left	15:10
	← jitendravyas left	15:10
	→ BigWillie joined	15:10
	← carandraug left	15:10
	→ m0ltar joined	15:10
	← Vivekananda_y510 left	15:10
	← listochkin left	15:11
	→ TititaTitutu_ joined	15:11
	← Marcus___ left	15:11
	← Gonzo89 left	15:11
	← TititaTitutu left	15:12
	→ listochkin joined	15:12
	← solker left	15:14
	→ FortySix2 joined	15:14
	← dsdeiz left	15:14
	← teran__ left	15:14
	→ _Vi joined	15:14
	→ teran joined	15:15
	← ValicekB left	15:15
	← StefanLehmann left	15:15
	→ stiffi joined	15:15
	← devoldmx left	15:16
	→ montchr joined	15:17
	← zoso left	15:17
	→ basiclaser joined	15:17
	→ eburcat_ joined	15:17
	← cbr_ left	15:18
	← jdmf left	15:18
	→ Macaveli joined	15:18
	← TititaTitutu_ left	15:19
	← kpease left	15:19
	→ kpease joined	15:19
	← eburcat left	15:20
	← d0nkeyBOB left	15:20
	← Pyrogerg left	15:21
	← eburcat_ left	15:21
	→ nerdfiles joined	15:25
	→ ValicekB joined	15:25
	← avvs left	15:26
	→ gancl joined	15:27
	→ gsingh93 joined	15:29
	← knalf_ left	15:29
	→ Marcus_ joined	15:30
	← cuppscakes left	15:30
	→ mtk joined	15:30
	→ Robarelli joined	15:31
	→ lowkeyli_ joined	15:31
	→ tgunr joined	15:31
	→ Roots47 joined	15:31
	→ robzilla joined	15:31
	→ githogori joined	15:32
	← acharlieh left	15:34
	← p4sh4 left	15:34
	← lowkeyliesmyth left	15:34
	← nekyian_ left	15:34
	→ ojacobson joined	15:34
	→ SatansFather joined	15:35
	← Marcus_ left	15:35
	← lowkeyli_ left	15:36
	← robzilla left	15:36
	→ lowkeyliesmyth joined	15:37
	gitinfo set mode: +v	15:37
	→ acharlieh joined	15:37
	→ dccc joined	15:38
	→ TititaTitutu joined	15:38
	← Corey84 left	15:38
SatansFather	anyone know how i can get back uncommited changes that were deleted?	15:38
	via github software	15:38
	← kevinb left	15:38
SatansFather	i was trying to update epic's unreal tournament project	15:38
	said it couldnt sync because of uncommited changes	15:39
	← kadoban left	15:39
SatansFather	went to discard changes and it deleted two maps i was working on	15:39
	← _tpavel left	15:39
ojacobson	SatansFather: "discard changes" how?	15:40
	← regreg left	15:40
	→ logix812 joined	15:40
SatansFather	i right clicked the checkbox on the right side and selected Discard All Changes	15:40
	after i unchecked the files i wanted to keep	15:40
ojacobson	git doesn't have checkboxes	15:41
	it's a CLI tool	15:41
	oh you said, github's UI	15:41
Seveas	you can get them from your backups.	15:41
ojacobson	github's UI is terrible about telling you what git commands it's running	15:41
	ask them if there's any way to recover the data it deleted	15:41
	→ Corey84 joined	15:41
SatansFather	yeah i only use it to update this project	15:41
	as in download	15:41
ojacobson	if you'd used git, the answer would be "nope, it's gone" for most of the ways to do that, so next time - commit your changes (possibly on a branch)	15:41
SatansFather	no uploading, it wont allow it	15:41
	← freimatz left	15:41
SatansFather	im not a developer, just a user	15:42
	→ Pyrogerg joined	15:42
SatansFather	epic games is putting their whole unreal tournament project on github for users to look at	15:42
	so i was making some maps for it	15:42
	had them in the folder	15:42
	← danemacmillan left	15:42
SatansFather	and they got deleted when they shouldnt have	15:42
	→ danemacmillan joined	15:43
	← danemacmillan left	15:43
	→ DevAntoine joined	15:43
DevAntoine	hi	15:43
	→ danemacmillan joined	15:43
DevAntoine	how can I remove a file from a not pushed commit?	15:44
Seveas	hello DevAntoine	15:44
	→ kevinb joined	15:44
Seveas	if it's the last commit: git rm and git commit --amend	15:44
	otherwise git rebase -interactive and edit the commit	15:44
	← eletuchy left	15:44
DevAntoine	Seveas: yes, it's the last commit	15:45
	→ eletuchy joined	15:45
	→ cuppscakes joined	15:45
DevAntoine	so git rm myfile and git add myfile and git commit --amend?	15:45
Seveas	except no git add	15:45
DevAntoine	well, not add, considering I want to remove it...	15:45
	← nedbat left	15:46
DevAntoine	Seveas: but won't git rm remove the file from version control?	15:46
	→ nedbat joined	15:47
Seveas	it will	15:47
	if you just want to go back to the previous version: git checkout HEAD^ -- myfile && git add myfile && git commit --amend	15:47
DevAntoine	Seveas: maybe better just remove this commit and do it again then?	15:48
fission6	i have a topic branch, my colleague made changes relevant to the topic in another branch 'dev' which likely has a lot of off topic changes in it, whats the easiest way to get my colleagues revelant changes into my topic branch withouth pulling in a bunch of crap off topic from dev branch he commited to	15:48
	← sohail left	15:49
	← lowkeyliesmyth left	15:49
	← ehmatthes left	15:49
	← eletuchy left	15:49
	→ lowkeyliesmyth joined	15:49
Eugene	rebase -i, lots of pick	15:50
	→ sohail joined	15:50
fission6	whats the easiest way to pick Eugene	15:50
Sonderblade	im using git cherry-pick -n master..A to apply the diffs of all commits in the A branch, how can I do the same except for the last commit in the A branch?	15:51
SatansFather	i guess to simplify my question: i discarded a some changes in the uncommited files section of the github ui, and it deleted a file i need. any way to get it back?	15:51
Eugene	WIth the letter "p" in the interface it presents you. Or man git-cheryr-pick ;-)	15:51
	← taylanub left	15:51
Eugene	Except spelled right.	15:51
Seveas	DevAntoine: neh, the checkout/amend dance should be enough	15:51
	← qwyeth left	15:51
fission6	Eugene: how do i find what to pick!?	15:52
	just sift through commits?	15:52
Eugene	Pretty much.	15:52
Seveas	DevAntoine: check afterward with git log -p to see if it's now correct	15:52
Eugene	`git log -- path/to/file.txt` might help you limit the selection	15:52
	← pierre1_ left	15:52
DevAntoine	Seveas: well, I did a git reset --soft HEAD~1	15:52
fission6	Eugene: I think I am going to just mainly copy and add the files from one branch to another, and move forward with the topic branch, I think that shoudl work right?	15:52
Eugene	Sure	15:53
	← FortySix2 left	15:53
fission6	maybe the way to go given it only touches like two files	15:53
DevAntoine	Seveas: then git reset HEAD myfile	15:53
	to unstage it	15:53
	→ Sleepy63 joined	15:54
	← sin3t_ left	15:54
	→ FortySix2 joined	15:54
	→ m0viefreak joined	15:55
	← gain left	15:55
	→ todd_dsm joined	15:55
	← dreiss left	15:55
	← klausson_ left	15:56
	← endiruna1 left	15:57
	→ robzilla joined	15:58
	→ knalf joined	15:58
	→ Rhonda joined	15:58
	→ s2013 joined	15:58
	← rjhunter left	15:59
	→ Quevin joined	15:59
	← Esya left	15:59
	→ mugenzebra joined	15:59
	→ zoso joined	16:00
	→ freestyl3r joined	16:00
	← kriks left	16:00
	← SatansFather left	16:00
	→ mennea joined	16:01
	→ angrycodr joined	16:02
	← nedbat left	16:03
	← NCS_One left	16:03
	← Emperor_Earth left	16:04
	← palcu left	16:04
	→ toedwy joined	16:04
	← Polymorphism left	16:04
	→ Sasazuka joined	16:05
	← gccostabr left	16:05
	← zumba_ad_ left	16:05
	→ sin3t joined	16:05
	← jargon left	16:05
	→ jstimm joined	16:05
	← jstimm left	16:06
	→ CoreIT84 joined	16:06
	→ pweaver_ joined	16:06
	← yacks left	16:06
	← shinnya left	16:06
	← h0bbit left	16:07
	→ nedbat joined	16:07
	← nedbat left	16:07
Seveas	DevAntoine: that would work too :)	16:07
	→ nedbat joined	16:08
	→ Vivekananda_y510 joined	16:08
	→ LucasTT_ joined	16:09
	← numdig left	16:09
	→ bezet joined	16:09
	← Roots47 left	16:09
	← nerdfiles left	16:09
	← Corey84 left	16:10
	← AlexZan left	16:10
	→ nerdfiles joined	16:10
	→ diegoviola joined	16:10
	← pweaver_ left	16:11
	→ User458764 joined	16:11
	← DevAntoine left	16:12
	→ jonmorehouse joined	16:12
	→ Corey84 joined	16:12
	→ hoege joined	16:12
	→ shinnya joined	16:12
	→ thiago joined	16:12
	← knalf left	16:12
	← mfmfmfmfmfmf left	16:12
	← hyperair left	16:12
	← User458764 left	16:13
	→ eletuchy joined	16:13
	← s2013 left	16:13
	→ yacks joined	16:14
	← CoreIT84 left	16:14
	→ imachuchu joined	16:14
	← Not_Whatever left	16:14
	← ferreum left	16:15
	← sinkensabe left	16:15
	← hoege left	16:15
	← mtk left	16:15
	→ jottr joined	16:15
	← nedbat left	16:16
	→ nedbat joined	16:16
	← TititaTitutu left	16:16
	← thierryp left	16:17
	← nedbat left	16:17
	→ nedbat joined	16:17
	← jnavila left	16:19
	← buffal0 left	16:19
	← cuppscakes left	16:19
	← AlexDenisov left	16:19
fission6	Eugene: quick question, so i am trying to move things over I see one commit which does have a lot of changes in one branch that I want in another, is cherry picking what i want to do	16:20
	← nour left	16:21
	← nnyk left	16:21
	→ crelix joined	16:21
	← irqq left	16:22
	← todd_dsm left	16:23
	→ hyperair joined	16:24
	→ klausson_ joined	16:24
	← LeMike left	16:24
	← listochkin left	16:25
	← robbyoconnor left	16:26
	← mkaesz left	16:26
	→ listochkin joined	16:26
	→ sdrfnord1 joined	16:27
	→ thevishy joined	16:28
	→ todd_dsm joined	16:28
	← lpax left	16:28
imachuchu	fission6: yep, sounds right. !tias	16:28
gitinfo	fission6: Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/tias.html may help with git-specific TIAS.	16:28
	→ JohnBat26 joined	16:28
	→ buffal0 joined	16:28
fission6	well, turns out everything was merged into master, so i just rebased iwth master	16:28
	→ ehmatthes joined	16:28
fission6	we have this dev branch where everyone is commiting things for different topics which is making it hard	16:28
	to know whats deployable when	16:28
	→ s2013 joined	16:29
	← crydust left	16:29
	← sohail left	16:29
	← listochkin left	16:30
	→ deric_skibotn joined	16:30
	← Quevin left	16:30
	← crelix left	16:31
	→ mtk joined	16:31
	← mikecmpbll left	16:31
	← killtheliterate left	16:32
	← todd_dsm left	16:33
	→ killtheliterate joined	16:34
	→ DeathIncarnate joined	16:36
	→ kukks joined	16:37
	→ Quevin joined	16:38
	← LucasTT_ left	16:38
	← Asiajey left	16:39
	→ konr joined	16:40
	← jdi left	16:41
	→ toedwy_ joined	16:42
	→ gccostabr joined	16:42
	← iaaah left	16:43
	← toedwy left	16:45
	← D-Boy left	16:45
	→ iaaah joined	16:46
	← adryan left	16:46
	→ daedeloth joined	16:47
	← nerdfiles left	16:48
	→ nerdfiles joined	16:48
	← jagob left	16:48
	← hyperair left	16:48
	← lowkeyliesmyth left	16:49
	→ arkore joined	16:50
	← thiago left	16:50
	→ tranzfus_ joined	16:52
	← ValicekB left	16:52
	→ maestrojed joined	16:52
	→ kristofers joined	16:52
	→ dreiss joined	16:52
	→ cuppscakes joined	16:52
	→ smw joined	16:53
	→ luxgeek joined	16:53
	← Vivekananda_y510 left	16:54
	← punchagan left	16:54
	← achadwick left	16:54
	→ jitendravyas joined	16:54
	← tranzfuse left	16:55
	→ SimonNa joined	16:55
	→ LeMike joined	16:55
	→ punchagan joined	16:55
Eugene	Sounds like you need a codified release process	16:55
	← Faffyman left	16:55
	→ AlexZan joined	16:56
	→ Faffyman joined	16:56
	← zoso left	16:57
	← FortySix2 left	16:57
	← cuppscakes left	16:57
	← coldkey21 left	16:58
	→ thibaultcha joined	16:59
	→ ValicekB joined	17:00
	→ ferreum joined	17:00
	← Faffyman left	17:00
	← lsiv568 left	17:00
	→ toedwy joined	17:00
	← encod3 left	17:01
	→ Polymorphism joined	17:01
	→ m8 joined	17:01
	← shinnya left	17:02
	← Polymorphism left	17:02
	→ coldkey21 joined	17:02
	→ cuppscakes joined	17:02
	→ LBV_User joined	17:02
	← DrShoggoth left	17:03
	→ Polymorphism joined	17:03
	→ sohail joined	17:03
	→ mikecmpbll joined	17:03
	← toedwy_ left	17:03
	← kukks left	17:04
	→ DrShoggoth joined	17:04
	← bbloom left	17:04
	← thibaultcha left	17:04
	← Quevin left	17:05
	→ tgt joined	17:06
	← cuppscakes left	17:07
	→ regedit joined	17:08
regedit	hello	17:08
	i'm using git as a backup system, committing a "restore point" every day	17:08
	→ D-Boy joined	17:08
regedit	how can i do something like "delete old restore points" from a certain point in time backward	17:09
	for example "drop all commits older than 3 weeks old" sorta thing	17:09
	how is this done in git?	17:09
	← W0rmDr1nk left	17:09
	← kermit left	17:10
Eugene	It isn't. Git isn't a backup system, stop using it as one. Trimming-out old commits like you want isn't possible, because git is based upon the idea of keeping a consistent history. Forever.	17:10
	!rong	17:10
gitinfo	[!xy] Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...	17:10
Eugene	Not what I wanted, stupid bot.	17:10
	!ugfwiini	17:10
gitinfo	[!UGFWIINI] You appear to be Using Git For What It Is Not Intended - https://www.google.com/search?q=UGFWIINI Are you sure git is the right tool for the job? See also !wrong	17:10
	→ fandi joined	17:11
	→ bitsoflogic joined	17:12
regedit	and yet git does have a way of making as if a certain point in time was the beginning of time, condensing all previous commits into one, no?	17:12
ojacobson	not easily, no	17:13
	if you believe you have an example, please, do share :)	17:13
	→ lsiv568 joined	17:13
	← hoschi left	17:13
	← mikecmpbll left	17:13
	gitinfo set mode: +v	17:13
luto1	.	17:13
	luto1 → luto	17:13
	→ cagedwisdom joined	17:14
regedit	my googlings yielded keywords such as "rebase", "squash",	17:14
	← luto left	17:14
	→ luto joined	17:14
	kornbluth.freenode.net set mode: +v	17:14
	← hahuang65 left	17:14
	← BigWillie left	17:14
ojacobson	both of which amend the entire history from the modified commit forward	17:14
	→ lowkeyliesmyth joined	17:14
ojacobson	(graphwise-deepest modified commits, rather)	17:15
	← toedwy left	17:15
	→ kukks joined	17:15
	→ toedwy joined	17:15
regedit	you mean it affects all commits after the rebase/squash point as well?	17:15
	← jottr left	17:16
Eugene	rebase/squash snip commits from the middle, not the beginning.	17:16
	← s2013 left	17:16
	→ niax joined	17:16
jab416171	regedit, the easiest way would be: rm -rf .git && git init && git add . && git commit -m "initial commit"	17:16
Eugene	What you're describing would be !orphan, but really, stop using git for backups.	17:16
gitinfo	To create an orphaned branch(unrelated to existing history): `git checkout --orphan newbranchname`. This will leave your index/worktree as-is(use `rm .git/index; git clean -dfx` to delete EVERYTHING). If you get 'error: unknown option `orphan`' see !orphan_old. For an empty/null commit see !orphan_null.	17:16
Eugene	`s3cmd` and a bucket set for RRS+Versioning will do a much better job of it	17:16
	→ knalf joined	17:16
jab416171	or rbackup	17:17
Eugene	They even have built-in controls for auto-archiving/deletion of old objects	17:17
	→ stodan joined	17:18
regedit	client is not paying me enough to look into that	17:18
Eugene	Find richer clients	17:18
	→ encod3 joined	17:19
	← flugo left	17:19
	→ kriks joined	17:19
	← Raging_Hog left	17:21
regedit	:D	17:21
	← m0viefreak left	17:21
	→ mikecmpbll joined	17:21
regedit	jab416171: except it wouldnt keep all commits up to 3 weeks ago	17:21
	← nerdfiles left	17:22
	← lowkeyliesmyth left	17:22
	← toedwy left	17:22
	→ nerdfiles joined	17:22
	→ daito_ joined	17:22
	← encod3 left	17:22
	→ toedwy joined	17:23
	→ BigWillie joined	17:23
	← klausson_ left	17:23
jab416171	regedit, no it wouldn't, which is why you shouldn't use git for backup.	17:24
	← tgt left	17:24
	← nerdfiles left	17:25
	← lsiv568 left	17:25
	← reyha left	17:26
	→ JosephFerano joined	17:26
	← daito_ left	17:26
	→ damccull joined	17:27
PerlJam	regedit: why do you want to get rid of the older commits exactly?	17:27
	← teran left	17:27
	→ nerdfiles joined	17:27
	→ Quevin joined	17:27
	→ ianbrandt joined	17:27
jab416171	PerlJam, save space	17:28
regedit	PerlJam: it's backing up a shat-load of files and i guess i'm trying to minimize disk space usage long term	17:28
	→ jeffreylevesque joined	17:28
jeffreylevesque	how do i close 2 or more issues on a pull request?	17:28
	Resolves #1, Resolves #2?	17:28
	or Resolves #1, #2?	17:28
ojacobson	jeffreylevesque: depends on your bug tracker, really	17:28
	guessing you meant to ask this in #github	17:28
regedit	it might not make much difference even if it has 6 months of commits piled up, but maybe after a few years it'll get too huge	17:29
	→ Gizburdt joined	17:29
jeffreylevesque	thank you	17:29
	→ s2013 joined	17:29
	← _0xff left	17:29
ojacobson	regedit: git continues not to be a backup tool, really	17:29
	→ klausson_ joined	17:29
regedit	so i'd like to truncate history older than 1 month every so oftne	17:29
	→ mikeric joined	17:29
	← stodan left	17:29
	← DeathIncarnate left	17:29
regedit	and my client continues to not pay me enough to bother not using git as the backup tool :)	17:29
	→ toedwy_ joined	17:29
PerlJam	regedit: "maybe" is not something to base a decision on. IF you have something that you can measure and reason about, you should decide based on that. Until then ... don't worry about it.	17:29
	→ stiffi_ joined	17:30
	→ lowkeyliesmyth joined	17:30
regedit	PerlJam: as you can tell, this is a client i don't want to hear from ever ever again :D	17:30
PerlJam	regedit: your client is paying you enough to worry about hypothetical future disk spaces needs though?	17:30
	ah. I see.	17:30
	regedit: then fire the client. :)	17:31
	→ thibaultcha joined	17:31
regedit	with a pistol, yes	17:31
	← mennea left	17:31
	← nikita left	17:31
	→ kermit joined	17:31
	← EminenceHC left	17:31
	→ _0xff joined	17:31
	→ tgkokk joined	17:31
	→ EminenceHC joined	17:31
	→ flugo joined	17:31
	← Quevin left	17:32
	← toedwy left	17:32
	← punchagan left	17:32
	← tgkokk left	17:32
	→ mennea joined	17:32
	← stiffi left	17:33
	→ tgkokk joined	17:33
	→ toedwy joined	17:33
	← dreiss left	17:34
	← noituloveand left	17:34
	← tgkokk left	17:34
	→ armin joined	17:34
	→ tgkokk joined	17:34
armin	hi, can i somehow edit/reset multiple (read: "all") email addresses in my project, of multiple/all commits?	17:35
	← tgkokk left	17:35
	← gluten_hell_ left	17:35
	← toedwy_ left	17:36
	→ tgkokk joined	17:36
	→ Shusshu joined	17:36
	← Shusshu left	17:36
	← EminenceHC left	17:36
	← tgkokk left	17:36
Eugene	armin - sure; man git-filter-branch. You want to fiddle with the COMMITER_ and AUTHOR_ fields	17:37
gitinfo	armin: the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html	17:37
	→ EminenceHC joined	17:37
	← JosephFerano left	17:37
	→ tgkokk joined	17:37
Eugene	--env-filter is the one you want	17:37
	→ himansurathi joined	17:37
	← himansurathi left	17:37
	← jftf left	17:38
	← SjB left	17:38
	→ JosephFerano joined	17:38
	← BigWillie left	17:38
	← lowkeyliesmyth left	17:38
	← tgkokk left	17:38
	→ himansurathi joined	17:38
	← himansurathi left	17:38
	→ tgkokk joined	17:39
armin	Eugene: sick. awesome. thanks a lot for your kind help.	17:39
	→ himansurathi joined	17:40
	→ motto joined	17:40
	← m8 left	17:41
	← himansurathi left	17:41
	→ przemoc joined	17:42
	← przemoc left	17:43
	→ przemoc joined	17:43
	→ adriankal joined	17:43
	← adriankal left	17:44
	→ adriankal joined	17:44
	→ nikita joined	17:44
	← jeffreylevesque left	17:45
	← kukks left	17:45
	← montchr left	17:46
	→ lite_ joined	17:46
	→ Bjbeach joined	17:46
	→ hahuang65 joined	17:46
	→ lsiv568 joined	17:46
	→ leeN joined	17:47
	→ FortySix2 joined	17:47
	→ spareproject joined	17:48
	→ BigWillie joined	17:48
	→ booboy joined	17:48
	← Sasazuka left	17:48
	← subhojit777 left	17:49
	→ ropav joined	17:50
	← salamanderrake left	17:51
	→ Ziber joined	17:51
	← intellix left	17:51
	→ Sasazuka joined	17:52
	← ropav left	17:52
	← FortySix2 left	17:52
	← Ziber left	17:53
	← robzilla left	17:53
	→ toedwy_ joined	17:53
	→ AKK9 joined	17:53
	← jceb left	17:53
	→ Ziber joined	17:53
	→ knownasilya joined	17:54
	← toedwy left	17:56
	← lsiv568 left	17:57
	→ ropav joined	17:57
	→ salamanderrake joined	17:58
	← Bjbeach left	17:59
	→ Quevin_ joined	17:59
	→ listochkin joined	17:59
	M-ou-se_ → M-ou-se	18:00
	← killtheliterate left	18:00
	← knalf left	18:01
	→ lsiv568 joined	18:02
	← nedbat left	18:02
	→ irqq joined	18:03
	→ gittish joined	18:03
	← s2013 left	18:03
	→ Sijdesign joined	18:03
	→ doener joined	18:03
	→ toedwy joined	18:04
	← ropav left	18:04
	← toedwy left	18:04
	→ nedbat joined	18:05
	→ robzilla joined	18:06
	→ jftf joined	18:06
	← toedwy_ left	18:06
	← SimonNa left	18:07
	→ Faffyman joined	18:07
	→ toedwy_ joined	18:09
	→ jottr joined	18:09
	← kermit left	18:09
	→ HG` joined	18:11
	→ punchagan joined	18:11
	← Faffyman left	18:11
	→ esc joined	18:11
	← nerdfiles left	18:12
	→ thiago_ joined	18:13
	→ ijp joined	18:14
	→ cuppscakes joined	18:14
	← jottr left	18:14
	← maxorator left	18:14
	← cuppscakes left	18:15
	← regedit left	18:15
	→ dreiss joined	18:15
	→ cuppscakes joined	18:15
	→ punchagan1 joined	18:15
	gitinfo set mode: +v	18:15
	← trang left	18:16
ijp	suppose I git mv foo bar; mv baz foo; git add foo; git commit. will I still get correct blame for file bar?	18:16
	→ AdrianGuenter joined	18:16
	← punchagan left	18:16
	→ mribeirodantas joined	18:17
	→ maxorator joined	18:17
	← mribeirodantas left	18:17
	→ mribeirodantas joined	18:17
	← Sasazuka left	18:17
	→ noituloveand joined	18:18
Eugene	Probably not. !tryit	18:18
gitinfo	[!tias] Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/tias.html may help with git-specific TIAS.	18:18
Eugene	See also !mv	18:18
gitinfo	[!rename] git does not support explicitly file renaming - the 'git mv' command is shorthand for 'git rm --cached; mv; git add'. All "rename" statistics are generated at runtime when examining history with git-log. See the -M option in the git-log manpage for more info. Also http://thread.gmane.org/gmane.comp.version-control.git/27/focus=217 and `diff.renames = true` in man git-config	18:18
xender	ijp: se man git blame	18:19
gitinfo	ijp: the git-blame manpage is available at http://jk.gs/git-blame.html	18:19
xender	*see	18:19
	← cuppscakes left	18:19
xender	ijp: IIRC it hase some switch for detedting renames	18:19
	→ cuppscakes joined	18:19
xender	Also, you may sometimes want to use blame on a file multiple times, each time specifying the revision as a parent of revision which modified interesting line last time	18:20
	→ Sasazuka joined	18:21
xender	For example: when blame points to a commit which was a whitespace change, but you want to know previous [more meaningful]change to that line	18:21
	← punchagan1 left	18:22
	← Sauvin left	18:22
	→ toedwy__ joined	18:22
	← kristofers left	18:23
	← toedwy_ left	18:25
	→ toedwy_ joined	18:25
	← Gizburdt left	18:25
	← angrycodr left	18:26
	← HG` left	18:26
	→ jottr joined	18:26
	← n-st left	18:26
	← BigWillie left	18:26
	→ Gizburdt joined	18:27
	← toedwy__ left	18:28
	→ Arpho joined	18:28
	→ BigWillie joined	18:29
	gitinfo set mode: +v	18:30
	→ CodePulsar joined	18:30
	← toedwy_ left	18:31
	→ toedwy joined	18:31
	→ paul424 joined	18:32
	← lsiv568 left	18:32
	→ FortySix2 joined	18:32
	← Rylee left	18:32
	→ oskude joined	18:32
	→ TititaTitutu joined	18:33
	→ Rylee joined	18:34
	→ the8thbit\|work joined	18:34
the8thbit\|work	Hello	18:34
	← _Vi left	18:34
oskude	hi, given this tree http://ix.io/e4e (where the recurring thing is "/lang/<lang-code>/"), how can i .gitignore all "lang" dirs but not any "lang/en" dirs?	18:34
the8thbit\|work	I recently ran into an issue where I had changes, but they weren't ready to push out to origin	18:34
	→ kline joined	18:34
the8thbit\|work	however, I had newer changes which _were_ ready	18:34
	so I had to rebase to push those out	18:35
	← kline left	18:35
the8thbit\|work	and I ended up having to do that multiple times	18:35
	and eventually my git log turned into speghetti and I couldn't push anything out until I was ready to push everything out	18:35
	→ tranzfuse joined	18:35
the8thbit\|work	Whats the best way to manage git repos such that you don't run into that sort of situation?	18:35
	Using stashes or branches or..?	18:36
	→ killtheliterate joined	18:36
	← tgkokk left	18:38
	← St_Marx left	18:38
Arpho	oskude : how about using negative gitignore matches (starting with !...)?	18:39
gitinfo	[!dots] A..B = stuff that happened between A and B (if A and B are related; otherwise refer to "man gitrevisions"), A...B = (a) in history viewers: stuff that isn't in both A and B yet; (b) in "git diff": stuff that happened in B since the two diverged; (c) in "git checkout": the merge base of A and B. "master.." is the same as "master..HEAD" and "..master" is the same as "HEAD..master", and so forth.	18:39
	← tranzfus_ left	18:40
	← logix812 left	18:40
	← lite_ left	18:40
	→ pizzaprty joined	18:40
oskude	Arpho: you mean "lang/\n!lang/en/"? that still ignores lang/en/ and if i read the man page correctly, that is a feature?	18:41
	→ tgkokk joined	18:41
	← tgkokk left	18:41
	→ TititaTitutu_ joined	18:41
	→ tgkokk joined	18:42
	→ thierryp joined	18:42
	← listochkin left	18:42
	← TititaTitutu left	18:42
	→ zumba_addict joined	18:42
	← tgkokk left	18:42
	→ Eins_ joined	18:43
	→ tgkokk joined	18:43
	→ todd_dsm joined	18:44
	← todd_dsm left	18:44
	→ jheg joined	18:44
	→ St_Marx joined	18:44
	← thierryp left	18:45
	→ logix812 joined	18:45
	→ gluten_hell_ joined	18:46
	← AdrianGuenter left	18:46
	← _0xff left	18:47
	→ hashar joined	18:47
	← Sijdesign left	18:48
	→ dhardison joined	18:48
	← logix812 left	18:49
	← TititaTitutu_ left	18:49
	← bitsoflogic left	18:49
	→ mkaesz joined	18:50
	← gluten_hell_ left	18:50
oskude	Arpho: http://ix.io/e4f a test case	18:51
	← robustus left	18:51
	← Hounddog left	18:52
	→ ropav joined	18:52
	← Quevin_ left	18:52
	→ listochkin joined	18:53
	← Rylee left	18:54
ijp	Eugene: I did, I was just hoping that there was a more complicated version of said incanation that would preserve it and one of you would point it out	18:54
	← darkbasic left	18:54
	→ jagob joined	18:54
	← luxgeek left	18:54
	← amcsi_work left	18:54
	← tgkokk left	18:54
ijp	xender: noted about the flag, but I'll probably forget it when I need it	18:54
	→ Rylee joined	18:54
	→ knalf joined	18:55
oskude	i wonder if would be technically possible to add a feature that if "!lang/en" was defined before "lang/" in .gitignore, the rule "It is not possible to re-include a file if a parent directory of that file is excluded" would be ignore. or maybe a flag to allow child dirs to be re-included even if parent is ignored	18:55
	→ darkbasic joined	18:55
	→ robustus joined	18:55
Arpho	# cat .gitignore	18:55
	/public/	18:55
	!*/public/config.php	18:55
	..	18:56
	this is how I use it	18:56
oskude	Arpho: i need it for dirs	18:56
xender	ijp: There is no way to record a rename in core git. Git detects renames post-factum	18:56
Arpho	do dirs have subdirs?	18:56
	← mugenzebra left	18:56
Arpho	not my usecase, but try !lang/en/*	18:57
xender	ijp: If you really want, you can make an alias or sth. But remembering that such options exists and having manual at hand is good too.	18:57
ijp	FWIW: the use case was reorganising my emacs init.el as a literate org file, and loading the new file from the new init.el	18:57
Arpho	Is anyone here (and alive) familiar with git internals?	18:58
Eugene	Arpho - !ask	18:58
gitinfo	Arpho: Yes, it's okay to ask questions here.... in fact, you just asked one! ;-) Pretty much any question is fine. We're not terribly picky, but we might be asleep. Please be patient and you should get an answer soon.	18:58
Arpho	I am currently looking into making filename .gitignore configurable, to have it named something else if required.	18:58
Eugene	It's called a symlink. Use it.	18:58
	→ mugenzebra joined	18:59
Arpho	Eugene: too fast :)	18:59
	← ijp left	18:59
Arpho	I am not looking into another file to be used as alias to .gitignore, but to rename gitignore itself, so if someone recreates it, it will be ignored	19:00
	← bezet left	19:00
	← gancl left	19:00
Arpho	let me say simpler: core.exclude_filename = .gitexclude	19:00
Eugene	I'm trying to imagine a use case for this.	19:00
Arpho	and if I create .gitexclude, it gets parsed by git, but not .gitignore	19:00
	try not to :)	19:00
Eugene	!xy. You want local ignores?	19:00
gitinfo	Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...	19:00
	← nedbat left	19:01
Eugene	The proper place for such a suggestion would be the mailing list, btw. But you'll get laughed off it.	19:01
	→ Adam_ActiveState joined	19:01
	→ trang joined	19:01
	→ mskaesz joined	19:01
	← mkaesz left	19:02
	oskude wonders where in git source code .gitignore is handled :P	19:02
	← Rylee left	19:02
Arpho	so this irc #chan is more of a self-support group and not git developer/maintainer hangout?	19:02
	← tvw left	19:02
Eugene	Correct.	19:02
	You're free to discuss it here, but the maintainers aren't around.	19:02
thevishy	all irc channels are the same :)	19:02
Arpho	oskude: dir.c, line 1620	19:02
	→ Rylee joined	19:03
oskude	Arpho: thanks :D	19:03
	← mugenzebra left	19:03
Arpho	oskude: (just to be clear, start there, but you will have to search further yourself, I haven't gotten further yet)	19:03
oskude	Arpho: roger	19:04
	← jheg left	19:04
	→ _lexjm joined	19:04
Arpho	Eugene: I'll skip discussion here then. Tnx for info.	19:05
	← ropav left	19:05
	← EminenceHC left	19:05
	← robzilla left	19:05
	← gfixler left	19:06
	→ ropav joined	19:06
	→ EminenceHC joined	19:06
	→ demo1414 joined	19:06
	← demo1414 left	19:06
	← Macaveli left	19:06
xender	thevishy: Not all, on some (like #mpv-player) there are project programmers around	19:07
thevishy	right most of the popular ones I mean like python git vim etc	19:08
xender	Possibly, yeah	19:08
Arpho	thevishy, xender: but why do these channels exist and are populated then?	19:08
	← mennea left	19:08
Arpho	is getting help here faster than googling it up?	19:08
	→ _Vi joined	19:08
	← ropav left	19:08
	→ mfmfmfmfmfmf joined	19:09
Arpho	(not in my experience, FWIW)	19:09
xender	Arpho: Depends on case	19:09
thevishy	people with same interest mostly Arpho !	19:09
	← hahuang65 left	19:09
	← FortySix2 left	19:09
xender	Sometimes there's no answer easily findable on WWW	19:10
	← ValicekB left	19:10
	← hj2014 left	19:10
	← EminenceHC left	19:10
	→ bbloom joined	19:10
Arpho	xender: true, especially when you do not know how to correctly phrase your question :)	19:10
xender	And sometimes you need to point someone to the correct place. Or even tell what to do step by step	19:11
	→ jheg joined	19:11
	→ FortySix2 joined	19:11
Arpho	who is the good samaritan to do that? I could use a few, but now I only need a tool to convert irc responses into working code automatically... :)	19:11
	→ AdrianGuenter joined	19:12
xender	It doesn't work that way :D	19:12
	← Droolio left	19:12
	→ reyha joined	19:13
Arpho	yeah, but I wonder how long would it take for someone to notice he can exploit the server by just providing the right answers on irc :)	19:14
	anyway, let's leave fantasy aside.	19:14
	← kriks left	19:15
	→ looper joined	19:15
	→ KevinTS joined	19:15
	→ ropav joined	19:15
	→ lowkeyliesmyth joined	19:16
	← KevinTS left	19:16
	← looper left	19:16
	← ropav left	19:17
	→ toedwy_ joined	19:17
	→ eburcat joined	19:17
	← sgen_ left	19:17
	← nettoweb left	19:17
	← lowkeyliesmyth left	19:17
	→ AaronMT_ joined	19:18
	← AaronMT left	19:19
	← toedwy left	19:19
	→ ValicekB joined	19:20
	→ looper joined	19:21
	← mariuscc left	19:22
	← JohnBat26 left	19:22
	→ AdrianGuenter_ joined	19:24
	→ phishy_ joined	19:25
	← phishy_ left	19:25
	← jheg left	19:25
	→ Vile joined	19:25
	→ studmuf joined	19:26
	← thiago_ left	19:27
	← AdrianGuenter left	19:27
	→ jheg joined	19:27
	← MithrilTux left	19:28
	← BigWillie left	19:28
	→ mennea joined	19:29
	→ kballou joined	19:29
	→ teran joined	19:29
	→ noxd joined	19:29
	← zumba_addict left	19:29
	→ WaReZ joined	19:29
	← studmuf left	19:30
	→ ocbtec joined	19:30
	→ lsiv568 joined	19:30
	→ cnj joined	19:30
Arpho	heh, got it working by now, changing .gitignore filename into configurable option	19:30
	← howitdo left	19:31
	→ abnvp joined	19:31
Arpho	anyway, have a nice one guys	19:31
	← Arpho left	19:32
	← Rylee left	19:32
	← bambams_ left	19:32
arkore	Off-topic question: anyone experienced "curl: (67) Access denied: 530" message when using git-ftp? Google doesn't have anything on this.	19:33
	→ Rylee joined	19:33
hashar	any git dev around? I am wondering what Signed-off-by: field is for when proposing a patch to git	19:33
	→ _0xff joined	19:33
	→ P4_Denis_ joined	19:33
	← phenicie left	19:34
hashar	is that authorship / copyright information? The work I am going to propose is fairly trivial but is subject to a joint copyright with an organization (Wikimedia Foundation Inc. for what it is worth).	19:34
	← Nizumzen left	19:34
	← ocbtec left	19:34
grawity	hashar: afaik, it comes from the "Developer's Certificate of Origin" – https://www.kernel.org/doc/Documentation/SubmittingPatches section 12	19:35
	→ thierryp joined	19:35
	← petersr left	19:35
grawity	which is exactly primarily about copyright	19:35
	→ nedbat joined	19:35
	← P4_Denis left	19:36
hashar	so that is more or less similar to providing a copy of the copyright hand signed by myself :]	19:36
	← a_l_e left	19:36
	→ tm512 joined	19:37
hashar	maybe I am overthinking it	19:37
	← adriankal left	19:38
hashar	grawity: thanks for the document pointer :]	19:38
	→ fstd_ joined	19:39
	← lsiv568 left	19:39
	← thierryp left	19:40
	→ toedwy joined	19:40
	→ lite_ joined	19:41
	← fstd left	19:42
	fstd_ → fstd	19:42
	← Rylee left	19:42
	→ thierryp_ joined	19:43
	← kpease left	19:43
	→ robbyoconnor joined	19:43
	← toedwy_ left	19:43
	→ Marcus_ joined	19:44
	→ Rylee joined	19:44
	← nedbat left	19:45
	← lite_ left	19:46
	→ nedbat joined	19:47
	→ DeathIncarnate joined	19:47
	→ moritzs joined	19:47
	← abnvp left	19:47
	← moritzs left	19:47
	← thierryp_ left	19:47
	→ moritzs joined	19:48
	← przemoc left	19:48
	← sandorjanssen left	19:48
	← rfreeman_w left	19:48
	← hexagoxel left	19:49
	← moritzs left	19:49
	→ moritzs joined	19:49
	→ przemoc joined	19:49
	← akim_ left	19:49
	gitinfo set mode: +v	19:50
DeathIncarnate	Is there anyway to deal with a Merge conflict on the behalf of someone else? Such as.. You know there will be a conflict, and that if he pulls there will be a conflict. So is there a way to facilitate the bridge between the merge and deal with the merge and then push the updated branch so that the people can now pull and not have to deal with the conflict themselves?	19:50
	→ kpease joined	19:50
	← AKK9 left	19:51
_ikke_	DeathIncarnate: 2 options: rebase you branch onto the branch being merged into, or merge the branch it gets merged into in your branch	19:51
	→ akim_ joined	19:51
	← AdrianGuenter_ left	19:51
	← cuppscakes left	19:51
grawity	DeathIncarnate: have them push their code into a temporary branch, then pull from that branch and solve the merge conflict yourself, then push the resulting merge	19:51
_ikke_	DeathIncarnate: The former leads to nicer looking history, but is problematic when others already have the commits	19:51
	→ alvaro_o_ joined	19:51
	→ toedwy_ joined	19:54
	→ zumba_addict joined	19:55
	← listochkin left	19:55
	→ bambams_ joined	19:56
	→ Faffyman joined	19:56
	→ listochkin joined	19:56
	→ pantsman- joined	19:56
	→ cuppscakes joined	19:56
	← cuppscakes left	19:56
	CodePulsar → SkyLizard	19:56
	← toedwy left	19:57
DeathIncarnate	_ikke_, if you have multiple people working in multiple groups on different tasks. Would it be better to have multiple branches or have multiple folders in one branch?	19:57
	→ cuppscakes joined	19:57
_ikke_	DeathIncarnate: multiple branches	19:57
	← listochkin left	19:57
	← cuppscakes left	19:57
	→ listochkin joined	19:57
	→ cuppscakes joined	19:58
	→ hoschi joined	19:58
	→ howitdo joined	19:58
DeathIncarnate	_ikke_, but then if you need work from that branch at some point, would you checkout that branch? or how would you deal with that, because the moment you checkout, you lose your work in your current branch to what they have	19:58
j416	DeathIncarnate: if multiple folders is an option, is the work even related? Separate repos comes to mind.	19:58
	→ EminenceHC joined	19:58
j416	DeathIncarnate: what is the nature of your project?	19:58
DeathIncarnate	j416, the work is related a whole, like a huge project. But individual tasks and groups are assigned to do certain things. When the time comes, we will need to access all of the data	19:59
	j416, just not currently.	19:59
	→ rfreeman_w joined	19:59
DeathIncarnate	j416, we are rebuilding wikipedia in our database class and I am put in charge of setting up GIT	19:59
_ikke_	DeathIncarnate: When you need work from another branch, does that mean that particular work is done?	19:59
j416	Git*	19:59
DeathIncarnate	j416, we have a read team optomizing read capabilities, memcach, redis, etc... And a write team that's optimizing editing and concurrency issues	20:00
	← Faffyman left	20:00
	← FortySix2 left	20:00
j416	DeathIncarnate: it sounds like you have the same set of files and that everyone works on those files.. ?	20:00
	→ gfixler joined	20:00
j416	DeathIncarnate: and at some point or other, multiple people _may_ need to touch the same file?	20:00
DeathIncarnate	_ikke_, Not necessarily. Such as, the write team is working on editing page data. Optimizing tools for editing XML and HTML pages. So now after making the tools, they need the data from the read team, such as the Riak server information or HTML data	20:01
	→ blarson joined	20:01
DeathIncarnate	j416, correct	20:01
	→ robertnix joined	20:01
DeathIncarnate	I just don't know how I would go about it	20:01
j416	DeathIncarnate: in that case, one repo, different branches	20:01
	if everything is realted	20:01
	related*	20:01
DeathIncarnate	j416, okay, then how would you access another branch without losing your information?	20:01
	→ jottr_ joined	20:02
DeathIncarnate	Would you then just merge the two branches j416 ?	20:02
_ikke_	DeathIncarnate: By merging it in	20:02
j416	but if the tools can be thought of as independent projects with no dependencies between, then I'd have one repo per such project	20:02
_ikke_	!workflow	20:02
gitinfo	Finding the right workflow for you is critical for the success of any SCM project. Git is very flexible with respect to workflow. See http://sethrobertson.github.com/GitBestPractices/#workflow for a list of references about choosing branching and distributed workflows.	20:02
j416	DeathIncarnate: commit, then checkout	20:02
	DeathIncarnate: merge when you need to combine everything	20:02
DeathIncarnate	_ikke_, I see, I thought so. So if I'm in a branch called "read" and I want to pull information from write, I would have to be inside of my "read" branch and then do "git merge origin/write" right?	20:02
	← Rylee left	20:02
j416	DeathIncarnate: it depends on what you mean by 'pull information'	20:03
	→ lowkeyliesmyth joined	20:03
	→ davispuh joined	20:03
DeathIncarnate	pull the entire branch or individual files?	20:03
	→ StarManta joined	20:03
DeathIncarnate	is there an option I can do between those 2?	20:03
	→ Rylee joined	20:03
j416	DeathIncarnate: you always merge branches, not files	20:03
_ikke_	You merge history/branches, not files	20:03
	→ FunkyAss joined	20:03
DeathIncarnate	I see	20:03
j416	DeathIncarnate: but I get the feeling that you are confusing checkout with merge	20:04
	DeathIncarnate: checkout = look at something, merge = join the history of two or more branches	20:04
DeathIncarnate	j416, I think I finally understand now. So what is the process of merging two branches? be in your current branch, then "git merge origin/(name of branch to merge)" ?	20:04
j416	DeathIncarnate: git merge <branch>, yes	20:04
DeathIncarnate	j416, I got them confused momentarily because you can "git checkout" individual files you know what I mean?	20:05
	j416, I got it now though	20:05
	← toedwy_ left	20:05
_ikke_	yes, you can, but that won't merge the files	20:05
	← jottr left	20:05
DeathIncarnate	_ikke_, I see. Thank you both j416	20:05
j416	I am just one	20:05
DeathIncarnate	j416, I mean _ikke_ as well :)	20:05
j416	:P	20:05
DeathIncarnate	:P	20:06
_ikke_	:P	20:06
	→ tranzfus_ joined	20:06
	← pizzaprty left	20:06
DeathIncarnate	Very interesting but boring project for this class though. University Database 3 and Data Persistence Application projects class.	20:06
	Pulled XML dump from wikipedia and making our own, sharding and storing information on our own riak cluster, and running map reduce, etc..	20:06
	it's annoying	20:06
j416	how can something be interesting and boring at the same time o_O	20:06
	→ robzilla joined	20:06
_ikke_	j416: I wondered the same :P	20:06
	Perhaps tedious?	20:07
j416	_ikke_: great minds think alike	20:07
	→ thiago joined	20:07
DeathIncarnate	_ikke_, there you go. j416 it's interesting because of the project scope. It's boring because of getting stuck in doing a task you don't want to do.	20:07
	Such as sorting and managing link data	20:07
	or parsing XML to HTML	20:07
j416	aha	20:07
DeathIncarnate	or dealing with a 47 GB XML Dump file	20:07
_ikke_	Which is a problem of it's own	20:07
	← lowkeyliesmyth left	20:08
DeathIncarnate	As of right now, converting XML to HTML (including wikitext)	20:08
j416	sax parser	20:08
	oops wrong channel	20:08
	→ kaendfinger joined	20:08
	← daum left	20:08
_ikke_	?	20:08
j416	!	20:08
_ikke_	.	20:08
j416	,	20:08
DeathIncarnate	and I agree with j416 we did that.	20:08
_ikke_	That's about the only choice	20:08
	parsing on the go	20:08
j416	parsing on the go :D	20:09
DeathIncarnate	j416, we ran into a problem where we need to stream the file, but pulling information from Riak would not allow us to use SAX parser because it requires a file, we have a stream	20:09
	← hoschi left	20:09
j416	sax doesn't require a file	20:09
	because it's stream-based...	20:09
	perhaps a bad implementation	20:09
DeathIncarnate	j416, so the process would be: pulling data from riak -> writing certain information to a file and storing it on your computer -> running it through SAX for result	20:09
	yeah :(	20:09
	→ Annak joined	20:09
	→ dreisner joined	20:09
	gitinfo set mode: +v	20:10
	← tranzfuse left	20:10
_ikke_	fifo file?	20:10
	SkyLizard → DrSkyLizard	20:10
	← robzilla left	20:11
_ikke_	Should look like a file to riak, but the sax parser can read it as a stream	20:12
	gitinfo set mode: +v	20:12
	→ sgen_ joined	20:12
StarManta	hey, so, i'm a pseudo-noob at using git, and we can't seem to get a grasp of the process of having two branches. that is to say, when i commit a change while danny's working, it forces him to stash his changes before he can get my changes, and then his changes seem to be trapped in the "stash" and we can't figure out how to get them back out so he can commit his changes	20:12
	← Diemuzi left	20:12
StarManta	(both using sourcetree on os x)	20:12
	← ockham1 left	20:12
_ikke_	StarManta: First, don't think you have to 'update' at every commit	20:13
StarManta	...sourcetree seems to disagree. it doesn't let us commit anything unless we're up to date on all the existing commits	20:13
	→ punchagan joined	20:13
	← moritzs left	20:13
	← BSaboia left	20:13
	← dreisner left	20:14
_ikke_	What does it say when you try to commit anyway	20:14
	because that should not be the case	20:14
	→ Quevin joined	20:14
StarManta	uh.... might take a second to get the error message, the repository is not currently in a state where i can trigger that situation	20:15
	← mskaesz left	20:15
	→ btree joined	20:15
	→ kermit joined	20:15
_ikke_	StarManta: except for things like pull / fetch / merge, everything happens locally	20:15
	→ MithrilTuxedo joined	20:16
	Annak → Diemuzi	20:16
_ikke_	so if you commit something locally, there is no way danny should notice that	20:16
	→ ockham joined	20:16
	→ aidalgol joined	20:16
StarManta	(second, somewhat related question: do there exist any GUI git clients that are not half-assedly built on top of the command line? it seems like anytime sourcetree hits a condition that is even the slightest bit unexpected, it just throws its hands in the air and is like, "here's 20 paragraphs of cryptic error text, it's your problem now")	20:17
voxxel	I've seen examples of post-receive hooks which copy (using GIT_WORK_TREE=path git checkout -f) changes to a local directory which is different from the repo dir... But is there any way to perform the same task to update a remote directory (on another server)?	20:17
	← jitendravyas left	20:17
	← punchagan left	20:17
_ikke_	StarManta: I have very little experience with git GUIs	20:17
StarManta	well... in our situation, what's the point of committing without pushing?	20:17
Eugene	!SmartGit is full-assedly built over the CLI.	20:17
gitinfo	[!smartgit] SmartGit is a (commercial) UI for git that is very user-friendly and feature-complete. http://syntevo.com/smartgithg	20:17
	→ deant765 joined	20:18
_ikke_	StarManta: It depends on how you commit. git happily lets you create small, self-contained commits. You don't want to bother others with every small commit	20:19
	→ nnyk joined	20:19
_ikke_	but you push for example when you have finished something significant	20:19
	← eburcat left	20:19
	← B1x1t0 left	20:20
	→ eburcat joined	20:20
StarManta	ok, well, all that aside... we still at some point need to merge stuff	20:20
ojacobson	that's a natural consequence of concurrent development, yes	20:20
	→ ropav joined	20:20
_ikke_	StarManta: !workflow	20:21
gitinfo	StarManta: Finding the right workflow for you is critical for the success of any SCM project. Git is very flexible with respect to workflow. See http://sethrobertson.github.com/GitBestPractices/#workflow for a list of references about choosing branching and distributed workflows.	20:21
	← Will\| left	20:21
	← ropav left	20:21
_ikke_	StarManta: Like that snippet said, git doesn't enforce a specific workflow. But that also means that it's not immediately clear what a good workflow is	20:22
	StarManta: that means people well often just do something like commit, pull, push, repeat	20:23
	→ s2013 joined	20:23
_ikke_	While that works somewhat, it also makes very messy history	20:23
	→ Will\| joined	20:24
	→ mkaesz joined	20:24
	← eburcat left	20:24
	→ FortySix2 joined	20:25
	→ montchr joined	20:25
	← Gizburdt left	20:25
StarManta	that did seem to be the only option available	20:25
_ikke_	well, there are more options	20:26
	→ hahuang65 joined	20:26
StarManta	trying to apply a stash, I get this message: "error: Your local changes to the following files would be overwritten by merge:" with no obvious way to say "anything that's different, the stash is preferred"	20:26
	(workflow etc aside, since danny's work for the day is in that stash, this is the first thing i need to figure out)	20:27
_ikke_	StarManta: git commit -am "tmp"; git stash apply; git reset HEAD^	20:27
	← dc_33 left	20:27
_ikke_	No idea how to do it in SourceTree	20:27
	→ ovoraptor joined	20:27
	← robbyoconnor left	20:28
	← arkore left	20:28
	← nilg left	20:29
	← IrishPrime left	20:29
	→ Gizburdt joined	20:31
	← cuppscakes left	20:31
	→ veebers joined	20:32
	← hcc23 left	20:32
	→ toedwy joined	20:33
	← Gizburdt left	20:34
	→ lowkeyliesmyth joined	20:35
	← s2013 left	20:35
	← toedwy left	20:35
	← ovoraptor left	20:35
	→ EmmEight joined	20:36
	← Kicer86 left	20:36
	→ ovoraptor joined	20:37
	← Eins_ left	20:37
	← EmmEight left	20:38
	→ isc_X joined	20:39
	← lowkeyliesmyth left	20:40
	← isc_X left	20:40
	← tranzfus_ left	20:41
	→ AlexDenisov joined	20:41
	→ Gizburdt joined	20:41
	→ tranzfuse joined	20:42
	→ lite_ joined	20:42
	→ lowkeyliesmyth joined	20:42
	→ isc_X joined	20:43
	→ EgS joined	20:43
	← nickpresta left	20:44
	← spareproject left	20:44
	← Corey84 left	20:44
	← jagob left	20:45
	→ toedwy joined	20:46
	→ r0ok joined	20:46
	← sonicparke\|bradm left	20:46
	← Wiz_KeeD left	20:46
	→ jagob joined	20:46
	← lite_ left	20:46
	← btree left	20:47
	← ojacobson left	20:47
	← beastd left	20:47
	→ jayrobot joined	20:47
	→ Eins_ joined	20:48
	← montchr left	20:48
	→ nickpresta joined	20:49
	← the8thbit\|work left	20:49
	→ JeanCarloMachado joined	20:49
	→ shafox joined	20:51
	→ cuppscakes joined	20:52
	← cuppscakes left	20:52
	← acharlieh left	20:52
	→ cuppscakes joined	20:53
	← cuppscakes left	20:53
	→ sinkensabe joined	20:53
	← Vile left	20:53
	→ cuppscakes joined	20:53
	← diegoviola left	20:54
	← davegb3 left	20:54
	→ tvw joined	20:54
	→ toedwy_ joined	20:54
	→ BBBThunda joined	20:54
	→ Vile joined	20:55
	→ ropav joined	20:55
	← DeathIncarnate left	20:55
	← nickpresta left	20:56
	→ martinklepsch joined	20:56
	← toedwy left	20:57
	→ autochthon joined	20:57
	← ehmatthes left	20:58
	← OffTheRails left	20:58
	→ toedwy joined	20:59
	→ DeathIncarnate joined	20:59
	→ acharlieh joined	20:59
	← oskude left	21:00
	→ mskaesz joined	21:00
	← EgS left	21:00
	→ bezet joined	21:00
	→ EgS joined	21:00
	← mkaesz left	21:00
	→ B1x1t0 joined	21:01
	← cannonball left	21:01
	← bambams_ left	21:01
	← toedwy_ left	21:01
	← _0xff left	21:04
	→ tpollard joined	21:04
	← gittish left	21:04
	← bezet left	21:04
	→ diegoviola joined	21:06
	← hahuang65 left	21:06
	→ dsdeiz joined	21:07
	→ robzilla joined	21:07
	→ robbyoconnor joined	21:07
	← fission6 left	21:08
	← xSmurf left	21:08
	← Amandil left	21:09
	← martinklepsch left	21:09
	← _lexjm left	21:09
	← aidalgol left	21:09
	← buffal0 left	21:09
	← kermit left	21:10
	← jagob left	21:10
	→ aidalgol joined	21:10
	→ CodePulsar joined	21:10
	← Deele left	21:11
	→ xSmurf joined	21:11
	← gccostabr left	21:11
	→ kermit joined	21:11
	← robzilla left	21:12
	← dsdeiz left	21:12
	← dccc left	21:12
	← ovoraptor left	21:12
	← thiago left	21:12
	→ toedwy_ joined	21:12
	→ dsdeiz joined	21:12
	← dhardison left	21:13
	→ hcc23 joined	21:13
	← ropav left	21:13
	← mskaesz left	21:14
	← DrSkyLizard left	21:14
	← toedwy left	21:15
	← robertnix left	21:16
	← cuppscakes left	21:16
	← FunkyAss left	21:17
	← FreezingCold left	21:17
	← MithrilTuxedo left	21:18
	← FortySix2 left	21:18
	← mikecmpbll left	21:22
levifig	getting tons of CA issues with git/curl… :(	21:23
	latest one: `SSL: CA certificate set, but certificate verification is disabled`	21:23
	gah	21:23
	→ anbz joined	21:23
	← robbyoconnor left	21:23
	← bbloom left	21:25
	← anbz left	21:25
	← isc_X left	21:25
	← reyha left	21:26
	→ lowkeyli_ joined	21:26
	← tarkus left	21:27
	→ cuppscakes joined	21:27
	→ dagnachew joined	21:28
	← teran left	21:28
	→ FortySix2 joined	21:28
	← AlexDenisov left	21:28
	→ moviuro joined	21:28
	← lowkeyli_ left	21:28
	→ lowkeyli_ joined	21:28
	← iamjarvo left	21:28
	← sin3t left	21:29
	→ sin3t joined	21:29
	← lowkeyliesmyth left	21:30
moviuro	Hi all! When git bisect-ing and reaching a final "skip", I get this: ix.io/e4n (project systemd @ freenode) but the commits' list is in a complete random order. Why that? Why not from top to bottom: most recent to oldest?	21:30
	← it0a left	21:31
	→ robzilla joined	21:32
	→ toedwy joined	21:32
	← diegoviola left	21:32
	→ StarManta2 joined	21:32
	→ FreezingCold joined	21:33
	→ diegoviola joined	21:33
	← dagnachew left	21:34
	→ dagnachew joined	21:34
	← mennea left	21:34
	← toedwy_ left	21:34
	→ m0viefreak joined	21:35
	← robzilla left	21:36
	→ toedwy_ joined	21:37
	→ nerdfiles joined	21:37
	← sin3t left	21:37
	← deric_skibotn left	21:37
	→ sin3t joined	21:38
	← basiclaser left	21:39
	← toedwy left	21:40
	← sinkensabe left	21:40
	← irqq left	21:40
	← Skapadapaduu left	21:40
	→ n-st joined	21:41
	→ buffal0 joined	21:41
	← Eins_ left	21:41
	→ irqq joined	21:41
	← deant765 left	21:42
	← pantsman- left	21:43
	← sdrfnord1 left	21:43
	→ ehmatthes joined	21:43
	→ deant765 joined	21:43
	← dagnachew left	21:43
	← aidalgol left	21:43
	← deant765 left	21:43
	→ deant765 joined	21:44
	→ pizzaprty joined	21:44
	→ Eins__ joined	21:44
	← deant765 left	21:44
	→ ropav joined	21:44
	→ Faffyman joined	21:44
	← mribeirodantas left	21:45
	→ aidalgol joined	21:46
	→ nemesit\|znc joined	21:47
	→ Ankhers joined	21:47
	→ basiclaser joined	21:47
	← Chuk left	21:47
	← ropav left	21:48
	← irqq left	21:48
	← Faffyman left	21:48
	→ zophy joined	21:49
zophy	with git, how can i use .git/info/exclude to exclude all files in a directory but still have git add the directory itself to the repository ?	21:50
	→ ropav joined	21:51
	→ toedwy joined	21:51
	→ dagnachew joined	21:52
	← sgen_ left	21:53
	→ bbloom joined	21:53
	← wrouesnel left	21:54
	→ deric_skibotn joined	21:54
	← aidalgol left	21:54
	← toedwy_ left	21:55
	→ aidalgol joined	21:55
Eugene	!empty	21:55
gitinfo	[!orphan_null] To create an orphan branch with the null/empty commit, use: `git checkout -b orphan $(echo "empty" \| git commit-tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904)`	21:55
Eugene	Ugh, no.	21:55
	← DeathIncarnate left	21:56
	← bitkiller left	21:56
Eugene	!dirs	21:56
gitinfo	[!directory] Git does not track directories, only files in directories. Create a nonce file as a placeholder (eg .gitignore) to create the directory or create the directory as part of a post-checkout hook	21:56
	→ bitkiller joined	21:56
	← lowkeyli_ left	21:57
	← livingstn left	21:57
	→ sdrfnord1 joined	21:57
	→ DeathIncarnate joined	21:58
	← LBV_User left	21:59
	← knalf left	21:59
	← dsdeiz left	21:59
	→ gluten_hell_ joined	22:00
	← hashar left	22:01
	← flugo left	22:01
	← Gizburdt left	22:01
	← ferreum left	22:01
	→ ferreum158 joined	22:01
	← trang left	22:02
zophy	Eugene, wow, thank you for the tip	22:02
	← acharlieh left	22:02
	→ flugo joined	22:03
	→ lowkeyliesmyth joined	22:03
	← xSmurf left	22:03
	← rfreeman_w left	22:03
	→ knalf joined	22:03
	→ thiago joined	22:04
	→ martinklepsch joined	22:04
	→ pierre1_ joined	22:04
	→ jko_ joined	22:05
	→ kadoban joined	22:05
	→ toedwy_ joined	22:07
	← thevishy left	22:08
	← nnyk left	22:09
	← toedwy left	22:10
	← nedbat left	22:10
	→ Sammy8806 joined	22:11
	→ xSmurf joined	22:11
	← noituloveand left	22:12
	← StarManta left	22:12
	→ rfreeman_w joined	22:13
	← ropav left	22:13
	← danemacmillan left	22:13
	← LeMike left	22:14
	→ ropav joined	22:15
	← ropav left	22:16
	→ toedwy joined	22:17
	→ trang joined	22:17
	← Ankhers left	22:17
	→ Corey84 joined	22:18
	← listochkin left	22:18
	← knalf left	22:19
	← Sammy8806 left	22:19
	← martinklepsch left	22:19
	→ listochkin joined	22:19
	→ ropav joined	22:19
	← toedwy_ left	22:19
	← tranzfuse left	22:20
	→ knalf joined	22:21
	← Corey84 left	22:21
	← trang left	22:21
	→ Corey84 joined	22:21
	← gluten_hell_ left	22:22
	← ropav left	22:23
	← dagnachew left	22:23
	← listochkin left	22:24
	→ listochkin joined	22:24
	← B1x1t0 left	22:25
	→ robzilla joined	22:25
	→ intellix joined	22:25
	← Sasazuka left	22:25
	← treehug88 left	22:26
	← killtheliterate left	22:26
	← Quevin left	22:26
	← m0viefreak left	22:27
	→ Joost` joined	22:27
	← deric_skibotn left	22:27
	← jottr_ left	22:27
	← fr33domlover left	22:27
	← jheg left	22:28
	→ P4_Denis joined	22:28
	← leeN left	22:28
	→ trang joined	22:29
	→ ropav joined	22:29
	→ Quevin joined	22:29
	← listochkin left	22:29
	→ CoreIT84 joined	22:29
	← ValicekB left	22:29
	→ teran joined	22:29
	← trang left	22:30
	→ Sasazuka joined	22:30
	← jko_ left	22:30
	← oojacoboo left	22:30
	← cuppscakes left	22:30
	← rfreeman_w left	22:30
	← P4_Denis_ left	22:31
	← DrShoggoth left	22:31
	← sgambino left	22:31
	← Sasazuka left	22:32
	← jftf left	22:32
	← Corey84 left	22:32
	→ Sasazuka joined	22:32
	→ toedwy_ joined	22:32
	← ropav left	22:32
	→ oojacoboo joined	22:32
	→ Corey84 joined	22:33
	→ m0viefreak joined	22:33
	ferreum158 → ferreum	22:34
	← knalf left	22:34
	← CoreIT84 left	22:34
	← EgS left	22:35
	→ ropav joined	22:35
	← toedwy left	22:35
	← sdrfnord1 left	22:36
	→ rue joined	22:36
	← FortySix2 left	22:36
	→ trang joined	22:37
	→ cuppscakes joined	22:37
	← hcc23 left	22:38
	→ endiruna joined	22:38
	← mechanicalduck left	22:39
	→ WormDrink joined	22:39
	→ EgS joined	22:39
	→ ValicekB joined	22:40
	→ mechanicalduck joined	22:41
	← m0ltar left	22:41
	→ rfreeman_w joined	22:42
	← wlvrn left	22:42
	← ws2k33 left	22:42
	→ noituloveand joined	22:43
	← CodePulsar left	22:43
	→ nedbat joined	22:43
	← ropav left	22:44
	→ dsdeiz joined	22:45
	← WaReZ left	22:46
	← mtk left	22:47
	→ deant765 joined	22:47
	← noxd left	22:48
	→ ropav joined	22:49
	← cuppscakes left	22:49
	→ Internet13 joined	22:51
	→ dccc joined	22:51
	→ CoreIT84 joined	22:51
	← deant765 left	22:51
	← FreezingCold left	22:52
	→ _lexjm joined	22:54
	← Corey84 left	22:55
	stiffi_ → stiffi	22:55
	← ropav left	22:56
	← toedwy_ left	22:56
	← CoreIT84 left	22:56
	← intellix left	22:56
	← noituloveand left	22:56
offby1	as the leper said to the ...	22:57
	→ s2013 joined	22:57
	← freestyl3r left	22:57
	→ jftf joined	22:57
	→ toedwy joined	22:58
	→ ropav joined	22:58
	← DeathIncarnate left	22:59
	→ Ankhers joined	23:00
	← ropav left	23:00
	← Xethron left	23:00
	→ LordWillO joined	23:00
	← LordWillO left	23:01
	← r0ok left	23:02
	← jftf left	23:02
	← toedwy left	23:03
	→ Samual joined	23:03
	← autochthon left	23:03
	← thiago left	23:03
	→ upene joined	23:04
	← kballou left	23:05
	→ upene1 joined	23:06
	← upene left	23:06
	← upene1 left	23:06
	→ upene joined	23:06
	→ FreezingCold joined	23:07
	← robzilla left	23:07
	→ listochkin joined	23:07
	← mfmfmfmfmfmf left	23:09
	← flugo left	23:09
	← Doyle left	23:10
	← Ankhers left	23:10
	→ ropav joined	23:10
	← thibaultcha left	23:11
	← listochkin left	23:12
	→ robzilla joined	23:12
	→ deric_skibotn joined	23:13
	← robzilla left	23:13
	→ toedwy joined	23:13
	← CheckDavid left	23:14
	← _lexjm left	23:14
	← Marcus_ left	23:15
	→ madewokherd joined	23:15
	← Robarelli left	23:15
	→ Marcus_ joined	23:15
	→ robarelli joined	23:16
	← diegoviola left	23:17
	← akim_ left	23:18
	→ mfmfmfmfmfmf joined	23:20
	→ m0ltar joined	23:21
	→ diegoviola joined	23:21
	← trang left	23:21
	← robarelli left	23:21
	← Noldorin left	23:21
	→ trang joined	23:22
	← m0ltar left	23:22
	← raven-au left	23:22
	← motto left	23:23
	→ noituloveand joined	23:23
	← ropav left	23:23
	→ raven-au joined	23:23
	← upene left	23:25
	→ godgodgodgo joined	23:25
	→ tmcmahon joined	23:26
	← noituloveand left	23:27
	← toedwy left	23:27
	→ toedwy joined	23:28
	→ m0ltar joined	23:28
	← teran left	23:29
	← ValicekB left	23:30
	→ noituloveand joined	23:30
	→ toedwy_ joined	23:30
	→ tranzfuse joined	23:31
	→ teran joined	23:31
	→ epifanio joined	23:32
	→ gluten_hell_ joined	23:32
	→ Faffyman joined	23:33
	← nerdfiles left	23:33
	→ toedwy__ joined	23:33
	← toedwy left	23:33
	← toedwy__ left	23:34
	→ toedwy joined	23:34
	← tranzfuse left	23:35
	← daedeloth left	23:35
	← teran left	23:36
	← toedwy_ left	23:36
	← EgS left	23:36
	← gluten_hell_ left	23:36
	← Faffyman left	23:37
	← toedwy left	23:38
	→ sgen_ joined	23:39
	→ Amandil joined	23:40
	→ ValicekB joined	23:40
	→ rethus joined	23:40
	→ knalf joined	23:40
	→ sinkensabe joined	23:41
	← EminenceHC left	23:42
	→ EminenceHC joined	23:42
	← JanC left	23:43
	← n-st left	23:43
	← m0ltar left	23:43
	← ntio left	23:44
	← knalf left	23:45
	← Amandil left	23:45
	← sinkensabe left	23:46
	→ EgS joined	23:46
	→ ntio joined	23:46
	→ TititaTitutu joined	23:47
	← EminenceHC left	23:47
	← looper left	23:47
	→ Lyqyd joined	23:48
	← armin left	23:49
	← AlexZan left	23:49
	← ockham left	23:50
	← maqr left	23:50
	← d10n-work left	23:50
	→ armin joined	23:50
	← AaronMT_ left	23:51
	→ thumpba_ joined	23:52
	→ m0ltar joined	23:53
	← thumpba left	23:55
	→ rjhunter joined	23:55
	← m0ltar left	23:55
	← Embassy left	23:56
	← Diemuzi left	23:57
	→ JanC joined	23:57
	→ ferreum158 joined	23:57
	→ ojacobson joined	23:57
	→ jftf joined	23:58

Logs Search ←Prev date Next date→

Channels Documentation