IRCloggy #git 2013-11-07

Provider of IRC logs since 2005.

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

	2013-11-07
	← CheckDavid left	00:00
	→ CheckDavid joined	00:00
	← groglogic left	00:00
	→ yargy joined	00:00
	→ hyperair joined	00:01
	← CheckDavid left	00:02
	→ CheckDavid joined	00:02
	← Chiftin left	00:04
	→ SoftwareMechanic joined	00:04
	← fuzzybunny69y left	00:05
	→ cenuij joined	00:06
	← felixsamora left	00:06
	← Sigma left	00:07
	← mmcdaris left	00:07
	→ mmcdaris joined	00:07
	→ CKyle joined	00:08
	← cyphase left	00:08
	← axl_ left	00:08
	← kriks left	00:09
	← hashpuppy left	00:10
	→ rchavik joined	00:11
	← batrick left	00:12
	← decotii left	00:12
	← Boohbah left	00:13
	← CheckDavid left	00:14
	→ felixsamora joined	00:14
	← felixsamora left	00:14
	→ CheckDavid joined	00:14
	← joshbetz left	00:15
	→ koptein joined	00:15
	→ jerius joined	00:15
	→ ulkesh joined	00:15
	→ Destos joined	00:16
	← kirin` left	00:16
	← echo-area left	00:16
	← frgtn left	00:17
	→ frgtn joined	00:17
	→ ezio joined	00:17
	→ CycoCid joined	00:17
	← aspiers left	00:20
	← _iron left	00:21
	→ pitzips joined	00:21
	→ eaj joined	00:21
	← frgtn left	00:22
	← bakers left	00:23
	→ kriks joined	00:23
	← richgilbank left	00:24
	→ shinnya joined	00:24
	← nwertman left	00:25
	← asQuirreL left	00:25
	→ arand joined	00:25
	← crazydiamond left	00:26
	← nettoweb left	00:26
	← CKyle left	00:27
	← eaj left	00:27
	← infynyxx left	00:29
	→ nwertman joined	00:29
	→ pandeiro joined	00:29
	→ Boohbah joined	00:29
	← hyperair left	00:29
	← ismlages left	00:30
	← hobodave left	00:30
	← kriks left	00:30
	← Zeam left	00:31
	→ ojacobson joined	00:32
	→ ezekielnoob joined	00:32
	← chuckharmston left	00:32
	→ dyng joined	00:33
	← apipkin left	00:33
	← yargy left	00:34
	← harobed_ left	00:34
	→ whaley joined	00:34
	→ ozymandias_ joined	00:35
	← dyng left	00:35
	→ dyng joined	00:35
	← spaceonline left	00:36
ozymandias_	is it possible to 'clone' a repository starting at the original and pushing to the new? I have a server that I have unrestricted egress, but restricted ingress I want to clone from	00:36
	← mfulz left	00:36
	← zarubin left	00:36
ozymandias_	or could I just scp the whole directory and use that as the start?	00:37
tang^	you could scp, but then you lose the remote link. mind you, with limited ingress, you'd lose the link to that remote anyway	00:38
	→ jday_ joined	00:38
	← tang^ left	00:39
	← Robarelli left	00:39
ozymandias_	yeah, I want to move it so the master repo is on a more accessible server and pull everything from it	00:39
	→ Mars__ joined	00:39
	← dyng left	00:39
	→ cesarkawakami joined	00:40
	→ dyng joined	00:40
	← FernandoBasso left	00:40
ojacobson	ozymandias_: man git-clone, man git-push	00:40
gitinfo	ozymandias_: the git-clone manpage is available at http://jk.gs/git-clone.html	00:40
	ozymandias_: the git-push manpage is available at http://jk.gs/git-push.html	00:40
ojacobson	read the `--mirror` docs for each	00:40
ozymandias_	ty	00:41
	→ Sigma joined	00:42
	→ threesome joined	00:42
	→ MacWinner joined	00:43
	→ yargy joined	00:44
	← sfz_ left	00:46
	→ sfz joined	00:46
	→ dragon3_ joined	00:46
	← dragon3_ left	00:46
	→ dragon3_ joined	00:46
	→ ticoucoutoulou joined	00:47
	→ sriracha joined	00:49
	← ticoucoutoulou left	00:49
	← Bosox20051 left	00:50
	→ chuckharmston joined	00:50
	← thiago left	00:50
	← sfz left	00:50
	→ joelrobichaud joined	00:50
	← halu_ left	00:50
	← Stygia left	00:51
	← yargy left	00:53
maestrojed	I wish I had created my repo in the directory one level up (the parent directory). Is there a way to do this easily?	00:54
	→ yargy joined	00:54
	← chuckharmston left	00:55
	← harish left	00:56
	→ bitkiller joined	00:57
	← whaley left	00:58
	← decimad left	00:59
	← AaronMT left	01:01
	← yargy left	01:02
ojacobson	mv .git ../.git && git add --all ../	01:03
	→ nurey joined	01:03
	→ hyperair joined	01:04
	← etcetera left	01:04
	← akurilin2 left	01:05
	← pitzips left	01:05
	→ SaCu joined	01:05
	← Destos left	01:06
	← raonyguimaraes left	01:06
	→ etcetera joined	01:07
	← pfFredd left	01:09
	← ehmatthes left	01:09
	← SaCu left	01:09
	← graphitemaster left	01:09
	← huli_ left	01:10
	→ SaCu joined	01:10
	→ graphitemaster joined	01:10
	← graphitemaster left	01:10
	→ graphitemaster joined	01:10
	← rafaqueque left	01:10
	← SaCu left	01:11
	← 92AAASC1P left	01:12
	← mmlac-bv left	01:12
	→ SaCu joined	01:12
	→ weiyang joined	01:13
	→ hejia joined	01:13
	→ Destos joined	01:13
	← tjj_ left	01:14
	← rnsanchez left	01:14
	→ tjj_ joined	01:15
	→ Cassiel joined	01:15
	→ vipzrx joined	01:16
	← vipzrx left	01:16
	← wintrmute left	01:16
	← DonRichie left	01:18
	→ DonRichie joined	01:19
	→ lresende joined	01:19
	→ diegoviola joined	01:20
	→ vipzrx joined	01:20
	← vipzrx left	01:20
	→ chuckharmston joined	01:21
	→ yargy joined	01:21
	→ ehmatthes joined	01:22
	← chuckharmston left	01:22
	→ chuckharmston joined	01:22
	→ Droolio joined	01:23
	← kevwil left	01:23
	← rhl left	01:24
	→ marhaban joined	01:24
	→ eaj joined	01:25
	→ nettoweb joined	01:25
	← zhost left	01:26
	← graphitemaster left	01:26
	→ harish joined	01:27
	→ graphitemaster joined	01:27
	← graphitemaster left	01:27
	→ graphitemaster joined	01:27
	← rchavik left	01:27
	← chuckharmston left	01:27
	← Sigma left	01:28
	← Destos left	01:28
	← pr0ggie left	01:28
	← pdimitrov left	01:28
	→ pr0ggie joined	01:29
	← xeqution left	01:29
	→ zedsix joined	01:29
	← zedsix left	01:29
	→ zedsix joined	01:29
	→ pdimitrov joined	01:29
	← whunt left	01:29
	← SoftwareMechanic left	01:30
	← pandeiro left	01:30
maestrojed	ojacobson thanks	01:30
	→ degasus joined	01:30
	← hwrd\|work left	01:31
	← eaj left	01:31
	← harish left	01:32
	→ rjhunter joined	01:33
	← cenuij left	01:34
	→ woollyams joined	01:34
	→ joelm_ joined	01:35
	← s_e left	01:35
	→ nhmood joined	01:36
	→ s_e joined	01:36
	← joelm left	01:36
	→ knighthawk joined	01:36
nhmood	Is there any way to view the diff of a file that has already been staged (added) to a commit without removing it from staging?	01:37
preaction	nhmood: git diff --staged	01:37
	← goshawk left	01:39
	→ dhruvasagar joined	01:40
steak	Does anyone know of any git multi master documentation?	01:40
	← maestrojed left	01:40
	→ chuckharmston joined	01:41
	← victorbjelkholm left	01:41
nhmood	preaction: thank you!	01:41
	→ bwreilly_ joined	01:42
	← bwreilly_ left	01:42
	← penguin42 left	01:42
steak	Specifically syncing between masters	01:42
	← bwreilly left	01:44
	← AWinterman left	01:44
ojacobson	steak: git doesn't have masters (other than the default name of the branch 'git init' sets up); what are you really asking here	01:47
	← SHyx0rmZ left	01:47
crankharder	so I mentioned this earlier today -- been getting this error "fatal: Could not change back to '(unreachable)/scow': No such file or directory" from "git status" -- speculation that the filesystem was corrupt or the path was changing came up. but i dont think that's it	01:47
	I just remembered I checked the 'encrypt your home directory' when I set this new Ubuntu box up	01:48
	← kwmiebach left	01:48
	→ acl_ joined	01:48
crankharder	so maybe ubuntu is experiring the decrption of the session somehow?	01:48
	→ harish joined	01:48
crankharder	I can still see things with "ls ~/" and other various paths... which is odd	01:48
steak	ojacobson: This is for the purpose of soft migration from our existing centralized git workflow to using Gerrit as our central server.	01:49
	← mdiers left	01:49
	→ luc_ joined	01:51
	→ wafflejock joined	01:51
	← shruggar left	01:52
	← harish left	01:53
	→ Sigma joined	01:54
	← marhaban left	01:56
	→ glebihan_ joined	01:57
	← lresende left	01:59
	→ lresende joined	01:59
	← glebihan left	02:00
	→ dsdeiz joined	02:00
	← pigeon left	02:01
	← Abb_s left	02:01
	→ pigeon joined	02:02
	← tvw left	02:03
	← jcromartie left	02:03
	← _ikke_ left	02:06
	→ harish joined	02:06
jrnieder	steak: do you mean you want to have multiple git servers that accept pushes and forward the updated refs to each other?	02:06
	steak: that sounds complicated	02:06
	steak: what happens when both servers receive an update to the same ref?	02:07
steak	Yeah, that's the one	02:07
	← nettoweb left	02:07
steak	There would need to be a merge commit made.	02:07
jrnieder	steak: what happens if the changes conflict?	02:07
	← Davey left	02:08
	→ daito joined	02:08
	→ vipzrx joined	02:08
jrnieder	steak: i.e., I modify a line to say "A" on one server, and my coworker modifies the same line to say "B" through another server, at the same time	02:08
	→ batrick joined	02:08
steak	which would then be sent to both the servers. I'm guessing on merge conflict, there would need to be manual intervention. This would be temporary for the change over period only. Hence wondering if anyone has ever done it before.	02:09
jrnieder	steak: ok. I don't think anyone has done this :)	02:09
	steak: what's more common is (a) using some shared storage (NFS, database, or whatever) for the two git servers so conflicts can't happen	02:09
	← Tommy[D] left	02:09
	← marcidy left	02:10
	← jfoy left	02:10
steak	Yeah, I'm starting to wonder if that might be an easier route. Also, not as easy as it sounds though..	02:10
jrnieder	steak: or (b) treating the two servers as completely decoupled in normal operation, and regularly synching up when there is a person around in case they might need to resolve conflicts	02:10
	→ Davey joined	02:10
jrnieder	steak: that person can run a script that checks out the branch from their own server, pulls from the other server, and then pushes the result	02:11
	← Treggats left	02:12
jrnieder	steaks: that's sort-of how many open source projects work --- the project's maintainer pulls from people who have been making changes without bothering the maintainer up until then	02:12
steak	What I was thinking is having the scripts run, and break on conflict fail for human intervention. So in the normal case that there are merge conflicts, the sync happens fast.	02:13
jrnieder	steak: sure. but since conflicts can happen, conceptually these are decoupled servers	02:13
	← kpreid left	02:15
jrnieder	steak: as long as that's acceptable, it's a fine way to go. (It means you can't e.g. make your load balancer randomly route requests to both as though they were indistinguishable servers.)	02:15
steak	Yes, that is correct. I guess multi master isn't the best term to give it. But it's not far off what I am thinking about.	02:15
	← gdoteof left	02:15
	← jhulten left	02:15
	→ gdoteof joined	02:15
	← petey left	02:15
	→ CKyle joined	02:15
	→ jhulten joined	02:15
	→ Watabou joined	02:15
	→ marcidy joined	02:15
jrnieder	steak: at my work we have the shared storage thing working well	02:16
	→ Goopyo_ joined	02:16
	← bitkid left	02:16
steak	Correct, the complexity of load balancers etc isn't a problem for us. It's mostly just minimizing sharp developer work flow transitions.	02:16
jrnieder	steak: since we're using some weird databasy thing instead of NFS, it's fussy, but it mostly works :)	02:16
steak	Yeah I think I need to investigate the shared storage idea further.	02:17
ojacobson	sharing storage between a `git`-based server and gerrit is a non-starter	02:17
	gerrit (well, jgit) doesn't guarantee the same locking mechanisms, AFAIK	02:18
	you're going to have to solve this with meat, or with a sharp transition, I think	02:18
jrnieder	I thought jgit did use the normal locking mechanism for ref updates	02:18
steak	ojacobson: OK thanks, that's good to know.	02:18
ojacobson	Could be	02:18
jrnieder	but I agree that a sharp transition is nicest :)	02:18
	→ hwrd\|work joined	02:18
	← Goopyo left	02:19
	Goopyo_ → Goopyo	02:19
	→ nettoweb joined	02:19
steak	Sadly, that's not an option for us.	02:19
	← jhulten left	02:20
ojacobson	Of course it is	02:20
	you might not like it, and you might want to avoid it, but it remains an option	02:20
	if nothing else, you can turn writes on one off and the other on at a well-announced time	02:20
	← netoholic left	02:22
	→ lu_zero joined	02:22
	Davey → Eomar	02:24
	→ txwikinger joined	02:24
	← txwikinger left	02:24
	→ txwikinger joined	02:24
	→ r0bby_ joined	02:25
	← guampa left	02:26
	← CKyle left	02:27
steak	haha this company has more politics than the white house.	02:28
	→ eaj joined	02:28
	→ CKyle joined	02:28
	← SocalNick left	02:30
steak	jrnieder: Thanks for your input :)	02:30
	ojacobson: Same goes, thanks.	02:30
	← jkremser left	02:30
	→ rchavik joined	02:31
	← Jabberish left	02:32
	→ Jabberish joined	02:32
	→ delasteve joined	02:33
	← _Harm_B_ left	02:34
	← eaj left	02:34
	← etcetera left	02:34
	← Sigma left	02:35
	← Targen left	02:36
	→ felixsamora joined	02:37
	← felixsamora left	02:37
	→ felixsamora joined	02:38
	← Vampire0 left	02:39
	→ Vampire0_ joined	02:39
	← felixsamora left	02:39
	→ kpreid joined	02:40
	← knighthawk left	02:40
	→ felixsamora joined	02:40
	→ macabre joined	02:41
	← felixsamora left	02:41
	→ sylon joined	02:42
	← mitz left	02:44
	→ PaulCapestany joined	02:47
	← Goopyo left	02:48
	← mmcdaris left	02:48
	→ conan joined	02:48
	← abelsiqueira left	02:50
	← txwikinger left	02:50
	← CKyle left	02:51
	→ felixsamora joined	02:51
	← felixsamora left	02:51
	→ tang^ joined	02:51
	→ felixsamora joined	02:52
	← felixsamora left	02:52
	→ txwikinger joined	02:52
	→ felixsamora joined	02:53
	← felixsamora left	02:53
	→ felixsamora joined	02:54
	← txwikinger left	02:54
	← felixsamora left	02:54
	→ felixsamora joined	02:55
	← felixsamora left	02:55
	→ txwikinger joined	02:55
	← txwikinger left	02:55
	→ txwikinger joined	02:55
	→ felixsamora joined	02:55
	← felixsamora left	02:56
	← hwrd\|work left	02:56
	← chrisss404 left	02:58
	→ macabre^ joined	02:58
	← macabre left	02:58
	← PaulCapestany left	02:58
	→ mitz joined	02:58
	→ intripoon joined	02:59
	→ chrisss404 joined	02:59
	← dhruvasagar left	03:00
	→ PaulCapestany joined	03:00
	→ Sigma joined	03:01
	← conan left	03:01
	← intripoon_ left	03:02
	← strobert left	03:03
	→ felixsamora joined	03:03
	← felixsamora left	03:03
	→ strobert joined	03:04
	← Dougie187 left	03:04
	← ezio left	03:04
	← nettoweb left	03:04
	← shinnya left	03:04
	→ srcerer_ joined	03:04
	→ ezio joined	03:04
	← rjhunter left	03:05
	→ rjhunter joined	03:06
	← Cassiel left	03:06
	→ nettoweb joined	03:07
	← srcerer left	03:07
	→ Destos joined	03:08
	← Destos left	03:08
	→ felixsamora joined	03:08
	← felixsamora left	03:09
	← Mars__ left	03:09
	→ felixsamora joined	03:09
	← felixsamora left	03:09
	→ felixsamora joined	03:10
	← felixsamora left	03:10
	← rjhunter left	03:10
	→ CKyle joined	03:10
	→ felixsamora joined	03:11
	→ Goplat joined	03:11
	← felixsamora left	03:12
	← mr_red left	03:13
	rm_work → rm_work\|away	03:13
	→ SocalNick joined	03:14
	← CKyle left	03:14
	← r0bby_ left	03:15
	→ echo-area joined	03:16
	→ rurufufuss joined	03:17
	← galaris left	03:17
	→ krixxkraxx joined	03:17
	← PaulCapestany left	03:17
	← bitkiller left	03:17
	→ mr_red joined	03:18
	→ nafg joined	03:18
	→ knigitz joined	03:18
	→ thiago joined	03:19
	→ PaulCapestany joined	03:19
	→ eletuchy_ joined	03:20
	← shuaib left	03:21
	→ ewnd9 joined	03:21
	← macabre^ left	03:21
	→ macabre joined	03:22
	← eletuchy left	03:23
	→ jhulten joined	03:23
	← SocalNick left	03:24
	← CheckDavid left	03:25
	← eletuchy_ left	03:25
	← Sigma left	03:25
	← macabre left	03:26
	→ CKyle joined	03:28
	← undecim left	03:28
	← cannonball left	03:29
	← dyng left	03:31
	→ eaj joined	03:31
	→ dyng joined	03:32
	→ undecim joined	03:33
	→ Mars__ joined	03:34
	→ SocalNick joined	03:35
	← freestyl3r left	03:35
	→ curvedmark joined	03:35
	→ cyphase joined	03:36
	← cyphase left	03:36
	← dyng left	03:37
	← thiago left	03:37
	→ Scarberian joined	03:37
	← gdoteof left	03:37
Scarberian	help! i use vimdiff as my mergetool	03:37
	and I need to resolve a merge conflict	03:38
	← eaj left	03:38
Scarberian	but it opens 4 files for mergine	03:38
	merging	03:38
	← mribeirodantas left	03:38
Scarberian	BASE, LOCAL, REMOTE and what appears to be the straight up source file	03:38
	→ Cassiel joined	03:39
	→ guest212 joined	03:41
	← nettoweb left	03:42
	← harish left	03:43
	→ Sigma joined	03:44
	→ hwrd\|work joined	03:45
	← alvaro_o left	03:45
	← PaulCapestany left	03:46
	→ cyphase joined	03:46
	→ rjhunter joined	03:46
	→ PaulCapestany joined	03:50
	← Sigma left	03:52
	→ axl_ joined	03:53
	← hwrd\|work left	03:55
	→ hwrd\|work joined	03:56
	← tang^ left	03:59
	→ dsdeiz_ joined	04:00
	← dsdeiz left	04:00
	→ tonyj joined	04:01
	← tonyj_ left	04:01
	← krixxkraxx left	04:02
	→ galaris joined	04:02
	→ ezekielnoob2 joined	04:02
	→ guest2121 joined	04:04
	← ezekielnoob left	04:05
	← woollyams left	04:05
	→ dsdeiz joined	04:05
	→ tang^ joined	04:05
	→ _ikke_ joined	04:05
	← alfons83 left	04:06
	← dsdeiz_ left	04:06
	← guest212 left	04:06
	→ woollyams joined	04:07
	← shoshin left	04:08
	→ alfons83 joined	04:08
	← jerius left	04:09
	← ewnd9 left	04:09
	→ mizu_no_oto joined	04:10
	→ cpg joined	04:11
	→ Treggats joined	04:11
	→ r0bby_ joined	04:11
cpg	hi, i keep on seeing some remotes/origin/blah branches when i do git branch -a	04:11
	like 9 of them	04:11
tang^	that's what -a does	04:11
cpg	even though the origin is supposed to not have them	04:11
	← SocalNick left	04:11
tang^	shows youe -all	04:12
cpg	i think they should not be there	04:12
	← lresende left	04:12
cpg	at least gitlab does not show them	04:12
tang^	well, if origin isn't supposed to have them, somebody pushed them there	04:12
	→ lresende joined	04:12
tang^	from gitlab's perspective, everything you see as origin/branch it sees as branch	04:13
	→ mmlac-bv joined	04:13
cpg	at some point they existed, but they were deleted, i thought	04:13
	how can i delete thes guys? git branch -d remote/origin/blah ?	04:13
	← KillYourTV left	04:14
cpg	(somewhat noob to the deeper details of git)	04:14
tang^	git push origin :<branch>	04:14
	← Skrypter left	04:15
	→ eletuchy joined	04:15
	← jhulten left	04:15
tang^	cpg: man git-push will have some details on that	04:15
gitinfo	cpg: the git-push manpage is available at http://jk.gs/git-push.html	04:15
	← SirFunk_ left	04:15
	← Watabou left	04:15
	→ Watabou joined	04:15
cpg	tang^: thanks much. i have done that before with branches, but these ones are resilient	04:16
	→ SirFunk_ joined	04:16
cpg	$ git push origin :api-v03 … error: unable to delete 'api-v03': remote ref does not exist	04:16
	← mitz left	04:16
cpg	but git branch -a does show remotes/origin/api-v03	04:16
	→ sqlnoob joined	04:18
	← sqlnoob left	04:18
	← daito left	04:18
	→ sqlnoob joined	04:19
	→ jhulten_ joined	04:19
	→ daito joined	04:19
tang^	have you done a git fetch recently?	04:19
cpg	yes, i have	04:19
	→ Tommy[D] joined	04:20
	← sqlnoob left	04:20
cpg	i tried to check out that branch and i see this: Branch api-v03 set up to track remote branch api-v03 from origin.	04:20
tang^	hmm, odd	04:20
cpg	then i deliete it locally and try to push .. and it fails	04:20
tang^	delete what and push?	04:20
cpg	so it does look like it exists at the origin repo	04:20
	← mizu_no_oto left	04:20
	→ sqlnoob joined	04:20
cpg	git br -d api-v03: Deleted branch api-v03 (was 7df027e).	04:21
	$ git push origin :api-v03: error: unable to delete 'api-v03': remote ref does not exist	04:21
	← sqlnoob left	04:21
	← dreiss left	04:21
	← txwikinger left	04:22
	→ sqlnoob joined	04:22
tang^	and a git fetch --all says what?	04:22
	→ Sigma joined	04:22
cpg	$ git fetch --all: Fetching origin	04:23
	← daito left	04:23
cpg	uh, i was able to delete another one of those origins: git push origin :api-v302: - [deleted] api-v302	04:23
	interesting	04:23
	← sqlnoob left	04:23
cpg	let me try deleting the other ones	04:24
	← lresende left	04:24
	→ sqlnoob joined	04:24
	← joelm_ left	04:25
	→ joelm joined	04:25
	→ preflex_ joined	04:25
cpg	ok, only one was deleted - the rest all give an error http://ur1.ca/fzuo6	04:25
	the error is: $ git push origin :local-server: error: unable to delete 'local-server': remote ref does not exist	04:26
	i tried with all (except master)	04:26
	only one was deleted	04:26
	the rest are resisting	04:26
	→ _davetoo joined	04:26
	← preflex left	04:27
	← earny left	04:27
	preflex_ → preflex	04:27
tang^	hmm, let me try something locally	04:28
	→ twoface88 joined	04:28
cpg	gitlab showed only one branch (master)	04:28
tang^	almost feels like there's a cache getting in the way	04:29
	cause fetch should make the two look the same	04:29
	→ earny joined	04:29
	→ dyng joined	04:30
	← dsdeiz left	04:30
	→ dsdeiz joined	04:30
cpg	dunno. does gitlab do something odd?	04:30
tang^	I'm not familiar with gitlab	04:33
	→ txwikinger joined	04:33
	→ jnavila joined	04:33
	← echo-area left	04:33
	→ srcerer joined	04:33
	→ mitz joined	04:34
	→ eaj joined	04:35
	← axl_ left	04:35
	← srcerer_ left	04:35
	→ ewnd9 joined	04:38
	← Scarberian left	04:38
	→ tanmayk joined	04:39
	← twoface88 left	04:39
	→ twoface88 joined	04:40
	← twoface88 left	04:41
	→ ezekielnoob joined	04:41
	← eaj left	04:41
	← yhager left	04:42
	→ yhager joined	04:43
	← ezekielnoob2 left	04:45
	← Eomar left	04:45
	← nicedice left	04:46
	→ d8bhatta joined	04:46
d8bhatta	hello guys	04:46
	I have got few commits to cherry pick like a121344 , a343fs3, 23d2s33 , 3s23ass ...I cherry pick first one like git cherry pick 121344	04:48
	then second one...in second one i get conflict on a file...I resolved the conflict file, add to git and commit...and again run second git cherry pick...but agian i am getting same error...	04:48
	please suggest me how can I cherry pick series of committs	04:49
	← woollyams left	04:49
	← cebor left	04:50
	→ Targen joined	04:51
	→ cebor joined	04:51
	→ axl_ joined	04:52
foucist	d8bhatta: there is git cherry-pick youngest-sha..oldest-sha if they're consecutive apparently	04:52
skorgon	don't cherry-pick the commit twice	04:52
foucist	i never managed to make that work	04:52
	→ cads joined	04:53
	→ Sprinbit joined	04:53
	← diegoviola left	04:53
d8bhatta	thanks guys, how could we push certain commits to release branch instead of cherry-pick	04:53
	?	04:53
	← yacks left	04:55
	→ jwmann joined	04:56
skorgon	well, to integrate changes into a branch you usually use merge, cherry-pick or am. and then you can publish the branch if you like. so, depending on your workflow and what you want to achieve, cherry-pick is probably the right tool	04:56
	→ felixsamora joined	04:57
	→ daito joined	04:57
	← jhulten_ left	04:58
	→ dreiss joined	04:58
	← axl_ left	04:58
	← tang^ left	04:59
d8bhatta	skorgon: thanks, i have to spend lots of time just resolve the conflicts that appears during cherry-pick of several commits...so probably i didn't care that which one is older and younger...so it looks like we need to cherry-pick from most recent commits to older commits...right?	04:59
skorgon	rather from old to young. the younger should be based on older work, right?	05:00
	→ dhruvasagar joined	05:01
d8bhatta	skorgon: yes, young is based on old..	05:01
	→ BBonifield joined	05:02
	← Sigma left	05:02
	← hwrd\|work left	05:02
	→ mizu_no_oto joined	05:02
	→ eaj joined	05:03
	← felixsamora left	05:03
d8bhatta	skorgon: mistakenly I have cherry-picked few youngest commits and pushed to the branch....and now i am not able to cherry-pick most oldest one ....so in this case, should i revert all those commits and start cherry-pick from older to younger?	05:03
skorgon	did you already publish your changes and do you have downstream users? read !rewrite	05:04
gitinfo	[!rewriting_public_history] Rewriting public history is usually bad. Everyone who has pulled the old history have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push -f` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	05:04
	← CKyle left	05:05
	→ Davey joined	05:05
	← kermit left	05:05
	→ mj12albert joined	05:05
d8bhatta	skorgon: the code is pushed to release branch but I have not yet pulled the release branch into my live site...and also there is no body else workig on release branch except me...	05:06
	← Davey left	05:06
	← banisterfiend left	05:07
	→ Davey joined	05:08
	← dhruvasagar left	05:08
	→ leeN joined	05:09
	← skorgon left	05:09
	→ dhruvasagar joined	05:09
	→ skorgon joined	05:10
skorgon	d8bhatta: sorre, network issues on my side. i don't know if it made it through, in case not: have a look at !fixup	05:11
gitinfo	d8bhatta: 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!	05:11
	← mizu_no_oto left	05:12
	← irqq left	05:13
	← Davey left	05:13
	→ saurabh joined	05:13
	→ darkf joined	05:13
	→ jaseemabid joined	05:14
	← jaseemabid left	05:14
darkf	Hi - I'm trying to edit a hunk with `git commit -p`, but no matter how I edit it, it fails to apply (on line 411 apparently.) I've tried just replacing some of the + with space and also editing the line count. Here's the hunk: http://lpaste.net/1384361624147591168	05:15
	→ jaseemabid joined	05:16
	← joelm left	05:16
	← Sprinbit left	05:16
	→ Davey joined	05:18
	← luxgeek left	05:18
	→ tdm00 joined	05:18
	→ Sigma joined	05:18
	← the_cybersphinx left	05:19
	← madewokherd left	05:21
	← Gamecubic left	05:21
	→ CreativeEmbassy joined	05:21
	← delasteve left	05:24
	→ johnnyfuchs joined	05:24
	← mmlac-bv left	05:24
	← maroloccio2 left	05:27
	→ h0bbit_ joined	05:27
	← wbill left	05:29
	→ nnyk_ joined	05:29
	→ clone1018_ joined	05:29
	← Ziber left	05:29
	→ User458764 joined	05:29
	← alindeman left	05:29
	← SirFunk left	05:30
	← hhuuggoo left	05:30
	→ hhuuggoo joined	05:30
	← clone1018 left	05:30
	→ wbill joined	05:30
	→ alindeman joined	05:31
	→ mizu_no_oto joined	05:32
	→ LuxuryMode joined	05:33
	→ crazydiamond joined	05:34
	← johnnyfuchs left	05:34
	→ SirFunk joined	05:35
	← wbill left	05:35
	→ CKyle joined	05:37
	→ Ziber joined	05:37
	← tpope left	05:40
	← User458764 left	05:40
	→ iderik joined	05:40
	→ maleknet joined	05:43
	← maleknet left	05:43
	← dhruvasagar left	05:43
	→ Goopyo joined	05:44
	→ dhruvasagar joined	05:44
	→ canoon joined	05:44
	← Ragnor left	05:45
	→ tpope joined	05:45
	r0bby_ → robbyoconnor	05:45
	→ sfz joined	05:46
	→ jazz264 joined	05:47
	← jaseemabid left	05:49
	← dhruvasagar left	05:50
	→ dhruvasagar joined	05:50
	← degasus left	05:50
	→ neo1691 joined	05:52
	← kukks left	05:54
	→ Tommy[D]_ joined	05:55
	→ fobius_ joined	05:56
	← LuxuryMode left	05:56
	→ WernerZA joined	05:57
WernerZA	Hi guys	05:57
gitinfo	WernerZA: 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.	05:57
	← neo1691 left	05:57
WernerZA	I'm trying to create a Git package using this command:	05:58
	← crazydiamond left	05:58
WernerZA	git diff -z --name-only --diff-filter=MAR 5e2a4b4 98bb500 \| xargs -s1000000 -0 git archive develop -o 'package.zip'	05:58
	I get the following error, there is a problem with a specific commit	05:58
	← simesy left	05:58
	← Tommy[D] left	05:59
WernerZA	xargs: git : Bad file number	05:59
	Any help would be appreciated :)	05:59
	← mizu_no_oto left	05:59
	→ simesy joined	05:59
	← Nibato left	05:59
	← Garen left	06:00
	→ Garen joined	06:01
	← akurilin left	06:02
	fobius_ → doliver	06:03
	→ groglogic joined	06:03
	← matanya left	06:04
	← simesy left	06:04
	→ Guest joined	06:05
	← groglogic left	06:06
	← nnyk_ left	06:06
	→ King_Hual joined	06:06
	→ asdfadfe joined	06:07
	← chuckharmston left	06:07
	→ chuckharmston joined	06:07
	← pigeon left	06:08
	← CreativeEmbassy left	06:08
	→ pigeon joined	06:09
canoon	WernerZA, that -s1000000 looks like its the problem	06:10
	← sriracha left	06:11
	← CKyle left	06:11
	← chuckharmston left	06:12
	← ewnd9 left	06:13
	→ simesy joined	06:13
	→ Nibato joined	06:14
	← jnavila left	06:14
	→ guest212 joined	06:15
	→ Search12 joined	06:15
	→ Lewoco joined	06:15
	→ xobb joined	06:16
	← Search12 left	06:16
Lewoco	Why doesn't this work?: git --git-dir=~/tmp/MyGitRepoClone fetch	06:16
canoon	Lewoco, error?	06:17
Lewoco	fatal: Not a git repository: '~/tmp/MyGitRepoClone'	06:17
canoon	oh git --git-dir=~/tmp/MyGitRepoClone/.git fetch	06:17
	i assume its a nonbare?	06:18
Lewoco	canoon, That's right	06:18
	← simesy left	06:18
Lewoco	canoon, But I tried that already. Same error.	06:18
	← guest2121 left	06:18
	← ezio left	06:18
	→ foxmk joined	06:18
	→ corygibbons joined	06:19
	→ ezio joined	06:19
	← guest212 left	06:20
Lewoco	canoon, I already checked that ~/tmp/MyGitRepoClone and ~/tmp/MyGitRepoClone/.git exist, so I think maybe I'm just using --git-dir wrong?	06:20
	← robbyoconnor left	06:20
	→ robbyoconnor joined	06:20
canoon	Lewoco, yeah, idk, I assume everything works as normal inside it?	06:21
Lewoco	canoon, Yup. This seems to work (i.e. no errors): (cd ~/tmp/MyGitRepoClone; git fetch)	06:22
canoon	Lewoco, oh unless it can't handle the ~	06:22
Lewoco	canoon, ~ should get expanded by bash	06:22
	I don't think git will ever see it.	06:22
WernerZA	canoon, I put that in because i got a problem previously where i tried to package too many files	06:22
canoon	not if its in the middle of a argument	06:22
Lewoco	canoon, Damn you're right!	06:22
canoon	WernerZA, yeah it looks like git can't handle that many files on the command line though	06:23
Lewoco	canoon, With $HOME it works. Thank you.	06:23
canoon	np	06:23
	→ attermr1 joined	06:23
WernerZA	canoon, is there a GUI that can create packages?	06:23
	← \|Freeman\| left	06:24
	→ \|Freeman\| joined	06:24
canoon	WernerZA, not that i'm aware of if you have a working directory you could just use tar though	06:24
	then just use tar though	06:25
	→ lite_ joined	06:25
	→ JeremyWei joined	06:26
WernerZA	Ye we did that thanks canoon, we using Msbuild to automatically deploy two environments, and we use that command to get the difference between branches	06:27
	← lite_ left	06:27
WernerZA	so it's a automated process	06:27
canoon	WernerZA, git diff -z --name-only --diff-filter=MAR 5e2a4b4 98bb500 \| xargs -s1000000 -0 git archive develop > archive.tar	06:27
	→ foxmk_ joined	06:27
	→ lite_ joined	06:27
canoon	wait	06:27
	→ arvind_khadri joined	06:27
canoon	git diff -z --name-only --diff-filter=MAR 5e2a4b4 98bb500 \| xargs -0 git archive develop > archive.tar	06:27
	then convert that to a zip?	06:27
WernerZA	O i see what you mean	06:27
	Will try that thanks	06:27
	← rjhunter left	06:27
	← pdimitrov left	06:27
	→ pdimitrov joined	06:28
	← pr0ggie left	06:28
	← foxmk left	06:29
	foxmk_ → foxmk	06:29
	→ pr0ggie joined	06:29
	→ beautifulmind joined	06:29
	→ ayaz joined	06:30
	← ayaz left	06:30
	→ ayaz joined	06:30
	← dhruvasagar left	06:30
	→ hwrd\|work joined	06:30
WernerZA	Thanks canoon, that works :)	06:31
	→ dhruvasagar joined	06:31
WernerZA	Just lastly, is there a way to ignore .gitattributes and .gitignnore when creating a package	06:31
canoon	you mean not include them in the package?	06:32
WernerZA	yeah	06:32
canoon	hmm grep maybe?	06:33
	not sure if there's a -0 like flag though	06:34
	← galaris left	06:34
	→ krixxkraxx joined	06:35
	← foxmk left	06:35
	→ User458764 joined	06:35
WernerZA	Yes grep works, but we not sure how to use it on more than one file	06:35
	← tpollard left	06:35
	← tdm00 left	06:36
	→ simesy joined	06:36
canoon	grep -v '^.git' should work	06:36
	-v is inverse i believe	06:36
	→ BiggFREE joined	06:37
	← corygibbons left	06:37
	← calcifea left	06:37
	← leeN left	06:38
	← robbyoconnor left	06:38
	→ corygibbons joined	06:38
	← hwrd\|work left	06:38
	→ kbart joined	06:39
	← Targen left	06:40
	← doliver left	06:40
	→ matanya joined	06:41
	← attermr1 left	06:41
	← samholmes left	06:42
	→ svector joined	06:42
	→ mordox joined	06:42
mordox	i'm here for tasty burgers	06:43
	← matanya left	06:43
	→ ThomasLocke joined	06:44
	→ akiress joined	06:44
	→ zapb joined	06:44
osse	WernerZA: are you using bash? try shopt -s extglob; git diff .... -- !(.gitattributes\|.gitignore) \|	06:44
	→ matanya joined	06:44
WernerZA	thanks canoon	06:45
	→ jargon joined	06:46
	← JeremyWei left	06:46
tm512	is there a way to make git post-receive deal with more than a single branch?	06:46
	→ joelroa joined	06:46
	← akiress left	06:47
	→ _Harm_B_ joined	06:47
moritz	yes	06:47
	→ ewnd9 joined	06:47
osse	tm512: post-receive receives newline seperated data about each read	06:47
	→ akiress joined	06:47
	← mordox left	06:47
	→ bitkid joined	06:48
WernerZA	tm512, cool looks like it works, thanks	06:48
	← dhruvasagar left	06:48
tm512	osse: ah, so I'd just have to put it in a while read old new ref ; do ... ; done	06:49
	→ dhruvasagar joined	06:49
	→ marthinal joined	06:49
	→ kerrick joined	06:49
	→ abrkn joined	06:49
osse	tm512: correct	06:49
	← User458764 left	06:49
	→ papegaaij joined	06:49
tm512	trying to make an IRC bot to do this with all the repos I have on gitolite	06:50
	← tonyj left	06:51
	← dhruvasagar left	06:51
tm512	like [repo][branch] abcdef - New things	06:51
	except with the colors not messed up	06:51
SamB	tm512: we can't see the colors anyway	06:52
	this channel seems to have them stripped	06:52
	→ tonyj joined	06:52
tm512	aw, that's no fun	06:52
	→ echo-area joined	06:53
	← Sigma left	06:53
	→ dhruvasagar joined	06:54
	← acl_ left	06:57
	→ takamichi joined	07:00
	← cyphase left	07:00
	← dhruvasagar left	07:01
	← longbeach left	07:01
	→ Orbitrix joined	07:01
	← Orbitrix left	07:01
	← wafflejock left	07:01
	→ dhruvasagar joined	07:01
	← trusktr left	07:01
	→ Orbitrix joined	07:01
	← yhager left	07:01
	→ eijk joined	07:04
	→ ciampix joined	07:04
	→ m0ltar joined	07:05
duke_	/window close	07:05
	← duke_ left	07:05
	→ maleknet joined	07:05
	→ macrover joined	07:06
	← daito left	07:06
	→ daito joined	07:07
	→ robbyoconnor joined	07:07
	← dhruvasagar left	07:08
	→ dhruvasagar joined	07:08
	→ lb1a joined	07:09
	→ soee joined	07:10
	← f0ster left	07:10
	→ Raging_Hog joined	07:10
	→ zequence joined	07:11
	→ pantsman joined	07:11
	→ SergeyPenkin joined	07:11
	← daito left	07:11
	← Goplat left	07:11
	← dhruvasagar left	07:13
	→ Zarthus joined	07:13
	→ eijk_ joined	07:14
	← eijk left	07:14
	→ TomyLobo joined	07:15
	← \|Freeman\| left	07:17
WernerZA	tm512, what does shopt -s extglob; do?	07:18
	← svector left	07:18
	→ bwreilly joined	07:18
tm512	no idea why you're asking me, because I don't know for sure	07:18
	but my best guess is that it turns on extended regex for globs in the shell	07:18
	→ yhager joined	07:19
WernerZA	osse*	07:19
	→ dhruvasagar joined	07:19
WernerZA	osse, what does it do?	07:19
SamB	why not read the shell manual?	07:19
	→ kcj_ joined	07:20
WernerZA	because I don't have it	07:20
	And he probably already knows	07:20
	← howitdo left	07:20
	← kcj left	07:21
	← kcj_ left	07:22
	→ kcj joined	07:23
	→ ezioa joined	07:24
osse	WernerZA: it matches everything except those two files	07:24
	so like * except...	07:24
	→ etcetera joined	07:24
	→ netiul joined	07:25
	→ daito joined	07:26
	← dhruvasagar left	07:26
osse	and you have the shell manual (probably): man bash	07:26
	← ezio left	07:26
WernerZA	Ok cool, does it alter anything permanently in the shell or is it per command?	07:27
	→ dhruvasagar joined	07:27
	← el3ctron_ left	07:27
	→ nnyk_ joined	07:27
	→ SimonNa joined	07:28
osse	WernerZA: you need to have run 'shop -s extglob' for it to work, and that enables extra globbing syntax	07:28
	← CycoCid left	07:29
osse	until either the script/your shell exits or you turn it off again	07:29
	← eaj left	07:29
osse	but it's powerful, i would put it in .bashrc	07:30
	→ eaj joined	07:30
	→ Xethron joined	07:30
	← Xethron left	07:30
	→ Xethron joined	07:30
	← jday_ left	07:32
	← pantsman left	07:32
	→ lun__ joined	07:32
	← simesy left	07:33
	→ howitdo joined	07:34
	→ simesy joined	07:34
	← simesy left	07:34
WernerZA	osse: thanks, the reason I'm asking is because it looks like it is leaving other stuff out as well. My packages don't have all the files the should have.	07:34
	→ simesy joined	07:34
	← mj12albert left	07:34
WernerZA	How do I turn it ff just to test?	07:34
	off*	07:34
	← lcoddocl left	07:35
	← eaj left	07:35
	→ himynameisdog joined	07:35
	→ Squarism joined	07:35
	← dhruvasagar left	07:35
	→ dhruvasagar joined	07:36
	Guest → Shoshin	07:36
	→ freimatz joined	07:37
	← rchavik left	07:38
	← himynameisdog left	07:39
	→ lc0dd0cl joined	07:39
	← lc0dd0cl left	07:40
	→ lc0dd0cl joined	07:40
	→ frgtn joined	07:41
	→ Ozch joined	07:41
	← robbyoconnor left	07:41
	← bwreilly left	07:41
	→ cbreak-work joined	07:42
	← cads left	07:42
	← lc0dd0cl left	07:43
	→ user258467 joined	07:43
	→ lc0dd0cl joined	07:44
osse	shopt +s extglob	07:45
	→ h_kon joined	07:46
	← zequence left	07:46
WernerZA	thanks man	07:46
	← Norm_ left	07:47
	→ shruggar joined	07:47
	→ zequence joined	07:47
	→ jarr0dsz joined	07:48
	← ewnd9 left	07:48
	→ ewnd9 joined	07:48
	→ liefer joined	07:49
	← krixxkraxx left	07:49
	← glebihan_ left	07:49
	→ fRAiLtY- joined	07:49
	→ glebihan_ joined	07:49
liefer	I cloned a remote repository using one username, "UserA". I would very much like to change this to using "UserB" for instead. How do i do this? "git remote set-url origin ssh://UserB@server" ?	07:50
	← threesome left	07:50
tnishant	modify in vim .git/config ?	07:51
	instaed of command try to modify the configuration file directory	07:51
	→ _iron joined	07:52
liefer	tnishant: oh, i see. Thank you	07:52
	← glebihan_ left	07:53
	ezioa → ezio	07:53
	→ glebihan_ joined	07:53
	← ezio left	07:53
	→ ezio joined	07:53
	← Shoshin left	07:54
	→ Guest21101 joined	07:54
	→ shoshin joined	07:55
	← shoshin left	07:55
	→ shoshin joined	07:55
	kamal__ → kamal_	07:56
	← weiyang left	07:58
	← TomyLobo left	07:59
	→ rchavik joined	07:59
	→ eaj joined	08:00
	→ ItSANgo_ joined	08:00
	← dhruvasagar left	08:01
	→ mmcdaris joined	08:01
	→ foxmk joined	08:02
	← etcetera left	08:02
	→ dhruvasagar joined	08:02
	→ koda joined	08:02
	← dreiss left	08:04
	← eaj left	08:06
	→ zakishaheen joined	08:07
iveqy	tnishant: it's really better to modify the config files with git commands rather than with an editor. Since many git users unfortunately have really bad editors =(	08:07
	→ rendar joined	08:07
tnishant	thats true ivegy	08:08
	→ halu joined	08:08
lb1a	iveqy, vi ftw	08:08
	→ conan joined	08:08
d8bhatta	Hello guys , I have used git rm -r --cached foldername to untrack those files which have been tracked bit not necessary to track...it works fine in my local ,..I committed and push to a branch from my local....now when I git pull in development server, it deletes all those files and folder which I don't want	08:08
	→ rob_w joined	08:08
	← beautifulmind left	08:08
iveqy	tnishant: personally I prefer to edit the configs, but yet again, I've a sane editor =)	08:08
lb1a	d8bhatta, that's correct behaviour of git	08:08
iveqy	lb1a: I'm actually not that hardcore. I prefer vim	08:08
tnishant	i am hoping its vim .. then its pretty fine	08:08
d8bhatta	now there is problem..i want to get back those files and folder in my dev server	08:09
lb1a	iveqy, me too most of the time ;)	08:09
	d8bhatta, you commit a change that said, stop caring about these files. and that what git does. it removed them from the version control.	08:09
Chais	can someone please help me. I just pulled the latest changes from remote but for some reasons they aren't applied locally	08:09
canoon	d8bhatta, copy them to your dev server, a somewhat standard way is to commit .sample files	08:09
iveqy	d8bhatta: you can use man git checkout to get an old version of those files, but since you deleted them, of course git won't show them	08:09
gitinfo	d8bhatta: the git-checkout manpage is available at http://jk.gs/git-checkout.html	08:09
iveqy	Chais: !repro	08:10
gitinfo	Chais: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will help immensely with troubleshooting.	08:10
iveqy	Chais: specially the output of git status is needed	08:10
	← foxmk left	08:10
lb1a	iveqy, damn i almost finished my solution to d8bhatta and you were faster ;)	08:10
	→ DaisyTheCow joined	08:10
	← zakishaheen left	08:10
d8bhatta	lb1a: ok..i didn't realise this...I want those files to appear in div...so is there any way to recover those files except copying ?	08:11
	← xobb left	08:11
canoon	d8bhatta, git checkout HEAD^ <files> (assuming they were in the previous revision)	08:11
lb1a	d8bhatta, as iveqy said, you can check them out from a previous version. git checkout <sha of good version> -- <path>	08:11
	→ harobed_ joined	08:11
	← harobed_ left	08:11
d8bhatta	canoon: i have hundereds of files	08:11
lb1a	d8bhatta, specify a path as you did with git rm --cached	08:12
	→ twoface88 joined	08:12
	→ harobed_ joined	08:12
	← twoface88 left	08:12
d8bhatta	git checkout <sha of good version> -- <path> :what should be here "sha of good version" . Here is list of my commits	08:14
	37f1fe7 #4 code created for image change is reverted	08:14
	d039666 media images are removed from git repo	08:14
	8b98bfc un-necessary files removed from git tracking	08:14
	c31aacd number format changed to two point decimal for subtotal and shipping amt	08:14
	8b98bfc and 039666 are those two commits that removed all of my files	08:14
iveqy	d8bhatta: !pastebin	08:16
gitinfo	d8bhatta: [!paste] Please paste snippets longer than one line at a pastebin site, such as https://gist.github.com/ rather than in-channel.	08:16
Chais	iveqy: https://gist.github.com/anonymous/42b35076251fde6c21ed	08:16
iveqy	d8bhatta: and we can't possible know what commit you're satisfied with. Probably the commit previous to the commit where you did the git rm	08:17
	← dhruvasagar left	08:17
	← vipzrx left	08:17
	→ dhruvasagar joined	08:18
d8bhatta	sorry guys..i pasted it here	08:18
	→ thiago joined	08:18
iveqy	Chais: read line 10-18 in the link you posted	08:18
	→ CodeShark joined	08:18
	← glebihan_ left	08:19
Chais	>_< thanks iveqy	08:20
	→ glebihan_ joined	08:20
Chais	reading usually helps	08:20
d8bhatta	iveqy : here is paste http://paste.org/68436 I want to keep 37f1fe7 and all commits from c31aacd	08:20
	← joelrobichaud left	08:20
iveqy	Chais: yes, and git usually have pretty nice messages, however ask if you don't understand them	08:21
d8bhatta	i want to delete 8b98bfc and 039666 commits	08:21
	→ noname001 joined	08:21
iveqy	d8bhatta: wait a second, do you want to checkout the files on the server or do you want to delete commits? I'm confused	08:21
Chais	iveqy: I'm just awfully confused by git. I used svn before, which seems so much easier	08:21
	→ threesome joined	08:22
	→ gua_ould joined	08:22
d8bhatta	iveqy: I want to checkout files in server and delete teh commit so that other developers dont face this issue into their local when they git pull	08:22
	→ dvide joined	08:23
d8bhatta	let's first try checking out the deleted files	08:23
	← DonRichie left	08:24
	← blahdodo left	08:24
	← thiago left	08:25
	→ blahdodo joined	08:25
	← macrover left	08:25
	← glebihan_ left	08:25
	→ glebihan_ joined	08:25
d8bhatta	iveqy: please suggest about checking out the files	08:25
	← h_kon left	08:26
canoon	git checkout --help	08:26
	→ aChatir joined	08:26
iveqy	Chais: !unlearn !talks (I recommend the one of Jessica Kerr) !books. Git isn't svn, and git uses a different abstraction model. git is really simple when you understand that model	08:28
gitinfo	Chais: Users of centralized VCSes will need to unlearn a number of habits in order to learn git. Many commands, such as "checkout" and "revert" bear little in common to those holding the same name in other systems.	08:28
	Chais: Some good video talks about Git: [yt] http://goo.gl/z72s (Linus Torvalds: History&Concepts); [yt] http://goo.gl/R9H2q (Scott Chacon: Git basics, live examples); http://vimeo.com/35778382 (Randal Schwartz: Git basics, descriptional); http://vimeo.com/46010208 (Jesica Kerr: Git basics, descriptional)	08:28
	Chais: [!book] 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	08:28
d8bhatta	git checkout <sha of good version> -- <path> , path referes to the deleted folder patg...which commit stands on ssh of good revision...	08:28
	iveqy^	08:28
	→ robbyoconnor joined	08:28
	← yhager left	08:28
canoon	do you want the one before?	08:29
	its sha^	08:29
iveqy	d8bhatta: let's just stick with !revert that commit. A checkout obviously just confuses you. You probably want to do a man git revert since a man git reset would result in !public history rewrite	08:30
gitinfo	d8bhatta: That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?	08:30
	d8bhatta: [!rewriting_public_history] Rewriting public history is usually bad. Everyone who has pulled the old history have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push -f` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	08:30
	d8bhatta: the git-revert manpage is available at http://jk.gs/git-revert.html	08:30
	d8bhatta: the git-reset manpage is available at http://jk.gs/git-reset.html	08:30
	← Guest21101 left	08:30
	← aChatir left	08:30
	→ xobb joined	08:31
	← _Harm_B_ left	08:32
lb1a	iveqy, i prefer scott over jessica, but i met him in person 2 times, maybe that's why i can relate to him much more	08:32
	← danillonunes left	08:32
iveqy	I never met any of them =(	08:32
lb1a	iveqy, scott is awesome. although he cleary was working on something, he just put his macbook away and had a 30 minute talk with me in the hotel lobby we both checked into. (he was in town for a talk at a conference which i obviously joined :)	08:33
tnishant	does vim have git integration plugins ?	08:33
Odd_Bloke	tnishant: Check out fugitive.	08:34
tnishant	Right	08:34
Odd_Bloke	tnishant: https://github.com/tpope/vim-fugitive	08:34
iveqy	lb1a: sounds like a nice guy	08:34
tnishant	will try it	08:35
	→ h_kon joined	08:35
	← dhruvasagar left	08:35
	→ dhruvasagar joined	08:36
	→ weiyang joined	08:37
	→ hoschi joined	08:38
	← mmcdaris left	08:39
lb1a	iveqy, he really is :)	08:40
	→ galaris joined	08:40
	← dhruvasagar left	08:40
	← tanmayk left	08:41
	→ dhruvasagar joined	08:41
	← conan left	08:41
	→ snql joined	08:41
	→ dfanjul joined	08:41
	→ FernandoBasso joined	08:42
lb1a	just got a little package of text markers. it has 2 "buttons". one says "push" the other one "pull" :D a gitified textmarker box :D	08:43
	→ Misan joined	08:43
	→ twoface88 joined	08:44
	→ psoo joined	08:48
milki	?	08:48
	oo	08:48
	← nnyk_ left	08:49
	→ dbuch joined	08:49
	→ alorence joined	08:50
	→ neo1691 joined	08:50
	→ intellix joined	08:51
	SamB sends lb1a a cake labeled "eat me"	08:51
	← brandonw left	08:54
	→ holderbaum joined	08:54
	← sfz left	08:54
lb1a	SamB, yeah you're allowed to grab a cookie from my cookie jar	08:54
	→ GT4066 joined	08:55
	→ sfz joined	08:55
	→ chineduu joined	08:55
	→ thierryp joined	08:55
	→ brandonw joined	08:55
	← shruggar left	08:57
	← dhruvasagar left	08:57
	→ Dev1L joined	08:57
	→ dhruvasagar joined	08:57
	→ mdiers joined	08:57
	← sfz left	09:00
	→ cenuij joined	09:00
	→ banisterfiend joined	09:00
	← iderik left	09:01
	→ joelmo joined	09:01
	→ guest212 joined	09:02
	← Raging_Hog left	09:02
	← Rob___ left	09:02
	→ rodrigo__ joined	09:05
	← Watabou left	09:05
	→ Rob___ joined	09:05
	→ achadwick joined	09:05
	→ germanoak joined	09:06
	← hyperair left	09:07
	→ hypera1r joined	09:07
	← ehmatthes left	09:07
	→ chuckharmston joined	09:08
	← ewnd9 left	09:08
	← galaris left	09:08
	← rodrigovaldes left	09:09
andres	Is there a way to control the tab width used in interactive commands?	09:09
	← jazz264 left	09:09
	→ cenuij_ joined	09:10
	← Ozch left	09:10
	→ kernelpanik joined	09:10
kernelpanik	hi guys	09:10
gitinfo	kernelpanik: 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.	09:10
	← GT4066 left	09:11
kernelpanik	I have a problem... I have many repositories and I would like set a password to all.. how can I do it?	09:11
	→ vtunka joined	09:12
	→ Norm_ joined	09:12
	← cenuij left	09:12
	← chuckharmston left	09:13
	← glebihan_ left	09:14
iveqy	kernelpanik: git doesn't do that. It all depends on which method you're using to share your git repos	09:14
	→ glebihan_ joined	09:14
	→ Gonzo89 joined	09:14
iveqy	andres: could you give an example?	09:14
kernelpanik	sure	09:15
	when I get the repo I do git clone git:/mygit.foo.org/mycookbook.git	09:15
	I would like that he asks me a password	09:15
andres	iveqy: I am working on a project that uses a tab width of 4. I can make the pager to the right thing by doing core.pager = less -x4, but that doesn't help for git add -p an friends.	09:16
iveqy	kernelpanik: git:// doesn't have "password protection" you need to use ssh or http for that	09:16
	← Mars__ left	09:16
kernelpanik	ah ok nice! but Can I disable the usage of git:// and set only via ssh or http?	09:16
	→ Mars__ joined	09:17
iveqy	andres: good question...	09:17
	kernelpanik: well, don't start gitd	09:18
kernelpanik	right, I sto gitd and I usage only ssh	09:18
	right, I sto gitd and I use only ssh	09:18
moritz	kernelpanik: that's a sane setup, yes	09:18
	→ FabTG_ joined	09:19
	← glebihan_ left	09:19
	← joelroa left	09:19
	← ayaz left	09:19
	→ glebihan_ joined	09:19
	→ emx joined	09:19
	← dhruvasagar left	09:20
	→ stodan joined	09:20
kernelpanik	thanks!	09:21
	I let u know	09:21
	← Mars__ left	09:21
emx	on the origin i got "master", "production" and "staging".	09:21
	← FabTG left	09:21
emx	locally i got "master".	09:21
	how do i get "production" and "staging" locally?	09:22
	or do i always work and branch from my local master branch?	09:22
	→ Unicykle joined	09:22
	→ jceb joined	09:23
	jceb → Guest4410	09:23
	→ juril joined	09:24
	← frgtn left	09:24
iamtakingiteasy	emx: try checking production/staging out	09:24
	git checkout staging	09:24
	for instance	09:24
	you can see them via git branch -r	09:24
	→ frgtn joined	09:24
	← simesy left	09:25
	← stodan left	09:25
	→ simesy joined	09:25
	← frgtn left	09:25
emx	iamtakingiteasy, git says "branch staging set up to track remote branch staging from origin" and "switched to a new branch "staging". does it mean that locally git had to create a new branch but which points to origin/staging?	09:25
	→ frgtn joined	09:26
	→ dhruvasagar joined	09:26
emx	(does my english make sense? i'm tired ^^)	09:26
	→ ZujkisNx joined	09:26
	→ howlymowly joined	09:27
	→ chovy joined	09:27
	→ shruggar joined	09:27
iamtakingiteasy	can't answer that, my knowledge of git internals is very sparse. but as fine-trained code monkey i know that git checkout allows you to switch branches, tags and commits locally	09:27
	→ eaj joined	09:27
chovy	should i push my tags to the origin?	09:27
	← Unicykle left	09:28
	← twoface88 left	09:28
iamtakingiteasy	emx: you can push from any local ref to any remote ref, afaik, but it is not always meaningful (like, pushing one branch' ref to another usually just breaking things)	09:28
	if ever succeeds on remote side	09:28
	gonzzor_ → gonzzor	09:28
emx	iamtakingiteasy, i think i get it. thanks.	09:29
	← simesy left	09:30
iamtakingiteasy	well, also keep in mind that git is offline tool, as in opposite to svn, which relies on remote side on almost every action	09:30
	← dragon3_ left	09:30
	← holderbaum left	09:30
	→ dragon3_ joined	09:31
	← liefer left	09:31
	→ holderbaum joined	09:31
	→ Ozch joined	09:31
	← mz` left	09:32
	→ YoungFrog joined	09:32
	← cesarkawakami left	09:32
	→ mz` joined	09:32
	← mz` left	09:32
	→ mz` joined	09:32
	→ Vinnie1991 joined	09:32
	akher0n → akheron	09:32
	→ raonyguimaraes joined	09:32
	→ worblehat joined	09:33
emx	about the workflow: to add a file, e.g., i checkout master, create a new branch, add the file to that branch, and finally merge it to master and staging. right?	09:33
iamtakingiteasy	emx: only if you want something like git-flow model	09:34
	usually it just git checkout master; git add ...; git commit; git push	09:34
	← neo1691 left	09:34
	← lun__ left	09:34
	→ rath joined	09:35
emx	iamtakingiteasy, where is the testing-part in that workflow?	09:35
iamtakingiteasy	ah, instead of checkout master; in case you already cheked it out; use git fetch; git rebase origin/master	09:35
	testing?	09:35
	→ lun__ joined	09:35
	← dragon3_ left	09:35
emx	iamtakingiteasy, i need to test my code on a remote test server.	09:35
iamtakingiteasy	do that after you push your changes to testing/development branch	09:36
	so remote server could check them out too	09:36
	← dhruvasagar left	09:36
iamtakingiteasy	before push -- all your changes are local	09:36
	→ dhruvasagar joined	09:36
iamtakingiteasy	including commits, branches, tags, everything is not reflected on remote before it gets pushed	09:37
	→ eijk joined	09:37
	→ stodan joined	09:38
iamtakingiteasy	also, if you're not using something like gerrit, which is incompatible with git-flow, i recommend to adopt git-flow model, it might prove itself useful	09:38
emx	ok. in this company they have a master (=development), a staging (auto deployed to test server) and production (which is deployed manually to the live server).	09:39
	→ ehmatthes joined	09:39
iamtakingiteasy	so, push your commit s to staging first	09:39
	← lun__ left	09:40
	← glebihan_ left	09:40
iamtakingiteasy	then cherry-pick successful ones in master	09:40
	→ glebihan_ joined	09:40
	← eijk_ left	09:40
	→ JimmyJohnson joined	09:41
	← brandonw left	09:41
	← corygibbons left	09:41
	← stodan left	09:42
	→ brandonw joined	09:43
chovy	is there a way to get a tag name in a post-receive hook?	09:43
	← dhruvasagar left	09:43
	→ dhruvasagar joined	09:44
	→ galaris joined	09:44
	← guest212 left	09:45
	Bigcheese_ → Bigcheese	09:45
	→ armin joined	09:45
armin	hi, can anyone recommend a link to docs to read about simple/matching for push.default?	09:46
	→ khushildep joined	09:46
	← hejia left	09:46
	← weiyang left	09:46
	→ jartur joined	09:46
armin	nevermind, found one.	09:47
	← FernandoBasso left	09:49
	← worblehat left	09:49
	→ DoniRS joined	09:50
	→ abelsiqueira joined	09:50
	→ jazz264 joined	09:52
	← glebihan_ left	09:53
	← maleknet left	09:54
	→ glebihan_ joined	09:54
jartur	Hello. Cannot quite google a solution. How should I handle a situation where I am doing a huge merge on one branch and then somebody comes and says, like, go to that other branch and add me a feature immediately?	09:54
	→ mikecmpbll joined	09:54
iveqy	jartur: I don't think you can do that :(	09:55
	→ irqq joined	09:55
	→ maleknet joined	09:55
iveqy	jartur: it might be possible with imerge	09:55
	jartur: however this shouldn't be a problem, you should not have huge merges ;)	09:55
jartur	Ok, I think I should just merge in a separate branch and just commit whatever I have already merged and just abort all other changes. Is it possible?	09:55
	← frgtn left	09:56
jartur	iveqy: Yeah, I shouldn't But it's hardly avoidable in early prototyping of, say, server game engine	09:56
	→ frgtn joined	09:56
	→ vurma joined	09:57
jartur	iveqy: Sometimes you have to backport a lot of features from one branch to the newer version which doesn't quite work yet.	09:57
	← h0bbit_ left	09:57
canoon	jartur, that should work	09:58
jartur	canoon: Thanks, I'll try it. I don't know why I have only though of this option after writing a question here...	09:59
canoon	you can just use git checkout / git reset to get the new stuff	09:59
	← dhruvasagar left	09:59
	← ikss left	09:59
	← holderbaum left	10:00
	← dvide left	10:00
canoon	actually jartur make sure just keep the list of files you've already merged	10:00
	thats all taht should be needed	10:00
	→ holderbaum joined	10:00
	→ frgtn_ joined	10:00
	← frgtn left	10:00
	→ Stygia joined	10:00
	→ simesy joined	10:01
	→ matteo joined	10:02
	→ dhruvasagar joined	10:04
	→ eijk_ joined	10:04
	← matteo left	10:04
	← eijk left	10:05
	← King_Hual left	10:05
	→ neo1691 joined	10:05
	→ matteo joined	10:07
	← h_kon left	10:07
	← mnathani left	10:07
	← pdimitrov left	10:07
	← pr0ggie left	10:07
	→ pr0ggie joined	10:07
	← echo-area left	10:08
	→ mlechner joined	10:08
	← ZujkisNx left	10:10
	→ h_kon_ joined	10:11
	→ kewah joined	10:13
	→ chuckharmston joined	10:14
	→ staafl joined	10:14
	← frgtn_ left	10:14
	→ stodan joined	10:15
	→ frgtn joined	10:15
	→ ikss joined	10:16
	← Simon-- left	10:17
	→ spaceonline joined	10:18
	→ mnathani joined	10:18
	→ beautifulmind joined	10:19
	← ehmatthes left	10:19
	← frgtn left	10:20
	→ ehmatthes joined	10:20
	← Misan left	10:21
	→ Misan joined	10:21
	→ pdimitrov joined	10:22
	← pr0ggie left	10:22
	→ pr0ggie joined	10:23
	→ armin_w joined	10:26
emx	is there a way to have trailing whitespaces removed from textfiles? (preferably with .gitattributes)	10:26
	← Vinnie1991 left	10:26
	← beautifulmind left	10:26
	← abelsiqueira left	10:27
	← glebihan_ left	10:27
	→ glebihan_ joined	10:28
	← intellix left	10:28
	← h_kon_ left	10:28
	← chuckharmston left	10:29
tnishant	this is actually editors job emx	10:29
	← Squarism left	10:29
tnishant	my opinion btw , git cant decided what whitespace is good vs bad I feel . you should correct it using something like vim IMHO	10:29
bremner	emx: the same pre-commit hook checks for bad whitespace	10:30
tnishant	yes u can have hooks perhaps , but git might directly intervene , however ... no probs asking :)	10:30
	might not	10:31
	← kerrick left	10:31
	cpg → cpg\|away	10:32
	← vtunka left	10:33
	→ Vinnie1991 joined	10:33
	← glebihan_ left	10:35
	→ glebihan_ joined	10:35
emx	i thought git is capable to strip trailing whitespaces since it can convert crlf to lf and vice versa. anyways. thanks.	10:35
moritz	I'm pretty sure it can	10:35
	did Google find nothing?	10:35
	← ezekielnoob left	10:37
emx	moritz, no (concerning .gitattributes)	10:37
	← blahdodo left	10:39
	← kcj left	10:40
	→ Gavrisimo joined	10:41
	← lite_ left	10:42
	→ h_kon joined	10:42
	→ lite_ joined	10:42
	← Ozch left	10:45
	← ska-fan left	10:47
	← lite_ left	10:47
	→ Octalot joined	10:47
	→ Mars__ joined	10:47
	→ lite_ joined	10:47
	→ jerius joined	10:49
	← banisterfiend left	10:49
	← Mars__ left	10:52
	→ mulo joined	10:52
	← Kulrak left	10:52
mulo	!list	10:52
gitinfo	[!mailing_list] The mailing list can be reached via [email@hidden.address] You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://j.mp/gitlist	10:52
	→ Etheco joined	10:52
	← luc_ left	10:53
	← mulo left	10:53
	→ pfFredd joined	10:53
bremner	!smudge	10:53
gitinfo	[!filters] Filters can be very useful for automatically making changes to files at checkout(smudge) and checkin/add(clean). See 'man gitattributes' for more information	10:53
canton7	There's also a section in ! config on that technique, iirc	10:54
	← ehmatthes left	10:55
	← armin_w left	10:55
	→ abelsiqueira joined	10:55
	← DaisyTheCow left	10:56
	→ dragon3_ joined	10:56
	← daito left	10:56
	→ marhaban joined	10:56
	← SimonNa left	10:56
	→ VictorCL joined	10:57
	→ daito joined	10:57
	← glebihan_ left	10:58
	→ glebihan_ joined	10:58
	← Jabberish left	11:00
	→ the_cybersphinx joined	11:00
	→ buzzybron joined	11:00
	→ kwmiebach joined	11:00
	→ ehmatthes joined	11:01
buzzybron	i have 2 branches, master & notmaster, I have been cherry picking notmaster's commit to master, is there a way to sync them?	11:01
	← daito left	11:01
sajbar	...merge?	11:01
buzzybron	but the cherry picked commits are not having the same hash, there will be conflicts?	11:02
	→ Jabberish joined	11:02
lb1a	buzzybron, merge ?	11:02
	buzzybron, define "sync them"	11:03
buzzybron	will there be 2 times the same commits?	11:03
	meaning get notmaster up to date with master	11:03
canoon	buzzybron, yeah	11:03
	not that it matters though	11:03
buzzybron	canoon : so how do i resolve these cherry picked commits, i mean they are like a mess and confusing?	11:04
	→ frgtn joined	11:04
canoon	just merge	11:04
	it'll do a file merge	11:04
	doesn't matter that the commits are there twice	11:04
	or you can cherry pick the remaining ones	11:04
	git cherry i think will tell you the remaining ones	11:05
	← Xethron left	11:05
buzzybron	git cherry will pick out those commits i am missing???	11:05
	→ Kulrak joined	11:05
canoon	i think it just tells you	11:05
buzzybron	so do i have to specify the branch?	11:06
canoon	yeah the other branch	11:06
	→ zarubin joined	11:06
canoon	but a merge is probably easier	11:06
	→ Xethron joined	11:06
	← Norm_ left	11:06
	← Vinnie1991 left	11:06
	← glebihan_ left	11:08
bluesm	Does the --all-match in the "git log" command is default now ?	11:08
	I mean if you do:	11:08
canoon	buzzybron, wait its backwards to what i thought you want git cherry master notmaster	11:09
	→ glebihan_ joined	11:09
	← dragon3_ left	11:09
bluesm	git log --author="Scott" --grep="remove" it will (as a default search for commits where author contains "scott" and commit message contains "remove" ? )	11:09
	→ echo-area joined	11:10
bluesm	I check that and it seem to be the case.	11:10
buzzybron	hmm canoon, i'm a bit confused myself right now as well lol	11:10
canoon	might want -v	11:11
	← simesy left	11:11
	→ nofxboy1234 joined	11:11
canoon	but does `git cherry -v master notmaster `give you sensible output?	11:11
	→ simesy joined	11:11
buzzybron	cool	11:12
	i'll take note of that	11:12
	ggtg	11:12
	thanks!!	11:12
	that is one heck of a cmd!!!	11:12
	← buzzybron left	11:12
	← nofxboy1234 left	11:13
canoon	bluesm, maybe author just always applies	11:13
	→ penguin42 joined	11:14
	← donmichelangelo left	11:16
	→ beautifulmind joined	11:16
	→ flujan joined	11:16
	→ donmichelangelo joined	11:16
	← simesy left	11:16
	← glebihan_ left	11:17
	wooy was looking for learning hg, but it's pain so far	11:17
	→ glebihan_ joined	11:17
	← dyng left	11:17
flujan	hello guys. I wanna to trim my repository, leaving it with only commits from 1 year ago. Deleting older branches too. Is it possible? I have 5 developers that clone from this repo, I wanna to avoid messing with their repo.	11:18
	→ dyng joined	11:18
	→ jatt joined	11:18
canoon	flujan, do you mean you want to revert 1 year ago?	11:18
	or delete before that?	11:18
flujan	canoon: delete before that.	11:19
	← nafg left	11:19
canoon	flujan, not without screwing with their repos	11:19
	you can't change the histroy without changing commit hashes	11:19
flujan	canoon: :(	11:19
	→ alan5 joined	11:19
	← dbuch left	11:19
flujan	My repo is 180MB, I wanna to reduce it.	11:19
iveqy	flujan: do you want to delete the branches to save disc space?	11:19
bluesm	canoon: So what "--all-match" does mean ? And where is used ?	11:20
flujan	iveqy: branches an old history.	11:20
	← joelmo left	11:20
canoon	bluesm, seems its only used for --grep	11:20
	if you have multiple ones	11:20
	← glebihan_ left	11:20
	→ schef joined	11:20
	→ rhombus joined	11:20
schef	hi guys..i made a mistake..i had problems with merging and did..	11:21
	→ glebihan_ joined	11:21
schef	git fetch origin	11:21
	git reset --hard origin/master	11:21
	now all my files are gone..	11:21
iveqy	flujan: each branch is 41 bytes. You need a lot of branches to delete to save discspace by that...	11:21
schef	is there a way to revert this..?!	11:21
	← mlechner left	11:21
canoon	iveqy, he's presumably got binary files in there	11:21
iveqy	schef: did you add or commit those files?	11:21
schef	yes	11:21
	→ dyng_ joined	11:21
	← dyng left	11:22
iveqy	schef: just checkout that commit then	11:22
	→ jkremser joined	11:22
	← jkremser left	11:22
	→ jkremser joined	11:22
iveqy	schef: or reset to that commit	11:22
schef	how do i do that..?!	11:22
	← d8bhatta left	11:22
schef	i did commit but i couldnt push	11:22
iveqy	schef: !reflog	11:22
gitinfo	schef: The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details. WARNING: reset --hard will trash any uncommitted changes! Visualize with: gitk --all --date-order `git log -g --pretty=%H`	11:22
flujan	canoon: Yeap. They store binaries in the early days of git .	11:22
	← neo1691 left	11:23
iveqy	flujan: you can do a git filter-branch to remove those binaries, but you'll completely rewrite the history messing up everybodies repo	11:23
	flujan: this is a security feature of git	11:23
	flujan: you'll always know if someone is messing with your code (for example inserting a backdoor or something)	11:23
	→ rudak joined	11:23
canoon	doesn't really mess up just make sure they overwrite their master when updating	11:23
flujan	iveqy: It will be easier to clone a new repo and save the old one for some time...	11:23
canoon	flujan, a clone will copy everything	11:24
	→ kcj joined	11:24
	→ JeremyWei joined	11:25
	→ svector joined	11:25
canoon	actually flujan do that filter-branch but just use it to remove all the binary files	11:25
	its probably what you want	11:25
	and gives you some history	11:25
	→ tomek joined	11:25
canoon	still fuck up the repos but still	11:25
	→ DaisyTheCow joined	11:25
	← dyng_ left	11:26
	→ dyng joined	11:26
	← ehmatthes left	11:27
	← canoon left	11:27
schef	thanks iveqy	11:28
	→ Squarism joined	11:28
	← pr0ggie left	11:29
	→ banisterfiend joined	11:29
flujan	thanks guys.	11:29
	→ ismlages joined	11:30
	→ kiennguyen joined	11:31
	→ User458764 joined	11:31
	← dyng left	11:31
	→ ehmatthes joined	11:31
	← pdimitrov left	11:31
	→ pr0ggie joined	11:32
	→ syst3mw0rm joined	11:32
	← marhaban left	11:32
syst3mw0rm	hi	11:33
gitinfo	syst3mw0rm: 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.	11:33
syst3mw0rm	I'm curious to know how is it possible for git to have two different commits without any 'git diff' between the two?	11:33
	→ ska-fan joined	11:34
moritz	syst3mw0rm: well, the SHA1 goes over meta data (commit message, timestamp etc.) too	11:34
syst3mw0rm	moritz: how can I change what all changed, if anything between two commits?	11:35
	← Stygia left	11:35
syst3mw0rm	not just file changes	11:35
moritz	syst3mw0rm: s/change/see/?	11:35
syst3mw0rm	*see	11:35
	yes!	11:35
moritz	syst3mw0rm: a good starting point is git show --pretty=fuller $sha1 for both commits	11:36
	→ lun__ joined	11:36
	← emx left	11:36
moritz	I don't know if that shows all of the meta information in the commits	11:37
	← flujan left	11:37
syst3mw0rm	moritz: it doesn't show all the changes.	11:37
moritz	syst3mw0rm: then you'll have to construct your own format, I think	11:38
	man git show tells you how to do that	11:38
gitinfo	the git-show manpage is available at http://jk.gs/git-show.html	11:38
	→ dragon3_ joined	11:38
syst3mw0rm	moritz: ok!	11:38
moritz	and has the list of all available pieces of meta data	11:38
	syst3mw0rm: have you actually done a diff of the two outputs?	11:39
syst3mw0rm	I guess it was happening because of merge commits which preserved the parent commit ids which were different	11:39
	moritz: I can actually see, there is a difference between the two in the command you mentioned above.	11:39
moritz	ah, so parent commit IDs are different	11:39
	→ neo1691 joined	11:39
moritz	there you have it	11:39
	→ kriks joined	11:39
moritz	that's part of the meta data too	11:40
	→ asQuirreL joined	11:40
	← rhombus left	11:40
	→ PeterBooker joined	11:40
	→ dyng joined	11:40
	← lun__ left	11:41
	← SicoWork left	11:41
	→ zhost joined	11:42
	← dragon3_ left	11:42
	← dyng left	11:43
	→ dyng joined	11:44
	→ dyng_ joined	11:45
	← dyng left	11:45
	→ pdimitrov joined	11:46
	← glebihan_ left	11:47
syst3mw0rm	moritz: yeah!	11:47
	→ glebihan_ joined	11:47
syst3mw0rm	thanks! :)	11:47
	← gua_ould left	11:47
	→ SicoWork joined	11:48
	→ Mars__ joined	11:48
moritz	you're welcome	11:48
	← rudak left	11:49
	← dyng_ left	11:49
	→ dyng joined	11:49
	→ Vinnie1991 joined	11:50
	→ bitkiller joined	11:52
	← JeremyWei left	11:52
bluesm	canoon: You mean --> git log --grep="oneEntry" --grep="secondEntry"	11:52
	← Mars__ left	11:52
	← mdiers left	11:52
	← User458764 left	11:53
snql	horror	11:53
	← dyng left	11:53
	→ Norm_ joined	11:54
	→ Mimmo joined	11:54
	← glebihan_ left	11:54
Mimmo	ciao	11:54
	!list	11:54
gitinfo	[!mailing_list] The mailing list can be reached via [email@hidden.address] You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://j.mp/gitlist	11:54
	→ glebihan_ joined	11:54
	← mikecmpbll left	11:54
	← Mimmo left	11:55
	glebihan_ → glebihan	11:55
	← Vinnie1991 left	11:56
	← paulweb515 left	11:57
	→ JeremyWei joined	11:57
	← kriks left	11:58
	← snql left	11:58
yargy	hey guys I accidentally ammended the last commit using Fugitive in vim and am just wondering how I can undo my modifications	11:59
	→ iokill joined	12:00
	← PaulCapestany left	12:01
	← banisterfiend left	12:01
	← wrouesnel1 left	12:03
	→ abrkn\ joined	12:03
moritz	git reset --hard $old_sha1 # attention, throws away uncommitted changes	12:04
	maybe do a git stash before	12:04
	and you can find the old sha1 with 'git reflog'	12:04
	→ alexwhitman joined	12:05
	← abrkn left	12:05
	→ armin_w joined	12:05
yargy	oh thanks moritz	12:06
	i actually am trying this http://stackoverflow.com/questions/1459150/how-to-undo-git-commit-amend-done-instead-of-git-commit	12:06
	does that seem like it would do what I want	12:06
	so far I have just done the git reset --soft HEAD@{1}	12:06
	← dhruvasagar left	12:06
	← armin_w left	12:06
yargy	and it seems like my change is back in git status'	12:06
	→ banisterfiend joined	12:07
	← JeremyWei left	12:07
yargy	hmmm that didn't do what I thought it would lol	12:10
	← neo1691 left	12:11
	→ Snibble joined	12:11
	→ gua_ould joined	12:11
	→ Xiti` joined	12:12
	→ wdkevinone joined	12:12
	→ Curtisbeef_ joined	12:12
	← Cassiel left	12:12
	→ khushildep_ joined	12:12
	→ ItSAN____ joined	12:12
	→ travisst1ton joined	12:13
	→ neo1691 joined	12:13
	→ CodeShar_ joined	12:13
	→ krixxkraxx joined	12:13
	← CodeShar_ left	12:13
	→ CodeShar_ joined	12:13
	→ jatt` joined	12:13
	→ eaj_ joined	12:13
	→ revyd_ joined	12:13
	→ Cassiel joined	12:14
	→ Gavrisim_ joined	12:14
	← neo1691 left	12:14
	→ BuuGhost joined	12:14
	← BuuGhost left	12:14
	→ BuuGhost joined	12:14
	→ freestyl3r joined	12:14
	→ xeqution joined	12:14
	→ echo-are` joined	12:14
	→ Edgan__ joined	12:14
	← Zarthus left	12:14
	BuuGhost → Zarthus	12:14
	→ ZujkisNx joined	12:14
	→ wagle_ joined	12:14
	→ Zeelot3k joined	12:15
	→ Dudalus_ joined	12:15
	→ howlymowly_ joined	12:15
	→ tdguy_ joined	12:15
	→ ktosiek_ joined	12:15
	→ r0bby_ joined	12:15
	← takamichi left	12:15
	→ nwertman_ joined	12:16
	→ marhaban joined	12:16
	→ mitsuhiko_ joined	12:16
	→ NfNit\|oop joined	12:16
	→ anonobom1er joined	12:16
	→ maloik joined	12:16
	→ neurodamage joined	12:16
	→ ahf_ joined	12:16
	→ JPohlman1 joined	12:16
	→ moritz_ joined	12:17
	→ ejnahc_ joined	12:17
	→ armenb joined	12:17
	→ d1b_ joined	12:17
	→ jonesbus1 joined	12:17
	→ zem__ joined	12:17
	→ chovy_ joined	12:17
	→ dropdriv1 joined	12:17
	→ murosai_ joined	12:17
	→ pdtpatri1k joined	12:17
	→ ZenGeist_ joined	12:17
	→ FabTG joined	12:17
	← beautifulmind left	12:17
	→ Rh0nda joined	12:17
	→ mk_io joined	12:17
	→ benizi_ joined	12:17
	→ LuxuryMode joined	12:17
	→ cehteh_ joined	12:18
	→ TheBrayn_ joined	12:18
	→ h0bbit_ joined	12:19
	→ jdav_gone joined	12:19
	← banisterfiend left	12:20
	→ Stygia joined	12:20
yargy	hmmm does anyone know how I would checkout a file from a different commit but save it under a new filename?	12:20
	→ h12o_ joined	12:20
	→ THE_BOULDER joined	12:20
	→ qsuscst joined	12:20
	→ RylaiC joined	12:20
	→ jcarouth` joined	12:20
	← RylaiC left	12:20
	→ ht joined	12:21
	→ scorphus` joined	12:21
	→ LittleFo- joined	12:21
	← ciampix left	12:21
	→ Tritania- joined	12:21
	→ d8bhatta joined	12:21
moritz_	git show <sha1>:<filename> > newfilename	12:21
	← VictorCL left	12:21
	→ RylaiC joined	12:21
	← RylaiC left	12:21
	← jatt left	12:21
	← echo-area left	12:21
	← Gavrisimo left	12:21
	← khushildep left	12:21
	← galaris left	12:21
	← raonyguimaraes left	12:21
	← eaj left	12:21
	← howlymowly left	12:21
	← FabTG_ left	12:21
	← Rob___ left	12:21
	← Dev1L left	12:21
	← hoschi left	12:21
	← robbyoconnor left	12:21
	← CodeShark left	12:21
	← ItSANgo_ left	12:21
	← bitkid left	12:21
	← saurabh left	12:21
	← jwmann left	12:21
	← marcidy left	12:21
	← zedsix left	12:21
	← nwertman left	12:21
	← jason237 left	12:21
	← ktosiek left	12:21
	← kaictl left	12:21
	← benizi left	12:21
	← t0r left	12:21
	← mk_io_ left	12:21
	← maloik_ left	12:21
	← armenb_ left	12:21
	← richwestcoast left	12:21
	← cehteh left	12:21
	← amcsi_work left	12:21
	← revyd left	12:21
	← TheBrayn left	12:21
	← jcarouth left	12:21
	← Zeelot left	12:21
	← Rylee left	12:21
	← jonesbusy left	12:21
	← pdtpatrick left	12:21
	← Devels left	12:21
	← mitsuhiko left	12:21
	← moritz left	12:21
	← scorphus left	12:21
	← Xiti left	12:21
	← travisstaton left	12:21
	← Dudalus left	12:21
	← totte left	12:21
	← Edgan_ left	12:21
	← wagle left	12:21
	← Curtisbeef left	12:21
	← ejnahc left	12:21
	← chovy left	12:21
	← Tritania left	12:21
	← anonobomber left	12:21
	← tdguy left	12:21
	← Rhonda left	12:21
	← h12o left	12:21
	← adaptr left	12:21
	← ahf left	12:21
	← LittleFool left	12:21
	← Freeaqingme left	12:21
	← EdwardIII left	12:21
	ht → totte	12:21
	THE_BOULDER → kaictl	12:21
	NfNit\|oop → NfNitLoop	12:21
	khushildep_ → khushildep	12:21
	→ RylaiC joined	12:21
	← RylaiC left	12:21
	ahf_ → ahf	12:21
foucist	the need for : seems inconsistent	12:22
	→ EdwardIII joined	12:22
	→ richwestcoast joined	12:22
	→ rndbit joined	12:22
	totte → Guest18138	12:22
	→ Rylee joined	12:22
	← Rylee left	12:22
	→ beautifulmind joined	12:22
	← ktosiek_ left	12:22
	→ Rylee joined	12:22
	← Rylee left	12:22
	→ Devels joined	12:22
	→ Rylee joined	12:23
	← Rylee left	12:23
	→ rblackwe joined	12:23
	→ Rob___ joined	12:23
	→ Rylee joined	12:24
	← Rylee left	12:24
	← GameGamer43 left	12:24
	← beawesomeinstead left	12:24
	→ CheckDavid joined	12:24
	← twisted` left	12:24
	← xerxas left	12:24
	← marhaban left	12:24
	→ ktosiek joined	12:24
	← pikpik left	12:24
	→ Rylee joined	12:24
	← Rylee left	12:24
moritz_	foucist: how would you separate hashes from file names?	12:25
	← jab416171 left	12:25
	← tfnico left	12:25
	moritz_ → moritz	12:25
	→ Rylee joined	12:25
	← Rylee left	12:25
moritz	git log uses -- but you can't use that consistently for multiple commit/filename combinations	12:25
	→ Rylee joined	12:25
	← Rylee left	12:25
	← ggherdov left	12:26
	→ Shaladdle joined	12:26
	→ xerxas joined	12:26
	→ tfnico joined	12:26
	→ GameGamer43 joined	12:26
	→ amcsi_work joined	12:26
	→ Rylee joined	12:26
	→ saurabh joined	12:26
	← Rylee left	12:26
	→ Dev1L joined	12:26
	→ marcidy joined	12:26
	→ adaptr joined	12:26
	→ farn joined	12:26
	→ Rylee joined	12:26
	← Rylee left	12:26
	→ jab416171 joined	12:26
	→ jason237 joined	12:26
	→ NanoArrow joined	12:27
	→ twisted` joined	12:27
	→ Rylee joined	12:27
	← Rylee left	12:27
	→ beawesomeinstead joined	12:27
	→ pikpik joined	12:27
	→ Rylee joined	12:27
	← Rylee left	12:27
	→ jstemmer joined	12:28
	→ Rylee joined	12:28
	← Rylee left	12:28
	→ raonyguimaraes joined	12:28
	→ Rylee joined	12:29
	← Rylee left	12:29
	→ Corey joined	12:29
	→ Rylee joined	12:29
	← Rylee left	12:29
	→ Rylee joined	12:30
	← Rylee left	12:30
	→ neo1691 joined	12:30
	→ rue joined	12:30
	→ PaulCapestany joined	12:30
	→ Rylee joined	12:30
	← Rylee left	12:30
	→ Rylee joined	12:31
	← Rylee left	12:31
	→ banisterfiend joined	12:31
	← darkf left	12:31
	→ hoschi joined	12:31
	→ mikecmpbll joined	12:31
	→ Rylee joined	12:31
	← Rylee left	12:31
	→ sgambino joined	12:32
	→ Rylee joined	12:32
	← Rylee left	12:32
	→ Rylee joined	12:32
	← Rylee left	12:32
	→ ggherdov joined	12:33
	→ Rylee joined	12:33
	← Rylee left	12:33
	→ shinnya joined	12:33
	→ Rylee joined	12:33
	← Rylee left	12:33
	← PaulCapestany left	12:34
	→ Rylee joined	12:34
	← Rylee left	12:34
	→ Rylee joined	12:34
	← Rylee left	12:34
	← Kronuz left	12:35
	← rue left	12:35
	← Corey left	12:35
	→ mdiers joined	12:35
	→ Rylee joined	12:35
	← Rylee left	12:35
	→ Corey joined	12:36
	→ emx joined	12:36
	→ Rylee joined	12:36
	← Rylee left	12:36
	→ Rylee joined	12:36
	← Rylee left	12:36
	→ Kronuz joined	12:37
	← BiggFREE left	12:37
	→ Rylee joined	12:37
	← Rylee left	12:37
	→ khushildep_ joined	12:37
	→ bitkid joined	12:37
	→ Rylee joined	12:37
	← Rylee left	12:37
	→ tmcmahon joined	12:38
	→ Rylee joined	12:38
	← Rylee left	12:38
	→ Rylee joined	12:38
	← Rylee left	12:38
	← penguin42 left	12:39
	→ Rylee joined	12:39
	← Rylee left	12:39
foucist	moritz: a space?	12:39
	← raonyguimaraes left	12:39
	→ Rylee joined	12:39
	← Rylee left	12:39
	← CodeShar_ left	12:40
	← h_kon left	12:40
	← khushildep left	12:40
	→ khushildep__ joined	12:40
	→ Rylee joined	12:40
	← Rylee left	12:40
moritz	foucist: but 'git show' also accepts multiple hashes, so that's ambiguous	12:40
	→ Rylee joined	12:40
	← Rylee left	12:40
	→ Rylee joined	12:41
	← Rylee left	12:41
	→ CodeShark joined	12:41
	← ezio left	12:41
	→ Rylee joined	12:41
	← Rylee left	12:42
	→ Rylee joined	12:42
	← Rylee left	12:42
	fionnan_ → fionnan	12:42
	→ Rylee joined	12:43
	← Rylee left	12:43
	→ ezio joined	12:43
	← ezio left	12:43
	→ ezio joined	12:43
	← khushildep_ left	12:43
	← CodeShark left	12:43
	→ Rylee joined	12:43
	← Rylee left	12:43
	← LuxuryMode left	12:43
	→ Rylee joined	12:44
	← Rylee left	12:44
	→ harish joined	12:44
	→ Rylee joined	12:44
	← Rylee left	12:44
	← kwmiebach left	12:45
	→ kwmiebach joined	12:45
	→ Rylee joined	12:45
	← Rylee left	12:45
	→ Rylee joined	12:45
	← Rylee left	12:45
	→ Rylee joined	12:46
	← Rylee left	12:46
	→ Rylee joined	12:46
	← Rylee left	12:46
	→ dragon3_ joined	12:47
	→ Jackneill joined	12:47
	→ Rylee joined	12:47
	← Rylee left	12:47
	→ GT4066 joined	12:47
	→ Rylee joined	12:47
	← Rylee left	12:47
	← kiennguyen left	12:48
	→ Rylee joined	12:48
	← Rylee left	12:48
	← jerius left	12:48
	→ Mars__ joined	12:48
	→ Rylee joined	12:49
	← Rylee left	12:49
	← dfanjul left	12:49
	→ Rylee joined	12:49
	← Rylee left	12:49
	← dsdeiz left	12:50
	→ Rylee joined	12:50
	← Rylee left	12:50
	← aartist left	12:50
	→ Rylee joined	12:50
	← Rylee left	12:50
	→ Rylee joined	12:51
	← Rylee left	12:51
	← yargy left	12:51
	→ helperW joined	12:51
helperW	Hi	12:51
gitinfo	helperW: 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.	12:51
	→ Rylee joined	12:51
	← Rylee left	12:51
	→ yargy joined	12:52
	→ Rylee joined	12:52
	← Rylee left	12:52
helperW	I have a drupal website running. It is is hosted on a FTP server ( ' duh' ). And I would like to make some edits on it. Currently the website is only running online on a development server on a FTP. It is a Drupal site, where I have to create a new module for.	12:52
	→ Rylee joined	12:52
	← Rylee left	12:52
	← Mars__ left	12:53
	← svector left	12:53
	← sajbar left	12:53
helperW	I have currently the whole website in Bitbucket. How can I create my new module and test it the most efficient way?	12:53
	BTW : I work alone.	12:53
yargy	hello	12:53
	→ Rylee joined	12:53
	← Rylee left	12:53
yargy	can you guys see this?	12:53
lov	no, try harder	12:53
	use caps	12:53
	→ LuxuryMode joined	12:53
	→ felixsamora joined	12:53
yargy	oh I thought my nick wasn't registered	12:53
	→ Rylee joined	12:53
	← Rylee left	12:53
	← tmcmahon left	12:54
	← neo1691 left	12:54
	→ Rylee joined	12:54
	← Rylee left	12:54
	→ kriks joined	12:55
	→ Rylee joined	12:55
	← Rylee left	12:55
yargy	helperW: you should setup a development server on your local machine	12:55
	and develop it there and then upload it to your FTP	12:55
	→ Rylee joined	12:55
	← Rylee left	12:55
helperW	hmm	12:56
	→ takamichi joined	12:56
helperW	But I would like some version control in it.	12:56
	→ sajbar joined	12:56
	→ Rylee joined	12:56
	← Rylee left	12:56
yargy	then setup a local development server on your local machine	12:56
	use git	12:56
	and then use git-ftp	12:56
	to upload the changes to your ftp server	12:56
	it is a bit flaky	12:56
	and kind of annoying to setup	12:56
	→ Rylee joined	12:56
yargy	but I got it to work	12:56
	← Rylee left	12:56
	→ neo1691 joined	12:57
	→ Rylee joined	12:57
	← Rylee left	12:57
	→ CreativeEmbassy joined	12:57
yargy	helperW: I used this one https://github.com/git-ftp/git-ftp	12:57
	there is some other python one as well	12:57
	→ Rylee joined	12:57
	← Rylee left	12:57
helperW	btw I have to say GIT is totally new to me.	12:57
yargy	I have had issues with both of them though	12:58
	oh hmm yeah I am new to it as well	12:58
	→ Rylee joined	12:58
	← Rylee left	12:58
	← CreativeEmbassy left	12:58
yargy	and I have had some disaster scenarios because I have done things when I thought I knew what I was doing but it did something unexpected	12:58
	→ LBV_User joined	12:58
	→ Rylee joined	12:58
	← Rylee left	12:58
yargy	well in that case you should definitely setup a local development server and then you can use it as a backup as well lol	12:59
	→ Rylee joined	12:59
	← Rylee left	12:59
	← lite_ left	12:59
	→ Rylee joined	12:59
	← Rylee left	12:59
	← neo1691 left	13:00
	→ svector joined	13:00
	→ lite_ joined	13:00
	→ khushildep joined	13:00
	← takamichi left	13:00
	← khushildep__ left	13:00
	→ Rylee joined	13:00
	← Rylee left	13:00
	← soee left	13:00
	← LuxuryMode left	13:00
	→ Rylee joined	13:00
	← Rylee left	13:01
	← kriks left	13:01
	→ Rylee joined	13:01
	← Rylee left	13:01
	→ Rylee joined	13:02
	← Rylee left	13:02
	→ dyng joined	13:02
	→ Rylee joined	13:02
	← Rylee left	13:02
	→ Rylee joined	13:03
	← Rylee left	13:03
	→ takamichi joined	13:03
	→ Rylee joined	13:03
	← Rylee left	13:03
helperW	hmm	13:04
	→ Rylee joined	13:04
	← Rylee left	13:04
helperW	but there alway will be some differences	13:04
	← lite_ left	13:04
	→ Rylee joined	13:04
	← Rylee left	13:05
yargy	yeah	13:05
	it is annoying sometimes	13:05
	→ Rylee joined	13:05
	← Rylee left	13:05
	→ Rylee joined	13:05
	← Rylee left	13:05
	→ Rylee joined	13:06
	← Rylee left	13:06
	→ dfanjul joined	13:06
	→ Rylee joined	13:07
	← Rylee left	13:07
	→ Rylee joined	13:07
	← Rylee left	13:07
	← mitz left	13:07
helperW	@yargy I found a way to import my git repo in my computer via phpstorm	13:08
	I clouded the GIT url	13:08
	and now the project is opening	13:08
	Is that a good way of creating the project locally?	13:08
	→ Rylee joined	13:08
	← Rylee left	13:08
	→ Rylee joined	13:08
	← Rylee left	13:09
	← zapb left	13:09
	→ Rylee joined	13:09
	← Rylee left	13:09
	→ Rylee joined	13:09
	← Rylee left	13:09
	→ Rylee joined	13:10
	← Rylee left	13:10
	→ Rylee joined	13:10
	← Rylee left	13:11
	→ swair joined	13:11
	→ cannonball joined	13:11
	→ Rylee joined	13:11
	← Rylee left	13:11
	← asQuirreL left	13:11
	→ Rylee joined	13:11
	← Rylee left	13:12
	→ tvw joined	13:12
	→ Rylee joined	13:12
	← Rylee left	13:12
	→ guest212 joined	13:13
	← kcj left	13:13
	→ Rylee joined	13:13
	← Rylee left	13:13
	→ Rylee joined	13:13
	← Rylee left	13:14
	→ guest2121 joined	13:14
	→ Sonderblade joined	13:14
	→ Rylee joined	13:14
	← Rylee left	13:14
	← Sonderblade left	13:14
	→ Rylee joined	13:14
	← Rylee left	13:14
	→ Sonderblade joined	13:15
	← stodan left	13:15
	→ Rylee joined	13:15
	← Rylee left	13:15
	→ stodan joined	13:15
	← zarubin left	13:15
	→ btree joined	13:15
	→ Rylee joined	13:15
	← Rylee left	13:16
	→ Rylee joined	13:16
	← Rylee left	13:16
	← eaj_ left	13:16
	→ kcj joined	13:16
	→ sriracha joined	13:16
	← Goopyo left	13:16
	← dragon3_ left	13:16
	→ Rylee joined	13:16
	← Rylee left	13:17
	← guest212 left	13:17
	→ Rylee joined	13:17
	← Rylee left	13:17
	→ Rylee joined	13:17
	← Rylee left	13:18
	→ Rylee joined	13:18
	← Rylee left	13:18
	→ h_kon joined	13:19
	← guest2121 left	13:19
	→ Rylee joined	13:19
	← Rylee left	13:19
	← sgambino left	13:19
	→ Rylee joined	13:19
	← Rylee left	13:20
	→ Rylee joined	13:20
	← Rylee left	13:20
	→ Rylee joined	13:20
	← Rylee left	13:21
	→ Rylee joined	13:21
	← Rylee left	13:21
	← davividal left	13:21
	→ neo1691 joined	13:21
	→ Rylee joined	13:22
	← Rylee left	13:22
	→ Rylee joined	13:22
	← Rylee left	13:22
	→ simesy joined	13:22
	→ Rylee joined	13:23
	← Rylee left	13:23
	→ Rylee joined	13:23
	← Rylee left	13:23
	← Gavrisim_ left	13:23
	→ Rylee joined	13:24
	← Rylee left	13:24
	→ chuckharmston joined	13:24
	→ Rylee joined	13:25
	← Rylee left	13:25
	→ Goopyo joined	13:25
	→ Rylee joined	13:25
	← Rylee left	13:25
	→ Rylee joined	13:26
	← Rylee left	13:26
	→ Rylee joined	13:26
	← Rylee left	13:26
	→ Rylee joined	13:27
	← Rylee left	13:27
	← simesy left	13:27
	→ Rylee joined	13:27
	← Rylee left	13:27
	→ Rylee joined	13:28
	← Rylee left	13:28
	→ Rylee joined	13:28
	← Rylee left	13:28
	→ Rylee joined	13:29
	← Rylee left	13:29
	← Misan left	13:29
	→ Pullphinger joined	13:29
	→ rue joined	13:29
	← quup left	13:29
	→ quup joined	13:29
	← maleknet left	13:29
	→ Rylee joined	13:30
	← Rylee left	13:30
	→ Rylee joined	13:30
	← Rylee left	13:30
	→ Rylee joined	13:31
	← Rylee left	13:31
	→ danillonunes joined	13:31
	→ canton7 joined	13:31
	→ Misan joined	13:31
	← halu left	13:31
	→ Rylee joined	13:31
	← Rylee left	13:31
	→ rabbite joined	13:31
	→ Rylee joined	13:32
	← Rylee left	13:32
	← Jackneill left	13:32
	→ Rylee joined	13:32
	← Rylee left	13:32
	→ Jackneill joined	13:32
	→ Rylee joined	13:33
	← Rylee left	13:33
	→ paulweb515 joined	13:33
	→ simesy joined	13:33
	→ yacks joined	13:33
	→ Rylee joined	13:33
	← Rylee left	13:33
	← Kronuz left	13:33
	← paulweb515 left	13:33
	→ Kronuz joined	13:33
	→ paulweb515 joined	13:33
	→ Rylee joined	13:34
	← Rylee left	13:34
	→ Rylee joined	13:35
	← Rylee left	13:35
	→ Rylee joined	13:35
	← Rylee left	13:35
	← j0ran1 left	13:35
	→ j0ran3 joined	13:35
	→ Rylee joined	13:36
	← Rylee left	13:36
	→ Rylee joined	13:36
	← Rylee left	13:36
	→ lun__ joined	13:36
	→ Rylee joined	13:37
	← Rylee left	13:37
	→ huli_ joined	13:37
	→ Rylee joined	13:37
	← Rylee left	13:37
	← huli_ left	13:37
	→ Rylee joined	13:38
	← Rylee left	13:38
	→ Kronuz_ joined	13:38
	→ Rylee joined	13:38
	← Rylee left	13:38
	→ Rylee joined	13:39
	← Rylee left	13:39
bluesm	bluesm What is the meaning of --> -- t/ <-- in --> git log <-- command ?	13:39
	git log --pretty="%h - %s" --author=gitster -- since="2008-10-01" --before="2008-11-01" --no-merges -- t/	13:39
	→ Rylee joined	13:39
	← Rylee left	13:39
sajbar	man git log	13:39
gitinfo	the git-log manpage is available at http://jk.gs/git-log.html	13:39
	→ Rylee joined	13:40
	← Rylee left	13:40
	→ Rylee joined	13:40
	← Rylee left	13:40
bluesm	sajbar: And search for ?	13:40
	← Snibble left	13:40
	← Kronuz left	13:41
	→ Rylee joined	13:41
	← Rylee left	13:41
	→ calcifea joined	13:41
	Kronuz_ → Kronuz	13:41
	← jazz264 left	13:41
	← lun__ left	13:41
	→ TheBrainWork joined	13:41
deryni	The SYNOPSIS and then the matching explanation for the bit you want to understand.	13:41
	← ska-fan left	13:42
	→ Rylee joined	13:42
	← Rylee left	13:42
	→ ska-fan joined	13:42
sajbar	bluesm: --	13:42
	→ __rgn joined	13:42
	→ Rylee joined	13:42
	← Rylee left	13:42
sonOfRa	bluesm	13:42
	you could search for "-t"	13:42
sajbar	sonOfRa: which would give you nothing	13:43
	→ Rylee joined	13:43
	← Rylee left	13:43
sajbar	search for --	13:43
sonOfRa	oh, I just saw it wasn't -t, but -- t	13:43
sajbar	basically it gives you an log of the path -- t/	13:43
	→ Rylee joined	13:43
	← Rylee left	13:43
deryni	Don't just search. Read the SYNOPSIS then search for the matching term(s).	13:43
	→ Rylee joined	13:44
	← Fandekasp left	13:44
	← Rylee left	13:44
	→ angelsl joined	13:44
	→ Rylee joined	13:44
	← Rylee left	13:44
	← alfons83 left	13:44
	→ dhruvasagar joined	13:44
	→ Rylee joined	13:45
	← Rylee left	13:45
	→ twoface88 joined	13:45
	→ joshbetz joined	13:45
	→ Rylee joined	13:45
	← Rylee left	13:45
	→ zeppo joined	13:45
DolphinDream	can i run git diff and ignore certain files ? (not added to gitignore) ?	13:45
	→ Rylee joined	13:46
	← Rylee left	13:46
	→ luxgeek joined	13:46
deryni	You can run git diff on specific files but I don't know of a way to ignore specific files.	13:46
	→ Rylee joined	13:46
	← Rylee left	13:46
	→ ngw joined	13:46
	→ Rylee joined	13:47
	← Rylee left	13:47
	← zeppo left	13:47
	← simesy left	13:47
	→ Rylee joined	13:47
	← Rylee left	13:47
	→ zeppo joined	13:47
	→ simesy joined	13:47
	→ Rylee joined	13:48
	← Rylee left	13:48
	→ Rylee joined	13:48
	← Rylee left	13:48
	→ asQuirreL joined	13:48
	→ lite_ joined	13:48
	← zeppo left	13:49
	→ Mars__ joined	13:49
	→ Rylee joined	13:49
	← Rylee left	13:49
	→ zeppo joined	13:49
	← saurabh left	13:49
	→ Rylee joined	13:50
	← alan5 left	13:50
	← Rylee left	13:50
	← h_kon left	13:50
	→ Rylee joined	13:50
	← Rylee left	13:50
	→ axl_ joined	13:50
	→ ewnd9 joined	13:50
	→ Rylee joined	13:51
	← Rylee left	13:51
	→ Rylee joined	13:51
	← Rylee left	13:51
	→ Rylee joined	13:52
	→ Sigma joined	13:52
	← Rylee left	13:52
	→ dsdeiz joined	13:52
	← simesy left	13:52
	→ Rylee joined	13:52
	← Rylee left	13:52
	← hoschi left	13:52
	→ troyt joined	13:52
	→ Rylee joined	13:53
	← Rylee left	13:53
	← GT4066 left	13:53
	→ Rylee joined	13:53
	← Rylee left	13:53
	← Mars__ left	13:53
	→ Rylee joined	13:54
	← Rylee left	13:54
	← beautifulmind left	13:54
	→ ayaz joined	13:54
	→ Rylee joined	13:55
	← Rylee left	13:55
	→ Rylee joined	13:55
	← Rylee left	13:55
	→ KillYourTV joined	13:55
	→ Rylee joined	13:56
	← Rylee left	13:56
	← joshbetz left	13:56
	→ Rylee joined	13:56
	← Rylee left	13:56
	← MattMaker left	13:56
	→ ezekielnoob joined	13:56
	→ delasteve joined	13:57
	→ Rylee joined	13:57
	← Rylee left	13:57
	→ mmitchell joined	13:57
	← Dev1L left	13:57
	→ Rylee joined	13:58
	← Rylee left	13:58
	→ halu joined	13:58
	← ngw left	13:58
	→ Rylee joined	13:58
	← Rylee left	13:58
	→ h_kon joined	13:58
	← shoshin left	13:58
	→ Rylee joined	13:59
	← Rylee left	13:59
	→ ngw joined	13:59
	→ Rylee joined	13:59
	← Rylee left	13:59
	→ cmpera joined	13:59
	← kcj left	13:59
	→ Rylee joined	14:00
	← Rylee left	14:00
	→ Rylee joined	14:00
	← stodan left	14:00
	← Rylee left	14:00
	→ Rylee joined	14:01
	← Rylee left	14:01
	← WernerZA left	14:01
	→ franksta-imac joined	14:01
	← DaisyTheCow left	14:01
	→ Rylee joined	14:02
	← Rylee left	14:02
	→ Rylee joined	14:02
	← Rylee left	14:02
	→ Rylee joined	14:03
	← Rylee left	14:03
	← rchavik left	14:03
	→ freeed joined	14:03
	→ shoshin joined	14:03
	→ Rylee joined	14:03
	← Rylee left	14:03
	← shoshin left	14:03
	→ ojacobson_ joined	14:03
	← ojacobson_ left	14:03
	← pdimitrov left	14:03
	← halu left	14:04
	→ Rylee joined	14:04
	→ macabre joined	14:04
	← Rylee left	14:04
	→ shoshin joined	14:04
	← shoshin left	14:04
	→ pdimitrov joined	14:04
	→ decotii joined	14:04
	→ AaronMT joined	14:04
	← pr0ggie left	14:04
	→ shoshin joined	14:04
	← shoshin left	14:04
	→ Rylee joined	14:05
	← Rylee left	14:05
	→ Rylee joined	14:05
	← Rylee left	14:05
	→ shoshin joined	14:05
	→ pr0ggie joined	14:05
	← shoshin left	14:05
	→ shuaib joined	14:05
	→ FernandoBasso joined	14:06
	→ shoshin joined	14:06
	← shoshin left	14:06
	→ shoshin joined	14:06
	← shoshin left	14:06
	← zeppo left	14:06
	← ojacobson left	14:07
	→ zeppo joined	14:07
	→ shoshin joined	14:07
	← shoshin left	14:07
	→ shoshin joined	14:07
	→ Cromulent joined	14:09
	→ sgambino joined	14:09
Chais	how do I properly push an amended commit?	14:09
	→ notjohn joined	14:09
iveqy	Chais: git push	14:10
Chais	iveqy: it's rejected	14:10
iveqy	Chais: and what's the message?	14:10
	→ Snibble joined	14:11
	→ Snibble1 joined	14:11
	→ mizu_no_oto joined	14:11
	← rabbite left	14:11
iveqy	Chais: I bet it was "To prevent you from losing history, non-fast-forward updates were rejected	14:12
	Merge the remote changes before pushing again. See the 'non-fast forward'	14:12
	→ Raging_Hog joined	14:12
foucist	you can force it.. git push -f	14:12
iveqy	section of 'git push --help' for details."	14:12
	Chais: so I suggest you type git push --help	14:12
	← neo1691 left	14:12
iveqy	Chais: after that you need to read !public	14:12
gitinfo	Chais: [!rewriting_public_history] Rewriting public history is usually bad. Everyone who has pulled the old history have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push -f` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	14:12
	→ acharlieh joined	14:13
	← shoshin left	14:13
Chais	iveqy: you're right the git error message are rather helpful	14:14
	→ FrodoTheHobbit1 joined	14:14
DolphinDream	how can i get the master branch to point to a given commit ?	14:14
	← FrodoTheHobbit1 left	14:14
iveqy	DolphinDream: man git reset	14:15
gitinfo	DolphinDream: the git-reset manpage is available at http://jk.gs/git-reset.html	14:15
_ikke_	git checkout master; git reset --keep <commit>	14:15
DolphinDream	iveqy, does reset take you up in history or only down?	14:15
	← freestyl3r left	14:15
	← Snibble left	14:15
DolphinDream	i used reset hard to go back a few commits.. and nwo i want to go back up	14:15
iveqy	DolphinDream: neither, it resets your branch to point to an other commit. You could also use git branch for this	14:15
	← dyng left	14:16
	← DoniRS left	14:16
	→ VictorCL joined	14:17
	→ dyng joined	14:17
	← FrodoTheHobbit left	14:17
	→ justpie joined	14:17
	← banisterfiend left	14:18
	→ marhaban joined	14:18
iveqy	DolphinDream: if you've forgott what the sha1 is see !revlist	14:18
	!reflist	14:18
DolphinDream	:)	14:18
	funny	14:18
iveqy	:(	14:18
yargy	hey guys does anyone know where I would put this https://gist.github.com/hartym/2584767	14:18
justpie	Hey all, could anyone explain a rebase to me? I read though the docs and im a bit unclear on it	14:18
	→ iamjarvo joined	14:19
iveqy	!reflog	14:19
gitinfo	The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details. WARNING: reset --hard will trash any uncommitted changes! Visualize with: gitk --all --date-order `git log -g --pretty=%H`	14:19
DolphinDream	i never used reset with SHA.. i only used it with HEAD ^~	14:19
yargy	it looks like a function but I don't know where I would put it so that I can actually use it	14:19
DolphinDream	so never thoguth of HEAD :) as a SHA :)	14:19
	← chineduu left	14:19
	← thegladiator_ left	14:19
	→ jerius joined	14:19
	→ chineduu joined	14:19
	→ simesy joined	14:20
_ikke_	Basically, git tries to resolve it to a commit	14:20
	← acharlieh left	14:20
_ikke_	HEAD -> branch -> commmit	14:20
	← echo-are` left	14:20
	→ Yonkie_ joined	14:20
	← j0ran3 left	14:21
	→ j0ran1 joined	14:21
	← dyng left	14:21
	[emmajane] → emmajane	14:23
	← delasteve left	14:23
	→ hellopat joined	14:24
	→ echo-area joined	14:24
	→ hashpuppy joined	14:25
	← hashpuppy left	14:26
	→ delasteve joined	14:26
	→ banisterfiend joined	14:26
	→ jazz264 joined	14:26
	← delasteve left	14:26
Chais	now I updated on the other machine, so I had to stash the changes away. restoring them resulted in files being deleted and created, instead of being moved. how can I convert that?	14:26
	← sqlnoob left	14:26
	→ delasteve joined	14:27
	← delasteve left	14:27
	→ freestyl3r joined	14:27
Chais	trying to move just gave me a "source file doesn't exist"-style message	14:27
	← twoface88 left	14:28
	→ zapb joined	14:28
	← chineduu left	14:28
	← simesy left	14:28
	← Guest18138 left	14:28
	→ Guest18138 joined	14:28
	Guest18138 → totte	14:28
	→ jumperswitch joined	14:28
	← shuaib left	14:30
	jumperswitch → tty-1	14:31
	→ Dougie187 joined	14:31
	← mikecmpbll left	14:31
	← oojacoboo left	14:31
	→ lithiumn joined	14:32
	→ thegladiator_ joined	14:32
	→ yhager joined	14:32
	→ hholtmann joined	14:33
	→ tty-1_ joined	14:33
	→ CKyle joined	14:33
	→ bruno4254 joined	14:33
bruno4254	anyone got any tips on nmap	14:33
moritz	bruno4254: yes, try a different channel	14:34
	→ snag joined	14:34
	← snag left	14:34
justpie	bruno4254 : what are you trying to do?	14:34
	bruno4254 slaps moritz around a bit with a large trout	14:34
moritz	bruno4254: why do you slap me if you're the one off-topic?	14:35
	← chuckharmston left	14:35
	→ neo1691 joined	14:35
moritz	bruno4254: at least I don't see what nmap has got to do with #git	14:35
bruno4254	oh for lols, in all seriousness	14:35
	← admin_ left	14:35
moritz	ok	14:35
bruno4254	im just learning about it	14:35
	seeing what others know	14:35
	→ adlez joined	14:35
bruno4254	can you lead me in the right direction	14:35
	← Luke-Jr left	14:35
	← CKyle left	14:35
	→ Luke-Jr joined	14:35
moritz	google, use the man page, ask in generic linux or networking channels	14:36
justpie	bruno4254 : Start by learning low level networking. Then use tools.	14:36
	→ khushildep_ joined	14:36
	← tty-1 left	14:36
bruno4254	oh i already have	14:37
	been ussing wireshark for a while	14:37
	tty-1_ → tty-1	14:37
	← tty-1 left	14:37
	← btree left	14:37
	→ davividal joined	14:38
	← axl_ left	14:38
	→ phile joined	14:38
	← khushildep left	14:38
	khushildep_ → khushildep	14:38
	← adlez left	14:39
	→ mastro joined	14:39
	← zhost left	14:39
	← mdiers left	14:39
	→ zhost joined	14:39
	→ LuxuryMode joined	14:40
	→ jonatasnona joined	14:41
	← bruno4254 left	14:42
	← calcifea left	14:43
	→ dougsland joined	14:43
	→ joelroa joined	14:43
	← zeppo left	14:44
DolphinDream	why is merge FETCH_HEAD merging with a different branch and not with origin/master ?	14:44
	→ rabbite joined	14:44
DolphinDream	is it possible that i have run get fetch while i was in the brach?	14:45
	→ mdiers joined	14:45
	→ JeremyWei joined	14:45
	→ kcj joined	14:46
	→ shuaib joined	14:48
YoungFrog	origin/master is most probably a remote tracking branch, which means it is updated by git fetch automatically	14:48
	merging FETCH_HEAD makes sense if you merge into your own branches	14:48
	→ Mars__ joined	14:50
	→ intellix joined	14:50
	← mizu_no_oto left	14:51
	← macabre left	14:51
	→ zeppo joined	14:51
	→ richgilbank joined	14:51
	← zeppo left	14:51
	← intellix left	14:52
	→ tty-1 joined	14:53
	← Pullphinger left	14:53
	→ rgr joined	14:53
	← Mars__ left	14:54
	← lite_ left	14:55
	→ lite_ joined	14:56
	→ nox__ joined	14:56
	→ herdingcat joined	14:57
	→ intellix joined	14:57
	← iamjarvo left	14:57
	← iokill left	14:58
	← krixxkraxx left	14:58
	→ dcpc007 joined	14:58
	← mdiers left	14:59
DolphinDream	if i remove a tag locally and push tags will the remote tag be also removed ?	14:59
	← donmichelangelo left	15:00
	→ mribeirodantas joined	15:00
	← lite_ left	15:00
	← h_kon left	15:00
	→ iokill joined	15:00
	→ donmichelangelo joined	15:00
	→ kriks joined	15:01
	← _iron left	15:01
moritz	DolphinDream: you can find out with git push --dry-run	15:01
	→ Gamecubic joined	15:01
	← shinnya left	15:01
moritz	(I'm 99% confident the answer is "no", but better to check)	15:01
	← rabbite left	15:02
	→ guest212 joined	15:02
	← ZujkisNx left	15:03
	← dhruvasagar left	15:03
	← jarr0dsz left	15:03
	← shuaib left	15:03
	→ natechan joined	15:03
	← nox__ left	15:04
	← natechan left	15:04
	← asQuirreL left	15:04
DolphinDream	moritz, you have to git push --delete origin tagname	15:05
	← neo1691 left	15:05
	→ iamjarvo joined	15:06
	→ shoshin joined	15:08
	→ ojacobson joined	15:08
	← ShooterMG left	15:08
	→ jarr0dsz joined	15:10
	→ galaris joined	15:11
	← Snibble1 left	15:11
	→ twoface88 joined	15:12
	→ bamj0rb joined	15:12
	→ devoldmx joined	15:12
	gitinfo set mode: +v	15:12
	← rue left	15:13
	← galaris left	15:13
	→ rabbite joined	15:14
	→ Targen joined	15:14
	→ tplaner joined	15:14
	→ jwmann joined	15:15
	← notjohn left	15:15
	→ galaris joined	15:15
	← mribeirodantas left	15:16
	← ezio left	15:16
	← yargy left	15:16
	← shoshin left	15:16
	→ ssedano joined	15:16
	← devoldmx left	15:17
	clone1018_ → clone1018	15:17
	→ chuckharmston joined	15:17
	← davividal left	15:17
	→ ZoanthusR joined	15:18
	← CheckDavid left	15:18
	→ kermit joined	15:18
	← iokill left	15:18
DolphinDream	with gitolite how do u restrict push to branch ?	15:18
	→ lite_ joined	15:19
dr_lepper	DolphinDream: http://gitolite.com/gitolite/g2/bac.html	15:20
ojacobson	dr_lepper: http://gitolite.com/gitolite/rules.html more likely, but he asked the same question in #gitolite	15:20
	more or less	15:20
dr_lepper	oh my	15:21
	← iamjarvo left	15:22
	→ neo1691 joined	15:22
	← arand left	15:22
	→ iamjarvo joined	15:22
	→ lite__ joined	15:23
	← lite_ left	15:24
	← Xethron left	15:24
	← psoo left	15:24
	→ Pullphinger joined	15:24
	→ dhruvasagar joined	15:24
	→ zarubin joined	15:24
	→ simesy joined	15:25
	→ asQuirreL joined	15:25
	← kernelpanik left	15:26
	→ arand joined	15:26
sitaram	ojacobson: and he waited 28 seconds before asking on the other channel	15:26
ojacobson	indeed	15:27
	← marhaban left	15:27
	→ lacrymology joined	15:28
	→ macabre joined	15:29
	← yhager left	15:29
	→ droogans joined	15:29
	← simesy left	15:29
	→ mizu_no_oto joined	15:30
	← dhruvasagar left	15:31
	→ davividal joined	15:31
	← twoface88 left	15:31
	→ guest2121 joined	15:31
lacrymology	I need to re-run a number of commits and re-run the commit-msg hook	15:32
	can I do that?	15:32
	rebase doesn't run the hooks, apparently	15:32
	→ guest2122 joined	15:32
	→ pbujok joined	15:33
	jcarouth` → jcarouth	15:34
	← guest212 left	15:34
	→ _goTAN joined	15:34
ojacobson	Is there a shell-friendly way to get a list of conflicted files, so that I can eg. run $EDITOR $(list of conflicts) ?	15:35
	← joelroa left	15:35
	← arvind_khadri left	15:35
droogans	ojacobson git status -sb	15:35
sitaram	ojacobson: git ls-tree should have something. So should git status in its new avatar	15:35
	aah	15:35
	→ iamjarvo_ joined	15:35
droogans	UU is conflicted	15:36
ojacobson	\| grep '^UU' presumably	15:36
	okay, I can live with that	15:36
droogans	Yessir	15:36
	You may want to research that	15:36
	← guest2121 left	15:36
ojacobson	Yeah, i'm investigating sitaram's suggestion, too	15:36
droogans	I think if one is deleted, and the other is modified, it comes up DU or UD	15:36
ojacobson	and ofc DD for conflicting moves	15:37
sitaram	ojacobson: I meant ls-files not ls-tree, sorry	15:37
	'git ls-files -u', it seems, from the manpage	15:37
	→ lun__ joined	15:37
	→ alphpt joined	15:38
ojacobson	git ls-files -u emits an entry per stage, so needs some massaging, but it feels more correct than git status	15:38
	gitinfo set mode: +v	15:38
	← tplaner left	15:38
	← iamjarvo left	15:39
sitaram	ojacobson: on the flip side, git status's "-s" was meant for computer processing so it is likely to be as stable as other plumbing	15:39
	IIRC	15:39
	→ PeerAS joined	15:39
	← ayaz left	15:39
	← nfroidure left	15:40
	→ pmoust joined	15:40
	← Pullphinger left	15:40
pmoust	Hey guys, i am cloning an svn repo to git using svn-git	15:40
	it gets fine the first 1100+ commits	15:40
	then	15:41
	r1183 = 46ad257f9c67f43569e994a7519d41367bd4b063 (refs/remotes/ma2)	15:41
	fatal: refs/remotes/trunk: not a valid SHA1	15:41
	update-ref refs/heads/master refs/remotes/trunk: command returned error: 128	15:41
	any suggestions?	15:41
	→ delasteve joined	15:42
	→ shoshin joined	15:42
	← oso96_2000 left	15:42
	→ notjohn joined	15:42
offby1	pmoust: "reposurgeon" might help	15:42
	I've never used it so I cannot offer further advice	15:42
	← lun__ left	15:43
	→ therealfakemoot joined	15:43
therealfakemoot	So, let's say I want to include a directory in my repository. Just to make sure it exists in future installs. Is that reasonable/possible? Or is that something my application should be handling?	15:44
	← h0bbit_ left	15:44
lb1a	therealfakemoot, you cant track empty dirs...	15:44
therealfakemoot	Just checking.	15:45
	← ewnd9 left	15:45
	→ ezio joined	15:45
	→ johnnyfuchs joined	15:45
	→ ewnd9 joined	15:45
ojacobson	You can either have your project create the directory as needed or track a dummy marker file (an empty `.gitignore` is somewhat conventional)	15:45
lb1a	therealfakemoot, what ojacobson says	15:45
	← Norm_ left	15:45
therealfakemoot	Yeah, that's the idea	15:45
	s/idea/plan/	15:46
offby1	what lb1a says	15:46
therealfakemoot	I was just curious if i twas possible	15:46
	→ Gavrisimo joined	15:46
offby1	ojacobson: now you just need to say "what offby1 says" and we've got perpetual motion!	15:46
	← lite__ left	15:46
	← kbart left	15:46
therealfakemoot	thanks	15:46
ojacobson	what offby1 said.	15:46
	→ lite_ joined	15:47
	→ jasonp joined	15:47
	→ whaley joined	15:47
offby1	whee and we're off	15:47
	← pfFredd left	15:47
ojacobson	always happy to kick thermodynamics in the knee	15:48
	→ tdm00 joined	15:48
	dropdriv1 → dropdrive	15:49
lb1a	Unhandled exception at 0x003C3D79 in #git: 0xC00000FD: Stack overflow (parameters: 0x00000001, 0x003D2F70).	15:49
	← therealfakemoot left	15:49
lb1a	great offby1 ojacobson :P now i got the messy thing here :P	15:49
	← dsdeiz left	15:50
	→ Mars__ joined	15:50
lb1a	i gotta go now ...	15:50
	cheers	15:50
	← lb1a left	15:50
offby1	I don't think I've ever seen that exception from any program ever.	15:51
	Ever	15:51
	← lite_ left	15:51
	→ natechan joined	15:51
	← Hoksilato left	15:51
	← whaley left	15:52
	→ dhruvasagar joined	15:52
	Xiti` → Xiti	15:52
	→ TheHoneyBadger joined	15:53
	← Gavrisimo left	15:53
	← jargon left	15:54
	← matanya left	15:54
TheHoneyBadger	I'm getting a message on a pull "Your branch is ahead of 'origin/master' by 49 commits." However, I don't do any commits on the working copy in question.	15:54
	Why is this happening and how do I fix it?	15:54
	← d33tah left	15:54
amoe	Hi, is there any way to show the diff of a manual conflict resolution that I did for a previous merge?	15:54
	→ str joined	15:54
	← Mars__ left	15:55
	← ngw left	15:55
	→ d33tah joined	15:55
	← hypera1r left	15:55
	← dfanjul left	15:55
	→ whaley joined	15:55
	← rabbite left	15:55
	← lacrymology left	15:55
	→ snql joined	15:56
offby1	amoe: sure -- "git diff SHA^ SHA"	15:56
	i.e., compare the commit's tree with the tree of its first parent	15:56
	← davividal left	15:56
	→ chineduu joined	15:58
amoe	thanks offby! :)	15:59
	← zhost left	15:59
	→ oso96_2000 joined	15:59
	← snql left	15:59
	→ abrkn joined	15:59
	→ ZujkisNx joined	16:01
	← abrkn\ left	16:03
	→ shuaib joined	16:04
	→ knighthawk joined	16:04
	→ GT4066 joined	16:04
	→ tty-1_ joined	16:05
knighthawk	I made a small change to my working tree then pushed it up to the central remote host (origin) then pushed it to my webserver found out it blew something up. so want to rollback (maybe two or more commits) so generally a 'git reset --heard HEAD-2' I think only I've already pushed it up. So what should I do instead?	16:06
	sorry that should be 'hard' not 'heard'	16:06
	← ezio left	16:07
	→ joelrobichaud joined	16:07
	→ ezio joined	16:07
	← ezio left	16:07
	→ ezio joined	16:07
CareBear\	knighthawk : you should possibly use git revert instead in this case. avoid !rewrite if you are sharing code with others.	16:07
gitinfo	[!rewriting_public_history] Rewriting public history is usually bad. Everyone who has pulled the old history have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push -f` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	16:07
	← banisterfiend left	16:07
	← SergeyPenkin left	16:07
	← netiul left	16:08
	← tty-1 left	16:08
	→ gasbakid joined	16:08
	→ thiago joined	16:08
	← undecim left	16:08
	← gasbakid left	16:09
	→ gasbakid joined	16:09
	← gasbakid left	16:10
	→ Pullphinger joined	16:10
	→ davividal joined	16:10
	← zorzar left	16:10
	→ undecim joined	16:11
TheHoneyBadger	So I check out a fresh working copy. I make changes in a different copy, commit them, then push to origin. I pull from origin in the first copy, no problem. However, on a subsequent "git checkout master", I get "Your branch is ahead of 'origin/master' by 2 commits."	16:11
	→ banisterfiend joined	16:11
TheHoneyBadger	The heck? Are those commits from the pulls or what?	16:12
	← cbreak-work left	16:12
	→ Gavrisimo joined	16:12
	→ joelm joined	16:13
	→ CreativeEmbassy joined	16:13
	← whaley left	16:13
	→ yhager joined	16:13
	→ zorzar joined	16:13
	← curvedmark left	16:14
	← galaris left	16:14
	← rath left	16:15
	→ galaris joined	16:15
	← thiago left	16:15
	→ mustmodify joined	16:15
	→ CKyle joined	16:15
	← tpope left	16:16
mustmodify	I use got commit --amend more than is perhaps healthy... is there a way to remove a new file I committed using --amend?	16:16
	→ glosoli joined	16:16
	← ezio left	16:16
DolphinDream	how do i reset hard remote branch ?	16:16
	→ lite_ joined	16:16
mustmodify	I added script/fu.rb and I really wanted it in my next commit. But I don't want to reset the commit because it had a lot of new files and deletes and moves and it would be a big pita.	16:17
	← threesome left	16:17
	→ hiroyuki joined	16:17
DolphinDream	nevermind	16:17
	→ nfroidure joined	16:18
ssedano	mustmodify: you could split that last commit into more than one	16:18
	→ Snibble joined	16:18
	← jazz264 left	16:18
ssedano	or instead, do it interactively and stash that file instead of adding it	16:18
mustmodify	interactively... like git add -p?	16:19
ssedano	sure	16:19
mustmodify	Can you reverse-interactively-remove things from an existing commit?	16:19
	or stash	16:19
	← JimmyJohnson left	16:19
	← _davetoo left	16:20
	← sdx23 left	16:20
	→ sdx23 joined	16:20
ssedano	take a look at the git rebase man page, the splitting commit section	16:20
	→ ngladitz joined	16:21
	← ngladitz left	16:21
	→ ngladitz joined	16:21
mustmodify	ok, that sounds interesting. Thanks.	16:21
ssedano	I never did it myself, so I'm of little help,sorry	16:21
	← GT4066 left	16:21
	← s0undt3ch left	16:22
	→ s0undt3ch joined	16:22
	→ mribeirodantas joined	16:23
	→ ezio joined	16:24
	← ezio left	16:24
	→ ezio joined	16:24
	← pmoust left	16:25
	→ simesy joined	16:25
	← lavaman left	16:25
	→ maestrojed joined	16:26
	→ tang^ joined	16:26
	← Sonderblade left	16:26
	← nfroidure left	16:26
	← Squarism left	16:26
	← mizu_no_oto left	16:26
	→ kjn joined	16:27
	→ alan5 joined	16:27
	← tty-1_ left	16:27
	← Snibble left	16:27
	→ CheckDavid joined	16:27
	← galaris left	16:28
	→ nicedice joined	16:28
	→ miceiken joined	16:28
	← jatt` left	16:28
	← helperW left	16:28
	← tvw left	16:29
	← richgilbank left	16:29
	→ harish_ joined	16:29
	← alphpt left	16:29
	→ rue joined	16:29
	← thierryp left	16:29
	← Misan left	16:30
	← simesy left	16:30
	← herdingcat left	16:30
	← harish left	16:30
	→ papegaaij_ joined	16:30
	→ abrkn\ joined	16:30
	→ tvw joined	16:30
	← papegaaij left	16:31
	← joel_falcou left	16:31
	→ halu joined	16:33
	← abrkn left	16:33
	→ mizu_no_oto joined	16:33
	← ThomasLocke left	16:33
	← gua_ould left	16:34
	→ Pyrogerg joined	16:34
	→ rabbite joined	16:35
	← davividal left	16:36
	→ aspiers joined	16:36
	← Guest4410 left	16:37
	→ lmat joined	16:37
	← johnnyfuchs left	16:37
	→ Artpicre joined	16:37
	← noname001 left	16:37
	→ richgilbank joined	16:38
	→ Pyrogerg_ joined	16:39
	→ doliver joined	16:39
	← Gavrisimo left	16:39
	← holderbaum left	16:40
	→ knownasilya joined	16:41
	→ Gavrisimo joined	16:41
	← neo1691 left	16:41
	← Pyrogerg left	16:41
knownasilya	I have a folder and it's not getting into the repo with it's contents, and it's not ignore in any .gitignores in the repo	16:41
	ignored*	16:41
DolphinDream	does git push pushes the current branch ?	16:41
justpie	Dolphin, yes.	16:42
knownasilya	why isn't it making it?	16:42
justpie	knownasila : git add folder/*	16:42
	← kewah left	16:42
	→ ShooterMG joined	16:43
DolphinDream	thx	16:43
	← richgilbank left	16:43
knownasilya	justpie: it says that the following files are ignored by one of my .gitignores..	16:43
	← Gonzo89 left	16:44
	← ska-fan left	16:44
knownasilya	is there another file other then .gitignore that can ignore files? I only have on at the root dir and others are at different directories, not above the one that doesn't wnat to add.	16:44
bamj0rb	knownasilya: .gitignore at any level, as well as .git/info/exclude.	16:45
	emmajane → emmajane\|afk	16:45
	→ galaris joined	16:45
	← abrkn\ left	16:46
	← rob_w left	16:46
	→ richgilbank joined	16:47
knownasilya	bamj0rb: nothing in the exclude..	16:47
	→ maroloccio joined	16:47
	← delasteve left	16:47
emx	is there an increasing "revision"number in git?	16:47
ojacobson	no	16:48
emx	bad	16:48
ojacobson	git-describe can number commits but not uniquely	16:48
	→ Lewoco_ joined	16:48
	← ezekielnoob left	16:48
ojacobson	'git rev-list --count <HASH>' will also number commits, but also not uniquely	16:48
	and more importantly not reversibly	16:48
	back up a step and explain how you'd use the number if you _could_ get it	16:49
	→ davividal joined	16:49
	→ babylon9 joined	16:49
	← Gavrisimo left	16:49
EugeneKay	This is a common question we get, and usually one that ends in "because SVN has them. git is so stupid!!!1"	16:49
	→ johnnyfuchs joined	16:50
	→ Tabmow joined	16:50
EugeneKay	git-describe serves the purpose of identifying a commit for making a release via tarball, by using your named tags as a baseline. Use that.	16:50
	→ penguin42 joined	16:50
emx	ojacobson, i track database changes in files which i named revision[number]_changesSince.sql and revision[number]_rollbackTo.sql.	16:50
	← irqq left	16:51
	→ Mars__ joined	16:51
emx	i don't know how to do that intuitively with hash values.	16:51
	← Lewoco left	16:52
ojacobson	hashes are non-ordered, but ISO 8601 timestamps are ordered	16:52
	that's one option	16:52
	← Guest18364 left	16:52
ojacobson	the other is to manage a database version number yourself	16:52
knighthawk	Okay I blew up a branch sent it to the central repo (gitHub) then relized I made a mistake in my local copy I did 'git checkout <branchname>~3' to roll back to fix. got it fixed created a new branch 'git checkout -b <cleanup-branch>' and commited my fixed version to the new branch. Now I'm trying to think what's the best way to push back to gitHub. Since I grabbed an older copy of the tree will it overwrite the bad changes on gitHub	16:52
	if I just do a push?	16:52
	→ apipkin joined	16:52
ojacobson	the other, other option is to keep a list (this is what liquibase does, for example) and apply them in the listed order	16:52
	→ King_Hual joined	16:53
	→ hyperair joined	16:54
knownasilya	haha, i had an ignore in sourcetree..silly application level ignore..	16:54
emx	ojacobson, how do i read out the timestamp of the last commit of a branch?	16:54
knownasilya	not sure why the terminal picked it up as well..	16:54
	→ lavaman joined	16:55
	← Mars__ left	16:55
emx	ojacobson, with the other, other option you mean that there is a single file and all changes are put into that one?	16:55
	← notjohn left	16:55
SamB	knighthawk: you probably need the "-f" flag	16:56
	← hiroyuki left	16:56
	← melee left	16:56
SamB	also see !history and consider if you think it's likely that anyone's pulled github in the meantime	16:57
gitinfo	[!clean_history] For a pointer on how to handle history in git see this e-mail from Linus: http://thread.gmane.org/gmane.comp.video.dri.devel/34744	16:57
SamB	er.	16:57
	← maroloccio left	16:57
SamB	see !rewrite ?	16:57
gitinfo	[!rewriting_public_history] Rewriting public history is usually bad. Everyone who has pulled the old history have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push -f` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	16:57
	→ _Qman joined	16:58
	← ehmatthes left	16:58
	→ whunt joined	16:58
	→ Guest25272 joined	16:58
	← yhager left	16:58
	Guest25272 → diegoviola	16:59
	→ delasteve joined	16:59
ojacobson	emx: git log, git show, git cat-file commit <hash>, various other mechanisms	17:00
	← m0viefreak left	17:00
	← felixsamora left	17:00
ojacobson	emx: no, I mean there's a catalog file that lists the migrations to apply, and each migration is in its own file. It still leads to some merge conflicts (append/append, usually) but they're trivial to resolve.	17:00
emx	ojacobson, k, thanks	17:01
	→ kevwil joined	17:01
	→ Watabou joined	17:02
	→ raar joined	17:02
	raar → Guest50999	17:02
	→ neo1691 joined	17:03
	← davividal left	17:03
	→ ezakimak_work joined	17:03
	← freimatz left	17:04
	← delasteve left	17:04
	← intellix left	17:05
	← galaris left	17:05
	→ zhost joined	17:05
	← user258467 left	17:06
	→ galaris joined	17:06
	→ SocalNick joined	17:06
	→ tpope joined	17:07
	→ alan5_ joined	17:08
	→ hwrd\|work joined	17:08
	rm_work\|away → rm_work	17:08
	← apipkin left	17:09
	← hwrd\|work left	17:09
	← ewnd9 left	17:09
	← alan5 left	17:09
	→ kevinold joined	17:09
	→ hwrd\|work joined	17:10
	→ ehmatthes joined	17:10
	← rabbite left	17:10
	← rurufufuss left	17:10
	← aspiers left	17:11
	→ calcifea joined	17:11
	← neo1691 left	17:11
kevinold	I'm using --author for git log to find commits by a certain author, but am seeing commits by that author that were cherry picked to another branch. I'd like to see only commits by that author on the single branch, but adding --branches=mybranch isn't working?	17:11
	← meLon left	17:11
kevinold	what is the best way to see commits by a single author on the current branch only	17:11
	← JeremyWei left	17:12
	→ etcetera joined	17:12
	→ ewnd9 joined	17:12
knighthawk	thanks SamB	17:13
	→ yhager joined	17:13
	→ thierryp joined	17:13
	← juril left	17:14
	→ devbug joined	17:14
grawity	kevinold: Git doesn't keep track of which branch a commit was authored on	17:15
SamB	or committed on, either	17:15
grawity	kevinold: I'd say `--not --grep="cherry picked from"`, but somehow I doubt the --not affects --grep :(	17:16
	← hahuang65 left	17:16
dropdrive	So I have read access to my coworker's collection of scripts, except that he refuses to version control. Is there a way for me to use git to track his changes without making a copy of his tree? For example, it's not enough to set GIT_DIR, which doesn't "pretend" that there is a work tree.	17:16
	← galaris left	17:16
	→ thiago joined	17:16
kevinold	got it, thanks, I think I'll just have to manually look through them as it's only a handful of commits	17:17
	→ davividal joined	17:17
	← richgilbank left	17:17
	← johnnyfuchs left	17:18
	→ bartzy joined	17:18
bartzy	Hey	17:18
	What is the difference between git commit --amend --no-edit and git commit -C HEAD ?	17:18
	→ apipkin joined	17:18
	← chineduu left	17:18
	→ chineduu joined	17:19
	→ h0bbit_ joined	17:20
grawity	bartzy: with --amend you're creating a new commit instead of the current HEAD (you could say --amend is editing the HEAD commit)	17:20
	bartzy: without --amend, you always create a new commit on top of HEAD, and the -C option merely copies the comment	17:20
	← alorence left	17:21
	← fRAiLtY- left	17:21
	→ User458764 joined	17:23
	← Cromulent left	17:23
	← CreativeEmbassy left	17:23
	→ infynyxx joined	17:24
	← davividal left	17:24
bartzy	grawity: Thanks. Any shorter way (without an alias) to do --amend --no-edit ?	17:24
	→ felixsamora joined	17:24
	← arand left	17:24
	← miceiken left	17:24
	← whoami left	17:25
	→ simesy joined	17:25
	← Watabou left	17:25
	← _goTAN left	17:26
grawity	bartzy: git config --global alias.mend "commit --amend --no-edit"	17:27
	← dhruvasagar left	17:27
	← Stygia left	17:28
	← chineduu left	17:28
	→ whoami joined	17:28
	← lite_ left	17:28
	bamj0rb likes to EDITOR=true git. >:)	17:29
	→ lite_ joined	17:29
	→ Skrypter joined	17:29
	← Pyrogerg_ left	17:29
	→ Reacto joined	17:29
	← Reacto left	17:29
	→ Reacto joined	17:29
	← donmichelangelo left	17:30
	← simesy left	17:30
	→ donmichelangelo joined	17:30
iveqy	dropdrive: yes you can do that	17:31
	→ Gavrisimo joined	17:31
bamj0rb	dropdrive: GIT_WORK_TREE. :)	17:32
	← shruggar left	17:32
	← lite_ left	17:33
	→ _iron joined	17:33
	→ _Vi joined	17:33
	→ arkygeek joined	17:34
	→ Ertac joined	17:34
	→ btree joined	17:34
arkygeek	hi folks	17:34
gitinfo	arkygeek: 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.	17:34
	← jonatasnona left	17:35
arkygeek	I made some changes to a few files and I would like to go back to the way it was.	17:35
	← adamm left	17:35
arkygeek	I want to only refresh the files that exist in the repository (gitorious)	17:35
	→ lite_ joined	17:35
arkygeek	how do I do that?	17:36
	← swair left	17:36
	→ davividal joined	17:36
	→ boombatower joined	17:37
	→ jonatasnona joined	17:37
	← alan5_ left	17:37
lmat	arkygeek: git reset --hard ?	17:38
	→ lun__ joined	17:38
arkygeek	lmat: ok, thx, I'll read up on that :-)	17:38
lmat	:)	17:39
	→ RogerWS joined	17:39
	→ hiroyuki joined	17:40
	→ delasteve joined	17:41
	← lun__ left	17:43
	→ adamm joined	17:43
	← ewnd9 left	17:44
	→ m8 joined	17:44
	→ cesarkawakami joined	17:44
	← emx left	17:45
	← ZujkisNx left	17:45
	← harobed_ left	17:46
	→ raonyguimaraes joined	17:46
	→ mfulz joined	17:47
	← ezio left	17:47
	← kevinold left	17:48
	→ kevinold joined	17:48
	← banisterfiend left	17:51
	→ Mars__ joined	17:51
	→ tplaner joined	17:51
	← kevinold left	17:53
	→ Snibble joined	17:53
	← felher left	17:53
	→ Ragnor joined	17:54
	← jast left	17:55
	→ CodeShark joined	17:55
	→ jast joined	17:55
	← Mars__ left	17:55
	← davividal left	17:56
	← cenuij_ left	17:56
	← zhost left	17:57
	→ btree_ joined	17:57
	← achadwick left	17:57
	→ twoface88 joined	17:57
	→ banisterfiend joined	17:58
	→ hahuang65 joined	17:59
	← vurma left	17:59
	→ Robarelli joined	17:59
	→ ZujkisNx joined	18:00
	← thiago left	18:00
	← lite_ left	18:00
	← btree left	18:00
	← felixsamora left	18:00
	← delasteve left	18:01
	→ macrover joined	18:01
	→ lite_ joined	18:01
	← doliver left	18:01
	→ galaris joined	18:02
	← lite_ left	18:02
	→ lite_ joined	18:02
	← kenperkins left	18:02
	← lite_ left	18:03
	← User458764 left	18:03
	→ lite_ joined	18:03
	→ jmd joined	18:04
	→ Misan joined	18:04
	→ Snibble1 joined	18:05
	→ mitz joined	18:05
	← Snibble left	18:06
	→ richgilbank joined	18:06
	→ admin_ joined	18:06
	← asQuirreL left	18:07
	← lite_ left	18:08
	← lithiumn left	18:08
	← PeerAS left	18:09
	→ Retep998 joined	18:09
	← lmat left	18:09
jmd	Is there a command to do pull and push in one operation?	18:09
	→ rhl joined	18:09
Retep998	Question, is there some sort of good article on why git forbids merging in a dirty working folder?	18:10
	→ petey joined	18:10
grawity	jmd: Not in core Git, unless you use something like `legit sync`	18:10
	→ lugzer joined	18:10
jmd	Retep998: Well because it is impossible.	18:10
grawity	Retep998: I'm pretty sure it only does that when merging would affect the specific files that are dirty?	18:10
	→ davividal joined	18:10
Retep998	grawity: Yeah, but svn does it	18:10
	and a friend of mine is really confused as to why git won't	18:11
jmd	svn doesn't have an "index"	18:11
grawity	svn and git use very different approaches to merging, for example	18:11
rhl	Hi, I am trying to setup git.rhl.io and I am having trouble getting git clones to work. I have my own private apache within webfaction, and I am using git+gitweb+gitolite	18:11
	DocRoot is /home/git/webapps/git and inside of there is a symlink called 'repos' to /home/git/repositories	18:11
	http://fpaste.org/52412/38384748/	18:11
	what is weird is that the git repo structure doesn't ever put refs inside of info, but they are folders at the same level	18:11
	so the rewrite rules in the htaccess might be doing something wrong.. this was provided to me after installing the 'git' application from webfaction.	18:11
grawity	merge-then-commit vs commit-then-merge	18:11
	rhl: info/refs isn't meant to be a folder, it is meant to be an auto-generated file	18:11
	rhl: (since it is tricky to list contents of the real refs/ folder over HTTP)	18:12
jmd	svn's merge is a three way merge. If git allowed merging a dirty working directory, it would be a four way merge.	18:12
rhl	grawity: well, refs isn't under info	18:12
	is this supposed to be generated by git.cgi ?	18:12
grawity	rhl: if you use the smart-HTTP backend, then it will reply to these requests transparently	18:12
	rhl: (the actual file only needs to exist for dumb-HTTP cloning, and is usually generated through a post-update hook, using git update-server-info)	18:13
	→ asQuirreL joined	18:13
	← Snibble1 left	18:13
	→ Snibble joined	18:13
grawity	rhl: although, does git.cgi actually point to git-http-backend (the smart-HTTP server)?	18:13
rhl	grawity: git.cgi says: /usr/libexec/git-core/git-http-backend "$@"	18:13
grawity	aha	18:14
	and it is executable, and has #!/bin/sh on top, right?	18:14
rhl	indeed	18:14
	/bin/bash, but yet.	18:14
	yes**	18:14
grawity	hmm	18:14
rhl	grawity, is it possible that the rewriterules aren't working, or that my clone url is incorrect?	18:15
grawity	not sure; maybe try the example configuration from `man git-http-backend`?	18:15
gitinfo	the git-http-backend manpage is available at http://jk.gs/git-http-backend.html	18:15
	← mmitchell left	18:15
dropdrive	iveqy, bamj0rb: Thanks. Is it fair to assume that git-add and git-commit will never modify files in GIT_WORK_TREE?	18:15
	→ mmitchell joined	18:15
grawity	if Apache says that info/refs does not exist, then it probably does mean that none of the git.cgi rewrite rules matched	18:15
	→ hobodave joined	18:16
	→ kenperkins joined	18:16
	→ doliver joined	18:16
rhl	the ScriptAliasMatch looks very similar to one of the rewrite rules	18:17
	→ sfz joined	18:17
	← etcetera left	18:18
	← galaris left	18:18
	→ dreiss joined	18:19
	← mmitchell left	18:20
	→ lun__ joined	18:20
	→ interru joined	18:20
	← doliver left	18:21
	→ gdoteof joined	18:21
gdoteof	i have a build process that makes my index.html file; where before i was manually making it. so i want to keep index.html out of hte repo and instead have templates/index.html	18:22
	and that works	18:22
	but if i add index.html to my gitignore it ignores templates/index.html	18:22
	→ lmat joined	18:22
gdoteof	if i do ./index.html it doesn't seem to work at all	18:22
	how can i have ./index.html ignored but leave templates/index.html in the repo	18:23
	→ arvind_khadri joined	18:23
gdoteof	without doing -f and always seeing the built index.html in my git status	18:23
	← khushildep left	18:23
	→ swair joined	18:24
	→ Kayra joined	18:24
	→ Squarism2 joined	18:25
canton7	gdoteof, /index.html ?	18:25
	→ tty-1 joined	18:26
	→ simesy joined	18:26
	→ BiggFREE joined	18:26
	← devbug left	18:26
rhl	grawity: do you know anyone who is really good with git and apache?	18:26
	→ galaris joined	18:27
lc0dd0cl	any users of git/cygwin notice vi behaves weird on git commit?	18:27
	← galaris left	18:27
rhl	or can I provide you with more information to help get my issue resolved. the only person in webfaction support is china based and wont start working until 6pm tonight (current time 10am) i was hoping to fix this problem..	18:27
	→ ciampix joined	18:27
	← arkygeek left	18:28
	→ ezio joined	18:28
	← Retep998 left	18:28
	→ conan joined	18:30
	→ johnnyfuchs joined	18:30
	← pbujok left	18:30
	← simesy left	18:30
	→ thiago joined	18:30
	← mustmodify left	18:30
	← thiago left	18:31
	→ thiago joined	18:31
	→ jhulten joined	18:32
	← Ertac left	18:32
	← mizu_no_oto left	18:33
	← Etheco left	18:33
	← btree_ left	18:34
	→ BitRaptor64 joined	18:34
	← tplaner left	18:35
	→ Ozch joined	18:35
	→ jfoy joined	18:36
	← glebihan left	18:36
	→ lithiumn joined	18:36
	→ glebihan joined	18:36
	← admin_ left	18:36
	→ ferdev joined	18:37
	← Artpicre left	18:37
	← ferdev left	18:38
	→ primitive joined	18:38
	← ezio left	18:38
	← ojacobson left	18:38
	→ ldiamond joined	18:39
ldiamond	Is there a way to debug git failure to connect to a https server?	18:39
	I.e. know if the connection failed due to git or the server	18:40
	if git refuses the certificate or something	18:40
	← pdimitrov left	18:40
	← thiago left	18:40
ldiamond	http.sslVerify=false works.	18:40
	← takamichi left	18:40
	→ pdimitrov joined	18:40
	→ DrShoggoth joined	18:40
ldiamond	but I did set http.sslCAInfo	18:40
	← conan left	18:40
	← pr0ggie left	18:41
	← FernandoBasso left	18:41
	→ Artpicre joined	18:41
	← apipkin left	18:41
knighthawk	I want to merge a branch but not from it's head. How would I do that? something like 'git merge <targetbrancch>~2'	18:41
	← shoshin left	18:41
knighthawk	no clue if that syntax would work or not.	18:41
PerlJam	knighthawk: try it :)	18:42
	→ Watabou joined	18:42
	→ etcetera joined	18:42
	→ shoshin joined	18:43
grawity	ldiamond: GIT_CURL_VERBOSE=1	18:43
ldiamond	ah cool, will try that	18:43
	→ anderse joined	18:43
	→ neo1691 joined	18:44
ldiamond	works. gives all the info I need.	18:44
	← D9_ left	18:44
ldiamond	client side issue	18:45
	← jarr0dsz left	18:45
	→ snql joined	18:46
	→ aard joined	18:46
	← Devastator left	18:48
	← raonyguimaraes left	18:48
	→ thiago joined	18:50
	→ Devastator joined	18:50
	← macrover left	18:50
	← kevwil left	18:51
	← twoface88 left	18:51
	← CKyle left	18:51
	→ bwreilly joined	18:52
	→ Mars__ joined	18:52
	← bwreilly left	18:52
bamj0rb	dropdrive: Define "modify"? :-/ git-add and git-commit do modify the working directory. git-add adds changes to the index. git commit turns the index into a proper commit object.	18:52
wooy	hi, is it ok to remove remote branch?	18:52
grawity	bamj0rb: the index is not part of the working directory, however	18:53
	bamj0rb: well, partially I guess?	18:53
	→ galaris joined	18:53
grawity	wooy: yes	18:53
bamj0rb	grawity: I never said it was. :)	18:53
	Oh, sorry, I meant DO NOT modify the working directory.	18:53
wooy	grawity: cheers	18:53
grawity	wooy: just noting that `git branch -r -d` doesn't actually delete remote branches, just their local copies – the next `git fetch` will bring them back	18:54
wooy	roger	18:54
	← Luke-Jr left	18:54
	→ jceb_ joined	18:54
	→ pr0ggie joined	18:55
	→ notjohn joined	18:55
	→ Luke-Jr joined	18:55
grawity	it is only `git push --delete` (or pushing an empty ref) that actually nukes the branch on the server	18:56
	→ pbujok joined	18:56
	← Mars__ left	18:56
	→ vurma joined	18:56
	→ CreativeEmbassy joined	18:57
	→ bwreilly joined	18:57
	← lithiumn left	18:57
	→ mdiers joined	18:57
	→ CKyle joined	18:58
	← thiago left	18:59
	→ lithiumn joined	18:59
	→ drizzd joined	18:59
	scorphus` → scorphus	18:59
	← scorphus left	18:59
	→ scorphus joined	18:59
	JakePee_ → JakePe	19:00
	JakePe → JakePee	19:00
	→ renatow_ joined	19:00
	→ thiago joined	19:01
	← renatow left	19:01
	← sriracha left	19:01
	← pbujok left	19:02
	→ sriracha joined	19:02
	← Watabou left	19:02
	→ deanclkclk joined	19:02
	→ bitfed joined	19:02
deanclkclk	folks...how do I check if I have access to a remote repo?	19:02
	ever before I clone it?	19:02
grawity	a) try cloning it and see if it fails :P	19:03
	b) `git ls-remote $URL`	19:03
	← Gavrisimo left	19:03
	→ unreal_ joined	19:04
	← Asenar left	19:04
bitfed	Question: Is there any way to find out what the latest stable branch is if there is no branch named "stable"?	19:05
	← frgtn left	19:05
jmd	bitfed: No.	19:05
bitfed	Cool, thanks	19:05
grawity	bitfed: by asking the developers	19:05
	→ frgtn joined	19:05
bitfed	I already did sort of	19:05
	→ Watabou joined	19:06
grawity	it is basically out of scope for Git – even if you sorted branches by activity date or something, Git still wouldn't know the purpose of any branch	19:06
	← koda left	19:06
	emmajane\|afk → emmajane	19:06
	Bucciarati_ → Bucciarati	19:06
jmd	Some projects don't have a stable branch.	19:06
	← unreal left	19:06
	unreal_ → unreal	19:06
bitfed	Am I right to think that having a clone of the latest stable under it's own branch called "stable" is the closest way to approximate this functionality?	19:06
jmd	??	19:07
	← angelsl left	19:07
grawity	some projects call 'master' the "stable" branch and 'devel' the unstable one	19:07
jmd	what functionality?	19:07
	← frgtn left	19:07
grawity	some projects have 'stable' or 'vX.Y.Z' branches, and use 'master' for main development	19:07
	→ frgtn joined	19:07
bitfed	Thanks grawity, you nailed it	19:07
grawity	in other words, the branching scheme is entirely up to you	19:08
	← germanoak left	19:08
grawity	several people have written blog posts about their "Git workflows", those might be useful as examples	19:08
jmd	What I object to in git is the fact that they are called "branches". They are not branches in any sense of the word.	19:08
bitfed	Cool thanks for the ans	19:08
	← mdiers left	19:08
bitfed	I'd seen stable branches before, just not on one of my most used repos	19:09
jmd	They should be called "forks" or something.	19:09
cbreak	why?	19:09
	they are branches	19:09
	→ xobb_ joined	19:09
	← ezakimak_work left	19:09
cbreak	the merge base is the fork	19:09
grawity	because everybody likes inventing new terminology	19:09
	scorphus → scorphus`	19:09
cbreak	maybe we could call them leaves	19:10
	→ kirin` joined	19:10
	bitfed names his "smegma"	19:10
grawity	cbreak: nah, Fossil already does that	19:10
bitfed	And in the leaves we will have tweets.	19:10
	→ TomyLobo joined	19:10
cbreak	I like leaves.	19:10
	→ pepper_chico joined	19:10
cbreak	jmd: git internally they are called refs/heads	19:11
grawity	Hg would probably just use the term 'heads'	19:11
	← xobb left	19:11
jmd	"heads" would be better.	19:11
	scorphus` → scorphus	19:12
	← _Vi left	19:12
	← thierryp left	19:12
jmd	"Branch" implies that there is some sort of heirachy, which in git there is not.	19:12
	→ shruggar joined	19:13
grawity	usually there is, it's just not tracked by Git	19:13
	← frgtn left	19:13
jmd	Well, if there is, it has to be manually maintained.	19:13
cbreak	jmd: why does it imply that?	19:13
	→ frgtn joined	19:13
jmd	Well "branch" is a metaphor from arborial terminology.	19:14
	→ jnavila joined	19:14
	→ lite_ joined	19:14
	→ ezio joined	19:14
	← ezio left	19:14
	→ ezio joined	19:14
cbreak	yeah. And there, all branches are part of the same tree	19:14
	← decotii left	19:15
jmd	But which is the trunk? And which branch is the parent of which other one?	19:15
	← frgtn left	19:15
cbreak	trunk?	19:15
	← ciampix left	19:15
cbreak	branches are all equal	19:15
	→ frgtn joined	19:15
jmd	cbreak: Exactly. That is my point.	19:15
cbreak	they split at parts	19:15
	like with tree branches	19:15
	← freeed left	19:16
jmd	No. Have you ever seen a tree?	19:16
cbreak	but if you go further down, they all go to the root	19:16
	the root is obviously part of all branches	19:16
	← YoungFrog left	19:16
cbreak	just like with git	19:16
	of course, git has merging, which real trees don't do.	19:16
jmd	"Branches" are not all equal. They have a parent child relationship. Unlike in git.	19:16
	← Kayra left	19:16
	→ alvaro_o joined	19:16
cbreak	jmd: not really.	19:16
	← lite_ left	19:16
PerlJam	cbreak: real trees can merge.	19:17
cbreak	if you follow the branch you come to the root	19:17
	→ rafaqueque joined	19:17
	→ decotii joined	19:17
cbreak	PerlJam: I doubt it is commonly conflict free	19:17
jmd	Yes Really. A proper config management tool indeed has real branches. I suppose git called them branches so as to make people think thats what it was.	19:17
	→ thierryp joined	19:18
cbreak	not really.	19:18
	git has called them branches because they are.	19:18
	→ kevwil joined	19:18
jmd	Yes. Really.	19:18
	← alexander__b left	19:18
PerlJam	jmd: what are "real branches"?	19:18
cbreak	PerlJam: they grow on trees	19:18
	→ PaulCapestany joined	19:18
cbreak	see above.	19:18
jmd	A branch is the child of its parent.	19:19
	→ cyphase joined	19:19
cbreak	no. have you ever seen a tree?	19:19
	they don't make children.	19:19
jmd	There is no parent of a git branch.	19:19
cbreak	they make new trees, with seeds	19:19
	branches are unrelated to that	19:19
	a branch is just the behavior of splitting up of a tree structure	19:20
	← jwmann left	19:20
cbreak	a young tree might only have one branch	19:20
	(the stem)	19:20
jmd	cbreak: Well thats what git means by "branch", but its not what other SCMs mean.	19:20
cbreak	but as it grows, it splits up into many more branches	19:20
	→ DaisyTheCow joined	19:20
jmd	It confused the hell out of me when I first started using git.	19:21
cbreak	but if you trace those branches, they all end in the root	19:21
	jmd: how so? It's quite natural	19:21
jmd	cbreak: No. It's totally unnatural.	19:21
	← DaisyTheCow left	19:21
	→ jwmann joined	19:21
	→ DaisyTheCow joined	19:22
PerlJam	This has got to be the weirdest conversation I've stepped into on IRC today	19:22
cbreak	PerlJam: you should join ##c++	19:22
jmd	I spent two days wondering why I couldn't see a branch's changes in the child branches.	19:22
PerlJam	no thanks. Been there, done that.	19:22
cbreak	jmd: ?	19:22
PerlJam	jmd: "child branches"?	19:22
	← d8bhatta left	19:23
cbreak	then you found rebase?	19:23
	(or merge :)	19:23
	← Samual left	19:24
jmd	merge/rebase is totally orthogonal to the issue. My point is that branches have a parent/child relationship. In git, they don't. Ipso facto, "branch" is a misleading term.	19:24
cbreak	I've never seen parent and child branches.	19:24
	you sound confused.	19:24
	→ here joined	19:25
PerlJam	jmd: It sounds to me like you just had the wrong metaphor for branching.	19:25
	→ snag joined	19:25
jmd	Because you've never used a Software Configuration Management tool.	19:25
	PerlJam: Well, a different one to what the inventor of git had.	19:25
	→ User458764 joined	19:26
cbreak	jmd: what's that good for?	19:26
jmd	what?	19:26
	→ Ertac joined	19:26
cbreak	a software configuration management tool	19:26
here	howza all i'm wondering how to do `git pull --rebase` in two steps using fetch and merge	19:26
jmd	For managing the configuration of software?	19:26
PerlJam	jmd: at the very least. but I've used other revision control systems before git and I saw nothing incongruous with git's idea of branching with the branching I was familiar with.	19:26
cbreak	I make my programs so that they can store their settings themselves	19:26
grawity	here: you don't	19:26
cbreak	your software must be quite limited if it can't even do that	19:27
grawity	here: `git pull --rebase` doesn't merge – it rebases	19:27
	← Droolio left	19:27
	→ pantsman joined	19:27
cbreak	jmd: something like an xml library?	19:27
PerlJam	here: step 1) git fetch step 2) git rebase :-)	19:27
	← kevwil left	19:27
jmd	In a proper SCM, one can make a change in a branch, and that change will automatically show up in all children of that branch.	19:28
PerlJam	jmd: can you give an example of a system that meets this criterion?	19:28
cbreak	jmd: that sounds stupid	19:28
here	perljam: hmm is it possible to rebase onto a future commit (like pull --rebase)	19:28
jmd	PerlJam: Aegis, Clearcase ...	19:29
cbreak	jmd: why would anyone want something like that?	19:29
	→ Bass10 joined	19:29
grawity	here: 'future commit'? what does that even mean?	19:29
cbreak	jmd: and what does that have to do with config files?	19:29
grawity	here: if you can pull or fetch a commit, it's not a 'future' commit, it's an existing commit	19:29
cbreak	sounds like you're mixing up things	19:29
jmd	cbreak: Nothing.	19:29
	→ oojacoboo joined	19:29
	← destiny left	19:30
here	grawity: origin: A-C local: A-B , from local git fetch origin and git rebase C ... C is what i was calling a 'future' commit -- i'm sure there is a better term .	19:30
	→ destiny joined	19:30
	← Snibble left	19:31
here	grawity: sorry backwards . origin: A-B local A-C result A-B-C	19:31
jmd	I am not mixing things up. I'm just explaining how branches (not in git's sense of the word) work. You say it "sounds stupid" because you're experience it limited to git-like SCMs	19:31
	→ kerrick joined	19:31
cbreak	I've also used svn a bit.	19:32
PerlJam	jmd: or ... the tools I've used that touted themselves as "software configuartion management" tools had no concept of "branching". They had the concept of "nesting" or perhaps "inheritance", but not "branching"	19:32
cbreak	it had branches similar to git (just implemented in a braindead way....)	19:32
	← chuckharmston left	19:32
	← ZoanthusR left	19:33
cbreak	and it didn't automatically merge like you describe	19:33
	← renatow_ left	19:33
	→ chuckharmston joined	19:33
jmd	Well whatever you call them thats the way it normally works. Unfortunately not in git.	19:33
	cpg\|away → cpg	19:34
	→ crazydiamond joined	19:34
PerlJam	jmd: Can you give an example SCM tool/system that uses the "branching" terminology?	19:34
cbreak	beware of leerpN. He seems to be a spammer.	19:34
jmd	PerlJam: Didn'T I just do that 2 mins ago?	19:35
cbreak	jmd: a successfull one.	19:35
	← howlymowly_ left	19:35
PerlJam	oh, sorry. Missed it.	19:35
	← chuckharmston left	19:36
grawity	here: I think 'upstream' or 'remote' would be something closer	19:36
	here: so you do `git fetch origin` and `git rebase origin/branchname`, for example	19:36
	← franksta-imac left	19:36
	← ezio left	19:36
	← arvind_khadri left	19:37
	← bwreilly left	19:37
	→ ezio joined	19:37
	← ezio left	19:37
	→ ezio joined	19:37
jmd	Anyway I wish git would call them "threads" or "heads" or anything but "branches". When I'm teaching git, I have to spend 45 mins explaining to the students that they are not really "branches".	19:38
	→ Snibble joined	19:38
cbreak	jmd: you're lying to students? why?	19:38
	jmd: of course git has branches	19:38
grawity	heh, it's always fun to have a teacher who thinks they know the technology so much better than everyone else	19:39
cbreak	maybe you should try to actually understand git instead of teaching your misconceptions from some weird fringe software products :)	19:39
here	grawity: thanks , thats what i was looking for . i ended up with `git fetch` followed by `git rebase FETCH_HEAD`	19:39
grawity	(often, they don't)	19:39
jmd	Not in the sense that intuition would lead anyone to think of as a "branch".	19:39
Hello71	s/often, //	19:39
cbreak	the only branch related misconception I've heard so far from people I taught git to was that they thought that a branch stops at the merge base (while in fact it stops at the root commits)	19:40
	but that's an easily fixed misunderstanding	19:40
	→ bwreilly joined	19:41
adamm	if you view git as a multi-version file system, then by that definition, it must has branches (of history).	19:42
PerlJam	jmd: Can you give me a URL that describes changes in a branch flowing to "subbranches" in either Aegis or Clearcase?	19:42
	← Davey left	19:42
	→ Samual joined	19:43
	→ Davey joined	19:43
	→ attermr joined	19:43
jmd	PerlJam: See the Aegis user manual.	19:43
cbreak	the only thing I heard about clearcase is that it's a pile of garbage	19:43
	apparently you need full time admins to keep it running :)	19:43
	→ threesome joined	19:43
jmd	cbreak: Well that is true...	19:43
PerlJam	cbreak: completely orthogonal to the branching issue ;)	19:44
	← mitsuhiko_ left	19:44
	← thiago left	19:44
	→ Chiftin joined	19:44
	→ rabbite joined	19:45
cbreak	PerlJam: maybe it's so bad because they misunderstood branches	19:45
	PerlJam: or something even more basic like commits	19:46
	→ admin_ joined	19:46
	← nwertman_ left	19:46
	← ezio left	19:47
	→ mitsuhiko joined	19:47
	→ ndngvr joined	19:47
	→ crater2150 joined	19:48
	→ xys_ joined	19:49
	→ felher joined	19:49
	← lithiumn left	19:49
	← bitfed left	19:51
	→ sgu joined	19:51
	→ leeN joined	19:51
sgu	Hi all, what's difference between `git merge --squash` and `git rebase`?	19:51
PerlJam	sgu: the latter is more powerful with all of the options you may use.	19:52
	← kcj left	19:52
	→ _Vi joined	19:52
	r0bby_ → robbyoconnor	19:52
	→ Mars__ joined	19:52
jmd	sgu: git merge --squash does a merge, but squashes tthe local commits into one.	19:52
	← Devastator left	19:53
	→ Devastator joined	19:53
	← aard left	19:53
	→ Kayra joined	19:53
jmd	git rebase applies the local commits at the end of the remote trackign branch.	19:53
	→ aard joined	19:53
	→ Mars___ joined	19:54
	emmajane → emmajane\|afk	19:55
	→ ezakimak_work joined	19:55
sgu	PerlJam, jmd: If the current branch is A, `git merge --squash B` (followed by a commit) and `git reabse B` generates the exactly same commit and commit history?	19:56
	→ rgoytacaz joined	19:56
	← defaultro left	19:56
	← Mars__ left	19:57
jmd	sgu: Under some circumstances it could do.	19:57
	→ eaj joined	19:57
	chovy_ → chovy	19:57
	← linduxed left	19:57
	← King_Hual left	19:58
	← spaceonline left	19:58
jmd	But not if the remote branch has changed since it was last pulled.	19:58
	← papegaaij_ left	19:58
rgoytacaz	Hello there, due to a fast-forward some images were deleted which I would like to get back, so I did a get checkout, because reverting doesn't see to restore those files from the fast-forward.	19:58
	← Mars___ left	19:59
rgoytacaz	is there a way to make the current checked out commit, HEAD?	19:59
	and abandon everything else?	19:59
grawity	technically HEAD always is the current checked out commit	19:59
	← DaisyTheCow left	19:59
	→ guns joined	19:59
grawity	but if you meant making it the branch head, use `git reset` or `git checkout`	19:59
	← matteo left	20:00
grawity	if you're currently on a branch and want to move it to another commit, do `git reset --hard <commit>`	20:00
sgu	jmd: So the behavior of git rebase depends on the remote branch? Any documentation for more details?	20:00
grawity	if you're currently on a commit (detached) and want to put a branch there, do `git checkout -B <branch>`	20:00
	end result is the same, though	20:00
cbreak	sgu: the behavior of rebase depends on what you tell it to do	20:00
	sgu: if you just give it a commit, then it will take the current commit, the one you told it about, calculates the merge base, takes all commits since the merge base reachable from your current commit, and applies their changes in order onto the commit you told it about	20:01
	sgu: effectively changing the merge base of the current commit	20:01
	← diegoviola left	20:01
cbreak	(naturally, the current commit will have changed afterwards)	20:02
	← galaris left	20:02
cbreak	merge --squash just makes a normal merge, but ignores all other heads when making the merge commit, so it'll be a normal commit (just one parent, instead of many)	20:02
	they are completely unrelated	20:02
	← notjohn left	20:02
rgoytacaz	grawity: Im currently on deatched head, but master is like 7 commits ahead, inclusing two silent ff which erased stuff	20:03
grawity	rgoytacaz: so which commit do you want to point 'master' to?	20:03
cbreak	rgoytacaz: ff NEVER erase stuff	20:03
grawity	cbreak: they do, if one of the commits did	20:04
	← eaj left	20:04
	← tvw left	20:04
cbreak	rgoytacaz: they are fast forward because you had no stuff that could be erased	20:04
	rgoytacaz: if you had any stuff, then it would be a merge that can't be fast forwarded	20:04
	→ eaj joined	20:04
	← jceb_ left	20:05
	→ halfdan joined	20:05
	← asQuirreL left	20:05
	→ germanoak joined	20:05
	→ thiago joined	20:05
	← germanoak left	20:05
	→ takamichi joined	20:05
	gitinfo set mode: +v	20:05
rgoytacaz	grawity: my current checkout commit.	20:06
	→ germanoak joined	20:06
grawity	rgoytacaz: git checkout -B master	20:06
	→ marccollin joined	20:06
halfdan	I'm trying to checkout an old branch "foo" - it fails because on master several directories were replaced by submodules and the checkout would override the files in the submodule directories. How can I checkout my old branch?	20:06
	← frgtn left	20:06
marccollin	i cloned kernel and i search a way to get : nouveau master branch (http://cgit.freedesktop.org/nouveau/linux-2.6/commit/?id=968a8d1b6c32c9f466f236032770b9165ece045a) and put it locally to my cloned kernel	20:06
	← pepper_chico left	20:07
	← glosoli left	20:07
	→ frgtn joined	20:07
	→ gkze joined	20:07
	→ kevwil joined	20:07
gkze	Hey guys I have a question	20:08
	I currently have a directory where a bunch of repos reside	20:08
	and I want to make a super-repo two directory levels above that	20:08
lmat	gkze: delete them all.	20:08
	oh..	20:08
	← jkremser left	20:08
	→ Norm_ joined	20:08
gkze	how can git init in ../../	20:08
	and add those repos as existing submodules?	20:09
	← eaj left	20:09
halfdan	move them out of the directory	20:09
	git init and then add the submodules	20:09
grawity	cd ../.. && git init && ...	20:09
	← DANtheBEASTman left	20:09
grawity	don't need to move them anywhere	20:09
rgoytacaz	grawity: oh i see.. after that there's still tons of commits ahead 7. I don't want to ff those, just discard. Should I do git reset or something?	20:09
grawity	... && git submodule add <url> foo/bar	20:09
	← babylon9 left	20:09
grawity	rgoytacaz: no	20:09
	← nhmood left	20:10
grawity	rgoytacaz: you've already "reset" your local branch to that commit you want	20:10
	rgoytacaz: if you want to "reset" the one on the server as well, it's `git push --force`	20:10
	→ longbeach joined	20:10
grawity	rgoytacaz: but note that if anyone else already has pulled those 7 commits, then they will also need to `git reset` their own repositories	20:10
	well, something like `git fetch origin && git reset origin/master`	20:11
	← JesseC left	20:11
	→ JesseC joined	20:11
gkze	I already have a system in place to manage those repos	20:11
	Vundle to be specific	20:11
rgoytacaz	grawity: I see, thats exactly how it got messed up.	20:11
gkze	is that going to mess with vundle?	20:11
	→ nwertman joined	20:12
	← frgtn left	20:12
grawity	rgoytacaz: if they do not reset to the same commit, then their git will think those commits are actually new, and it'll try to merge or fast-forward them again	20:12
	→ yargy joined	20:12
rgoytacaz	grawity: exactly.. thanks.	20:12
grawity	so again – if you're on a branch and want to move it to a specific commit, use `git reset`	20:12
	← hwrd\|work left	20:13
	→ joshbetz joined	20:13
	← petey left	20:13
	→ petey joined	20:14
	← shoshin left	20:14
	→ ezio joined	20:15
	← ezio left	20:15
	→ ezio joined	20:15
	← ezio left	20:16
	← SocalNick left	20:16
	→ ezio joined	20:16
	← Shaladdle left	20:16
	← Raging_Hog left	20:18
	← petey left	20:19
	← etcetera left	20:19
	→ LeMike joined	20:19
	→ nhmood joined	20:20
	← nhmood left	20:20
	← DrShoggoth left	20:20
	← freestyl3r left	20:20
	→ nhmood joined	20:20
	← nhmood left	20:20
	← joki left	20:20
	→ nhmood joined	20:20
	← nhmood left	20:20
	→ nhmood joined	20:20
	← nhmood left	20:20
	← bartzy left	20:21
	← gdoteof left	20:21
LeMike	hi there. i need some help with a workflow. if i have a submodule, and want to add a folder to it, then this won't go into my real repo with "git add" because the folder is within the submodule. but I want that particular folder in the repo i create and at the position it shall be (within the submodule later on).	20:21
	→ DrShoggoth joined	20:21
	→ nhmood joined	20:22
	← iamjarvo_ left	20:22
	→ etcetera joined	20:22
rgoytacaz	grawity: Cool, thanks again. since the project was already with some fellow workers, we had to delete it and clone it again, because git fetch and reset wasn't doing it =/	20:22
	→ freestyl3r joined	20:22
	→ iamjarvo joined	20:22
cbreak	LeMike: submodules are separate repositories.	20:23
	LeMike: so, think of something else, I guess?	20:23
	→ mmitchell joined	20:23
cbreak	from the outside, a submodule is a commit entry in the tree	20:23
	from the inside, it's a stand alone git repository	20:23
	→ JGarrido joined	20:24
LeMike	yee. and i accept the restriction. makes total sense. but is there any good solution you would suggest, to have an own folder within the submodule later on? i am hoping for a solution where i do not need to symlink manually	20:25
	→ hiroyuki_ joined	20:25
	→ joki joined	20:25
	← zarubin left	20:26
	→ simesy joined	20:26
	← snql left	20:27
	→ sq-one joined	20:27
cbreak	LeMike: you can commit it in the submodule.	20:27
	← rgoytacaz left	20:28
	← hiroyuki left	20:28
	→ gdoteof joined	20:28
	→ renatow joined	20:29
	→ galaris joined	20:29
LeMike	hm. okay. but then it would be in the repo of the submodule, right? (if i could push) .. but when i have the same "submodule" accross multiple projects, they would all get that code.	20:30
	← ianmcorvidae left	20:30
DolphinDream	when i merge branch A into branch B into a SHA1 commit ..can i edit the SHA1 commit to change something on branch A ? can i squash a subsequent commit after merge with the merge commit ?	20:30
	→ ianmcorvidae joined	20:30
	← Jackneill left	20:31
	→ tvw joined	20:31
LeMike	DolphinDream: you might search for --no-commit i guess	20:31
	← simesy left	20:31
DolphinDream	merge with no commit ?	20:31
	after i make my edit and commit.. will that appear as a merge commit ?	20:32
	← galaris left	20:32
	→ hwrd\|work joined	20:32
	→ galaris joined	20:32
LeMike	hm. dunno that. give it a try in a new branch ;)	20:32
	← paulweb515 left	20:33
	← hwrd\|work left	20:33
	← ezio left	20:33
sgu	Hi all: I encounter a merge conflict: when I use `git merge -s recursive -X theirs master`, git cannot resolve a merge conflict for a binary file(both modified), and the file is shown in `git status` as unmerged path, if I want to keep the file from master, which command should I use?	20:33
	→ swair_ joined	20:33
LeMike	git checkout master /path i guess sgu	20:34
	← snag left	20:34
LeMike	hope the conflict lets you do that	20:34
	→ SocalNick joined	20:35
	→ calcifea_ joined	20:35
	→ petey joined	20:36
	← calcifea left	20:36
	← rgr left	20:36
	← swair left	20:37
	← jonez left	20:37
	swair_ → swair	20:38
	← kjn left	20:39
	← gkze left	20:40
_ikke_	sgu: git checkout --theirs path/to/file	20:40
sgu	Thanks.	20:40
	→ ciampix joined	20:40
	← gdoteof left	20:41
arand__	(And git add after that)	20:41
	← h0bbit_ left	20:42
	← Ertac left	20:43
	← neo1691 left	20:43
	← Snibble left	20:43
bamj0rb	Protip: git checkout <commit> <path> adds <path> to the index automatically.	20:44
	← freestyl3r left	20:45
_ikke_	git checkout --theirs / --ours is an exception	20:45
	← DrNick left	20:46
_ikke_	ie, it checks it out from the index to the working tree, the index is still in the conflict state, until you add the file back to the index	20:46
	→ zhost joined	20:47
	← abelsiqueira left	20:47
	← lugzer left	20:48
	→ kevinold joined	20:48
	→ frgtn joined	20:48
	→ lugzer joined	20:48
	← shuaib left	20:48
	→ felixsamora joined	20:49
	→ freestyl3r joined	20:49
	→ jonez joined	20:50
	← freestyl3r left	20:50
	← petey left	20:50
sgu	Hi all: Is there a way to find out the history of a file which has been deleted in HEAD?	20:50
	→ jnavila_ joined	20:50
	← jnavila left	20:50
	jnavila_ → jnavila	20:50
	← Kayra left	20:51
grawity	yeah, just `git log` (`git log -- path/to/file` is probably needed, to tell git that it's specifically a path name)	20:51
	→ freestyl3r joined	20:51
	← Squarism2 left	20:51
	→ Kayra joined	20:51
	← freestyl3r left	20:52
	→ hwrd\|work joined	20:52
	← hwrd\|work left	20:52
	→ zarubin joined	20:52
	← lugzer left	20:53
	→ gdoteof joined	20:53
	→ GT4066 joined	20:53
	→ snql joined	20:54
	→ Mars__ joined	20:54
	→ chuckharmston joined	20:54
	→ alphpt joined	20:54
	gitinfo set mode: +v	20:55
	→ freestyl3r joined	20:55
	→ cff_ joined	20:55
	← nwertman left	20:55
	← iamjarvo left	20:56
	← m0ltar left	20:56
	← calcifea_ left	20:56
	→ iamjarvo joined	20:56
	→ calcifea joined	20:56
	← Kayra left	20:56
	← TheMoonMaster left	20:56
	← LBV_User left	20:57
	← TheBrainWork left	20:57
alphpt	hi. I'm using git version 1.8.4.msysgit.0 (windows). since this version I've been noticing weird behaviour in git rebase. seldom when rebasing a bunch of changes on top of another branch fails with merge conflicts, where merge conflicts were not expected. after `git rebase --abort` and `git rebase` once again, it succeeeds. is this issue known?	20:57
	→ gkze joined	20:58
	→ faBimon joined	20:58
	→ pbujok joined	20:58
	→ Snibble joined	20:58
	→ DrNick joined	20:58
alphpt	I also have a running app which runs `git status` in the background every now and then, and I have yet to see this heisenbug occur when this background app is not running	20:59
	→ malkomalko joined	20:59
	← marccollin left	20:59
	← iamtakingiteasy left	20:59
	→ nwertman joined	20:59
cbreak	alphpt: maybe windows is dumb.	20:59
	I heard it can only open a file in one single application	20:59
	if you try to open it in a second, it'll fail	21:00
tang^	that's application dependent	21:00
	→ neo1691 joined	21:00
	← DrShoggoth left	21:00
	→ rafeca joined	21:00
	← rafeca left	21:00
	→ TheMoonMaster joined	21:00
alphpt	when looking at the changes git tells me are conflictual, I notice they are the inverse changes of the previously rebased commit, as if the previously rebased commit was added to history, but its changes were not reflected in disk	21:00
	→ bartzy joined	21:01
cbreak	I'd blame windows. Because it's the most likely suspect.	21:01
	→ DrShoggoth joined	21:01
grawity	._.	21:02
	→ asQuirreL joined	21:02
	→ tpollard joined	21:02
	→ simesy joined	21:02
sgu	grawity: need to use `git log --follow -- path/to/file` to show the history files which has been deleted in HEAD.	21:02
grawity	you know, for someone who seems to know so much about git, you start looking really stupid when you bash Windows based on something you only "heard"	21:03
	← cmpera left	21:03
	← pbujok left	21:03
	← GT4066 left	21:03
	→ matanya joined	21:03
cbreak	grawity: nah. It makes sense.	21:04
	← crazydiamond left	21:04
	→ paulweb515 joined	21:04
cbreak	grawity: the symptoms match too	21:04
	← macabre left	21:04
	cehteh_ → cehteh	21:05
	← jmd left	21:06
	← iamjarvo left	21:06
	← matanya left	21:07
	→ devbug joined	21:07
tang^	I have seen this behaviour as well... shows up most when two different apps are manipulating git at the same time	21:07
	← Watabou left	21:07
	← Mars__ left	21:07
	→ iamjarvo joined	21:07
	→ Mars__ joined	21:07
	← Mars__ left	21:08
cbreak	my hypothesis is that since windows is weird, only one of the two programs can open the file	21:08
	← faBimon left	21:08
cbreak	the other somehow fails, and treats that failure as empty file instead of actually failing	21:08
	→ Mars__ joined	21:08
	← CreativeEmbassy left	21:08
cbreak	so you somehow get an inverse patch	21:08
	→ jerius_ joined	21:08
	→ iamtakingiteasy joined	21:08
alphpt	hm	21:08
	→ matanya joined	21:09
	→ Watabou joined	21:09
alphpt	thanks, this was already helpful, putting it into words	21:09
	I will turn myself to the mailing list	21:10
	→ abrkn joined	21:10
	← jerius_ left	21:10
	← jerius left	21:10
	→ macabre joined	21:10
	← jnavila left	21:11
here	hi again :) i've moved a directory of files into a subdirectory and git status is showing the files as deleted/new rather than renamed -- any tricks to helping git see that it was a move ?	21:12
Snibble	git mv instead of mv?	21:13
	← thierryp left	21:13
	→ wrouesnel1 joined	21:13
	→ thierryp joined	21:13
	→ Sonderblade joined	21:13
	← Sonderblade left	21:13
	→ iamjarvo_ joined	21:13
	← attermr left	21:14
	→ Sonderblade joined	21:14
	← gkze left	21:14
	→ SporkWitch joined	21:15
	← SporkWitch left	21:15
	→ SporkWitch joined	21:15
	→ wrouesnel2 joined	21:15
	← SporkWitch left	21:15
	→ SporkWitch joined	21:16
	← SporkWitch left	21:16
	→ SporkWitch joined	21:16
	→ m0ltar joined	21:16
_ikke_	here: It doesn't really matter	21:16
	← zapb left	21:16
_ikke_	here: Because it isn't stored anyway.	21:16
cbreak	here: just commit	21:16
	here: then you can tell it to -M or -C in git log --stat :)	21:17
_ikke_	here: What does matter though is that you probably made changes to the file at the same time	21:17
	← iamjarvo left	21:17
cbreak	(both allow specifying the required similarity)	21:17
_ikke_	here: Which make it harder for git to detect renames / copies	21:17
	→ alexander__b joined	21:17
	→ Kayra joined	21:18
	→ cmpera joined	21:18
	← thierryp left	21:18
	← alphpt left	21:18
	← kevwil left	21:19
	← JGarrido left	21:19
	→ aldodelgado joined	21:20
	← davividal left	21:20
	→ \|Freeman\| joined	21:20
	← zarubin left	21:21
	← thiago left	21:21
	→ kevwil joined	21:21
	← rabbite left	21:22
	→ YoungFrog joined	21:22
	← halfdan left	21:22
	→ bakers joined	21:22
	← cff_ left	21:22
	← infynyxx left	21:22
	→ hiroyuki joined	21:23
	→ infynyxx joined	21:23
	← m0ltar left	21:23
bakers	If I have a single commit on branch A, what's the best way to pull that in to branch B	21:23
	without merge the FULL branch	21:23
	→ bghost joined	21:24
cbreak	bakers: impossible. Consider cherry-pick instead	21:24
	bakers: that will make a clone of that commit, it'll create one with the same changes and message, but a different parent (Your HEAD)	21:24
	← LuxuryMode left	21:25
	← hiroyuki_ left	21:26
bakers	cbreak: So cherry pick basically duplicates the commit on my branch?	21:26
cbreak	yes	21:26
	← malkomalko left	21:26
bakers	perfect	21:27
	← infynyxx left	21:27
	→ LuxuryMode joined	21:27
	→ Guest96943 joined	21:28
cbreak	bakers: look at !lol	21:28
gitinfo	bakers: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	21:28
cbreak	bakers: if there's no other commit between the one you want and your current branch, then you can also just merge it	21:28
	← felixsamora left	21:28
	→ kukks joined	21:29
	← kukks left	21:29
	→ kukks joined	21:29
here	cbreak: it'd be cool if the revision showed 'renamed' to avoid me having to remember	21:31
cbreak	here: ?	21:31
here	ikke: i didn't change the files just moved them.	21:31
cbreak	what's a revision?	21:31
	← m8 left	21:32
here	git mv . subdirectory fails with fatal: cannot move directory over file, source=pics/, destination=pics/wordpress/	21:32
	← marthinal left	21:32
cbreak	here: yeah, that is nonsense	21:32
	← leeN left	21:32
cbreak	you can't move the current directory into a subdirectory	21:32
here	cbreak: trying to move files into a subdirectory and have git status show it as a rename not deleted/new	21:32
cbreak	because it'd move the subdirectory into itself	21:32
	→ infynyxx joined	21:32
cbreak	here: ignore it. just do what I told you and commit	21:33
here	cbreak: obviously, all the files into the subdirectory	21:33
	cbreak: i'd really like to understand this 'eh?	21:33
	cbreak: git status should show renamed not del/new right ?	21:33
cbreak	here: that'd be git mv allfilesbutsubdir subdir/	21:33
	here: it doesn't matter	21:33
chovy	is there a way to repush after a post-receive error?	21:33
	← rhl left	21:33
cbreak	here: rename detection is not free, so it'll not do it always	21:33
	chovy: post-receive does not affect the outcome of a push	21:34
	chovy: there's no need to repush	21:34
	← Snibble left	21:34
cbreak	here: if you do git log --stat -M it will detect. if you do -C it'll detect more.	21:34
here	cbreak: there must be a way to make it reflected properly in this commit.	21:35
chovy	cbreak: i want to rerun the post-receive hook	21:35
cbreak	here: there's no commit	21:35
	here: commit the changes, then there's a commit	21:35
	chovy: then you might have to push -f the old commit and then push again	21:36
	→ chineduu joined	21:36
	← matanya left	21:36
	→ demiurgo joined	21:36
	← xobb_ left	21:37
bakers	cbreak: Just to clarify... "git cherry-pick abc123" would pull commit abc123 on to my current branch?	21:37
	← Watabou left	21:37
cbreak	no	21:37
	← Luke-Jr left	21:37
cbreak	as said above, it'd create a similar commit in your current branch	21:37
	the commit will NOT be abc123	21:38
bakers	cbreak: That's what I meant, I just phrased it wrong	21:38
	→ irqq joined	21:38
bakers	it would take the diff of the commit, and make a new commit on my current branch	21:38
cbreak	it will have the same commit message, but a different tree, different parents, different hash.	21:38
bakers	Got it	21:38
	ok	21:38
cbreak	yes.	21:38
	← Kayra left	21:39
	← akiress left	21:40
	→ Kayra joined	21:40
	→ QiBala joined	21:40
here	cbreak: ok i committed just before the move and just after.	21:40
	← QiBala left	21:41
here	cbreak: now that I have a commit. the commit shows a bunch of new files.	21:41
	cbreak: there are no new files... only renamed / moved files .	21:41
	cbreak: this cannot be the best result.	21:41
	Guest96943 → diegoviola	21:41
cbreak	here: pastebin	21:41
	cpg → cpg\|away	21:41
cbreak	git log -1 -C	21:41
	→ Droolio joined	21:42
bakers	If I "git reset HEAD~5" to go back 5 commits to look at something, how do I see what's ABOVE where I am to go back?	21:43
jwmann	Okay, I'm about to lose my shit over these damn submodules	21:43
	I've changed .gitmodules, .git/config and .git/modules/my/submodule/config what else is there?!	21:43
cbreak	bakers: there's no above	21:43
	bakers: git reset nukes away history	21:43
	→ thierryp joined	21:44
cbreak	it removes it from your current branch, completely	21:44
here	cbreak: that just shows the sha, time, and comment ...	21:44
cbreak	here: --stat	21:44
tang^	ooh, debug time. a user is complaining that his usage of msysgit is using GMT instead of MDT both in mingw and cygwin	21:44
	→ n3xjn joined	21:44
cbreak	bakers: if you want to go back, git reset to the previous reflog entry, @{1} or so	21:44
dropdrive	bamj0rb: Regarding git-add and git-commit touching GIT_WORK_TREE, I have GIT_DIR set to a directory separate from GIT_WORK_TREE.	21:44
	← Kayra left	21:44
cbreak	bakers: and in the future, use git checkout and not reset for that	21:45
dropdrive	bamj0rb: So in that scenario, it seems that those commands don't affect GIT_WORK_TREE?	21:45
bakers	cbreak: I can do git log --all and see the stuff "above" it, and then do a reset back up to that?	21:45
cbreak	tang^: he should read the man page	21:45
	bakers: no. It's probably gone from history	21:45
jwmann	Anybody here a git submodule wizard?	21:46
	← n3xjn left	21:46
cbreak	tang^: man git-config, log.date or so	21:46
gitinfo	tang^: the git-config manpage is available at http://jk.gs/git-config.html	21:46
grawity	Anybody here has a crystal ball and knows what problem jwmann is having?	21:46
	→ abelsiqueira joined	21:46
cbreak	grawity: he doesn't understand the strong binding to a commit instead of a branch...	21:47
	that's the most common problem :)	21:47
here	cbreak: thanks for looking http://pastebin.com/HZgm3CfM	21:47
grawity	cbreak: didn't git 1.8 introduce weak bindings?	21:47
cbreak	here: doesn't look like you moved anything :)	21:47
	← kevwil left	21:47
cbreak	grawity: fake ones afaik? I didn't look at them	21:48
	← mfulz left	21:48
cbreak	here: a move would be a removal and a creation	21:48
	→ mfulz joined	21:48
cbreak	here: did you forget to commit the removal side?	21:48
jwmann	My problem is that I attempted to rename my submodule using this technique - http://bcachet.github.io/development/2012/05/25/rename-git-submodule/ - and after changing everything in the files I mentioned above, git submodule sync reports that 'fatal: not a git repository: ../../../.git/modules/my/submodule/oldpath' even though I changed it...	21:49
grawity	cbreak: commits v1.8.0.1-252-g06b1abb and v1.8.0.1-253-gb928922 apparently	21:49
	← sriehl left	21:49
here	cbreak: yep and now it shows renamed	21:50
	cbreak: sigh ok , thanks mucho !	21:50
	← User458764 left	21:50
tang^	yes, we looked into log date. tested reflogs with --date=iso and --date=local. Both seem to show dates at GMT instead of MDT which his system as a whole is set to	21:50
	→ deanclkclk_ joined	21:50
	→ delasteve joined	21:51
	← neo1691 left	21:51
cbreak	np :)	21:51
	tang^: windows?	21:51
tang^	yes... is msysgit used on non-windows platforms?	21:52
cbreak	I don't think so.	21:52
	← deanclkclk left	21:52
	← rafaqueque left	21:52
cbreak	maybe it does something dumb.	21:52
	deanclkclk_ → deanclkclk	21:52
	→ JGarrido joined	21:52
cbreak	I heard rumors that msys isn't perfect	21:52
	→ kevwil joined	21:52
tang^	doesn't surprise me	21:53
	I can't duplicate it on my system, but I know there are differences... he's running his commands through cygwin, I'm testing with mingw	21:53
cbreak	tang^: maybe it doesn't know your local time zone?	21:53
	cygwin is something else	21:54
jwmann	Now git status shows: fatal: Not a git repository: my/submodule/newpath/../../../.git/modules/my/subdmoule/oldpath What?	21:54
cbreak	tang^: tell him to use git bash	21:54
tang^	cbreak: did and now he says the behaviour is identical. so now I'm trying to figure out how to specify timezone	21:54
	→ matanya joined	21:54
	← sylon left	21:54
	→ CreativeEmbassy joined	21:55
	← thomas_b left	21:55
	← ZujkisNx left	21:55
	← joshbetz left	21:56
tang^	like I said, debug time	21:56
	→ ZujkisNx joined	21:56
	← ZujkisNx left	21:56
jwmann	:(	21:57
	→ lithiumn joined	21:57
	→ thomas_b joined	21:57
	→ eaj joined	21:59
	← aldodelgado left	21:59
	← admin_ left	22:00
	→ corygibbons joined	22:00
	→ gkze joined	22:00
cbreak	jwmann: you'll have to look at the .git file inside your submodule	22:00
bamj0rb	dropdrive: `add' and `commit' shouldn't affect GIT_WORK_TREE directly. `add' reads from GIT_WORK_TREE and adds to the index. `commit' basically just takes the index and turns it into a commit object.	22:00
jwmann	cbreak: I've looked at pretty much every relevant area in there and it all looks fine	22:01
bamj0rb	dropdrive: So they won't /write/ to GIT_WORK_TREE.	22:01
jwmann	Unless there's some file that I've missed	22:01
dropdrive	bamj0rb: Thanks!	22:01
	← iamjarvo_ left	22:02
bamj0rb	dropdrive: YMMV. I'm not an expert on Git's internals. :)	22:02
	← sq-one left	22:02
cbreak	jwmann: inside the submodule there should be a .git file	22:02
	→ iamjarvo joined	22:02
cbreak	jwmann: open it in a text editor	22:02
	→ rafaqueque joined	22:02
cbreak	what's inside the file?	22:02
jwmann	Oh shit, didn't think about that	22:03
	lemme check	22:03
	← TheHoneyBadger left	22:03
	← simesy left	22:04
	→ brucelee joined	22:05
	→ mdiers joined	22:05
brucelee	how do i back up a git repository	22:05
	→ swair_ joined	22:05
	→ simesy joined	22:05
jwmann	Wow, it's the exact part I needed to fix xD	22:05
	Thank cbreak! :)	22:05
cbreak	np. :)	22:05
	← eaj left	22:05
cbreak	brucelee: tar it, gzip it, done	22:05
brucelee	i want to backup the entire git repo, and then install gitolite or github	22:05
	a graphical user interface :p	22:05
	im afraid i might fuck it up	22:05
	and fuck up the repo :p	22:05
cbreak	brucelee: you can also git clone --mirror if you only care about history	22:06
	← cannonball left	22:06
brucelee	cbreak: ah ok	22:06
	cbreak: how do i know what to tar up	22:06
cbreak	the repository.	22:06
	← guns left	22:06
cbreak	git repos are self contained.	22:06
	← guest2122 left	22:06
brucelee	cbreak: ok i see	22:06
cbreak	if you have a non-bare, you only need the .git dir inside the working dir	22:06
brucelee	cbreak: so usually they would be in the /root/ folder?	22:06
cbreak	no	22:06
	I put mine into ~/Documents/blahproject	22:07
brucelee	ah ok	22:07
cbreak	on my server they are in ~git/repositories/	22:07
	(that is the location gitolite puts them)	22:07
brucelee	do you use anything on top of git to manage user permissions	22:07
cbreak	gitolite	22:08
brucelee	no graphical ui? :p	22:08
	→ neo1691 joined	22:08
brucelee	from what ive read, i think gitolite is just a command line tool	22:08
cbreak	TextWrangler.	22:08
	it's a nice text editor which I use for editing the gitolite config files.	22:08
brucelee	cbreak: oh ok	22:08
	→ eaj joined	22:08
	← swair left	22:09
	← wrouesnel2 left	22:09
	← phy1729 left	22:09
	← simesy left	22:09
	← demiurgo left	22:10
brucelee	cbreak: any thoughts on gitlab?	22:11
	← Pullphinger left	22:11
	→ thiago joined	22:11
	← bghost left	22:11
	← lmat left	22:11
cbreak	I don't like it.	22:12
	it requires a web server	22:12
	← mribeirodantas left	22:12
	← snql left	22:12
	→ glosoli joined	22:13
	← eaj left	22:13
	→ simesy joined	22:14
	swair_ → swair	22:15
	← justpie left	22:15
	← lun__ left	22:15
bamj0rb	~/src vs /var/lib/git, IMO. >:)	22:15
	qsuscst → qsusOFFcs	22:16
	← thierryp left	22:17
	← hholtmann left	22:17
	→ felixsamora joined	22:18
	← simesy left	22:18
	→ simesy joined	22:19
	→ Fandekasp joined	22:19
	← wrouesnel1 left	22:20
	← kevwil left	22:20
	→ hellopat_ joined	22:21
	← tdm00 left	22:21
	← vurma left	22:21
	→ TheFuzzball joined	22:22
	← gkze left	22:22
	← simesy left	22:23
	← hellopat left	22:24
	← delasteve left	22:24
	→ Gavrisimo joined	22:25
jwmann	Okay what's the easiest way of removing a submodule without removing the data from the git repo	22:25
	← hellopat_ left	22:26
	← anderse left	22:26
cbreak	jwmann: submodules are separate repositories	22:26
	← LuxuryMode left	22:26
cbreak	you can git rm --cached submodulepath	22:26
	and then remove the stale entries in .git/config and .gitmodules	22:26
	→ mribeirodantas joined	22:26
	→ Squarism2 joined	22:27
jwmann	wouldn't doing git rm --cached submodulepath remove it from the version control?	22:27
	← asQuirreL left	22:28
cbreak	yes	22:28
	wasn't that what you want?	22:28
jwmann	No, I wanted to keep it in version control but remove the whole submodule aspect from it	22:29
	→ kevwil joined	22:29
jwmann	Or would it be easier to remove it first and re-commit it	22:29
	→ axl_ joined	22:29
SaCu	what would I do to remove a file from a commit during rebase -i?	22:29
cbreak	jwmann: you want to make it part of the outer repository?	22:29
	→ joelmo joined	22:29
jwmann	Yes	22:29
	← donmichelangelo left	22:30
cbreak	then yes, remove it as described above, remove the .git file inside the submodule	22:30
	then git add the directory, and commit	22:30
jwmann	Kay, that makes sense	22:30
cbreak	afterwards you can delete the submodule repository which the .git file pointed at	22:30
	← Targen left	22:30
cbreak	you WILL lose history of course	22:30
	← lithiumn left	22:30
cbreak	(submodule history)	22:30
	← DrShoggoth left	22:30
	→ donmichelangelo joined	22:30
cbreak	you can keep history if you do subtree merging	22:30
jwmann	Yea that's fine	22:30
	I don't need the history	22:31
	→ Kayra joined	22:31
	← CreativeEmbassy left	22:31
	← devbug left	22:31
	→ petey joined	22:31
	← Lewoco_ left	22:34
	← Kayra left	22:34
	← jonatasnona left	22:34
	← mribeirodantas left	22:34
	← ngladitz left	22:35
	← pantsman left	22:35
	→ thierryp joined	22:35
	→ TN_Jonesboro joined	22:35
	← infynyxx left	22:36
	← axl_ left	22:37
	→ axl_ joined	22:37
	← richwestcoast left	22:38
	→ SJr joined	22:38
	→ gkze joined	22:38
	→ Kayra_ joined	22:38
	→ MrSoundless joined	22:39
	← asakura left	22:39
	← threesome left	22:39
MrSoundless	hi guys, how can I resolve a conflict using my version of the file?	22:39
	← thierryp left	22:39
	→ lugzer joined	22:39
MrSoundless	I tried 'git checkout --ours filename_here' without succes	22:40
	← felixsamora left	22:41
	← eijk_ left	22:41
cbreak	MrSoundless: why without success?	22:41
	← Ozch left	22:42
MrSoundless	well, git status still shows 'u' and git commit still says I got unmerged files	22:42
	← Guest50999 left	22:42
	← staafl left	22:42
cbreak	git add it	22:43
MrSoundless	git commit -a doesnt work	22:43
canton7	do you have other conflicted files?	22:44
	git status will tell you	22:44
MrSoundless	I have 2 conflicted files and I used git checkout on both	22:44
	but git status still shows U	22:45
	I believe that stands for UNMERGED	22:45
cbreak	git add marks files as resolved	22:45
	→ DANtheBEASTman joined	22:45
	→ infynyxx joined	22:45
MrSoundless	ah	22:45
	I have to use git add, git commit -a doesnt do the trick	22:45
	thanks	22:46
canton7	normal 'git status' output shows 'both modified' or some such. are you sure you aren't looking git status -s? anyway, you still need to mark them as resolved as cbreak says	22:46
	git commit -a == git add -u && git commit	22:46
	→ raar joined	22:46
MrSoundless	what is -u?	22:46
	raar → Guest29360	22:47
cbreak	command line flag	22:47
MrSoundless	git add worked btw	22:47
	cbreak yeah I know its a flag, what does it do :p	22:47
cbreak	it'll stage the changed files, within some conditions	22:47
	→ fobius_ joined	22:47
	← cmpera left	22:49
MrSoundless	thank you very much guys	22:49
	→ pfFredd joined	22:49
	→ faBimon joined	22:49
	→ ezio joined	22:50
	← ezio left	22:50
	→ ezio joined	22:50
jwmann	Should I be rebase or merging to a staging branch?	22:51
	← kermit left	22:51
	← hobodave left	22:52
	← glosoli left	22:52
	→ kermit joined	22:53
	← faBimon left	22:54
	→ JPT joined	22:54
	← mdiers left	22:56
	→ m0ltar joined	22:57
	← Artpicre left	22:58
	→ pbujok joined	22:58
	→ glosoli joined	22:58
	← PeterBooker left	22:59
	← neo1691 left	23:00
	← drizzd left	23:00
	← pbujok left	23:02
	← TheFuzzball left	23:02
	→ eaj joined	23:02
	← Dougie187 left	23:03
	→ raonyguimaraes joined	23:03
	← joelmo left	23:03
	→ rlubke joined	23:04
	← hyperair left	23:04
	← compact left	23:04
	← germanoak left	23:04
	← rlubke left	23:04
	← iamjarvo left	23:06
	← abelsiqueira left	23:06
	← thiago left	23:07
	→ ska-fan joined	23:08
	← eaj left	23:08
	→ Watabou joined	23:09
	← macabre left	23:10
	← rendar left	23:10
	← jhulten left	23:10
	→ jhulten joined	23:10
	→ iamjarvo joined	23:11
	← m0ltar left	23:11
	← jasonp left	23:13
	← colstrom left	23:14
	← GameGamer43 left	23:14
	← xerxas left	23:14
	← akitada left	23:14
	→ colstrom joined	23:15
	→ xerxas joined	23:15
	→ GameGamer43 joined	23:15
	→ akitada joined	23:15
	← jhulten left	23:15
	← axl_ left	23:15
	← Treggats left	23:15
	→ Treggats joined	23:16
	← aard left	23:16
	→ jhulten joined	23:16
	← yhager left	23:17
	→ neo1691 joined	23:17
	→ yhager joined	23:17
	← TomyLobo left	23:18
	← phile left	23:19
	→ thiago joined	23:19
	← Davey left	23:20
	→ asQuirreL joined	23:21
	→ Davey joined	23:21
	← gkze left	23:21
	← mastro left	23:22
	← kevwil left	23:22
	← kevinold left	23:23
	→ kevinold joined	23:23
	← VictorCL left	23:24
	← johnnyfuchs left	23:25
	← bamj0rb left	23:25
	→ kcj joined	23:26
	← ezio left	23:27
	← sgu left	23:27
	← chuckharmston left	23:28
	← kevinold left	23:28
	→ chuckharmston joined	23:28
	← MrSoundless left	23:29
	→ kevwil joined	23:29
	← petey left	23:29
	← jfoy left	23:30
bakers	If I do git branch -av is there a way to list the date of the last checkin?	23:30
	Say I get a list of 50 branches, how do I know the last branch that was used?	23:30
	and which are old	23:30
	← kcj left	23:31
	→ mvensky joined	23:32
	← Sonderblade left	23:32
	→ Alumin joined	23:32
Alumin	should I be able to remove the "origin" remote? I ran "git remote rm origin" and got no errors, but I still see it in "git branch -a"	23:33
	← chuckharmston left	23:33
Alumin	however, I don't see it in "git remote", which is interesting and possibly illuminative	23:33
	→ thierryp joined	23:35
	← RogerWS left	23:36
	→ simesy joined	23:37
	← jhulten left	23:37
	→ jhulten joined	23:38
	← kevwil left	23:38
	← therealkoopa left	23:38
	→ wafflejock joined	23:40
	→ kevinold joined	23:40
	← jhulten left	23:42
skorgon	Alumin, you have to prune the remote branches i think. 'git fetch --prune'	23:42
	at least that removes remote branches that have been removed on a remote. if it also works if you remove the remote - i never tried	23:43
	emmajane\|afk → emmajane	23:43
	← LeMike left	23:43
canton7	'git remote rm' should remove all of the remote-tracking branches	23:43
	← AaronMT left	23:44
Alumin	I concur ;)	23:44
	← chineduu left	23:45
Alumin	I made a backup of my entire repository into a tarball and then went into .git with a sledgehammer and machete	23:45
	← Gavrisimo left	23:45
	→ mmitchel_ joined	23:45
canton7	that's not "it would be a good feature if", but "the intended operation of 'git remote rm' is" :p	23:45
	→ chineduu joined	23:45
canton7	git branch -r -d is your friend	23:45
	and update-ref -d if things get really out of hand	23:45
Alumin	I tried that but got an error...possibly because I already manually removed something it expected to find	23:46
	I've managed to remove all traces of it; I'm gonna use it for a while and see if anything breaks	23:46
	← Squarism2 left	23:46
Alumin	next time I'll just rename origin instead of trying to eradicate it, which is probably what I should have done from the get-go here	23:47
	but...live and learn, right? :P	23:47
	← tang^ left	23:47
	← sgambino left	23:47
	← CKyle left	23:47
	→ Dougie187 joined	23:48
	← simesy left	23:49
	→ flexo joined	23:49
	← mmitchell left	23:49
	← lugzer left	23:49
	← mmitchel_ left	23:50
	← dreiss left	23:50
	→ lugzer joined	23:50
flexo	hey. i just "git rev-list HEAD --count" to turn a commit id into a sequential number somewhat analogous to svn revision numbers (i need something like this for our build/update system to know whether or not a build is newer than another one) ...	23:50
	so my question: how can i turn that back into a commit id?	23:50
canton7	you can't - that number's only valid for your personal repo, right now	23:51
	← droogans left	23:51
	→ johnnyfuchs joined	23:51
skorgon	flexo, can't you work with the commit date?	23:52
canton7	you should really be checking to see if one commit is the ancestor of the other	23:52
flexo	hm..	23:52
	→ guns joined	23:52
	← kevinold left	23:53
	← chineduu left	23:53
flexo	skorgon: can't really - all those scripts (which were developed when the project used svn) really depend on a number like this..	23:53
	→ CKyle joined	23:53
canton7	compare git rev-parse <commit1> with git merge-base <commit1> <commit2> - if they're the same, branch1 is an ancestor of branch2	23:53
	→ kevinold joined	23:53
	← CKyle left	23:53
flexo	so.. what exactly does git rev-list HEAD --count tell me then?	23:54
	← lugzer left	23:54
canton7	if it's done in a central authoratitive repo, which is never force-pushed to, then I guess it'll give a half-decent measure	23:55
flexo	it is	23:55
	← PaulCapestany left	23:56
flexo	(i know that this will break when someone does history rewrites...)	23:56
	→ kevinold_ joined	23:56
	→ jfoy joined	23:57
flexo	but the question remains - how to turn that number back into a commit id? :)	23:57
	→ cmpera joined	23:57
	← thierryp left	23:57
	← kevinold left	23:58
	← guns left	23:58
	← natechan left	23:58
canton7	git rev-list HEAD, and take the nth entry from the bottom	23:58
	→ MattMaker joined	23:58
	→ chuckharmston joined	23:59

Logs Search ←Prev date Next date→

Channels Documentation