IRCloggy #git 2012-08-16

Provider of IRC logs since 2005.

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

	2012-08-16
grawity	Use SSH remotes in your repositories instead of HTTPS ones	00:00
	← fisted left	00:00
	← Chappo left	00:00
grawity	as in, `git clone [email@hidden.address]	00:00
eltigre	ah	00:00
	→ Chappo joined	00:01
eltigre	changing the repo url in .git/config worked that way	00:02
	→ ehsan joined	00:03
	→ fisted joined	00:04
	← Milossh left	00:07
	← Lord_DeathMatch left	00:09
	← GNUcifer left	00:10
	← harish left	00:10
	← BiggFREE left	00:11
	→ hwrd\|work joined	00:11
	→ hellopat joined	00:13
	← hellopat left	00:14
	← Destos left	00:15
	← duckx left	00:15
	← burzum` left	00:17
	→ luxurymode joined	00:17
	→ shawngo joined	00:18
	← Davey left	00:19
	← hwrd\|work left	00:19
	← ChadStudmuffin left	00:19
	← AaronMT left	00:20
	→ subbyyy joined	00:23
	← Xilent_ left	00:24
	→ ameoba joined	00:24
	→ lresende joined	00:25
	← hyperair left	00:27
	← opus left	00:27
	→ opus joined	00:28
	← thiago left	00:30
	← btanaka left	00:30
	← Fangorn__ left	00:31
	← luxurymode left	00:31
	→ d1b joined	00:33
	← Ryback_ left	00:34
	← ology left	00:35
	← v0n left	00:35
	→ xiangfu joined	00:36
	→ private joined	00:37
	private → Guest29217	00:37
	→ flaguy48 joined	00:38
	→ luxurymode joined	00:40
	→ mklappstuhl joined	00:40
	← etcetera left	00:40
	← Sym3tri left	00:42
	→ Destos joined	00:43
	→ duckxx joined	00:44
	→ dsheets joined	00:45
	← dinesh6654 left	00:45
	← quazimodo left	00:45
	→ hellopat joined	00:45
	← dozymoe left	00:46
dsheets	How to resolve a conflict caused by a wrong automatic rename + modify? Is there a way to tell git to not automatic rename?	00:46
	→ itatitat joined	00:46
itatitat	guys I've a simple question	00:46
	when I say : $ git push origin master, master is the branch destiny, or the origin?	00:46
	→ hwrd\|work joined	00:47
	← Destos left	00:47
	← hellopat left	00:47
	← opus left	00:47
	→ hellopat joined	00:49
	→ Sym3tri joined	00:51
	← dr_lepper left	00:52
	← kenperkins left	00:54
grawity	itatitat: both	00:54
drive-by-advice	itatitat: man git-push	00:54
gitinfo	itatitat: the git-push manpage is available at http://git-scm.com/docs/git-push.html	00:54
itatitat	ah ok!	00:54
	thanks	00:54
drive-by-advice	git push remote refspec	00:54
	Remote is the repository and master is the branch.	00:55
itatitat	yes yes, I read something about refspect, can be a tag, and more things, but......each time I read "git push origin master" I'm confuse	00:55
	← molixiaoge left	00:55
	← Sym3tri left	00:55
grawity	if you only give a single name, "master", git uses the same name for both local and remote branch	00:55
itatitat	yes I know, but in that instruction is the branch destinY?	00:56
	→ ology joined	00:56
	grawity gives up.	00:56
itatitat	aaaaaaaaaaaaah	00:57
	ok, I understand, so that mean: "from master to master in remote"	00:57
	no?	00:57
	→ opus joined	00:57
grawity	yes	00:57
	→ molixiaoge joined	00:57
itatitat	OK, thanks a lot for your time grawity:	00:58
grawity	if you just specify "master", it means "from master to origin/master"	00:58
itatitat	very helpful	00:58
	← molixiaoge left	00:58
	→ Karmaon1 joined	00:58
itatitat	okok.............yeah, thanks!	00:58
grawity	if you specify "master:somethinelse", it means "from master to origin/somethinelse"	00:58
	← ashirus left	00:58
	→ molixiaoge joined	00:58
itatitat	ou............that's interesting...	00:58
	← RaceCondition left	01:00
	← kermit left	01:00
	← codeFiend left	01:00
	← bgerber left	01:00
	← nglorioso left	01:01
	→ dzonder joined	01:03
	← ajpiano left	01:06
	→ quazimodo joined	01:06
	← kihap left	01:07
	← hellopat left	01:07
	→ kihap joined	01:08
	← kihap left	01:08
	→ ajpiano joined	01:09
	→ jjbohn joined	01:10
	→ hellopat joined	01:10
	← codeM0nK3Y left	01:12
	→ nglorioso joined	01:14
	← Fernando1asso left	01:14
	→ FernandoBasso joined	01:15
	→ rurufufuss joined	01:16
	← hairyasian left	01:17
	← glennpratt left	01:18
	→ hyperair joined	01:19
	← bizhanMona left	01:20
	← palm_vue left	01:20
	← Lgb left	01:20
	→ codeFiend joined	01:20
	→ chrisgeorge joined	01:20
	Guest71934 → oakdog8	01:20
	→ kermit joined	01:20
	← dzonder left	01:20
	→ intripoon_ joined	01:21
	→ palm_vue joined	01:21
	→ Lgb joined	01:21
	→ bizhanMona joined	01:21
	→ lustucru_ joined	01:23
	← lustucru_ left	01:23
dsheets	How to resolve a conflict caused by a wrong automatic rename + modify? Is there a way to tell git to not automatic rename?	01:23
	← dsirijus left	01:23
dsheets	I used the resolve strategy but it doesn't let me mark "deleted by us" trees as existing to merge the new files	01:24
	← intripoon left	01:24
	← duckxx left	01:25
	← lustucru left	01:25
	→ GNUcifer joined	01:25
	← tukkol left	01:26
	← cmullican left	01:27
	→ Davey joined	01:28
frogonwheels_	dsheets: I'm not sure what you mean. How did git automatically rename + Modify? How can you tell. Git doesn't do this afaik	01:28
dsheets	frogonwheels_: Renaming lib_test/test_accept.ml => lib_test/test_net_lwt.ml	01:29
	Auto-merging lib_test/test_net_lwt.ml	01:29
	CONFLICT (rename/modify): Merge conflict in lib_test/test_net_lwt.ml	01:29
	both files are new in each branch but similar	01:29
	git wants them to be the same	01:29
frogonwheels_	dsheets: ahh. Ok that's a tricky one. Just git checkout <SHA1> -- lib_test/test_accept.ml and add those to your index	01:30
	dsheets: I mean chekcout the 2, one from each branch and add them to the index, and git commit --amend	01:31
	← mklappstuhl left	01:31
frogonwheels_	not git commit --amend - it's in an unmerged state	01:31
dsheets	frogonwheels_: during the merge resolution?	01:31
frogonwheels_	sorry.	01:31
	→ fireh joined	01:31
frogonwheels_	dsheets: yes, except for the --amend bit.	01:32
	→ etcetera joined	01:32
frogonwheels_	dsheets: you basically just need to get your index looking how you want it, and commit the merge	01:32
dsheets	frogonwheels_: wow, thanks, that works great… i dunno why i was hung up on git's confused rename	01:34
	→ Turicas joined	01:34
frogonwheels_	dsheets: :)	01:34
	← Speed left	01:36
	← _Vi left	01:36
	→ _Vi joined	01:37
	→ hairyasian joined	01:38
	← Vampire0_ left	01:39
	→ apok_ joined	01:39
	← SkAzZ1 left	01:39
	← alegen left	01:40
	← apok left	01:41
	→ jackh joined	01:43
	→ w09x joined	01:43
	← apok_ left	01:43
	← ology left	01:44
	← TheJH left	01:45
	→ barneybook joined	01:46
	← hellopat left	01:47
	← jjbohn left	01:47
	→ linoj joined	01:48
	→ mike007 joined	01:48
	← gfontenot left	01:50
	Leonidas_ → Leonidas	01:50
	← agumonkey left	01:51
	→ Vampire0_ joined	01:53
	→ ology joined	01:54
	← t0rc left	01:55
	→ duckx joined	01:55
	← jonshea left	01:56
	→ Fandekasp joined	01:58
	← codeFiend left	01:59
	→ pantsman joined	02:00
	← pantsman left	02:00
	→ pantsman joined	02:00
	← metcalfc left	02:00
	→ hellopat joined	02:01
	→ ISF joined	02:02
	← HyperNerdV2 left	02:03
	← towski left	02:04
	→ eletuchy_ joined	02:05
	→ herdingcat joined	02:06
	→ diegoviola joined	02:06
	← bubbles10101 left	02:07
	→ zdk joined	02:07
	← eletuchy left	02:08
	← Lulzon left	02:08
	← nglorioso left	02:09
	← itatitat left	02:09
	← Dimitr\|2 left	02:09
	→ towski joined	02:09
	→ nglorioso joined	02:09
	← cybersphinx left	02:10
	← diegoviola left	02:11
	→ codeFiend joined	02:11
	← ajpiano left	02:12
	← FernandoBasso left	02:12
	→ metcalfc joined	02:12
	← towski left	02:13
	← quotemstr left	02:13
	← metcalfc left	02:14
	→ metcalfc joined	02:14
	→ ajpiano joined	02:14
	← pdtpatrick left	02:15
	→ andrewhl joined	02:16
	← pantsman left	02:18
	← hwrd\|work left	02:18
	← ISF left	02:20
	← eletuchy_ left	02:21
	← leila_ left	02:22
	→ rchavik joined	02:23
	← rchavik left	02:23
	→ rchavik joined	02:23
	→ rohan32 joined	02:23
	→ mminion joined	02:23
	← mminion left	02:24
	← lresende left	02:24
	← lindenle left	02:25
	← iliketurtles left	02:25
	→ iori joined	02:26
	← ology left	02:26
	← Bombe left	02:27
	→ mminion joined	02:28
	← rchavik left	02:28
	← mminion left	02:28
	→ ISF joined	02:29
	→ rchavik joined	02:29
	← duckx left	02:32
	→ mminion joined	02:32
	← mminion left	02:33
	→ quotemstr joined	02:33
quotemstr	In the fast{import,export} file format, what are marks, exactly?	02:33
	← dsheets left	02:34
	→ cybersphinx joined	02:34
	→ diegoviola joined	02:36
	→ mminion joined	02:37
	← mminion left	02:37
	→ pastime joined	02:37
	← rchavik left	02:38
	→ mminion joined	02:39
	← etcetera left	02:40
	→ Bombe joined	02:40
	→ zph joined	02:41
	← mminion left	02:41
	jcao219 → zz_jcao219	02:42
frogonwheels_	quotemstr: had a read - suspect they are something specific to the fast-import/export	02:42
offby1	quotemstr: I bet esr would know. Poke around in his blog	02:42
frogonwheels_	offby1: :)	02:42
	→ nothingbutlove joined	02:42
	frogonwheels_ → frogonwheels	02:43
	← orafu left	02:43
	→ orafu joined	02:43
	← zph left	02:43
	← nothingbutlove left	02:44
	→ eletuchy joined	02:45
	→ mminion joined	02:46
	← mminion left	02:47
	→ Goplat joined	02:48
	← nglorioso left	02:49
	→ nothingbutlove joined	02:50
	→ juvenal joined	02:52
	← brentratliff left	02:52
	→ Douglarek joined	02:53
	← segher left	02:53
	→ iliketurtles joined	02:54
	← ISF left	02:54
	← codeFiend left	02:54
	→ mminion joined	02:55
	→ segher joined	02:55
	← mminion left	02:55
	← eletuchy left	02:56
Douglarek	hello everybody	02:56
	I want to know how can i look for remote branches?	02:59
	→ eletuchy joined	02:59
	→ Chib joined	03:00
	← quazimodo left	03:04
	→ quazimodo joined	03:05
	→ wolftankk joined	03:05
	← wolftankk left	03:05
	→ wolftankk joined	03:06
	← pastime left	03:08
frogonwheels	Douglarek: you've cloned?	03:09
	→ rehat joined	03:10
	← metcalfc left	03:11
mike007	Douglarek git branch -a	03:11
	← karlpinc` left	03:13
	← rehat left	03:13
	→ karlpinc joined	03:13
	← karlpinc left	03:13
	→ Yuuhi` joined	03:14
Douglarek	,mike007: tnks	03:15
	,frogonwheels: tnks too	03:15
	→ FreeArtMan joined	03:15
jonn	can someone explain to me abstractly how two git clients connect to eachother? do they just go over ssh and read the other person's git file?	03:15
	← Yuuhi left	03:16
	→ yrlnry joined	03:16
yrlnry	<yrlnry> why does git-log --stat omit mentioning the creation of zero-length files?	03:16
	* jn	03:16
	← linoj left	03:17
	← ehsan left	03:17
	→ jjbohn joined	03:17
yrlnry	Sorry for the bad paste, but I would like to know the answer to the question.	03:17
	→ SegFault1X\|work2 joined	03:17
	→ kimico joined	03:17
	← artnez left	03:18
	← kimico` left	03:18
mike007	you can connect to a remote git repo via ssh, http, file	03:18
	→ artnez joined	03:18
SethRobertson	jonn: That can happen. Most people have a server (typically accessed by ssh, though http(s) and other protocols are also available) which people use as a common server, like github	03:18
	→ allquixotic_ joined	03:18
	→ ehsan joined	03:19
	← wart____ left	03:19
	→ wart___ joined	03:19
SethRobertson	yrlnry: If I were guessing, because it did not involve the adding or deletion of a line which is the core of how that works. The source or the git mailing list is probably a better source than IRC for this sort of thing	03:19
jonn	mike007: whats normal for windows?	03:19
	← mike007 left	03:20
	← ro0 left	03:20
	← canapp left	03:20
	← japankurt left	03:20
jonn	SethRobertson: is there a free equiv to run locally?	03:20
	→ japankurt joined	03:20
	← Orphis_ left	03:20
	→ Orphis joined	03:20
	→ ro0 joined	03:20
	← SegFaultAX\|work2 left	03:20
SethRobertson	jonn: Tons, including native git. It all depends on what features you want/need.	03:20
frogonwheels	jonn: !gitolite	03:20
gitinfo	jonn: Want to host as many git repos (and users!) as you like, on your own server, with fine-grained access control? You want gitolite: https://github.com/sitaramc/gitolite - Documentation: http://sitaramc.github.com/gitolite/master-toc.html	03:20
	← AAA_awright left	03:20
	← allquixotic left	03:20
jonn	I want to try and push to switch to git at work	03:20
	→ DarkClown joined	03:20
frogonwheels	jonn: from what?	03:21
jonn	svn	03:21
SethRobertson	I commend you. It was the best decision I ever made.	03:21
jonn	SethRobertson: its even more awesome, because we have to have our code in an offline environment too	03:21
	→ Drool joined	03:21
	→ bubbles10101 joined	03:21
Douglarek	, jonn svn	03:21
	→ AAA_awright joined	03:21
frogonwheels	jonn: Have you been using git-svn ?	03:22
	→ Juri_Agarin joined	03:22
	→ zamba joined	03:22
	← Bosox20051 left	03:22
	← FreeArtMan left	03:23
	→ chayin_ joined	03:23
	→ liori_ joined	03:24
	→ lu_zero joined	03:24
	→ vals_ joined	03:24
	← lu_zero left	03:24
	→ lu_zero joined	03:24
	→ w09x_ joined	03:24
	← sporous left	03:25
	→ canapp joined	03:25
	→ sporous joined	03:25
	→ heroux_ joined	03:26
	→ pavelz joined	03:26
	→ colona_ joined	03:26
	→ dsop_ joined	03:26
	← gonzzor left	03:26
	← jjbohn left	03:27
	→ gonzzor joined	03:27
	→ soren_ joined	03:27
jonn	so I was thinking of pulling, and then doing a git-batch, writing that to a tape drive, and then importing that offline	03:27
	http://i.imgur.com/2K3pQ.png	03:27
	something like that	03:27
	← variable left	03:27
	← heroux left	03:27
	← pavelz_ left	03:27
	← nutron left	03:27
	← awx left	03:27
	← soren left	03:27
	← ro0 left	03:27
	→ ro0 joined	03:27
	← ro0 left	03:27
	→ ro0 joined	03:27
	→ variable joined	03:28
	← variable left	03:28
	→ variable joined	03:28
	→ awx joined	03:28
	→ RichardBronosky joined	03:28
	→ Silex^^ joined	03:28
	← ESphynx left	03:28
	← w09x left	03:29
	← flaguy48 left	03:29
	← kcj left	03:29
	← sjefen6 left	03:29
	← cilly left	03:29
	← ipalaus left	03:29
	← lamont` left	03:29
	← twem2_ left	03:29
	← lu_zero_ left	03:29
	← tizzo- left	03:29
	← KBme_ left	03:29
	← oakdog8_ left	03:29
	← chrisward left	03:29
	← blami left	03:29
	← s0undt3ch left	03:29
	← Hamled left	03:29
	← ketas left	03:29
	← Poapfel left	03:29
	← eighty4 left	03:29
	← kart0ffelsack_ left	03:29
	← axrfnu left	03:29
	← madduck left	03:29
	← eightyeight left	03:29
	← Droolio left	03:29
	← Odjuret_ left	03:29
	← tango_ left	03:29
	← albel727 left	03:29
	← Putr left	03:29
	← cschneid left	03:29
	← grillo left	03:29
	← finch left	03:29
	← liori left	03:29
	← flexd left	03:29
	← multi_io left	03:29
	← Silex left	03:29
	← foraks left	03:29
	← rtuin left	03:29
jonn	frogonwheels: no	03:29
	→ nutron joined	03:29
frogonwheels	jonn: Any reason not to? At least you would get to use git for your own use that way!	03:30
	← iliketurtles left	03:30
jonn	because working offline is a real PITA	03:30
	taking maven offline takes -forever-	03:30
	→ metcalfc joined	03:31
	→ iliketurtles joined	03:31
jonn	frogonwheels: right now, we have a script that checks our entire branch out from svn, builds it, pulls down dependencies, and writes it to a tape	03:32
	that takes like 40 minutes	03:32
	→ muep joined	03:32
	← rohan32 left	03:33
	→ flaguy48 joined	03:34
	→ kcj joined	03:34
	→ sjefen6 joined	03:34
	→ cilly joined	03:34
	→ ipalaus joined	03:34
	→ lamont` joined	03:34
	→ KBme_ joined	03:34
	→ twem2_ joined	03:34
	→ tizzo- joined	03:34
	→ oakdog8_ joined	03:34
	→ chrisward joined	03:34
	→ blami joined	03:34
	→ s0undt3ch joined	03:34
	→ Hamled joined	03:34
	→ ketas joined	03:34
	→ Poapfel joined	03:34
	→ eighty4 joined	03:34
	→ kart0ffelsack_ joined	03:34
	→ madduck joined	03:34
	→ axrfnu joined	03:34
	→ eightyeight joined	03:34
	→ Odjuret_ joined	03:34
	→ albel727 joined	03:34
	→ Putr joined	03:34
	→ cschneid joined	03:34
	→ grillo joined	03:34
	→ finch joined	03:34
	→ flexd joined	03:34
	→ multi_io joined	03:34
	→ foraks joined	03:34
	→ rtuin joined	03:34
	→ akheron joined	03:34
	→ Ratler joined	03:34
	→ hegge joined	03:34
	→ kini joined	03:34
	→ jhford joined	03:34
	→ electrogeek joined	03:34
	→ nb joined	03:34
	→ Fiouz joined	03:34
	→ zibri joined	03:34
	← cmn left	03:34
	← oakdog8_ left	03:34
jonn	frogonwheels: this splitting sucks :<	03:34
	← luxurymode left	03:34
	→ oakdog8_ joined	03:35
	→ HyperNerdV2 joined	03:35
	→ cmn joined	03:36
	→ shane_ joined	03:37
	← _Vi left	03:37
	→ BiggFREE joined	03:38
	Douglarek → douglarek	03:39
	→ duckxx joined	03:39
	→ corburn joined	03:39
	→ lresende joined	03:44
	→ iamjarvo joined	03:44
frogonwheels	jonn: Ok.. I remember this.	03:44
	← nothingbutlove left	03:46
	← Chib left	03:48
	← corburn left	03:48
	← Guest29217 left	03:48
jonn	frogonwheels: hmm?	03:49
	→ private joined	03:50
	private → Guest36956	03:50
frogonwheels	jonn: you were talking about this another day? with the one-way tape stuff	03:50
jonn	yeah	03:50
	a few days ago	03:50
	→ flippo joined	03:51
frogonwheels	jonn: have you tried a little mock-up of it?	03:51
jonn	yeah, it blew up because my maven repository was out of date :(	03:52
	→ procrastubator joined	03:54
	← kpreid left	03:54
	→ kpreid joined	03:54
	→ jceb_ joined	04:00
	← yrlnry left	04:02
	→ rehat joined	04:02
	→ gavin_huang joined	04:02
	← rehat left	04:03
	← kukks left	04:03
	← opus left	04:05
	→ ahayweh_ joined	04:05
	← madewokherd left	04:06
	← cakehero left	04:07
	← ahayweh left	04:08
	→ ESphynx joined	04:09
	gitinfo set mode: +v	04:10
procrastubator	Guys quick, daft question. So I followed the instructions on this page to the T http://qt-project.org/doc/qt-5.0/qt3d-building.html (i.e. git clone nanana and git checkout --track -b qt4 origin/qt4), however I receive the error message "Not a git repository (or any of the parent directories)	04:11
	Am I referring to the branches wrongly somehow?	04:11
frogonwheels	procrastubator: did you cd into the directory?	04:11
	← cilly left	04:12
procrastubator	no because i am idiot.	04:12
	lol thank you it's a bit too late for coding on this side of the globe	04:12
	→ cilly joined	04:14
	→ maletor joined	04:14
	← andrewhl left	04:15
	← maletor left	04:18
	← spyro left	04:18
frogonwheels	procrastubator: you're not the first :)	04:19
	(to forget to cd ... or to be coding too late into the night )	04:19
	→ beautifulmind joined	04:19
	→ arietis joined	04:19
	→ sangi joined	04:20
frogonwheels	procrastubator: lol. I just forgot to cd into my newly cloned repo b4 doing an operation. very funny.	04:20
procrastubator	Haha thanks for the solidarity man :)	04:20
	→ noyb joined	04:21
	→ maletor joined	04:21
	← d3vic3_ left	04:21
	← beautifulmind left	04:22
	→ d3vic3 joined	04:23
	→ maletor_ joined	04:24
	← HyperNerdV2 left	04:25
	← maletor left	04:26
	← procrastubator left	04:28
	← hellopat left	04:29
	→ leeN joined	04:29
	← graphitemaster left	04:30
	→ pretty_function joined	04:30
	→ beautifulmind joined	04:31
	← juvenal left	04:31
	→ igotnolegs joined	04:32
	→ Sigma joined	04:32
	→ jkitchen joined	04:33
	→ HyperNerdV2 joined	04:35
	← iliketurtles left	04:35
	← maletor_ left	04:37
	→ zackiv31 joined	04:38
	→ meLon joined	04:38
	← meLon left	04:38
	→ meLon joined	04:38
	← guampa left	04:39
	→ ReekenX joined	04:41
	← Sigma left	04:42
	← zackiv31 left	04:42
	→ jiangenj joined	04:45
	gitinfo set mode: +v	04:45
jiangenj	Hi, how to enable git receive-pack on a server?	04:46
	→ jasmina87SA__ joined	04:46
	← jasmina87SA__ left	04:46
	← arietis left	04:46
	→ pretty_f_ joined	04:47
	← pretty_function left	04:49
GNUcifer	jiangenj: you are sure you want that?	04:49
jiangenj	yes, I want to enable gerrit replication service	04:49
	← akiress left	04:50
GNUcifer	dunno about gerrit .. but rather looks to me you want some authentication	04:50
jiangenj	I have right permission, but I dont' know how to enable it	04:50
GNUcifer	i have some mob repos .. these are anonymously pushable, thats what receivepack enabling will do (speaking of git-daemon)	04:51
	that means anyone can do anything with your code .. still sure?	04:51
jiangenj	yes, I can set folder permission, right?	04:52
GNUcifer	eh where?	04:52
	gerrit? i dont know gerrit ..	04:52
	→ jobin joined	04:52
	← bubbles10101 left	04:53
jiangenj	on the destinate folder	04:53
GNUcifer	but for git-daemon you dont have any authentication and permission checking when you enable receivepack	04:53
jiangenj	gerrit using git push to backup git projects	04:53
	bug git-daemon specify where you can push the projects to?	04:53
GNUcifer	again i dont know gerrit .. but you certainly want to set up some secure way to push stuff	04:53
	ssh / https	04:54
jiangenj	I'm in a security network, ssh enabled for each connection	04:54
GNUcifer	i dont understand ..	04:54
	jobin → andy	04:55
GNUcifer	why dont you let gerrit push via ssh then?	04:55
jiangenj	gerrit has a config to enable this kind of push, I don't want to create my scripts to do this kind of job	04:56
	← eletuchy left	04:56
jiangenj	gerrit documents says to enable receive-pack	04:57
GNUcifer	urgs	04:57
	i prolly misunderstand .. but well	04:57
	wolftankk → wolftankk\|afk	04:57
	→ akiress joined	04:59
	← jceb_ left	05:01
	→ pretty_function joined	05:06
	→ spyro joined	05:07
	→ dogarrhea2_ joined	05:08
	← pretty_f_ left	05:09
	← dogarrhea2_ left	05:10
	→ dogarrhea2 joined	05:10
	← Esa left	05:10
	→ rchavik joined	05:10
dogarrhea2	i am on a particular revision/commit on a particular branch. I want to go back to another revision on this branch and branch from there. how do i do this?	05:11
	→ Esa joined	05:11
frogonwheels	dogarrhea2: git checkout -b newbranchname SHA1ofcommityouwanttobranchfrom	05:11
jast	git checkout -b newbranch <old commit ID>	05:11
jiangenj	when I do git pull, I used --squash, then git push the new commits, is it safe, if some of the squashed commits are previously already in the git repo	05:14
	→ zapsoda joined	05:15
	← zapsoda left	05:15
	→ Oliver_ joined	05:16
	→ pretty_f_ joined	05:17
	← pretty_function left	05:17
	→ shruggar joined	05:19
	wolftankk\|afk → wolftankk	05:19
	← dhruvasagar left	05:19
	→ theoliverc joined	05:20
	→ dinesh6654 joined	05:21
	gitinfo set mode: +v	05:22
Oliver_	hello everyone!	05:23
	← dogarrhea2 left	05:23
gitinfo	Oliver_: welcome to #git, a place full of helpful gits. If you have a question, just ask it–somebody should answer shortly. For more information about git and this channel, see the links in the topic. It can't hurt to do a backup (type !backup for help) before trying advice you receive here.	05:24
	→ dinesh6654_ joined	05:25
	← dinesh6654 left	05:26
	→ Zenopus_ joined	05:26
	→ harish joined	05:26
	→ pretty_function joined	05:27
	← pretty_f_ left	05:27
	→ amcsi_ joined	05:27
	→ onlyme joined	05:28
	→ BARNEYB3 joined	05:28
	→ _W joined	05:29
	→ SNEI joined	05:30
	→ Swathe_ joined	05:30
	← Zenopus left	05:30
	← codeshah left	05:30
	← hyperair left	05:30
	← ameoba left	05:30
	← amcsi left	05:30
	← _W_ left	05:30
	← barneybook left	05:30
	← SJS left	05:30
	← Swathe left	05:30
	→ ameoba joined	05:30
	→ hyperair joined	05:30
	← blast_hardcheese left	05:30
	Zenopus_ → Zenopus	05:30
	← yoklov left	05:31
	← onlyme left	05:31
	→ dogarrhea2 joined	05:32
dogarrhea2	hrm you can't use tab to autocomplete the rest of the hash?	05:32
frogonwheels	dogarrhea2: don't need to specify the full hash anyway	05:33
	dogarrhea2: just enough to be unique - first 4 is mostly fine. 10 is almost always enough	05:34
	← Esa left	05:34
dogarrhea2	what happens if the first few characters of the hash are not unique heh	05:34
	and u screw up	05:34
	or will there be a prompt to disambiguate	05:35
frogonwheels	dogarrhea2: I don't think it will recognise it as a commit if it's not unique.	05:35
dogarrhea2	maybe if you checkout something	05:35
frogonwheels	dogarrhea2: so yes, it will say it's not recogniseable	05:35
	→ darren joined	05:36
frogonwheels	dogarrhea2: 4 looks like minimum .. and I'm getting a short SHA1 822a is ambiguous.	05:36
	.. then ambiguous argument '822a': unknown rev ...	05:36
	→ pretty_f_ joined	05:36
	← pretty_function left	05:36
frogonwheels	dogarrhea2: I used git show to test.. but I'm assuming this is rev-parse, so any other command would be similar	05:37
	→ _sundar_ joined	05:37
	→ tekbwainz joined	05:37
	← MrRoot left	05:38
	← tekbwainz left	05:38
	→ tekbwainz joined	05:38
	tekbwainz → phreaky	05:38
	→ Esa joined	05:39
	← marc_kdab_ left	05:40
	→ archdori joined	05:40
dogarrhea2	hrm i git checkouted a particular revision and it appears i've lost some information in git log	05:42
	how do i see all my revisions?	05:42
frogonwheels	dogarrhea2: personally I use gitk --all :)	05:42
dogarrhea2	hrm yuck i have to install tk	05:43
	i'm using cygworst	05:43
	← subbyyy left	05:43
	→ subbyyy joined	05:43
	← iamjarvo left	05:44
frogonwheels	dogarrhea2: ah. I'm on msysgit.	05:44
	← chrisgeorge left	05:44
	→ blast_hardcheese joined	05:44
dogarrhea2	msysgit?	05:45
frogonwheels	dogarrhea2: it's a more native-windows version of git - based on msys. It has its own issues, but it isn't too bad.	05:46
	→ maleknet joined	05:46
	→ dermoth\|home joined	05:46
dogarrhea2	yuck	05:47
	this is taking to long to donwload.. am i'm not sure it's even the right package. tk is apparently too ambiguous for cygwin updator	05:47
	gtk.. tk tcl.. which package	05:48
frogonwheels	dogarrhea2: lol. yes, gitk and git gui use tk	05:48
	→ Per4u3e joined	05:49
	← Esa left	05:50
	← kermit left	05:51
dogarrhea2	ok i'm going to not get sucked into an xorg xwindow mess	05:51
	this is stupid	05:51
	anyone know what this error means? Error in startup script: no display name and no $DISPLAY environment variablewhile executing	05:52
frogonwheels	dogarrhea2: aahhh of course. that would make sense unfortunately. :\|	05:52
	← SyouJyoA left	05:52
frogonwheels	dogarrhea2: you need an X11 display to run the program	05:52
dogarrhea2	really?	05:52
	that is sooo dumb	05:52
	o well	05:52
frogonwheels	dogarrhea2: no. it's cygwin. that's how it work. That's why I use msysgit.	05:52
	*works	05:52
	→ Esa joined	05:52
dogarrhea2	bah it's too late now	05:53
	← cwang left	05:53
dogarrhea2	i just need the history	05:53
	→ cwang joined	05:53
	← neurodrone left	05:53
frogonwheels	dogarrhea2: yeah. fyi you can install Xming as a nice xserver	05:53
	← GNUcifer left	05:53
frogonwheels	dogarrhea2: at least that's one thing about X protocol .. it's a protocol	05:54
	→ marc_kdab_ joined	05:54
dogarrhea2	ok git reflog	05:54
	i'm NOT going down the xwindows insanity route	05:54
	← pretty_f_ left	05:54
frogonwheels	:)	05:54
	→ pretty_function joined	05:54
frogonwheels	dogarrhea2: git reflog shows you your history of branches	05:55
dogarrhea2	hrm i can't checkout	05:56
	something about i need to commit current changes (don't want to)	05:56
frogonwheels	dogarrhea2: you can always !stash	05:57
dogarrhea2	or stash .. how do i do neither and just put the head somewhere	05:57
frogonwheels	?	05:57
dogarrhea2	does stash change anything?	05:57
frogonwheels	dogarrhea2: stash will remove any changes you've made to files	05:57
	dogarrhea2: which is the point of it.	05:57
	← cwang left	05:58
frogonwheels	dogarrhea2: if you can't checkout it's cause you've modified a file that will be changed by the checkout.	05:58
dogarrhea2	yea, i don't care about that change at all	05:59
	so git stash uses a "stack" ?? so it's only temporary in memory or there forever?	05:59
	→ jceb_ joined	05:59
	← Esa left	05:59
	→ afuentes joined	06:00
	Per4u3e → SyouJyoA	06:00
frogonwheels	dogarrhea2: it's in the git db.. but if you git stash pop it will restore it back to your wd and delete the stash pointer.	06:00
	dogarrhea2: which will mean a git-gc will garbage-collect the temporary stash commits.	06:00
dogarrhea2	hehe. seems like extra complexity for nothing	06:01
	you mind as well give the option of committing or throwing away	06:01
frogonwheels	dogarrhea2: pop also causes standard conflict resolution to happen.	06:01
	dogarrhea2: you can always throw away if you want.	06:01
	→ Esa joined	06:01
dogarrhea2	it forces you to commit or stash..	06:02
frogonwheels	dogarrhea2: git reset --hard will remove workingdir changes to all tracked files,	06:02
	dogarrhea2: Git does not like overwriting user's changes	06:03
	*changes to workding-directory files that is.	06:03
	→ jceb__ joined	06:03
dogarrhea2	it might be confusing if someone forgets to clean the stash and later developers are like: "what?"	06:03
frogonwheels	dogarrhea2: when you stash, they are then commits, with a base - and git can do smart conflict resolution stuff.	06:03
	dogarrhea2: it's only in your local db	06:03
dogarrhea2	can you remove commits? say there's a commit between two other commits and u want to get rid of it and join the other two	06:04
frogonwheels	dogarrhea2: !rewrite .. but sure	06:04
gitinfo	dogarrhea2: [!rewriting_public_history] Rewriting public history is a very bad idea. Anyone else who may have pulled the old history will have to `git pull --rebase` and even worse things if they have tagged or branched, so you must publish your humiliation so they know what to do. You will need to `git push -f` to force the push. The server may not allow this. See receive.denyNonFastForwards (git-config)	06:04
frogonwheels	dogarrhea2: git rebase -i COMMIT~1 and just delete the offending commit.	06:04
	dogarrhea2: delete/squish or whatever. I often !sausage make my commits	06:05
gitinfo	dogarrhea2: [!sausage_making] Some developers like to "hide the sausage making", transforming their commits before presenting them to the outside world. See http://sethrobertson.github.com/GitBestPractices/#sausage and !perfect	06:05
dogarrhea2	only works on non branching poitns i would assume	06:05
frogonwheels	dogarrhea2: sure. doing it the other side of merge is tricky. and doing it the other side of the branch would also mean a rebase of the branch	06:06
	← jceb_ left	06:06
frogonwheels	I mean the other branch	06:06
dogarrhea2	hrm i'm not sure about something... so if you checkout from an earlier revision, make changes and commit, the checkoued earlier version will now be changed?	06:07
	← jceb__ left	06:07
dogarrhea2	that sounds almost as bad as removing a commit between commits	06:07
frogonwheels	dogarrhea2: no.	06:07
	dogarrhea2: you'll create a branch point. and if you don't checkout a branch, you'll be in a !detach state.	06:08
gitinfo	dogarrhea2: [!detached] A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach	06:08
dogarrhea2	it will auto branch with an automatic name?	06:08
	!reattach	06:08
gitinfo	Letters refer to !detached. (a) and (b): 'git checkout branchname' to continue working on another branch, or 'git checkout -b branchname' to start a new one here; (c) git am --continue; (d) git rebase --continue	06:08
frogonwheels	dogarrhea2: a 'branch' just means there's 2 or more commits with that node as a parent.	06:08
dogarrhea2	wow that sounds like usability bug infinity or something	06:09
frogonwheels	dogarrhea2: nope. not at all.	06:09
dogarrhea2	to allow someone to point their changes to neverland	06:09
	frogonwheels shrugs	06:09
frogonwheels	it warns you.	06:09
	→ dinesh6654 joined	06:09
	→ The24z joined	06:09
dogarrhea2	they might be under the impression that a commit saves it	06:09
frogonwheels	dogarrhea2: and it's in the reflog, so it's hard to lose it.	06:09
dogarrhea2	but then they go back to where they were (without branching) and their work is lost?	06:09
frogonwheels	dogarrhea2: well it does, it will s tick around for a few weeks	06:10
	← akiress left	06:10
dogarrhea2	but how do you get to it?	06:10
frogonwheels	dogarrhea2: the reflog	06:10
dogarrhea2	this sounds kind of like the insertion and deletion of nodes..	06:10
	since this new commit that is in neverland is not attached to anything	06:10
frogonwheels	dogarrhea2: nope. not at all.	06:10
dogarrhea2	isn't that dangerous?	06:10
frogonwheels	dogarrhea2: meh. only if you let it be.	06:10
	dogarrhea2: once you've done it once, it's a lot less scary	06:11
dogarrhea2	if you commit something that is not topologically attached, how is that user friendlY? it's just so easy to git checkout whatever	06:11
frogonwheels	dogarrhea2: there are many reasons to be able to do it. one is that routines like rebase and multiple cherry-picks generally commit in a detached state, so t hat there's only one move of the final head in the reflog	06:12
dogarrhea2	no wonder people get screwed up repos	06:12
	← civilordergone left	06:12
	← dinesh6654_ left	06:12
dogarrhea2	english?	06:12
frogonwheels	dogarrhea2: sorry. outa time. gotta work.	06:13
	dogarrhea2: !doc	06:13
gitinfo	dogarrhea2: A list of useful documentation of all kinds is here: http://git-scm.com/documentation -- or try the wiki at http://git.wiki.kernel.org/. Also try typing "!book" "!cs" "!bottomup" "!parable" "!best_practices" or "!vcbe" or "!designers" here in IRC. !book is probably the most helpful.	06:13
frogonwheels	dogarrhea2: !simple	06:13
gitinfo	dogarrhea2: At its heart git is made up of many concepts that are individually simple. Getting the whole picture right is often tricky, and it is usually about breaking up the complex concept into its simple, individual parts and grokking those. Both !bottomup and !cs will help with that.	06:13
dogarrhea2	yuck	06:13
The24z	!cs	06:14
gitinfo	"Git for Computer Scientists" is a quick introduction to git internals for people who are not scared by phrases like Directed Acyclic Graph. http://eagain.net/articles/git-for-computer-scientists/ See also !concepts !bottomup	06:14
The24z	!book	06:14
gitinfo	There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	06:14
dogarrhea2	i think the other developers iw ork with are going to be very angry when we go away from perforce	06:14
	← shruggar left	06:14
frogonwheels	dogarrhea2: they will be if you teach them. good luck.	06:14
The24z	!bottomup	06:14
gitinfo	'Git from the bottom up' starts with explaining the building blocks of git and proceeds to tell you how they fit together. http://ftp.newartisans.com/pub/git.from.bottom.up.pdf	06:14
dogarrhea2	i'm not the tools architect :/	06:14
	→ akiress joined	06:14
The24z	!gcs	06:14
gitinfo	[!concepts] "Git Concepts Simplified" explains the basic structures used by git, which is very helpful for understanding its concepts. http://sitaramc.github.com/gcs/	06:14
The24z	!designers	06:15
gitinfo	'Git for Web Designers' is a quick "Who why what when how" on VCS and git: http://www.webdesignerdepot.com/2009/03/intro-to-git-for-web-designers/	06:15
dogarrhea2	o well. i will bring popcorn to work every day after we start using it	06:15
	← maleknet left	06:15
	→ mishok13 joined	06:15
	→ Nirvanko joined	06:16
	→ papegaaij joined	06:17
dogarrhea2	got a 60 year old developer, a 35 year old developer from ibm, a developer from india who doesn't speak english well, the tools architect pushing for git, a build/automation team lead and a manual qa person who uses excel sheets to store test stuff.. this will be so fun watching how they all react to git	06:18
frogonwheels	dogarrhea2: what's your dev environment?	06:19
dogarrhea2	i'll be fine as long as i know these very extremely easy (usability bug infinity) pitfalls like "git checkout sha" and changes go to nowhere, before i actually destroy anything.. but not so sure the others will do the same	06:19
frogonwheels	Ie. why use cygwin git and not msysgit ?	06:20
	→ flijten joined	06:21
	→ jceb__ joined	06:21
dogarrhea2	our dev environment is a bit fragmented at the moment.. some of us use eclipse some use intellij, some are on linux, some on windows, our unit testing is a mix of junit and java classes that throw exceptions manually, we use perforce hudson ant haxe and other things	06:21
	→ tsdh joined	06:21
dogarrhea2	your typical spaghetti enterprise legacy stuff	06:21
	→ lb joined	06:23
	← lb left	06:23
	→ lb joined	06:23
	→ piti joined	06:23
	← jey left	06:23
dogarrhea2	i think our architect is mroe focused on new dev rather than maintenance of all these spring mvc/hundreds of thousands of lines of ant code, xforms, other xml config, haxe compilation files, custom js built libraries from ie 5 era, etc	06:23
	← blast_hardcheese left	06:24
	zz_jcao219 → jcao219	06:24
dogarrhea2	frogonwheels: to answer your question, our architect doesn't care what individual developers use	06:25
	since "every clone is it's own repository"	06:25
frogonwheels	dogarrhea2: ok. well I suggest windows developers use msysgit.	06:25
	dogarrhea2: exactly. just make sure you are commiting unix line endings	06:25
	→ eijk joined	06:25
frogonwheels	dogarrhea2: !eol	06:26
gitinfo	dogarrhea2: The option/attribute to use when you need to care about different line-endings in your file: http://timclem.wordpress.com/2012/03/01/mind-the-end-of-your-line/	06:26
	← noyb left	06:26
	→ shruggar joined	06:27
	← duckxx left	06:27
dogarrhea2	our architect has not run into the 2000+ or so path error thing on git	06:27
	→ senny joined	06:27
dogarrhea2	where very enterprisy java package/paths are more than whatever number of characters are needed to break git clones	06:28
frogonwheels	dogarrhea2: ahh. yes there are some path limit issues in msys	06:28
dogarrhea2	(on windows)	06:28
frogonwheels	I think they are less bad in cygwin.	06:28
	→ soee joined	06:28
	→ SEToChan joined	06:28
	→ rehat joined	06:29
frogonwheels	there has been some discussion in the msys dev about how to cope with the path limit issues... as the limits are backwards compatible windows hacky limits.	06:29
	→ blast_hardcheese joined	06:29
	→ marthinal joined	06:29
	← ehsan left	06:29
frogonwheels	dogarrhea2: windows relative paths cannot make use of the longer path names.	06:29
	→ ahayweh joined	06:29
	← w09x_ left	06:29
frogonwheels	dogarrhea2: I'm talking winapi here.	06:30
	→ lustucru joined	06:30
	← dstorrs left	06:30
	← jdav_gone left	06:31
	→ w09x joined	06:32
	→ StarOnD joined	06:32
	← StarOnD left	06:33
	← ahayweh_ left	06:33
	→ jjang joined	06:33
	← mishok13 left	06:33
	← w09x left	06:33
	← metcalfc left	06:33
	← spyro left	06:34
	← jjang_ left	06:34
	← Anubisss__ left	06:35
	← lresende left	06:35
	← kaen left	06:35
	← The24z left	06:36
	→ jdav_gone joined	06:37
	→ olmak joined	06:38
	→ olaf_ joined	06:38
	← Nirvanko left	06:39
	→ Nirvanko joined	06:39
	→ spyro joined	06:39
	← spyro left	06:39
	→ spyro joined	06:39
	→ dzonder joined	06:40
	→ OOPMan joined	06:41
	← ph^ left	06:42
	← Guest36956 left	06:43
	← igotnolegs left	06:43
	→ pdelvo joined	06:46
	← dogarrhea2 left	06:47
	← darren left	06:48
	← Davey left	06:48
	→ Alvo joined	06:49
	← andy left	06:49
	← quazimodo left	06:50
	→ vervic joined	06:51
	← olmak left	06:51
	→ lirt joined	06:52
	→ shelhamer joined	06:54
	→ dc5ala joined	06:54
	← shelhamer left	06:54
	→ dstorrs joined	06:55
	→ skorgon joined	06:55
	← skorgon left	06:55
	→ skorgon joined	06:55
	← osmosis left	06:56
	→ pantsman joined	06:58
	← pantsman left	06:58
	→ pantsman joined	06:58
	→ mishok13 joined	06:58
	← subbyyy left	06:58
	→ hoschi joined	06:59
	→ Pugnax joined	06:59
	← herdingcat left	06:59
	← shruggar left	07:02
	→ agumonkey joined	07:02
	← Pugnax left	07:02
	→ jkremser joined	07:03
	→ kaen joined	07:03
	← dinesh6654 left	07:05
	→ ChadStudmuffin joined	07:05
	← kkszysiu_work left	07:06
	← jiangenj left	07:07
	→ The24z joined	07:07
	→ dhruvasagar joined	07:07
	→ EhevuTov joined	07:09
	→ jonshea joined	07:09
	→ bogwonch joined	07:10
	→ jargon- joined	07:10
	→ patrick85 joined	07:11
	← lustucru left	07:11
	← HyperNerdV2 left	07:11
	→ nor5trom joined	07:12
	← Maccer left	07:12
	→ macer_ joined	07:12
	→ zapy joined	07:13
	← jave left	07:13
	→ jave joined	07:14
	← macer_ left	07:14
	← vervic left	07:15
	← robbyoconnor left	07:15
	← cilly left	07:17
	→ dpino joined	07:17
	← palyboy left	07:18
	→ thirdknife joined	07:19
	← flijten left	07:19
	← palm_vue left	07:20
	← bizhanMona left	07:20
	← Lgb left	07:20
	← ChadStudmuffin left	07:20
	← intransit left	07:20
	← The24z left	07:20
	→ palm_vue joined	07:21
	→ Lgb joined	07:21
	← dzonder left	07:21
	→ bizhanMona joined	07:21
	→ dzonder joined	07:22
	→ bubbles10101 joined	07:22
	← Oliver_ left	07:26
	← harish left	07:26
	← StefanM left	07:26
	→ ph^ joined	07:27
	← dhruvasagar left	07:27
	→ dhruvasagar joined	07:27
	← theoliverc left	07:28
	→ giallu joined	07:29
	← bogwonch left	07:30
	← SyouJyoA left	07:30
	→ flijten joined	07:32
	← ConstantineXVI left	07:33
	→ quazimodo joined	07:33
	← quazimodo left	07:35
	→ thiago joined	07:35
	← Textmode left	07:36
	← babilen left	07:37
	← ReekenX left	07:38
	pdelvo → pdelvo\|afk	07:38
	← beautifulmind left	07:39
	→ amcsi_work joined	07:39
	← jave left	07:41
	→ eregi joined	07:41
eregi	hi! I was trying to do the first push, but I'm getting an error. http://pastebin.com/8d5ZpgkH any ideas how to find out what's wrong	07:42
	→ jceb_ joined	07:42
	→ amcsi_work_ joined	07:42
	→ jave_ joined	07:43
	→ jiangenj joined	07:43
	← marthinal left	07:43
	→ Milossh joined	07:43
	← amcsi_work left	07:43
	← rurufufuss left	07:43
	gitinfo set mode: +v	07:44
jiangenj	Hi, I want to know if multi threads is supported during git fetch	07:44
	← jceb__ left	07:44
jiangenj	We need to sync code each day from another site on a slow connection like 1000KB/s	07:44
	and the connection is shared	07:45
	→ tqmz joined	07:45
	← dzonder left	07:46
	vals_ → tango_	07:46
	→ TheHaven joined	07:47
	← jceb_ left	07:48
	← Putr left	07:48
	← fisted left	07:48
	→ fisted joined	07:48
	← thirdknife left	07:49
	← Goplat left	07:50
	→ thirdknife joined	07:50
jiangenj	?	07:50
	→ Oliver_ joined	07:51
	← jkremser left	07:51
	→ Textmode joined	07:51
	→ Putr joined	07:51
	← joephelius left	07:52
	→ dr_lepper joined	07:52
	← dr_lepper left	07:52
	→ dr_lepper joined	07:52
	← gry left	07:52
	← patrick85 left	07:52
	gitinfo set mode: +v	07:53
arex\	Any one know what the VS integration in gitextensions is/does?	07:53
	→ jkremser joined	07:53
	← simesy left	07:55
	→ Jay_Levitt joined	07:55
	→ simesy joined	07:55
	→ rurufufuss joined	07:55
	→ hakunin joined	07:56
	→ claudiu__ joined	07:56
	← mkj_wk left	07:56
	→ legumbre_ joined	07:56
	→ mkj_wk joined	07:56
	← Textmode left	07:57
	← agumonkey left	07:58
	→ agumonkey joined	07:58
	← legumbre left	07:59
	← soren_ left	07:59
	→ harish joined	07:59
	→ shruggar joined	07:59
	← adam_g left	07:59
	→ arturaz joined	07:59
	← eregi left	07:59
	← aaronky- left	08:00
	← simesy left	08:00
	→ adam_g joined	08:00
	→ aaronky joined	08:00
	← boombatower left	08:00
	← eltigre left	08:01
	← toothrot left	08:01
	→ toothr joined	08:01
	→ jceb_ joined	08:02
	← jkremser left	08:03
	→ LimeBlast joined	08:03
	← d3vic3 left	08:04
	← pantsman left	08:04
	→ eregi joined	08:04
	→ soren joined	08:05
	→ blami_ joined	08:05
	→ jkremser joined	08:05
eregi	Hi! I'm trying to do the first push, but I get fatal: The remote end hung up unexpectedly	08:05
	It always occurs at ' writing objects: 26% '	08:06
	→ d3vic3 joined	08:06
	← jceb_ left	08:06
	→ jceb_ joined	08:07
	→ Sebo joined	08:09
	→ Textmode joined	08:09
SEToChan	if i want to remove some file from source controll, how can i do it?	08:10
jast	eregi: are there very big files in your repository?	08:11
	SEToChan: git rm --cached	08:11
	or 'git rm' to remove the physical file as well	08:11
eregi	jast, well the total dir size on my development server is ~ 28 mb	08:12
	→ lng joined	08:13
	← lirt left	08:14
lng	Hi! I have created new rsa key-pair and it prompts me to enter passphrase evrytime I clone the project. Why? ssh-agent should take care of that automatically, right?	08:15
eregi	jast, currently it's frozen on Writing objects: 26% (527/2024), 1.02 MiB \| 1.00 MiB/s	08:15
	← matled left	08:19
niax	lng: did you add the new key to your agent?	08:19
	→ artem joined	08:19
lng	niax: do you mean the server?	08:19
	← artem left	08:19
lng	I can connect	08:19
niax	ssh-agent won't magically pick up new keys	08:20
lng	oh	08:20
	→ ConstantineXVI joined	08:20
niax	you have to add it with ssh-add	08:20
lng	I see, thanks	08:21
	→ quazimodo joined	08:21
	← artnez left	08:21
	← jiangenj left	08:24
	← amcsi_work_ left	08:25
	→ amcsi_work joined	08:25
	→ schemula_ joined	08:26
lng	niax: I always get "Could not open a connection to your authentication agent"	08:27
	→ maksim joined	08:27
eregi	Any recomendations how to fix this - http://pastebin.com/PtzXsFau ?	08:28
	← maksim left	08:28
	→ cedeon joined	08:29
	← schemula left	08:30
	schemula_ → schemula	08:30
	→ wolwid joined	08:30
	→ polymar joined	08:31
	→ codecowboy joined	08:31
	→ Lord_DeathMatch joined	08:31
lng	niax: resolved	08:32
	→ TheJH joined	08:33
	← kaen left	08:33
	← C8H10N4O2 left	08:33
codecowboy	hi. if i have created a new local branch and set it to track a remote branch, what is the best/easiest way to keep the local branch up to date? should i pull or rebase?	08:34
	← rehat left	08:34
	→ jiangenj joined	08:36
FauxFaux	codecowboy: Depends which you want.	08:36
	→ molixiaoge_ joined	08:36
	← molixiaoge_ left	08:37
	→ molixiaoge_ joined	08:37
eregi	anyone?	08:37
	→ jmd joined	08:38
	← molixiaoge_ left	08:39
	← molixiaoge left	08:39
	→ molixiaoge_ joined	08:39
	← Vile left	08:39
	→ maksim joined	08:39
codecowboy	FauxFaux, i dont know that, hence the question.	08:40
maksim	Hi, what is the difference between using rebasing and branching ?	08:41
	*rebasing and merging i mean	08:41
	← Karmaon1 left	08:41
	← Alvo left	08:42
	→ Alvo joined	08:42
	← polymar left	08:42
thiago	maksim: rebasing means "take all the patches and reapply them on top of the new base"	08:43
	that means each and every one of the commits must be valid, on top of the new base	08:43
	merging means "calculate the end result, assuming the two sides happened in parallel"	08:43
	if there are no conflicts, in general the end result will be the same	08:44
	if there are conflicts, you'll need to fix them in every commit, not just in the final	08:44
eregi	Ok, if anyone else encounters the same error - git config --global http.postBuffer 524288000 fixed it for me	08:44
	← schemula left	08:45
	→ RaceCondition joined	08:45
	→ schemula joined	08:45
	← letharion left	08:45
	→ timthelion joined	08:47
	→ kanupatar joined	08:48
kanupatar	hi guys	08:48
gitinfo	kanupatar: welcome to #git, a place full of helpful gits. If you have a question, just ask it–somebody should answer shortly. For more information about git and this channel, see the links in the topic. It can't hurt to do a backup (type !backup for help) before trying advice you receive here.	08:48
kanupatar	I am using svn for 10 years	08:48
	I just used git for checking out some android source	08:48
	← thirdknife left	08:48
kanupatar	didn't try any commits or developements	08:49
	→ achadwick joined	08:49
kanupatar	so I head git is better than svn	08:49
	→ babilen joined	08:49
kanupatar	so I am planning to put a suggestion to my uni to introduce git..can you guys help me to proceed with that	08:49
	how can I move on?	08:50
amcsi_work	hello, when git pushing through ssh onto a remote server from mine, git push gets stuck in the middle, always at the same time. This may be an ssh issue? Please, how do I fix this? :/ this is the second server it happens on, and I really need this to be fixed	08:50
OMGOMG	kanupatar: you don't use git yourself, but you want to introduce it?	08:50
kanupatar	I need to show the difference + extra features + usablity,portability etc	08:50
	OMGOMG: yes, by hearing from lot many friends	08:50
	→ mklappstuhl joined	08:51
	← thiago left	08:51
	→ borwar joined	08:51
	← borwar left	08:52
	← d3vic3 left	08:54
	← gavin_huang left	08:54
	→ letharion joined	08:55
kanupatar	gitinfo: any helps?	08:55
maksim	thiago: you mean in case of rebasing i will need to fix them in every commit?	08:55
	→ superfluous joined	08:55
OMGOMG	kanupatar: i suppose you could start here http://www.youtube.com/watch?v=4XpnKHJAok8	08:57
	→ Bartzy joined	08:58
kanupatar	OMGOMG: ok thanks	08:58
Bartzy	Hi	08:58
	if I have branch A which the origin for is master	08:58
kanupatar	OMGOMG: means oh my God x 2?	08:58
Bartzy	and I then have branch B which the origin for is branch A	08:58
	now I rebased branch A from master	08:58
	when I rebase branch B from branch A, I get a problem - right ? because history was changed	08:58
	how can I solve this ?	08:59
	→ whitman joined	08:59
	← maksim left	08:59
	← cmn left	08:59
	→ berserkr joined	09:00
codecowboy	I want to apply any remote changes to my local feature branch. Do I just do a pull to do that? Or is that what rebase is for?	09:00
	This is to stay up to date before committing or merging anything	09:01
	← anildigital left	09:01
	→ anildigital joined	09:01
	→ thirdknife joined	09:01
	← oojacoboo left	09:02
	← jonshea left	09:02
	→ fornext joined	09:03
	← afuentes left	09:04
	← fornext left	09:04
	→ fornext joined	09:04
	pdelvo\|afk → pdelvo	09:05
	→ oojacoboo joined	09:05
	→ afuentes joined	09:05
	→ d3vic3 joined	09:06
	→ thelazydeveloper joined	09:09
	← dstorrs left	09:10
	→ cmn joined	09:11
	← Bartzy left	09:11
	→ codeshah joined	09:13
	← aspotashev left	09:13
	→ Vert joined	09:15
	→ Vile joined	09:16
	→ EhevuTov_ joined	09:17
	← EhevuTov_ left	09:17
charon	codecowboy: why "before committing"? don't be afraid of committing	09:19
	why into a feature branch? it tends to contaminate them with unrelated changes, and is generally not recommended	09:19
	and using pull before merging is contradictory, because !pull	09:19
gitinfo	pull=fetch+merge (or with flags/config also fetch+rebase). It is thus not the opposite of push in any sense. A good article that explains the difference between fetch and pull: http://longair.net/blog/2009/04/16/git-fetch-and-merge/	09:19
codecowboy	charon, i suppose i just thought a merge would be less painful in future if i kept my feature branch u to date. also, what if code which has side effects for my code changes without me knowing? i would implement my feature incorrectly	09:20
	← wolwid left	09:20
charon	codecowboy: well, the way i generally go about it is: git checkout feature^0; git merge master; <test>; git checkout feature	09:21
	the trick being that checout feature^0 makes you !detached, and the resulting merge is "lost" once you move back to the branch	09:21
gitinfo	A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach	09:21
charon	so it results in a temporary for-testing merge	09:21
	if such testing, or just watching the progress of master, tells you that you need to stay up-to-date because of a side effect that master has on you, then a merge may indeed be the best choice	09:22
	(the other one being to make a mental note about what needs to be fixed at the merge into master)	09:22
	→ nocturnal joined	09:22
codecowboy	charon, i think you are confusing me with someone who knows what tyhey're doing	09:22
charon	but if you just do that whenever you feel like it, you'll have lots of "Merge branch master ..." commits that don't really mean anything	09:22
	→ marthinal joined	09:23
codecowboy	charon what is <test>	09:23
charon	test whether your code still works, by whatever means you normally do that	09:24
	e.g. make && make test	09:24
	← thirdknife left	09:24
codecowboy	charon, thanks. i dont think i will do what you are suggesting, though as it sounds dangerous in the wrong hands	09:25
	← Turicas left	09:25
	← keller left	09:26
	charon shrugs	09:26
charon	for future reference, this is in man gitworkflows, throw-away integration	09:26
gitinfo	the gitworkflows manpage is available at http://git-scm.com/docs/gitworkflows.html	09:26
charon	it also loses some of its danger if you use a temp branch instead of a detached HEAD, as described there	09:26
	← BiggFREE left	09:29
	← EhevuTov left	09:29
	← ipalaus left	09:29
	← Jay_Levitt left	09:30
	→ ipalaus joined	09:32
	→ Chibby_ joined	09:32
codecowboy	charon, thanks will take a look	09:32
aaronj	is there a way to manage file permissions in git? I tried chown a file before committing but it didn't seem to save that change in a fresh clone	09:33
	and when I chown a file git doesnt' register any change	09:33
	← OOPMan left	09:33
selckin	it only tracks +x, so no	09:34
charon	aaronj: git only tracks the u+x bit. perhaps you should look into etckeeper and such	09:34
	(what problem are you trying to solve, anyway?)	09:34
aaronj	charon: thx, will do	09:34
frogonwheels	aaronj: not directly. You could possibly make use of post-checkout hook and a text file containing stuff?	09:34
selckin	!deploy	09:34
gitinfo	Git is not a deployment tool. You can build one around it for simple environments. http://sitaramc.github.com/the-list-and-irc/deploy.html	09:34
	← RaceCondition left	09:34
frogonwheels	aaronj: ah yes.I was going to point to etckeeper as well, I think it has a mechanism	09:34
aaronj	cool, looks good	09:35
	charon: just trying to fit git into a deployment scenario :)	09:35
	← hays left	09:37
	← malesca_ left	09:37
	← tic left	09:38
	→ shreya joined	09:38
	→ tic joined	09:38
	→ thiago joined	09:38
	→ lsobral joined	09:39
	← ameoba left	09:40
	← Sebo left	09:40
	→ Sebo joined	09:40
	← Lgb left	09:40
	← bizhanMona left	09:40
	→ malesca joined	09:40
	→ Lgb joined	09:41
	→ Kicer86 joined	09:41
	→ bizhanMona joined	09:41
	→ hays joined	09:41
	→ ameoba joined	09:41
	→ The24z joined	09:42
	← The24z left	09:43
	→ The24z joined	09:43
	← The24z left	09:43
	→ The24z joined	09:44
	→ _aeris_ joined	09:45
	→ juvenal joined	09:45
	← juvenal left	09:45
	→ alexukf joined	09:47
	← Weiss left	09:48
	→ PetrMotejlek joined	09:49
	→ Weiss joined	09:50
	→ cjs joined	09:50
	→ RaceCondition joined	09:50
	→ simesy joined	09:50
	← DarkClown left	09:51
cjs	I've got a repo cloned from one with two branches, but I'd like my local clone to bring in the data only for one branch, in order to save disk space. Any idea how I'd do that?	09:51
charon	man git-clone --single-branch	09:52
	cjs: note that this is a fairly recent development, your git might be too old	09:52
	→ kkszysiu_work joined	09:52
cjs	Yeah, mine is too old, unfortunately.	09:52
	← jackh left	09:53
cjs	(1.7.9.5)	09:53
_aeris_	hello #git !	09:53
gitinfo	the git-clone manpage is available at http://git-scm.com/docs/git-clone.html	09:53
	_aeris_: welcome to #git, a place full of helpful gits. If you have a question, just ask it–somebody should answer shortly. For more information about git and this channel, see the links in the topic. It can't hurt to do a backup (type !backup for help) before trying advice you receive here.	09:53
cjs	Hm. Maybe the --depth thing will help me save disk space?	09:53
_aeris_	i have a little problem with git stash	09:53
charon	cjs: you can, however, emulate clone by hand if you are too lazy to update	09:53
cjs	I'm really interested only in reading the checked-out data, for this particular copy.	09:53
	← alexukf left	09:54
charon	cjs: it goes roughly like: git init; git remote add origin <url>; edit the fetch lines in .git/config in the obvious way, replacing * with your branch; git fetch origin; git merge origin/branchname	09:54
	(ok, that merge is just a veeeery lazy way to point another branch at it)	09:54
jast	sitaram: the "D" command doesn't seem to spit out an error message if you try to rm a locked repo. perhaps that should be changed?	09:54
charon	instead, maybe use 'git checkout -b branchname origin/branchname' so as to not learn any bad habits from me.	09:54
cjs	charon: Oh, that appears to make sense.	09:54
	← iori left	09:55
_aeris_	« git stash apply » returns me a « Could not restore untracked files from stash »	09:55
	but unable to find what file i have to remove…	09:55
sitaram	jast: could you send me an email? I'm doing too many things right now and anyway can't get to it for a week!	09:56
cjs	charon: Isn't lazier just to say, "git checkout branchname"? My versions of git will automatically create a local branchname as a tracking branch of origin/branchname if branchname doesn't already exist.	09:56
	← harish left	09:56
charon	cjs: i bow down to your supreme laziness	09:58
	→ iori joined	09:59
	→ joephelius joined	09:59
	→ beautifulmind joined	09:59
	→ swair joined	10:03
cjs	charon: :-)	10:03
	← dhruvasagar left	10:04
	→ durre joined	10:04
	→ gusnan joined	10:04
	→ dhruvasagar joined	10:05
jmd	I want to make a publicly readable repo. What's the best way to do that?	10:05
durre	I committed some changes to my local branch. then I did "git checkout hashtag of en earlier commit"… then "git checkout HEAD"…. now my previous seem to be uncommitted again. not sure how to proceed	10:05
	→ alexukf joined	10:05
	← heroux_ left	10:06
_ikke_	durre: Could you explain it a bit more	10:06
	durre: !repro	10:06
gitinfo	durre: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session, or at least explain exactly what you did that led up to the problem. This will help immensely with troubleshooting.	10:06
	SeoZ → SeoZ-work[AWAY]	10:06
	← tsdh left	10:06
	→ tsdh joined	10:07
jast	sitaram: sure thing!	10:07
jmd	durre: git reflog	10:08
jast	sitaram: actually I think it goes to stderr or something... and since this is an HTTP setup, stderr probably ends up in the web server logfiles	10:09
sitaram	probably...	10:09
	→ msankhala joined	10:09
sitaram	it's been a while since I looked at that code (and I wrote it for someone else, not myself)	10:09
jast	... yep	10:09
	your command suggestion yesterday works like a charm, btw	10:10
	← berserkr left	10:10
	← alexukf left	10:11
	← swair left	10:11
	→ swair joined	10:12
durre	hmm, might be I'm in the wrong branch messing about	10:12
	→ graphitemaster joined	10:12
	← hyperair left	10:14
aaronj	I've got a submodule I checked out a 'work' branch, how do I merge that in with origin/anotherbranchname and push back upstream ? I don't want to push up the work branch	10:15
	when I checkout origin/anotherbranchname it says I'm running on a detached head	10:16
	← fireh left	10:16
	→ _iron joined	10:16
	→ JP__ joined	10:17
	→ irqq joined	10:18
	← _sundar_ left	10:18
	→ landypro joined	10:18
	← JP__ left	10:19
	→ OOPMan joined	10:19
	← jceb_ left	10:21
jmd	git checkout anotherbranchname ; git merge work	10:22
aaronj	think I figured it out, I just checkout anotherbranchname and it automatically links i tto origin/anotherbranchname and then I can merge with work	10:22
	jmd: nice, thanks	10:22
	← dpino left	10:23
	→ thirdknife joined	10:23
	← Alvo left	10:23
	→ alexukf joined	10:23
aaronj	jmd: is there a way to have the local version of anotherbranchname automatically there when I submodule update?	10:23
jmd	So far as I'm aware, there's no such thing as a "submodule" (or "module") in git.	10:24
aaronj	?	10:24
	→ Alvo joined	10:24
aaronj	jmd: http://git-scm.com/book/en/Git-Tools-Submodules	10:25
jmd	I stand corrected then.	10:26
	→ arkiver joined	10:26
	← alexukf left	10:28
	← Textmode left	10:29
	← tazle_ left	10:29
	→ pandian912 joined	10:31
	→ marhaban joined	10:32
	→ _sundar_ joined	10:32
	← pandian912 left	10:32
	← thirdknife left	10:33
	← simesy left	10:35
	→ simesy joined	10:35
	myme_ → myme	10:35
	← cjs left	10:36
	→ heroux joined	10:38
	→ heoa joined	10:38
	← Oliver_ left	10:39
	→ wolwid joined	10:39
	← simesy left	10:39
	→ alexukf joined	10:41
	← Sebo left	10:41
	→ Sebo joined	10:41
	→ tazle_ joined	10:41
	← marhaban left	10:43
	→ gavin_huang joined	10:43
	← shreya left	10:43
	→ irqq_ joined	10:45
	← eregi left	10:46
	← irqq left	10:46
	← alexukf left	10:47
	→ cilly joined	10:49
	→ DarkClown joined	10:49
	← arex\ left	10:49
	→ shreya joined	10:50
lng	\exit	10:51
	exit	10:51
	← lng left	10:51
	← dbr left	10:54
	← jjang left	10:54
	→ thirdknife joined	10:54
	← Chappo left	10:55
	← xiangfu left	10:56
	← d3vic3 left	10:57
	← marthinal left	10:57
	→ Learath2 joined	10:58
	→ d3vic3 joined	10:59
	← superfluous left	10:59
	→ alexukf joined	11:00
	← jkremser left	11:00
	→ dpino joined	11:01
	← zdk left	11:02
	← schemula left	11:03
	→ skobiyan joined	11:03
monkeyiq	anyone know of a simple/approved method for creating a second fork of a project on github?	11:04
	← alexukf left	11:04
selckin	bypass the ui	11:04
	do it the normal git way	11:04
	← lb left	11:05
	→ xMYTHICx joined	11:05
	→ SkAzZ joined	11:05
Learath2	monkeyiq: why need 2 forks	11:05
	when you can get 2 branches :D	11:05
monkeyiq	Learath2: yeah, I made one fork with freatures and want a fresh one. Didn't create branches before I started hacking/committed :/	11:05
	I'd prefer to have multiple separate repos rather than branches	11:06
Learath2	monkeyiq: ..	11:06
_ikke_	monkeyiq: Why is that?	11:06
	← arkiver left	11:06
_ikke_	monkeyiq: That's a bit an svn way of doing things	11:06
monkeyiq	selckin: I assume normal git way is to clone origin and then add a new remote to push a mirror too	11:06
selckin	yeha	11:06
Learath2	monkeyiq: well you can always start a branch from a specific commit	11:06
monkeyiq	_ikke_: I've had a little issue with git recently, its more defensive to keep a single repo per patch	11:07
	→ jkremser joined	11:07
	← agile left	11:07
	→ nada joined	11:07
_ikke_	What kind of issue?	11:07
monkeyiq	while branches are the right way, I'm happy to throw a bit of bandwidth at things to keep things separate	11:08
	← nada left	11:08
_ikke_	monkeyiq: You can even clone a repository multiple times	11:08
	← psoo left	11:08
monkeyiq	_ikke_: I seem to have misused rebase at some point. my patch to origin went from 50kb to 4mb with changes unrelated to stuff I'd touched	11:08
_ikke_	monkeyiq: Why do you need multiple github forks?	11:08
monkeyiq	_ikke_: the main motivation is separation of patches	11:09
	→ theGP joined	11:09
monkeyiq	no single point of failure, the repos only exist until the patch is accepted upstream and then can fade away	11:09
	→ paolooo joined	11:09
	→ agile joined	11:10
	← durre left	11:10
monkeyiq	it seems my old workflow of cloning origin and then pushing a copy to github as a new remote is as close as I'll get to multiple forks on github	11:10
	← paolooo left	11:10
selckin	can always try to learn git better aswel	11:11
_ikke_	I don't really get the problem. You can even misuse rebase with different clones	11:11
	monkeyiq: I think you are trying to solve this issue in the wrong direction	11:11
monkeyiq	I'll definitely rtfm much more on git, though that will be in a bit when I've done the code hacking I've planned	11:11
_ikke_	monkeyiq: A github fork is mainly a way to interact with others	11:12
	← jiangenj left	11:12
monkeyiq	sorry guys, I know I'm using a hammer to screw in a nail with my usage style :/	11:12
_ikke_	monkeyiq: You don't need multiple interaction points with others	11:12
	monkeyiq: If you want to keep patches seperate, put them in a different branch	11:12
	→ angelsl joined	11:13
theGP	Hi, simple question : Is it good practice to open a bunch of branches to keep track of pending features, kind of like a to-do list? I don't collab with anyone, just me writing the code	11:13
_ikke_	theGP: Yeah, that's what branches are for	11:14
	theGP: People often call them topic branches	11:14
selckin	you write 5 features at the same time?	11:14
	→ paolooo joined	11:14
	← wolftankk left	11:14
	→ lb joined	11:15
	← lb left	11:15
	→ lb joined	11:15
theGP	selckin: rather I'm trying to fix a mess I inherited	11:15
	thanks, off to branchland I go	11:15
	→ alexukf joined	11:16
_ikke_	rather then piling up everything one one big heap, you devide each function onto different stackes	11:17
	stacks*	11:17
	pdelvo → pdelvo\|afk	11:18
	→ harish joined	11:19
	→ psoo joined	11:21
	← lb left	11:21
	← alexukf left	11:22
	← ipalaus left	11:22
	→ lb joined	11:23
	← lb left	11:23
	→ lb joined	11:23
	pdelvo\|afk → pdelvo	11:25
	← lb left	11:25
	← gavin_huang left	11:25
	← dpino left	11:27
	← xMYTHICx left	11:28
	← cyen left	11:28
	→ dpino joined	11:29
	→ _eMaX_ joined	11:29
_eMaX_	hi all	11:29
gitinfo	_eMaX_: welcome to #git, a place full of helpful gits. If you have a question, just ask it–somebody should answer shortly. For more information about git and this channel, see the links in the topic. It can't hurt to do a backup (type !backup for help) before trying advice you receive here.	11:29
	→ lb joined	11:30
	← lb left	11:30
	→ lb joined	11:30
	→ xMYTHICx joined	11:32
	→ kleist joined	11:32
	→ ipalaus joined	11:33
	← theGP left	11:33
	→ alexukf joined	11:34
_eMaX_	can I rename a stash?	11:34
_ikke_	_eMaX_: A stash doesn't have a name, only a description	11:34
	← blexim left	11:36
frogonwheels	_eMaX_: you can tag whatever you like, so presumably you can tag one. but why would you want to?	11:37
	→ xiangfu joined	11:37
frogonwheels	_eMaX_: !xy	11:37
gitinfo	_eMaX_: This sounds like an "XY Problem" http://mywiki.wooledge.org/XyProblem So let's step back for a minute. What are you actually trying to achieve? Why are you doing it this way?	11:37
	← alexukf left	11:38
	lamont` → lamont	11:39
_eMaX_	ok can I change the description of a stash?	11:40
	← letharion left	11:40
frogonwheels	why?	11:40
_ikke_	_eMaX_: Nope, you can't	11:41
	except for applying and resaving the stash	11:41
	← xiangfu left	11:42
frogonwheels	_eMaX_: but as I suggested, you can tag a stash. but unless you answer the why? I can't really help further.	11:43
	→ letharion joined	11:43
	← Psycho_pr left	11:43
	← dpino left	11:43
	→ Psycho_pr joined	11:43
	← giallu left	11:45
	→ Chappo joined	11:46
frogonwheels	_eMaX_: hint. I have more information..but it requires some direction!	11:46
	→ aruiz joined	11:46
	→ cannonball joined	11:46
	wereHams1er → wereHamster	11:47
	→ geekbri joined	11:47
	→ mikewintermute joined	11:47
	→ lixef joined	11:48
	→ Maccer joined	11:50
	→ alexukf joined	11:50
	← philips_ left	11:51
	← TheJH left	11:51
	→ Oliver_ joined	11:52
	← alexukf left	11:52
	→ tvw joined	11:52
	→ philips_ joined	11:53
	→ vervic joined	11:53
	→ Ryback_ joined	11:55
	← Esa left	11:56
	→ chrisgeorge joined	11:56
	← quazimodo left	12:00
	→ Esa joined	12:00
	← hexa2k9 left	12:01
	→ hexa2k9 joined	12:01
	← Esa left	12:05
	→ marhaban joined	12:05
	→ alexukf joined	12:07
	→ tinti joined	12:12
	← Psycho_pr left	12:13
	→ Esa joined	12:14
	← Oliver_ left	12:14
	Silex^^ → Silex	12:14
	→ skyf joined	12:15
	→ C8H10N4O2 joined	12:16
	→ jackh joined	12:17
	← jackh left	12:18
	→ marthinal joined	12:19
	← wolwid left	12:19
	← kcj left	12:20
	→ dys joined	12:21
	← joephelius left	12:23
	← kurrataW left	12:25
	← cilly left	12:26
	← vervic left	12:28
	← Chibby_ left	12:29
	← xMYTHICx left	12:32
	→ jceb_ joined	12:33
	→ Psycho_pr joined	12:33
Psycho_pr	Hi	12:33
	I just did git checkout some_old_commit	12:34
	and I want to go back to where HEAD was before	12:34
	what should I do?	12:34
	→ RaceCondishun joined	12:34
grawity	I think `git checkout -` can do that	12:34
	or "HEAD@{1}", or just "master" if you were on master	12:35
	→ hellopat joined	12:35
	← RaceCondishun left	12:35
Psycho_pr	Let's see...	12:35
charon	grawity, Psycho_pr: checkout HEAD@{1} leaves it detached	12:36
	'git checkout -' is magic in that it actually re-attaches if you were on a branch before	12:36
grawity	aha	12:37
	it's also magic in that it does not seem to be documented.	12:37
Psycho_pr	I did checkout master. Is it now re-attached?	12:37
charon	Psycho_pr: yes	12:37
	grawity: hrm, we must have lost it at some point. i swear it was documented when it was added	12:37
	← RaceCondition left	12:38
	→ borwar joined	12:38
	→ joephelius joined	12:38
Psycho_pr	Thanks!	12:38
charon	grawity: no wait, it's still there, buried in the description of <branch> after all the options	12:40
	→ mmc1 joined	12:40
grawity	Ah.	12:40
	← Sebo left	12:42
	→ storrgie joined	12:42
	← sangi left	12:46
	← Gentlecat_ left	12:46
	→ xMYTHICx joined	12:47
	← iori left	12:48
	← hellopat left	12:48
	← berndj left	12:50
	→ rgsteele joined	12:50
	→ TheFuzzb_ joined	12:54
	← harish left	12:54
	→ theCole joined	12:54
	← afuentes left	12:55
	→ Oliver_ joined	12:55
	→ freeed joined	12:55
	→ quazimodo joined	12:56
	→ Sebo joined	12:56
	← lixef left	12:57
	→ ddelrio1986 joined	13:00
	← borwar left	13:01
	→ camdenx joined	13:01
	→ RaceCondition joined	13:02
The24z	Help! Getting a error: The following untracked working tree files would be overwritten by merge: on git pull origin master	13:02
	How can I get rid of it?	13:02
charon	The24z: what are you trying to do?	13:03
The24z	I want to force my local master branch to be exactly like the remote one. Oddly enough git ls-files does NOT have the file in question in the list. git status shows everything up to date. git rm file does not work.	13:03
_ikke_	The24z: That's because the file is not tracked	13:04
	→ nwest joined	13:04
_ikke_	(and probably ignored)	13:04
	→ gmartyn joined	13:04
_ikke_	try git ls-files -i	13:04
The24z	that is true, it is in .gitignore	13:04
charon	so just run 'git fetch origin && git reset --hard origin/master' ... which spells exactly "make my branch the same as origin/master and trash anything that is in the way, including all my uncommitted work"	13:04
	running pull for this instead is wrong on many levels, including !pull and !pull4	13:04
gitinfo	pull=fetch+merge (or with flags/config also fetch+rebase). It is thus not the opposite of push in any sense. A good article that explains the difference between fetch and pull: http://longair.net/blog/2009/04/16/git-fetch-and-merge/	13:04
	[!fetchfour] Never use the four-word version of git-fetch or git-pull (e.g. git fetch remote refspec). It always ends in tears. Yes, if you understand the implications of FETCH_HEAD it can technically be done, but really it is easier to just fetch the whole remote (or perhaps edit the fetchspec if you never want other bits). If you must, see !fetch4why	13:04
	→ MrRoot joined	13:04
	→ ehsan joined	13:05
	← thirdknife left	13:05
The24z	That worked. So what exactly did it do?	13:05
charon	'reset --hard origin/master' moves the current branch to point at origin/master (or rather, its tip commit), and trashes all uncommitted work so that the worktree matches the state of origin/master, too	13:06
	details in man git-reset	13:06
gitinfo	the git-reset manpage is available at http://git-scm.com/docs/git-reset.html	13:06
charon	note that it's one of the few git operations with no safety net whatsoever, at least as far as uncommitted work goes	13:07
	→ linoj joined	13:07
	→ berndj joined	13:07
	→ longbeach joined	13:07
	← mikewintermute left	13:07
The24z	But it only sets the POINTER to point to that commit, it doesn't change anything with the actual files on my disk, am I correct?	13:07
	That part happens when I execute the fetch.	13:08
	Is that correct?	13:08
charon	no	13:08
	i just said "and trashes all uncommitted work so that the worktree matches the state of origin/master, too"	13:08
	fetch just serves to update origin/master	13:08
	to what origin currently has	13:08
The24z	Thanks for being patient with me. I really wanted to understand this for a long time and you seem very knowledgable. :-)	13:08
charon	i told you to fetch because 'git pull origin master' specifically does not update origin/master, which is a bit of an UI wart	13:09
The24z	But how does reset update my files when it does not pull any data from the origin	13:09
	← Esa left	13:09
charon	after fetch, your local repository already has the full state of the remote repo in the origin/* namespace	13:09
	so it's merely a question of unpacking all of it to your worktree	13:09
	that's the distributed nature of git: all operations except fetch and push are local (*)	13:10
	← dvide left	13:10
charon	(*) don't tell me about the exceptions, if you know them you don't need this adivce	13:10
The24z	ah! git fetch origin downloads the files but they remain in gits data store.	13:10
	→ chuckharmston joined	13:10
	→ Chib joined	13:10
The24z	the reset --hard origin/master is a LOCAL operation and tells git to unpack the diffs and move exactly to the current head state of the origin. is that said correctly?	13:10
	→ mikewintermute joined	13:10
charon	yes (well, it's wrong in the implementation details, but meh)	13:11
	reset --hard C quite literally does: point the current branch to commit C; make the index contents match C (that is, unpack C's tree to the index); make the worktree contents match the index	13:11
The24z	okay. the fetch is just needed before because otherwise it would not know about the changes that are available on C	13:12
charon	no, because i was afraid that origin/master would point at an older commit because you hadn't fetched in a way that updates it	13:13
	at the time reset looks at it, the branch is just a neat way to refer to a commit	13:13
	but fetch updates which commit it refers to	13:13
	... the origin/master remote-tracking branch, i mean	13:14
	→ pinguinux joined	13:14
	← pinguinux left	13:14
	→ pinguinux joined	13:14
The24z	thanks a lot.	13:14
	that helped a lot	13:14
charon	(another small misconception is that git does actually not store any diffs; they are always computed on-the-fly. git stores full tree snapshots)	13:15
	→ Mtheory joined	13:15
	→ v0n joined	13:15
	→ Anubisss joined	13:15
	→ agileadam joined	13:15
	← Oliver_ left	13:15
	→ yuuki__ joined	13:16
	← orafu left	13:16
The24z	So does git reset in and out of itself go to the server (remote) and check anything? Or does it work purely locally?	13:16
	→ iamjarvo joined	13:16
charon	purely locally	13:16
	→ orafu joined	13:16
	→ revagomes joined	13:17
charon	the full list that the (*) above hides is: fetch, push, ls-remote, archive --remote (usually disallowed by server), and the component four programs that implement fetch/push client/server sides	13:17
	(i hope i got that right)	13:17
	no other operation talks to the network	13:17
	← oakdog8_ left	13:17
	→ oakdog8_ joined	13:17
	oakdog8 → Guest32093	13:17
	→ glennpratt joined	13:18
The24z	It's really the first time I understand this.	13:18
	Are you a contributor to the git code?! :-)	13:18
	oakdog8_ → oakdog8	13:18
charon	yes	13:18
The24z	Wow. Honored.	13:18
	→ andrewhl joined	13:18
The24z	So that really means that a git reset sets the pointer to a specific commit that the local store knows about. Even the "real" origin/master might be at a different commit.	13:19
	charon blushes	13:19
charon	The24z: indeed	13:19
	← bizhanMona left	13:20
	← Lgb left	13:20
	← palm_vue left	13:20
	→ orkz_ joined	13:20
The24z	So I should ideally never to a reset prior to fetching from remote. Expressed differently: First make sure that the local origin/master is the same as the remote origin/master THEN reset	13:20
charon	well, it depends ;) but yes, in general you want to fetch before working with the remote branches	13:21
	← orkz left	13:21
	orkz_ → orkz	13:21
charon	it's just that this can also become OCD... i mean, there's usually no point in fetching more than once a day from junio's git.git, for example, because it doesn't change that often	13:21
	→ Lgb joined	13:21
	→ palm_vue joined	13:22
	→ bizhanMona joined	13:22
	→ john2496 joined	13:23
charon	btw, if you write down the above list of remote operations, you should add a note that pull=fetch+merge and clone=init+fetch+checkout, so by extension they are also remote	13:24
	← rchavik left	13:24
	→ TeckniX joined	13:24
charon	(using the + in a loose sense, there's slightly more to it than that...)	13:24
The24z	you should write a book about this. by the way, any book YOU would recommend?	13:24
charon	!book	13:25
gitinfo	There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	13:25
	→ localhost joined	13:25
	← localhost left	13:25
charon	fwiw, the introduction i give to coworkers is loosely based on !cs	13:25
gitinfo	"Git for Computer Scientists" is a quick introduction to git internals for people who are not scared by phrases like Directed Acyclic Graph. http://eagain.net/articles/git-for-computer-scientists/ See also !concepts !bottomup	13:25
The24z	!cs	13:25
gitinfo	"Git for Computer Scientists" is a quick introduction to git internals for people who are not scared by phrases like Directed Acyclic Graph. http://eagain.net/articles/git-for-computer-scientists/ See also !concepts !bottomup	13:25
The24z	!gitt	13:26
gitinfo	A book designed to teach people about Git in a real world usage model. The book follows a fictional company as they implement and learn about Git. Covers all 21 standard Git commands. Available for free at http://cbx33.github.com/gitt/	13:26
	→ dpwrussell joined	13:27
The24z	!bottomup	13:27
gitinfo	'Git from the bottom up' starts with explaining the building blocks of git and proceeds to tell you how they fit together. http://ftp.newartisans.com/pub/git.from.bottom.up.pdf	13:27
	→ rohan32 joined	13:27
	liori_ → liori	13:28
	← ehsan left	13:29
dpwrussell	Apologies for asking what is probably a very obvious question, but I couldn't quite find the answer. I have made some commits to local and I can reverse them out if I want, but what I often want to do is simply make my local clone the same as the remote one again and lose all the local changes. How do I do that. I suspect rebase is involved, but I'm not sure how	13:31
	I want to lose local changes and local commits completel.	13:31
	completely*	13:31
jmd	dpwrussell: git reset	13:32
	→ minusthetiger joined	13:32
	→ mischat joined	13:32
	← storrgie left	13:34
	→ The24z_ joined	13:34
dpwrussell	jmd: thanks, I knew it was much less complicated than I was thinking	13:34
	← The24z left	13:36
	The24z_ → The24z	13:36
	→ rmr joined	13:37
tubbo	does `git push origin --tags` also push all branches to origin?	13:37
	or just any new tags?	13:37
	→ jceb__ joined	13:37
	← jceb_ left	13:38
	→ kaen joined	13:38
	← pretty_function left	13:38
_ikke_	man git push	13:39
gitinfo	the git-push manpage is available at http://git-scm.com/docs/git-push.html	13:39
	→ bartek_ joined	13:39
_ikke_	"All refs under refs/tags are pushed, in addition to refspecs explicitly listed on the command line."	13:39
gmartyn	what is the best way to see the state of my branch at a previous point in time? it looks like i have to know which of the parent commits to follow when tracing back through a merge, but it's hard to know which one to follow.	13:39
	← bartek_ left	13:40
shruggar	gmartyn: what are you actually trying to find?	13:40
	← msankhala left	13:41
	← jceb__ left	13:42
gmartyn	2 questions really.. 1) how to restore our server to yesterday's state, and 2) when a patch was merged to live. For #2 i tried "git log --ancestry-path --merges {patch #}..live" to find when the patch was merged, but there were several merges, so it's hard to tell which one put it into the live tag	13:44
_ikke_	gmartyn: Do you know what yesterdays state was? (was it tagged)?	13:45
gmartyn	no tag	13:45
_ikke_	you could try the reflog	13:45
	→ phishy joined	13:46
	← yuuki__ left	13:46
	→ corburn joined	13:46
	→ t0rc joined	13:48
	→ The24z_ joined	13:50
	← The24z_ left	13:50
	→ crispus joined	13:50
gmartyn	reflog just shows me local changes, right?	13:50
	→ Noodels joined	13:51
	→ The24z_ joined	13:51
	← jargon- left	13:51
crispus	i just merged a branch, how do i go back and look at what the merge did?	13:52
	← The24z_ left	13:52
	← The24z left	13:52
jmd	gmartyn: Well it can't show you what happened on a remote, unless you have synced with that remote.	13:52
	→ The24z_ joined	13:52
	→ Ecesis joined	13:53
	← The24z_ left	13:54
	→ jceb__ joined	13:54
	→ The24z joined	13:54
gmartyn	jmd: i see now. thanks. i did sync with the remote	13:54
	gitinfo set mode: +v	13:56
Noodels	Hi, does anyone know if it's possible to take an existing svn repository, and an existing git repository based off that svn repository, and merge in the svn history without starting from scratch?	13:56
	← chuckharmston left	13:56
	→ storrgie joined	13:57
gmartyn	Noodels: it is	13:57
	→ ReekenX joined	13:57
	→ RaceCondishun joined	13:58
Noodels	gmartyn: That's good news. What term would concisely refer to that? Bearing in mind that I already have an existing git repository with its own set of a few weeks worth of changes.	13:58
	→ ehsan joined	13:58
	→ JotaLambda joined	13:59
gmartyn	Noodels: dunno. i remember svn2git seemed to do it	13:59
	to clarify for myself by putting it in svn terms, there's no equivalent in git of "svn checkout -r {2012-08-01} branches/live" without having a tag that was made on that day of that branch	14:00
	→ barq joined	14:00
	← obiwahn left	14:00
	→ williamcotton_ joined	14:00
Noodels	Hmm. I don't know much about svn terms.	14:00
_ikke_	gmartyn: What would happen if multiple cmomits were made that day?	14:00
	Noodels: He's talking about his own situation	14:01
	→ iguanna joined	14:01
	← RaceCondition left	14:02
	RaceCondishun → RaceCondition	14:02
	← williamcotton left	14:02
	williamcotton_ → williamcotton	14:02
_ikke_	Noodels: Is there any connection between the svn and git repository?	14:02
Noodels	_ikke_: Yeah, they're of the same project. I didn't personally make the git repository, but hopefully the svn repository now is in a state identical to the first git commit.	14:02
	→ thirdknife joined	14:03
	← xMYTHICx left	14:03
_ikke_	Is this a one off operation?	14:03
	→ hyperair joined	14:03
Noodels	Yep.	14:04
aaronj	if git only does +\|-x for permissions, does it just use the original values for the rest or a set of defaults?	14:04
wereHamster	aaronj: git uses your umask for everything else	14:04
iguanna	what is the equivalent command that svn update in git? maybe git checkout	14:04
aaronj	aka, if I need a directory to be chmod 775 can I get git to do that automatically?	14:05
wereHamster	aaronj: no	14:05
gmartyn	_ikke_: it would give you midnight. you can also do something like {2006-02-17T15:30}	14:05
wereHamster	aaronj: maybe you want !deploy instead.	14:05
gitinfo	aaronj: Git is not a deployment tool. You can build one around it for simple environments. http://sitaramc.github.com/the-list-and-irc/deploy.html	14:05
_ikke_	gmartyn: Well, checkout itself has no such option, but git log does	14:05
aaronj	wereHamster: yea, second time I've gotten that response today LOL	14:05
	→ zackiv31 joined	14:05
aaronj	wereHamster: thanks	14:05
	→ Oliver_ joined	14:05
iguanna	let's say some colleague add some files in the repository and I want to get these files in my local workcopy what command should be use? git checkout?	14:06
Noodels	iguanna: git pull I think	14:06
wereHamster	aaronj: that's one too many.	14:06
	← ph^ left	14:07
	→ jackh joined	14:07
Noodels	iguanna: Assuming you're just updating a copy you've already cloned	14:07
_ikke_	aaronj: Note to be rude, but maybe take that advice to heart, it'll save you a lot of troubles	14:07
gmartyn	_ikke_: yeah, but the log includes commits dated when they happened in other branches and not when they finally landed in the live branch	14:07
iguanna	Noodels: yeah I have already cloned a repository in my local machine	14:08
	→ mike007 joined	14:10
Noodels	iguanna: Actually I think you want git fetch	14:11
	→ neurodrone joined	14:11
Noodels	Are there any ops here? I've got a user asking why they've been banned here.	14:11
	← ska-fan left	14:12
	← Mez__ left	14:12
	→ Mez__ joined	14:12
	Mez__ → mez	14:12
	mez → Mez	14:12
_ikke_	wereHamster is one	14:13
Noodels	Ah, he's sorted it out now.	14:13
	→ wolftankk joined	14:14
	→ AaronMT joined	14:14
	→ jonshea joined	14:14
	← minusthetiger left	14:15
	→ berserkr joined	14:16
	→ ska-fan joined	14:17
	← jkremser left	14:17
	→ giallu joined	14:17
	← wolftankk left	14:18
	→ codeFiend joined	14:18
	→ TheJH joined	14:18
	← Mtheory left	14:19
	→ jkremser joined	14:19
	← AaronMT left	14:19
	→ apok joined	14:20
	→ Error404NotFound joined	14:20
	→ AaronMT joined	14:21
	rohan32 → rohan\|building	14:22
	← alexukf left	14:23
	← swair left	14:23
	← jmd left	14:26
	→ david1010 joined	14:27
	← david1010 left	14:27
	← tsdh left	14:28
	← beautifulmind left	14:29
	← lb left	14:29
	← w41 left	14:33
	→ titaniumNoob joined	14:34
	→ timini_ joined	14:35
	→ _eMaX_1 joined	14:35
	← OOPMan left	14:35
	→ chuckharmston joined	14:36
	← Kulrak left	14:36
	← storrgie left	14:36
	→ Synthead joined	14:37
	← mike007 left	14:37
	← timini_ left	14:37
	→ chinnychin joined	14:38
	← chuckharmston left	14:39
	← _eMaX_ left	14:39
	→ axl_ joined	14:39
	→ HyperNerdV2 joined	14:39
	← chinnychin left	14:40
	→ chuckharmston joined	14:40
	→ psoo_ joined	14:40
	→ msankhala joined	14:40
	← zapy left	14:41
	← t0rc left	14:41
	← RaceCondition left	14:41
	← papegaaij left	14:42
	← psoo left	14:43
	→ fly9 joined	14:45
	→ arex\ joined	14:45
	← psoo_ left	14:45
	← drougge left	14:45
	gitinfo set mode: +v	14:46
arex\	Thoughts on TeamCity vs Bamboo? Trying to decide.	14:46
	rohan\|building → rohan32	14:46
	→ dv310p3r joined	14:47
	→ cwang joined	14:47
	→ juvenal joined	14:48
	→ localhost joined	14:50
	← localhost left	14:50
	→ gfontenot joined	14:50
	← marhaban left	14:51
	→ ph^ joined	14:51
	← agileadam left	14:51
	→ tasslehoff joined	14:51
	→ localhost joined	14:52
tasslehoff	Is git-osx the best / a good choice on OSX?	14:52
	→ lresende joined	14:52
	→ mike007 joined	14:54
	← tqmz left	14:54
wereHamster	choice for what	14:56
	→ brentratliff joined	14:56
	← Guest27074 left	14:57
	← SNEI left	14:58
	← Alvo left	14:58
	→ beneggett joined	14:58
	→ SJS joined	14:58
	← SJS left	14:59
	→ SJS joined	14:59
	← _iron left	14:59
	→ jsec joined	15:00
	← jsec left	15:00
	→ jargon- joined	15:00
	→ itatitat joined	15:00
	← phreaky left	15:00
tasslehoff	For git on osx, though when you ask I suspect I was a bit vague. I mostly use the command line and magit, so fancy gui is not required.	15:01
	← shreya left	15:01
charon	i think in mountain lion it is included with xcode anyways	15:02
	(i'm not a mac user, so i can't say which version)	15:02
	→ nixus joined	15:02
	← nixus left	15:02
wereHamster	tasslehoff: or use homebrew to install the latest git (brew install git). Or use any one of the many graphical clients.	15:02
	← kpreid left	15:03
tasslehoff	charon: ah, correct. didn't even think to check: git version 1.7.9.6 (Apple Git-31.1)	15:03
	→ jsec joined	15:04
	← jsec left	15:04
charon	apple git... wow	15:04
	→ Jay_Levitt joined	15:04
	← Jay_Levitt left	15:04
tasslehoff	yeah, and they are way ahead of others. already at v31!	15:05
	→ _iron joined	15:05
	→ shreya joined	15:06
	← juvenal left	15:07
	← flijten left	15:08
	→ Topcat joined	15:08
	← itatitat left	15:08
Topcat	how the hell do I wipe everything that I've not commited if not git reset --hard master	15:10
	← Favorit left	15:10
	← rurufufuss left	15:11
wereHamster	Topcat: are you looking for alternatives to git reset --hard? There are many	15:11
charon	Topcat: with the 'master' argument, it will actually also move the branch pointer (if not already pointing at master)	15:11
	so that doesn't only trash uncommitted work	15:12
Topcat	I've got a number of files i made after a commit not even tracked in staging and I want them gone. Whats the tool?	15:12
	charon: the branch pointer is the HEAD right ?	15:13
charon	Topcat: HEAD just names a branch (by name) when it is not detached. reset moves the branch pointed-at-by-HEAD, usually called "the current branch"	15:13
wereHamster	Topcat: rm <file>	15:13
charon	also man git-clean to get rid of untracked files	15:13
gitinfo	the git-clean manpage is available at http://git-scm.com/docs/git-clean.html	15:13
	→ intransit joined	15:14
wereHamster	Q: How do I remove files. A: rm <file>. Next!	15:14
	→ hidekin joined	15:14
	→ fireh joined	15:15
Topcat	wereHamster: I'd be after the equivalent of add . but rm . as in rm everything not already tracked. I don't want to rm each file 1 at a time	15:15
	→ msmithng joined	15:15
Topcat	git clean looks like what i want	15:16
	← graphitemaster left	15:16
	← iamjarvo left	15:16
	← Chib left	15:16
	← corburn left	15:17
	chuckf_ → chuckf	15:17
	← shawngo left	15:18
	→ eijk_ joined	15:18
	← skorgon left	15:18
	← eijk left	15:18
Topcat	yeah, cheers charon.	15:18
	→ minusthetiger joined	15:18
	→ duckxx joined	15:18
	← minusthetiger left	15:19
	← thirdknife left	15:19
	→ Jay_Levitt joined	15:19
	← Lord_DeathMatch left	15:19
	→ OOPMan joined	15:20
	→ slimjimflim joined	15:20
slimjimflim	hi, in svn i do: svn info to find the url of my working copy. how do i find the url in git?	15:20
	→ kermit joined	15:20
charon	slimjimflim: git remote -v. there may be more than one	15:21
slimjimflim	k ty	15:21
	← Topcat left	15:22
	← TheJH left	15:22
	← finch left	15:22
	→ graphitemaster joined	15:22
	→ zastern joined	15:22
	→ finch joined	15:23
	→ torjus_ joined	15:24
	→ darren_ joined	15:24
	← thiago left	15:24
	→ matthiasgorgens joined	15:24
gmartyn	is there a convention for how the parents are listed in a merge commit? is the first one the branch that you're in, and the 2nd the branch that you're merging from?	15:24
charon	gmartyn: correct	15:25
	← theCole left	15:26
gmartyn	ah, good	15:26
	← Sebo left	15:26
	← andrewhl left	15:26
	← fireh left	15:26
matthiasgorgens	I have a topic branch that's a fast-forward of master. Is there an easy way to split my topic branch into two, so that everything affecting one (filesystem) subtree goes into one branch and everything affecting another subtree goes into a different one?	15:26
	→ jsec joined	15:26
	← jsec left	15:26
	→ jsec joined	15:26
	← dsantiago left	15:26
matthiasgorgens	is using filter-branch the right approach here?	15:27
gmartyn	thanks charon	15:27
	→ ashirus joined	15:27
	→ Sky[x] joined	15:27
	← AaronMT left	15:27
	← jonshea left	15:28
	→ SirCmpwn_ joined	15:28
	→ Jon-- joined	15:28
	SirCmpwn_ → SirCmpwn	15:28
	→ dcslbw joined	15:29
	→ anabelle joined	15:29
	→ AaronMT joined	15:29
	→ duckx joined	15:29
Jon--	git remote set-url --add origin ssh://user@host:port:/path adds for push but not pull. how do I add this for pull as well?	15:29
	← AaronMT left	15:29
	→ iocor joined	15:30
iocor	is there a way to set signoff as on by default in gitconfig?	15:30
	→ AaronMT joined	15:30
	→ kenperkins joined	15:31
	← dermoth\|home left	15:31
	← AaronMT left	15:32
	← dhruvasagar left	15:32
charon	Jon--: umm... would that make any sense? how is fetch supposed to resolve conflicts between what the two URLs give it? what problem are you trying to solve? i think you should just add multiple remotes	15:32
	← duckxx left	15:32
charon	iocor: not in commit, but in format-patch	15:33
Jon--	charon, I have ssh access over 22 to where the repo is hosted at, I want to move it to use a different port (it will have to when the box is deployed)	15:33
	and a different host, for that matter	15:33
	→ COBadger joined	15:33
charon	Jon--: but then you'd replace the URL, not add one. and i'm reading the manpage to imply that the default without --add is to operate on fetch urls	15:34
	← quotemstr left	15:34
	← dcslbw left	15:34
	← amcsi_work left	15:34
Jon--	charon, I was going to add then rm	15:35
	charon, I saw no option to modify (ignoring going hunting in .git for some conf file by hand)	15:35
charon	huh? set-url without options modifies	15:36
	→ metcalfc joined	15:36
	← ipalaus left	15:36
	→ etcetera joined	15:37
	← tasslehoff left	15:37
	← nor5trom left	15:38
	← darren_ left	15:38
	→ gigamonkey joined	15:38
	← Vert left	15:38
Jon--	charon, fixed it, I didn't see set-url	15:38
	→ dzonder joined	15:39
	← jceb__ left	15:39
	→ gtrak joined	15:39
	← berserkr left	15:39
slimjimflim	if i create a free account on github, can somebody with a private repo give me access to it?	15:40
FauxFaux	Yes.	15:40
slimjimflim	k	15:40
	→ luxurymode joined	15:41
	← nwest left	15:41
charon	matthiasgorgens: it's a big hammer, but if your commits are all tangled up, probably a fairly quick solution ... if you know how to wield it	15:41
	← jkremser left	15:42
	→ utdemir joined	15:42
	→ tasslehoff joined	15:42
	← glennpratt left	15:43
	→ Sebo joined	15:43
	← hidekin left	15:43
	→ dogarrhea2 joined	15:43
	← HyperNerdV2 left	15:44
	← arturaz left	15:44
	→ glennpratt joined	15:44
	→ zdk joined	15:44
	← shruggar left	15:46
	→ axl__ joined	15:47
	→ kukks joined	15:48
	← kukks left	15:48
	→ kukks joined	15:48
	← axl_ left	15:49
	axl__ → axl_	15:49
	→ bgerber joined	15:49
	→ ISF joined	15:51
	← _sundar_ left	15:51
	→ ipalaus joined	15:53
	← bgerber left	15:53
	→ bgerber joined	15:54
	→ bLUEE joined	15:55
	← cwang left	15:55
	← iocor left	15:55
	← _eMaX_1 left	15:57
	→ psoo joined	15:57
	← mmc1 left	15:58
	← pinguinux left	16:00
	← bLUEE left	16:00
	→ fission6 joined	16:01
	→ TheJH joined	16:01
fission6	i have some branches on remote/	16:01
	which show hwne i do branch -a, they dont seem to exist on the remote anymore - how can i clean them up	16:01
	← dr_lepper left	16:01
charon	fission6: man git-remote, prune	16:01
gitinfo	fission6: the git-remote manpage is available at http://git-scm.com/docs/git-remote.html	16:01
	→ chriskon149 joined	16:02
charon	or git fetch --prune, does the same	16:02
	← chriskon149 left	16:03
fission6	git fetch --prune origin, still shows all the remotes, even though github only has two branches	16:04
	← whitman left	16:04
charon	!repro	16:04
gitinfo	Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session, or at least explain exactly what you did that led up to the problem. This will help immensely with troubleshooting.	16:04
fission6	never mind i see thsi issue	16:05
	how can i delete some remote branches	16:05
	← axl_ left	16:05
	→ axl_ joined	16:06
	→ andrewhl joined	16:06
	← neurodrone left	16:06
	← babilen left	16:06
wereHamster	fission6: git push --delete	16:07
fission6	ok	16:07
	→ theCole joined	16:07
	← TheHaven left	16:07
	→ rehat joined	16:08
	→ _sundar_ joined	16:08
	← ReekenX left	16:08
	← sh4rm4 left	16:09
	← msankhala left	16:09
	→ sh4rm4 joined	16:10
	← mklappstuhl left	16:10
	← ShooterMG left	16:10
	→ dhruvasagar joined	16:10
matthiasgorgens	charon: thanks.	16:10
	← jargon- left	16:11
	← axl_ left	16:11
	← oojacoboo left	16:12
	← utdemir left	16:12
	→ axl_ joined	16:14
	← brentratliff left	16:14
	← codeFiend left	16:15
	→ iocor joined	16:15
	→ aeontech joined	16:16
	← luxurymode left	16:16
	→ EhevuTov joined	16:16
	← dhruvasagar left	16:17
	→ luxurymode joined	16:17
	→ skorgon joined	16:17
	← jackh left	16:19
	← revagomes left	16:20
	→ Speed joined	16:20
	← Speed left	16:20
	→ Speed joined	16:20
	← nocturnal left	16:20
	← Oliver_ left	16:22
	← bgerber left	16:22
	← MrRoot left	16:23
	← rehat left	16:23
	→ thiago_ joined	16:24
	← skorgon left	16:24
	← ISF left	16:24
	← apok left	16:24
	← axl_ left	16:24
	← senny left	16:25
	→ dsantiago joined	16:26
	→ dhruvasagar joined	16:27
	→ axl_ joined	16:28
	jcao219 → zz_jcao219	16:29
	→ t0rc joined	16:31
	← mishok13 left	16:32
	← psoo left	16:32
	→ dr_lepper joined	16:33
	← dr_lepper left	16:33
	→ dr_lepper joined	16:33
	← dhruvasagar left	16:33
	→ dsirijus joined	16:33
	→ Textmode joined	16:33
	→ opus joined	16:33
	← LimeBlast left	16:34
	→ boombatower joined	16:35
	→ skorgon joined	16:35
	→ ReekenX joined	16:35
	← spyro left	16:35
	legumbre_ → legumbre	16:36
	← ipalaus left	16:36
Jon--	I've messed up my git repository somehow, I don't have any py source files in master anymore, just pyc.	16:36
	Anyone give me a hand?	16:36
	← angelsl left	16:37
	→ drupy joined	16:37
wereHamster	Jon--: run git status	16:37
	→ Rajesh joined	16:37
	Rajesh → Guest15244	16:38
	→ martinjlowm joined	16:38
	← Guest15244 left	16:38
	→ dfr\|mac joined	16:38
Jon--	wereHamster, on br master nothing to commit (working directory clean)	16:38
	← surma left	16:39
wereHamster	how did you delete the files?	16:39
	→ Vinnie_win joined	16:40
	← hoschi left	16:40
drupy	Anyone know of a GUI-style interface to Git that would let me connect to my various server environments? For example I'd like to log in to staging.example.com to push, pull, merge, unfubar myself and then log in to production.example.com and pull from origin, etc.	16:40
	→ Rajesh_ joined	16:40
	← Rajesh_ left	16:40
Jon--	wereHamster, the issue seems to be only on this working repo if I do a git clone on remote it works fine	16:40
	→ HyperNerdV2 joined	16:40
wereHamster	drupy: xterm, Terminal.app, urxt, gnome-terminal. There are soo many to choose from...	16:40
	← iocor left	16:41
drupy	I'll investigate. Gracias	16:41
Jon--	it had some uncommitted changes I don't want to lose if possible	16:41
	← axl_ left	16:41
	→ hoschi joined	16:41
	← soee left	16:41
wereHamster	Jon--: the uncommitted changes are gone when git sais 'working directory clean'	16:41
	→ axl_ joined	16:41
	← lu_zero left	16:41
	→ lu_zero joined	16:42
Jon--	D:	16:42
	← EhevuTov left	16:42
	← lu_zero left	16:42
drupy	wereHamster, those all seem to be CLI interfaces rather than GUI (like SourceTree)	16:42
	→ GNUcifer joined	16:42
Jon--	I was changing my remote addr for push/pull and I then did a pull	16:42
	→ lu_zero joined	16:42
	← lu_zero left	16:42
	→ lu_zero joined	16:42
	← lu_zero left	16:42
	→ oojacoboo joined	16:42
	→ pdtpatrick joined	16:43
	→ ipalaus joined	16:43
	← dfr\|mac left	16:43
wereHamster	drupy: I don't know of any GUI that can connect to a remote server. But if all you want is push/pull, then what do you need a GUI for? Also: !deploy	16:44
gitinfo	drupy: Git is not a deployment tool. You can build one around it for simple environments. http://sitaramc.github.com/the-list-and-irc/deploy.html	16:44
	→ lu_zero joined	16:44
	← lu_zero left	16:44
	→ lu_zero joined	16:44
	← PetrMotejlek left	16:44
	→ dinesh6654 joined	16:44
	← barq left	16:45
	→ Sym3tri joined	16:45
drupy	I often find when I pull my local dev changes into staging there's some merge problem. The GUI-based tools seem to offer me a more readable way of sorting out my problem.	16:46
	→ barq joined	16:47
wereHamster	drupy: you should not be merging on the staging server anyway. Again: !deploy	16:47
gitinfo	drupy: Git is not a deployment tool. You can build one around it for simple environments. http://sitaramc.github.com/the-list-and-irc/deploy.html	16:47
	→ neurodrone joined	16:47
	← neurodrone left	16:47
	→ neurodrone joined	16:47
	→ blendedbychris joined	16:47
	→ towski joined	16:49
	← pdtpatrick left	16:49
	→ spyro joined	16:49
	← drupy left	16:50
	← dsantiago left	16:50
	← barq left	16:50
	← metcalfc left	16:50
	← dc5ala left	16:50
	→ barq joined	16:51
	← tasslehoff left	16:52
	→ dhruvasagar joined	16:53
	→ FreeArtMan joined	16:53
	→ pdtpatrick joined	16:53
	→ iliketurtles joined	16:53
	→ Davey joined	16:53
	rohan32 → rohan\|afk	16:53
	→ apok joined	16:54
	→ goshawk joined	16:55
	→ jceb__ joined	16:56
	→ iocor joined	16:56
	→ pdtpatrick_ joined	16:56
	→ Xilent joined	16:57
blendedbychris	Hey guys… is there a better way to do this… http://hellomountee.com/support/git_and_mountee/	16:57
	i find it odd having to run git status in a bare repo location	16:58
	or non-bare maybe?	16:59
	→ specialGuest joined	16:59
	← bigmeow left	16:59
	→ mirror joined	17:00
	raek_ → raek	17:00
raek	to me it looks like a non-bare repo where the .git stuff is kept outside of the working tree	17:00
	← iguanna left	17:01
	← mirror left	17:01
	→ afuentes joined	17:01
blendedbychris	Right. it's basically a mount that can't write anything but the working files.	17:01
	→ LekeFly joined	17:01
blendedbychris	Just trying to figure out how to put this into my workflow	17:02
	So would I just run the git commands in that bare location?	17:02
	← russt left	17:02
	← Noodels left	17:02
grawity	Can the mount write a file named ".git"?	17:02
blendedbychris	No.	17:03
	It's like a mount that writes template files via an API and the files have to be specifically to that system.	17:03
	specific*	17:03
grawity	How about `export GIT_DIR=/Users/username/Sites/repos/hellomountee.git`	17:03
	← Yuuhi` left	17:04
blendedbychris	Hrmm… interesting idea but that'd screw up all the other repos	17:05
	Any idea how to jail it in that one?	17:05
	← neurodrone left	17:05
grawity	You can open a second Terminal for other repos, or `unset GIT_DIR`...	17:05
	Oor, hmm	17:06
	Can the thing be mounted anywhere, or only under `/Volumes/foo`?	17:06
	→ mklappstuhl joined	17:06
	← Sky[x] left	17:07
	→ thirdknife joined	17:07
blendedbychris	the app only mounts in /Volumes	17:07
	:(	17:07
	→ cmullican joined	17:07
	← thirdknife left	17:07
blendedbychris	I might be able to dissect the mount command though	17:07
	grawity: what's your idea there?	17:08
cmn	what problem do you actually have?	17:09
	what's under /Volumes/foo? is that dir a git-dir?	17:10
	← codecowboy left	17:10
	→ tasslehoff joined	17:10
blendedbychris	I'm just curious if there is a way to make it so I can run the git commands inside of the /Volumes/foo drive instead.	17:10
	No. It's non .git files	17:10
grawity	cmn: /Volumes/foo is a special filesystem (Mountee, a MacFuse thing), and it is impossible to store a Git repository in it, only specific data	17:10
	← GNUcifer left	17:10
	→ chuckhar_ joined	17:11
grawity	blendedbychris: Well, you can set $GIT_DIR when working inside that drive...	17:11
blendedbychris	I think that's the best idea so far :)	17:11
	→ artnez joined	17:11
cmn	so the worktree is there?	17:11
blendedbychris	cmn: correct	17:11
cmn	then add a gitfile	17:11
	so you tell it where the repo is	17:12
	← COBadger left	17:12
blendedbychris	I can't write anything to the root of the volume	17:12
	→ imachuchu joined	17:12
grawity	Hmm, it would be a simple feature request for Mountee, though	17:12
	← apok left	17:12
	→ bogwonch joined	17:12
grawity	it certainly can store a one-line file somewhere locally	17:13
	← joephelius left	17:13
	→ nor5trom joined	17:13
	→ apok joined	17:13
blendedbychris	I mine as well request them to allow .git dir to be ignored :P	17:13
cmn	you don't need a .git dir	17:13
grawity	blendedbychris: I was also thinking of having a normal repo somewhere in ~/hellomountee, with the special filesystem being a subdirectory in it... but it's messy	17:13
	← chuckharmston left	17:13
grawity	blendedbychris: a .git directory might be too complicated to implement	17:13
	← opus left	17:14
grawity	blendedbychris: a .git file is easy	17:14
	(or a .git symlink, for that matter)	17:14
	← blami_ left	17:14
cmn	if you can't write anything to it, why do you want git to consider it a working dir?	17:14
blendedbychris	cmn: http://hellomountee.com/support/git_and_mountee/	17:14
grawity	cmn: nobody said "can't write anything" here	17:14
blendedbychris	I said i can't write to the root :)	17:14
	→ Shusshu joined	17:14
grawity	cmn: it allows writing files, just in a strict directory structure	17:14
blendedbychris	grawity: in the meantime, is it possible to make environmental variables be applied in a dir?	17:15
grawity	blendedbychris: No.	17:15
	→ erichynds joined	17:15
grawity	blendedbychris: But environ variables only apply to certain processes – e.g. to a single Terminal window – so I'd say it's good enough	17:16
	gitinfo set mode: +v	17:16
cmn	if you can't write there, why do those instructions tell you to?	17:16
	thiago_ → thiago	17:16
	← localhost left	17:16
grawity	cmn: they don't?	17:16
blendedbychris	cmn: those instructions tell you to create a headless repo somewhere else and set your work-tree to the /Volume/foo	17:16
grawity	blendedbychris: Or you could alias mgit="git --git-dir=/whatever"	17:16
cmn	headless is not what they're doing	17:17
blendedbychris	or whatever, I don't know the correct term	17:17
grawity	bare?	17:17
	→ localhost joined	17:18
	← localhost left	17:18
blendedbychris	grawity: so if i was able to write a file to the root it's basically just a glorified gitconfig?	17:18
grawity	or a simplified gitconfig...	17:18
cmn	ah, it looks like init won't set it up correclty	17:18
	then then instructions are just wrong, because that status command won't work	17:19
	bah, nevermind, they're doing it the other way around	17:19
blendedbychris	heh :P	17:19
	→ jonshea joined	17:19
grawity	blendedbychris: if you could write a single line "gitdir: /path/to/whatever" to a file named ".git", it would work	17:19
	← beneggett left	17:20
cmn	he's already dismissed that	17:20
blendedbychris	I was going to submit a feature request	17:20
	← cagedwisdom left	17:21
blendedbychris	grawity: the tough thing is these guys are going to have to figure out where to store the .git file.	17:21
	→ psoo joined	17:21
	← sh4rm4 left	17:21
grawity	blendedbychris: Mountee already stores various user preferences, I would guess?	17:21
	Git repository path could be just another preference	17:22
blendedbychris	Yea i guess it could be coded in each mount preference	17:22
	now i have another idea… is the location of the .git directly allowed to be a series of paths git looks for?	17:23
	→ sh4rm4 joined	17:23
	→ skylamer` joined	17:23
	→ neurodrone joined	17:23
blendedbychris	because I CAN write other dirs like one called "git" instead	17:23
	→ localhost joined	17:23
	→ lindenle joined	17:23
blendedbychris	or event _get	17:23
	er _git	17:24
	← Sebo left	17:24
	← psoo left	17:24
	→ beneggett joined	17:25
cmn	no, it's .git which is either a file or a dir	17:26
	← tasslehoff left	17:26
cmn	a symlink would work, probably, but same thing	17:26
	← skorgon left	17:27
	→ osmosis joined	17:28
	← lresende left	17:28
	→ Yuuhi joined	17:29
lindenle	Does git web come with an easy way to enable read only http access?	17:29
	← luxurymode left	17:30
	→ metcalfc joined	17:30
cmn	yes, that's all it does	17:30
	← kanupatar left	17:30
	← axl_ left	17:30
lindenle	cmn: wait, it just shows me the contents, how do i clone a repo over http using it?	17:30
cmn	you don't	17:30
	→ axl_ joined	17:31
lindenle	cmn: that is what I was asking	17:31
	← paolooo left	17:31
cmn	no, you asked about read access through gitweb	17:31
	which is completely unrelated to cloning	17:31
lindenle	i meant read only cloning	17:31
	→ iamjarvo joined	17:31
lindenle	sorry	17:31
cmn	that's the only form there is of cloning	17:31
	anyway, see the !book	17:31
gitinfo	There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	17:31
cmn	it tells you how to do it for apache	17:31
	→ joephelius joined	17:32
	← phishy left	17:32
	→ phishy joined	17:33
cmn	hm, that might only be for the dumb protocol, man git-http-backend does have it for sure	17:33
gitinfo	the git-http-backend manpage is available at http://git-scm.com/docs/git-http-backend.html	17:33
cbreak	dumb http is enough for cloning.	17:34
	it's just inefficient of course.	17:34
	→ darren joined	17:34
	← skylamer` left	17:35
	← achadwick left	17:35
cmn	sure, but you need to activate a hook for it to work	17:35
	← Shusshu left	17:35
	← metcalfc left	17:37
	→ opus joined	17:37
	→ Sky[x] joined	17:37
	→ Anniepoo[1] joined	17:38
	→ rehat joined	17:39
	← darren left	17:39
	← hyperair left	17:40
	→ hypera1r joined	17:40
	→ nglorioso joined	17:41
	→ covi joined	17:42
	← etcetera left	17:42
covi	I have these in my ~/.gitconfig	17:42
	[alias] comm = commit -m	17:42
	← ashirus left	17:42
covi	but I still can't use git comm "MSG". WHy's that?	17:42
	→ Rajesh joined	17:43
	Rajesh → Guest37020	17:43
	→ dpino joined	17:43
	→ lustucru joined	17:44
	→ irqq joined	17:44
blendedbychris	cmn: so i can't modify an environvariable so git looks in both .git or _git	17:44
cmn	no	17:44
	← irqq_ left	17:44
cmn	as was pointed out, you can tell git via env var which one it is	17:44
	and you can use relative paths	17:44
	← Vile left	17:45
cmn	so you can have GIT_DIR=_git	17:45
	but that breaks the others	17:45
blendedbychris	cmn: gotcha	17:46
	→ maletor joined	17:46
	← mikewintermute left	17:47
	→ etcetera joined	17:47
cbreak	is it a good idea to make that relative?	17:48
	I thought it should be an absolute path	17:48
	← bogwonch left	17:48
	→ pantsman joined	17:48
cmn	the hooks set GIT_DIR=.	17:49
	absolute paths are generally a good idea, certainly; but relative paths do work	17:49
	→ macer1 joined	17:52
	← etcetera left	17:52
	rohan\|afk → rohan32	17:52
macer1	hey	17:52
	I have a problem	17:52
	fatal: loose object dc128ea864728934ae14e2efc9f3de2f4ea2acac (stored in .git/objects/dc/128ea864728934ae14e2efc9f3de2f4ea2acac) is corrupt	17:52
	:(	17:52
	what can I do with that...	17:52
	→ tasslehoff joined	17:53
	→ juvenal joined	17:53
cmn	recover from backups	17:53
	→ etcetera joined	17:53
macer1	ouch. fucked filesystem	17:53
cmn	yeah, it probably didn't sync when you shut down the computer or something similar	17:54
EugeneKay	Depends what that object is. Usually you can get a fresh copy of the object from one of your remotes, or by recloing the repo. The fact that it went corrupt in the first place means that it's just gonna happen again; replace your underlying spinning magnetic material.	17:54
macer1	backups all important stuff as fast as he can	17:54
	← nor5trom left	17:55
	→ macabre joined	17:55
EugeneKay	An unfinished sync() call should have no reason to corrupt a git repo unless you were in the middle of a commit; in which case only the last commit should get eaten. Normally it corrupts logfiles or stuff that actually gets R/Wen. git objects are write once, read a bunch.	17:55
macer1	actually fsck runs every run for me	17:55
	and recovers something...	17:56
	→ luxurymode joined	17:56
	← dpino left	17:56
macer1	I see a lot of EXT4-fs (dm-2): re-mounted. Opts: commit=0	17:56
	in dmesg	17:56
	← TheJH left	17:57
	→ marhaban joined	17:57
	→ dpino joined	17:57
	← tasslehoff left	17:57
	→ lacrymology joined	17:57
	→ flijten joined	17:58
	← spyro left	17:58
EugeneKay	fsck.ext4 or git-fsck ?	17:58
macer1	there is git-fsck? o.O	17:58
	I mean every system run	17:58
EugeneKay	man git-fsck ;-)	17:58
gitinfo	the git-fsck manpage is available at http://git-scm.com/docs/git-fsck.html	17:58
macer1	ext4 fsck	17:58
EugeneKay	Not to be confused with gitinfo's !fsck command	17:59
gitinfo	[!profanity] Hey! This is a family-safe channel, so keep it frakking clean you fierfekker!	17:59
	← SeySayux left	17:59
macer1	I don't think it's a disk fail, it is an SSD and is less than year old	17:59
	→ fly9_ joined	17:59
	→ Karmaon1 joined	17:59
imachuchu	macer1: !backup your repo onto a less possibly flawed storage, git fsck it from there, then assure yourself that that ssd is actually ok	17:59
gitinfo	macer1: Taking a backup of a git repository is always a good idea, especially when taking advice over IRC. Usually, the best way to TACTICALLY back up a git repo is `git clone --mirror`. However, some unusual maintenance might require `tar cf repo-backup.tar repodir`. Testing in a clone is also an excellent idea. See also http://sethrobertson.github.com/GitBestPractices/#backups	17:59
	→ alexukf joined	18:00
macer1	actually github is a good backup for my open source projects :P	18:00
cmn	no, github isn't for backup	18:00
macer1	not backup. I push my commits there.	18:00
	I have the projects there...	18:01
cmn	right, but not backup	18:01
	it's a place to let people see your stuff	18:01
macer1	I know :)	18:01
imachuchu	macer1: either way your local repo has stuff that github won't (dangling commits and such) that still might be useful later on	18:01
	← elux left	18:02
	← Guest37020 left	18:02
	→ elux joined	18:02
	← fly9_ left	18:03
	← fly9 left	18:03
EugeneKay	"If your data isn't backed up offsite, you didn't really want it."	18:03
	→ dsantiago joined	18:04
	← elux left	18:04
	← lustucru left	18:04
	← mklappstuhl left	18:04
grawity	I kind of prefer "real men just upload their important stuff on ftp, and let the rest of the world mirror it."	18:04
	→ elux joined	18:05
	→ _Vi joined	18:05
	→ fly9 joined	18:05
macer1	"People are divided into two categories. Those who do backups, and those who will do backups"	18:05
	:P	18:05
	← Anniepoo[1] left	18:05
	→ cakehero joined	18:06
	← specialGuest left	18:06
	→ SeySayux joined	18:07
macer1	while true; sync; sleep 10; done	18:07
	do sync*	18:07
	→ nor5trom joined	18:07
	← v0n left	18:08
jast	poor solution, also dreadfully slow	18:08
	→ Sigma joined	18:09
	← Ecesis left	18:09
jast	probably just as slow as data=journal with ext3/4	18:09
	with standard hardware you can get corruption with absolutely all resilience tricks like that	18:09
	← etcetera left	18:10
macer1	ehh I think after reboot system will not run	18:10
	even system updates failes because of download file md5sums not matching	18:10
	does tars have some kind of md5sum included inside?	18:11
	to know if its not corrupt	18:11
jast	not usually	18:11
	there might be an uncommon extension, but the traditional format doesn't have 'em	18:11
	← Nirvanko left	18:13
	→ jobin joined	18:13
	→ aantix joined	18:13
	jobin → andy23	18:13
	← slimjimflim left	18:14
	Vampire0_ → Vampire0	18:14
gmartyn	gzip/bzip2 have a crc	18:15
macer1	awesome, thanks	18:15
	← kaen left	18:15
	→ slimjimflim joined	18:15
	← slimjimflim left	18:15
	← SEToChan left	18:15
	← Speed left	18:15
macer1	even ftp is not working to upload stuff	18:16
	...	18:16
	→ schemula joined	18:17
	→ _huoxito joined	18:17
	← kleist left	18:17
macer1	I copied all stuff to pendrive, its time for reboot. Wish me luck.	18:17
	→ Guest37020 joined	18:17
imachuchu	macer1: do you have a live cd handy?	18:18
macer1	hmm	18:18
	→ lustucru joined	18:18
pdelvo	I want to host a git repository on a windows server. do you know a good solution for this, when i want to use ssh?	18:19
macer1	imachuchu: I can't find any	18:19
grawity	pdelvo: CopSSH, Bitvise WinSSHd, probably FreeSSH...	18:19
imachuchu	macer1: well what are you going to do if the system won't boot?	18:20
macer1	imachuchu: I hope it will run to fsck point	18:20
	I found ubuntu 11.04	18:21
	→ bogwonch joined	18:21
macer1	its enough to fsck filesystem	18:21
	→ tom2929 joined	18:22
	← iamjarvo left	18:22
macer1	hmm if it was only ext4 not syncing, lvm & luks shouldn't break, eh?	18:22
	→ kpreid joined	18:22
macer1	luks { lvm{ ext4 & swap } }	18:23
	← landypro left	18:23
	→ ShadeTornado joined	18:23
imachuchu	macer1: man best of luck on that, I don't envy you trying to repair that stack/mess	18:24
macer1	thanks	18:24
imachuchu	macer1: actually...	18:24
	macer1: use the executables on the cd to backup your files	18:25
macer1	yeah, I'll try	18:26
	for now I packed everything important(good that all that stuff is in one folder) to pendrivw	18:26
	→ iamjarvo joined	18:26
imachuchu	macer1: if may get ugly if they're compressed (I have no idea), but if you have enough ram you can decompress them into a ram disk	18:26
	← bogwonch left	18:27
macer1	imachuchu: why? its actually less than 100MB	18:27
imachuchu	macer1: "they're" being the binaries on the cd	18:28
	← giallu left	18:28
	← jceb__ left	18:29
	← opus left	18:29
macer1	ah	18:29
	ok, reboot	18:29
imachuchu	macer1: do you have off everything you want?	18:30
	← tureba_ left	18:30
	← macer1 left	18:31
	rohan32 → rohan\|afk	18:31
	→ macer__ joined	18:32
	→ macer_ joined	18:32
	← luxurymode left	18:32
	← macer_ left	18:33
	← macer__ left	18:33
	→ jjb123 joined	18:33
	→ mrsrikanth joined	18:33
	← jjb123 left	18:33
	→ bogwonch joined	18:33
	← sawdisk left	18:33
	→ sawdisk joined	18:33
pdelvo	CopSSH gives me a access denied when i try to connect with the username + password -.-	18:34
cmn	is there any context there? where are you trying to connect to?	18:34
	how is it related to git/	18:34
pdelvo	over the web to a windows server	18:34
	→ opus__ joined	18:35
cmn	ssh over web? that sounds scary	18:35
	where's git in this?	18:35
pdelvo	git comes later. first i want to login over ssh with ssl	18:35
	← kpreid left	18:36
	→ tsdh joined	18:36
	← rehat left	18:36
	→ defmoves joined	18:36
cmn	then you should seek support for your issue wherever the people that make that software hang out	18:36
	→ luxurymode joined	18:37
	→ webben joined	18:38
	← webben left	18:38
grawity	over ssh with ssl? O_o	18:39
imachuchu	pdelvo: sounds like the server doesn't like your username+password	18:39
JEEB	argh, git send-email seems to have derped with an error after I wrote a long novella with --compose . Does git send-email per chance save this somewhere until the e-mail(s) is/are sent?	18:39
	← beneggett left	18:39
	→ tureba joined	18:39
	→ v0n joined	18:39
	→ webben joined	18:41
JEEB	oh, found	18:42
	yay	18:42
	→ beneggett joined	18:42
	← _Vi left	18:42
	← defmoves left	18:43
	→ jason237 joined	18:43
	→ _Vi joined	18:43
	← Davey left	18:44
imachuchu	the great thing about macer1's problem is nomatter what we won't hear from him again	18:45
	← dsantiago left	18:46
	→ nitrix joined	18:47
nitrix	Hi, I'm wondering what would be the best way to track files with git - files that are configuration files with passwords inside. More precisely my dotfiles on GitHub but I guess it could apply to any other projects.	18:49
grawity	How many dotfiles have your passowrd in them, anyway?	18:49
	← covi left	18:50
cbreak	git's not a backup tool.	18:50
PerlJam	nitrix: in short, you're doing it wrong! :)	18:50
imachuchu	nitrix: ack! passwords! Since passwords need to be encrypted using git isn't really a great choice (it can track them, but they can't be merged/diffed so branches are out)	18:51
	→ rehat joined	18:51
imachuchu	nitrix: use a general purpose backup instead	18:51
cbreak	encrypting passwords? what for?	18:51
imachuchu	nitrix: you could use git to store plaintext passwords, then backup an encrypted version of that repo, but why?	18:52
grawity	why are all of you assuming dotfiles on github can only be used as a backup	18:52
	and not, for example, as a tool to track changes.	18:52
nitrix	No my goal is to share them with others	18:52
	Without compromising the passwords.	18:53
	→ airportyh joined	18:53
cbreak	then don't track the passwords.	18:53
grawity	nitrix: move the passwords elsewhere?	18:53
cbreak	delete them out of the files.	18:53
	← airportyh left	18:53
nitrix	One idea I just received on #linux is to write a script that'll browse the dotfiles after deploying, and ask for each passwords specifically for each apps and replace them in the files.	18:53
grawity	many programs can read them from ~/.netrc instead of the main config file	18:53
	→ tasslehoff joined	18:53
imachuchu	nitrix: general purpose backup/post them to a site, share a common unlock password with everyone whos gonig to use them (look at keepass)	18:53
nitrix	grawity: But how would the program use it?	18:53
	grawity: irssi for example ?	18:54
grawity	nitrix: with irssi, just don't add the main config to a public repository	18:54
imachuchu	nitrix: are these passwords to be used by people manually entering them in, or by programs automatically reading them?	18:54
nitrix	imachuchu: I don't think you understand why someone would share dotfiles. It's not a backup process, everyone has backups already.	18:54
	← theCole left	18:54
grawity	(the irssi devs dislike users who edit the config directly, anyway)	18:54
	→ sq-one joined	18:55
nitrix	imachuchu: Programs reading 'em. They are configuration files.	18:55
	Like the config for irssi, or bitlbee, or mutt...	18:55
grawity	nitrix: muttrc has the 'source' command	18:55
	→ alexisabril joined	18:55
grawity	as in, source ~/.muttpasswords	18:55
nitrix	Which leads me to think I'll need a script anyway to generate password files locally for the user.	18:56
grawity	for github.password in .gitconfig, "password = !cat ~/.github-pass" sually works	18:56
	*usually	18:56
nitrix	I'll get back to #linux, they are more helpful :/	18:56
	→ ninegrid joined	18:56
	→ Eridius joined	18:57
	→ spyro joined	18:58
	← spyro left	18:58
	→ spyro joined	18:58
cmn	probably not if you ask them git things	18:58
	← tasslehoff left	18:58
	→ tqmz joined	18:58
	← marthinal left	18:59
imachuchu	actually I thought we were quite helpful, "that's not really what git is for, use something else"	18:59
EugeneKay	!refund ;-)	18:59
gitinfo	If you are not satisfied with git, or the support provided by the volunteers in #git, you are entitled to a full refund of the purchase price, and are invited to use another VCS. Elsewhere.	18:59
Jon--	using gitk I see that two branches point to the same point, yet there is a git diff branch1 branch2. No uncommitted changes in either. What's going on here?	18:59
grawity	imachuchu: git is not for what exactly?	18:59
	imachuchu: nitrix never did ask about using git for backups.	19:00
	→ ferdna joined	19:00
cmn	it's not for hiding your data either	19:00
	← phishy left	19:00
grawity	Jon--: I think the syntax is branch1..branch2 for comparing two branches?	19:00
	→ phishy joined	19:01
	→ ubuntu joined	19:01
cmn	Jon--: most likely you're reading the output wrong or haven't refreshed it	19:01
	← ubuntu left	19:01
Jon--	cmn, what does a yellow dot mean?	19:01
imachuchu	grawity: he asked what was the best way to use git to store configuration files with passwords inside them while still sharing them. The answer is don't use git or encrypt the whole git repo	19:01
cmn	grawity: that's one accepted, but it leads to confusion	19:01
	→ macer1 joined	19:01
cmn	Jon--: AFAICT it's HEAD	19:01
nitrix	cmn: Well I was mostly wondering because most of the time on other projects, you want sensible data in a config file to a database, to test locally...	19:02
	gitinfo set mode: +v	19:02
macer1	# git fsck	19:02
	fatal: failed to read object 351ba10c79a26ede7582c01ac544752ff1991a32: Invalid argument :(	19:02
cmn	nitrix: which you don't track	19:02
nitrix	So it's quite the similar problem. I want the file shared but not the password. Just curious if by the time, git implemented something new for that.	19:02
cmn	macer1: that looks like fs corruption	19:02
	nitrix: !config	19:02
gitinfo	nitrix: [!configfiles] Best practice is to store an example config file and then copy+modify it when you install your app. If your config file must be tracked by git to deploy(eg, Heroku), see https://gist.github.com/1423106 for some workarounds	19:02
macer1	cmn: indeed	19:02
	→ patient joined	19:02
macer1	I was thinking git fsck can help...	19:03
nitrix	Except if you do a change to the file, and you forget there's your password inside... ouch.	19:03
cmn	that's why you don't change the tracked file	19:03
	you don't use it	19:03
	macer1: fsck doesn't fix things	19:03
cbreak	fsck fscks things.	19:04
	→ i42n joined	19:04
macer1	:sad	19:04
cbreak	seems your repo is corrupt	19:04
	← rmr left	19:04
patient	hey guys, i'm trying to use 'git commit --amend' but i always get 'Your branch and 'origin/master' have diverged, and have 1 and 1 different commit each, respectively.' and when i try to push it's always rejected. Can someone give me some tips?	19:04
cbreak	can you throw it away and clone from an other copy?	19:04
	rohan\|afk → rohan32	19:04
	→ babilen joined	19:05
	→ mmc1 joined	19:05
cbreak	patient: don't rewrite public history	19:05
	if you pushed a commit, then you are NOT allowed to amend it	19:05
cmn	patient: that's expected, --amend rewrites the commit	19:05
	→ Speed joined	19:05
	← Speed left	19:05
	→ Speed joined	19:05
imachuchu	patient: !rewrite	19:05
gitinfo	patient: [!rewriting_public_history] Rewriting public history is a very bad idea. Anyone else who may have pulled the old history will have to `git pull --rebase` and even worse things if they have tagged or branched, so you must publish your humiliation so they know what to do. You will need to `git push -f` to force the push. The server may not allow this. See receive.denyNonFastForwards (git-config)	19:05
cmn	so it's no longer the same one	19:05
macer1	I have a "copy" a github	19:05
	← macabre left	19:05
	← alexukf left	19:05
imachuchu	patient: look into git-revert and if it's acceptable	19:05
	← OOPMan left	19:05
macer1	but not everything was pushed before FS crash	19:05
	← bogwonch left	19:05
patient	right...	19:05
	so '--amend' is only a good idea if i haven't pushed the commit info to the remote yet?	19:06
macer1	but it looks like source codes aren't corrupted...	19:06
cbreak	macer1: you could clone it, then unpack objects, and then try to puzzle the missing things into a copy of the damaged one	19:06
macer1	hm	19:06
cbreak	but it's probably better to somehow try to move the new history into a fresh clone	19:06
	→ whatthepoop joined	19:06
cbreak	patient: you can rewrite public history, but it might cause problems.	19:07
	→ lresende joined	19:07
cbreak	you'll have to force push for one	19:07
	and if someone else fetched the original version, then you're in trouble.	19:07
patient	i see	19:07
	→ lresende_ joined	19:07
patient	ok guys, thanks for the tips, very helpful	19:07
macer1	I can live without 1 day history and create a new repo	19:08
	it looks like source files are ok	19:08
	I mean source files are up to date	19:08
	history is not	19:08
	I need to check if my ae	19:09
	← mrsrikanth left	19:09
macer1	seconds OS(osx) is corrupted too	19:09
	or it is just linux partition fail	19:09
whatthepoop	any tips on storing design comp binaries (Illustrator / Photoshop files) in a git repo that also has code with lots of organizational branches?	19:10
	my concern is not being able to diff the binaries when merging the latest changes from the production branch into the dev branch I'm working the designs on, and losing the latest design changes	19:10
cmn	the tip is generally not to do it	19:10
	there's git-annex and git-media for dealing with large files	19:11
whatthepoop	cmn: figured so much.. :/	19:11
	← opus__ left	19:11
	← lresende left	19:11
	lresende_ → lresende	19:11
	← cedeon left	19:11
	→ bearbin joined	19:12
	← rgsteele left	19:12
	← axl_ left	19:13
	← i42n left	19:13
	→ axl_ joined	19:13
bearbin	Am i allowed to ask for help here?	19:13
	→ i42n joined	19:13
	← nor5trom left	19:13
loops	yup	19:13
	← tvw left	19:13
whatthepoop	cmn: ok cool, they both make sense.. I'll look into them, but maybe I'll just move them out and stick them on my dropbox since no one else needs to work on them	19:13
	← agumonkey left	19:14
	→ jaylevitt joined	19:14
	→ opus joined	19:14
	→ bogwonch joined	19:14
cmn	if you don't need to/can't merge/diff them, there's not much point	19:15
bearbin	Ok then, I prefer tabs over spaces for code, but peopel like python to be indented with spaces :( So i set up some rules following this (http://stackoverflow.com/questions/2316677/can-git-automatically-switch-between-spaces-and-tabs) and for some reason it tried to apply them to my .py~ and .pyc files. Is there some way to stop this behaviour?	19:15
	← fornext left	19:15
	→ eletuchy joined	19:16
imachuchu	whatthepoop: as long as no one else modifies them then you should never need to merge them, right? You can still commit/merge/rebase the other code just fine around them though	19:16
	← Jay_Levitt left	19:17
	← rohan32 left	19:17
	← i42n left	19:17
	← jaylevitt left	19:18
	← nitrix left	19:18
bearbin	Anybody? Baiscally i need .py files to have the filter applied, but not .py~ and .pyc	19:19
	← opus left	19:19
	← bizhanMona left	19:20
	← palm_vue left	19:20
	← Lgb left	19:20
	→ aspotashev joined	19:20
bearbin	Hello? Can anybody help me?	19:20
	← graphitemaster left	19:21
	→ OOPMan joined	19:21
	→ palm_vue joined	19:21
	→ Lgb joined	19:21
derekpioneer	i have a git repository with a lot of branches and commit history, i want to copy the contents of the repository into a new folder and start a new git repo without any of the previous history	19:21
	w	19:21
	→ bizhanMona joined	19:21
derekpioneer	obviously i could just do cp -r to the new location and then git init;	19:21
imachuchu	bearbin: have't ever touched git hooks but I'll take a look	19:21
	→ darren joined	19:21
derekpioneer	but i don't want to copy all the files listed in gitignore	19:22
bearbin	imachu: Thanks,	19:22
	← v0n left	19:22
imachuchu	bearbin: and is there any reason you can't just get your editor to switch between the two for you? I know vim can be set to encode the tab as 2 spaces	19:22
whatthepoop	imachuchu: I think so, yes.. I think that was our intent when we created a separate 'design' branch.. maybe I should just keep this 'design' branch, and only pull/push from/to the 'develop' branch (which is where all feature/bugfix branches are derived from) to keep things up to date, not worrying about effecting the other branches.. but won't git freak out when the older file from one of the other branches gets compared to my newer one when someone else pushe	19:23
	their changes into the 'develop' branch after I've pushed my newer binaries into it?	19:23
bearbin	imachuchu: i suppose so, but i thought this way would be easier :(	19:23
	→ duckxx joined	19:23
drive-by-advice	bearbin: are your .py~ and .pyc files being tracked by git?	19:23
loops	bearbin what's in your .git/info/attributes	19:24
bearbin	drive-by-advice: nope	19:24
	loops: only *.py filter=tabspace	19:24
imachuchu	bearbin: not really, and it's only a small change in the editors config (well most editors configs)	19:24
	← phishy left	19:24
drive-by-advice	bearbin: if that is the case the smudge-clean filters should have no effect...	19:25
loops	bearbin, from your answer to d-b-a, it's clear the script that is running to do the conversion is at fault	19:25
	→ phishy joined	19:25
loops	bearbin, it's not a git problem, something is wrong with the script	19:25
	← phishy left	19:25
	→ phishy joined	19:25
loops	bearbin, git will only convert files it tracks, the script must be overly aggressive with the argument being passed to it	19:26
imachuchu	whatthepoop: not sure I understand the problem. When you push your newer binaries there's will "freak out" but all they have to do is pull+rebase/merge like with any other changes	19:26
bearbin	loops: ok, ill see if i can fix it	19:26
	← Sigma left	19:26
	← darren left	19:26
bearbin	loo[s: ok, thanks for your help	19:27
	and everybody else too	19:27
	← aeontech left	19:27
imachuchu	whatthepoop: and since they haven't changed their copy of the binaries the rebase/merge won't ever have a conflict on them	19:27
whatthepoop	imachuchu: ok sorry, I	19:27
	← bearbin left	19:27
	← duckx left	19:27
whatthepoop	imachuchu: I don't know git quite as well as I should :)	19:27
loops	bearbin, hmm... it looks like it's using stdout.. weird.. maybe try the expand/unexpand option as given in one of the answers from the page you linked	19:27
	← olaf_ left	19:28
loops	bearbin, assuming you're on *nix	19:28
	→ Hasbro joined	19:28
	← Hasbro left	19:28
	→ Hasbro joined	19:28
	→ etcetera joined	19:28
imachuchu	whatthepoop: neither do I really (or at least as well as I would like). When applying commits git looks at what changed between them, if only your commits change the binaries they can't conflict with anyone elses work (since they haven't changed)	19:28
	→ R40UL joined	19:29
	← neurodrone left	19:29
R40UL	What do I use if I do an Initial commit? + , - or * ?	19:29
imachuchu	whatthepoop: unless of course you make the conflicts yourself (make 2+ branches, make different changes on each branch, merge them together = conflicts)	19:29
R40UL	I think + because I'm adding files	19:29
	→ ReachingFarr joined	19:29
	← lonewulf` left	19:30
imachuchu	R40UL: what? "git commit -a"?	19:30
R40UL	No no I mean the commit message imachuchu	19:30
	Some do "+ Added files"	19:30
	Or "* Code cleanup"	19:30
	But I want to know what is best for an initial commit	19:30
whatthepoop	imachuchu: ahhh I see, that's right.. ok, and that's exactly what brought me into this mess to begin with: without thinking I made some design changes in two different branches, since the design changes reflected the specific feature each branch was used for.... but if I stick to the 'design' branch only for all design changes, this should never be the issue with me or anyone else	19:31
	→ lonewulf` joined	19:32
	→ nor5trom joined	19:32
blendedbychris	cmn: I'm looking at using export GIT_DIR=~/Projects/foo.git … for the volume scenario I gave earlier but if I run git status on the volume dir it says "This operation must be run in a work tree"	19:32
imachuchu	R40UL: git doesn't care (it just stores the messages) it's up to you (though maybe people here who work on larger projects then I can chime in with their expiriances with standards)	19:32
	→ SaCu joined	19:32
whatthepoop	imachuchu: I guess there's still the issue of whether or not we should be storing these design comps in git, but I think I'll have to save that for another day since they're there now and now really growing much larger than they already are (~20MB)	19:32
	imachuchu: thanks, I'm learned.	19:32
	← SiDz left	19:32
	← Guest37020 left	19:32
	← letharion left	19:33
	← ska-fan left	19:33
imachuchu	whatthepoop: your welcome	19:33
R40UL	imachuchu I know, but what do you prefer?	19:33
	→ ska-fan joined	19:33
	→ ph^_ joined	19:34
	→ brandonw joined	19:34
	→ orkz_ joined	19:34
	→ v0n joined	19:35
brandonw	if i can see several branches on my remote named 'origin' via gitweb i have set up, but if i do `git fetch` and it is not pulling them down, am i doing something wrong?	19:35
imachuchu	R40UL: I don't use any thing like that, but I guess '+' for new features/files, '*' for changes, '-' for removals, and for the first commit you could use a '+'	19:35
	nischayn22\|Away → nischayn22	19:35
brandonw	i thought that all new branches in a given remote are fetched automatically, and it is only local tracking branches that you have to create yourself	19:35
	→ letharion joined	19:36
	→ SiDz joined	19:36
	→ ISF joined	19:36
R40UL	imachuchu Thanks for your opinion	19:36
imachuchu	brandonw: did you clone the remote for your local, or did you init the local?	19:37
	← ph^ left	19:37
imachuchu	R40UL: your welcome, but it's not worth much. If you decide later you don't like the messages you can always change them (assuming they are still just in private history)	19:37
	*you're	19:37
	← orkz left	19:38
	orkz_ → orkz	19:38
	← lonewulf` left	19:38
	→ alexukf joined	19:39
	→ tasslehoff joined	19:40
brandonw	imachuchu: the stuff that is currently in there is cloned	19:40
	← nor5trom left	19:40
	→ thefalling joined	19:40
	→ lonewulf` joined	19:40
	← tasslehoff left	19:41
thefalling	HOw do i merge only commits made in a particular branch? I have a live branch and a master branch, and i created the branch under the master branch, and i dont want it to merge the other commits that were made in the master branch	19:41
	→ mritz_ joined	19:42
cbreak	just git merge other branch	19:42
	that'll merge the whole branch	19:43
	← _Vi left	19:43
	→ _Vi joined	19:44
	← alexukf left	19:44
	→ tqmz__ joined	19:45
	→ DrHouse\|TARDIS joined	19:45
	← torjus_ left	19:45
	← tqmz left	19:45
	← tqmz__ left	19:45
	→ tqmz joined	19:45
	← v0n left	19:46
	→ specialGuest joined	19:47
thefalling	if i do get merge myBranch inside of golive, i get all the stuff that was in the master branch too	19:48
cbreak	no	19:48
	← FreeArtMan left	19:48
cbreak	you will only get what is in myBranch	19:48
	everything	19:48
brandonw	it's weird. git fetch --all doesnt seem to get all of the branches in the remote. git branch -a shows only the ones that are already there.	19:48
cbreak	everything sice myBranch was branched off your current branch	19:49
	brandonw: weird fetch spec in .git/config?	19:49
brandonw	i havent changed anything from defaults that i know of	19:49
cbreak	run git ls-remote remotename	19:50
	that will list all branches on the remote	19:50
	all that are there.	19:50
brandonw	all i see in .git/config are the [branch "xxxx"] with remote and merge set up, and then [remote "origin"] with the url and the three fetch lines for the 3 remote branches i actually do see with git branch -a	19:50
	← tsdh left	19:50
brandonw	ok	19:51
	good	19:51
	so they have been fetched locally	19:51
	that is the command i was looking for, i think	19:51
thefalling	I did it, and all the stuff that was in master before creating MyBranch on master got merged too	19:51
cbreak	three fetch lines?	19:51
	that's unusual	19:51
	normally it's something like fetch = +refs/heads/:refs/remotes/origin/	19:52
	thefalling: as I said, it will ONLY merge the commits that are in the branch you merge	19:52
	but it will merge ALL of them	19:52
	→ dunpeal joined	19:53
brandonw	hmm	19:53
	yes, mine specify each explicitly	19:53
	also, i dont have any remote tracking branches for all of the branches my co-worker pushed	19:53
	i see them with ls-remote, how do i make remote tracking branhes for them?	19:53
cbreak	if you have such a weird fetch spec that would not be surprising	19:53
	just fetch them	19:53
brandonw	okay, i was wondering if i was doing something wrong if i had to manually fetch them	19:54
	but the ls-remote was the key command i was missing, i think	19:54
	(outside of my weird explicit fetch lines)	19:54
	how do you think the fetch lines might have become configured like that? am i possibly doing soething that isn't standard?	19:54
cbreak	I have no idea.	19:54
	maybe you specified some branches on clone or something	19:55
	you should just fix it :)	19:55
brandonw	fix .git/config?	19:55
cbreak	yeah	19:55
	← mritz_ left	19:55
cbreak	make a backup if you're not sure :)	19:55
	→ duckx joined	19:55
brandonw	the ones that are in there were all there when i initially cloned the repo	19:55
	so it might have been an option i should have passed to clone	19:55
cbreak	when cloning you get something like I pasted above	19:56
	→ alexukf joined	19:56
	→ TheJH joined	19:56
	← diegoviola left	19:58
	← kart0ffelsack_ left	19:58
	→ private joined	19:59
	← duckx left	19:59
	← duckxx left	19:59
	→ v0n joined	19:59
	private → Guest66958	19:59
	→ duckx joined	19:59
brandonw	yeah my co-worker has a proper remote set up	19:59
	with wildcards	19:59
	→ mishok13 joined	19:59
brandonw	i fixed my config and it works now.. not sure what i did that made each fetch explicit, but at least i know how to fix it now :)	19:59
	thanks cbreak	20:00
	→ corburn joined	20:00
	→ kart0ffelsack_ joined	20:00
thefalling	so am i going to have to cherry pick those commits instead of merge?	20:00
	← alexukf left	20:01
	← axl_ left	20:01
	→ j416 joined	20:01
	← codertux left	20:02
	→ irqq_ joined	20:03
Jon--	using gitk I see that two branches point to the same point, yet there is a git diff branch1 branch2. No uncommitted changes in either. What's going on here?	20:03
dunpeal	A user has `master`, and `foo` that branched off it. Since branching off, `master` was merged into `foo` several times. Is there a clean way to rebase `foo` into `master`?	20:04
	→ flyz joined	20:04
	← irqq left	20:04
	← cybersphinx left	20:04
	← fly9 left	20:04
	← sh4rm4 left	20:04
	← pdtpatrick left	20:04
	pdtpatrick_ → pdtpatrick	20:04
	← yorick left	20:05
	← SiDz left	20:05
cbreak	dunpeal: rebasing will remove the merge commits	20:05
	→ cybersphinx joined	20:05
	→ sh4rm4 joined	20:05
	← luxurymode left	20:05
cbreak	just make a new branch and rebase that, that way you can easily go back if you're not happy with the result	20:06
	← ReekenX left	20:06
cbreak	Jon--: you probably don't refer to the right branches	20:06
dunpeal	cbreak: thanks, I'll try that. and as you guessed, I'm mostly interested in removing the merge commits.	20:06
cbreak	commits with the same sha by definition have no difference	20:06
Jon--	cbreak, I did git diff master branchname	20:06
cbreak	unless you managed to break sha :)	20:07
dunpeal	maybe Jon-- is from the future	20:07
Jon--	vs looking at the pointers in gitk	20:07
	which all point at HEAD	20:07
	→ yorick joined	20:07
cbreak	git rev-parse them	20:07
	← etcetera left	20:07
	← The24z left	20:07
	→ neurodrone joined	20:07
Jon--	cbreak, two of them same, one diff hash	20:08
	← skyf left	20:08
	→ SiDz joined	20:09
	← SiDz left	20:09
	→ SiDz joined	20:09
	← Xilent left	20:10
	→ Xilent joined	20:11
	← dsirijus left	20:11
	→ arkiver joined	20:12
	← mmc1 left	20:12
	← aspotashev left	20:12
	→ alexukf joined	20:12
	→ aspotashev joined	20:12
	← dr_lepper left	20:13
	← dlynes left	20:13
	← alexukf left	20:14
	← rhl left	20:15
	→ codertux joined	20:16
dunpeal	Jon--: what does "one diff hash" mean?	20:18
	→ rohan32 joined	20:18
	← dv310p3r left	20:18
	← fisted left	20:19
	← orkz left	20:19
	→ mmc1 joined	20:19
	→ orkz joined	20:20
	← j416 left	20:21
	→ dv310p3r joined	20:21
	→ j416 joined	20:21
	→ fisted joined	20:21
	← macer1 left	20:21
Jon--	dunpeal, Ignore the fact that I have 3 branches it's irrelvent (sorry for mentioning it). I have two branches, master and br1. br1 is pointing at HEAD, but I don't see master pointing at anything in gitk. I'm trying to investigate what is going on.	20:21
jast	I think you're misunderstanding what HEAD is	20:22
_ikke_	Jon--: HEAD probably points to BR1	20:22
jast	HEAD is a pointer to the currently checked out branch (or, with a detached HEAD, the currently checked out commit)	20:22
_ikke_	!head	20:22
gitinfo	[!HEAD] HEAD is a 'pointer' in the repository that refers to whatever is currently checked out (or the default branch in bare repositories). It's not specific to any branch.	20:22
Jon--	Ahh	20:22
	→ erynofwales joined	20:23
jast	right, I wanted to redo that trigger. it's a bit confusing as it is...	20:23
	→ wolftankk joined	20:23
Jon--	how can I get a graphical difference between two different branches?	20:24
jast	.trigger_edit HEAD HEAD is a 'pointer' to the currently checked out branch (or commit, if HEAD is !detached). In bare repositories it serves a different function: it tells clients which branch to checkout initially after cloning. HEAD is not something that exists separately for every branch; that's a common misunderstanding.	20:24
gitinfo	jast: Okay.	20:24
Jon--	if I checkout master or check out br1 I get a graph with gitk but I can't seem to get one with both of them on it.	20:24
jast	gitk master br1	20:25
cbreak	gitk --all	20:25
jast	you can also get the actual difference	20:25
_ikke_	Jon--: gitk by default only shows the current branch	20:25
dunpeal	Jon--: the graph displayed to you by gitk, if you don't specify anything, is walked from HEAD	20:25
Jon--	_ikke_, thanks	20:25
	dunpeal, &	20:25
	→ Sebo joined	20:25
cmn	gitk will show whatever you tell it, just like log	20:26
	← iamjarvo left	20:26
	→ Sigma joined	20:26
	← _iron left	20:26
	→ mklappstuhl joined	20:26
dunpeal	use jast's solution for a graphical/gitk display, or `git log master...br1`. It can be easier to read with the --left-right flag.	20:27
	Jon--: you're welcome. ^	20:27
	→ nickpresta joined	20:27
jast	oh dangit, I've dropped out of the top5 karmicians	20:28
Jon--	dunpeal, that was supposed to be a ^ but I wasn't gonna spam chan. Thanks :)	20:28
jast	my life is ruined etc.	20:28
_ikke_	jast: could you share the top 5?	20:29
	Or is it to embarassing for you?	20:29
	→ maqr joined	20:29
dunpeal	there's karma to be had here? /me puts down a chair and sets up residence	20:30
jast	!karma	20:30
gitinfo	This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them. Try ".karma <nick>" or ".topkarma", but please do it via private message to avoid mass highlighting people.	20:30
dunpeal	.karma dunpeal	20:30
gitinfo	the karma of the given users is shrouded in the mists of uncertainty.	20:30
jast	note that karma points are pretty expensive	20:30
dunpeal	:(	20:30
	→ dasil003 joined	20:30
	→ qwebirc79863 joined	20:30
_ikke_	jast: expensive?	20:30
	→ fly9 joined	20:30
dasil003	does anyone happen to have any domains registered at enomcentral.com?	20:30
dunpeal	random question of the day?	20:31
jast	yes. one point means having spent quite a bit of time helping thankful people	20:31
qwebirc79863	How does git handle symlinks (by default)? Will the contents of a symlinked directory be included in the repo?	20:31
	→ alexukf joined	20:31
_ikke_	jast: Ah ok	20:31
jast	qwebirc79863: no. it'll be stored as the equivalent of a symlink.	20:31
_ikke_	qwebirc79863: no	20:31
	← flippo left	20:33
_ikke_	Cool, i'm on a shared 2nd/3rd place with cbreak	20:33
	← andy23 left	20:33
dunpeal	.topkarma	20:33
gitinfo	top karmic beings: cmn: 20, _ikke_: 11, cbreak: 11, werehamster: 10, fauxfaux: 9	20:33
jast	hey! didn't it say "please do it via private message"?	20:33
dunpeal	woops, sorry	20:34
dasil003	dunpeal: yeah it's random, I'm scouring irc for someone with an eNom registration to confirm something in their admin	20:34
	← pdtpatrick left	20:34
	← rehat left	20:34
jast	perhaps I should change the commands to report back via notice only	20:34
	← mklappstuhl left	20:34
	← chuckhar_ left	20:34
	← nickpresta left	20:34
	← dpino left	20:35
imachuchu	holy crud, I didn't realize I had so much compared to the verterans here. Makes me feel somewhat useful	20:35
	← Sigma left	20:35
jast	.karma jast	20:35
gitinfo	the Genuine Real Life Karma™ REST API results are back! jast: 6	20:35
jast	my dirty secret is out...	20:36
lindenle	Does a recursive clone of submodules have a parallele option?	20:36
_ikke_	He built this system in the hopes he would get the highest karma	20:36
	← nasso left	20:36
	→ axl_ joined	20:36
jast	sure :P	20:36
	(I don't care at all, really. it's a nice toy, though.)	20:36
	lindenle: you mean for multi-threaded fetching? I don't think so.	20:36
	pdelvo → pdelvo\|afk	20:37
	→ pdtpatrick joined	20:37
lindenle	jast: yeah that is what I meant, if not why?	20:37
imachuchu	I'm working my way towards nirvana, just a few more karma tickets and I'll reach enlightenment!	20:37
	lindenle: how come, why does it matter?	20:37
jast	impatience )	20:37
cmn	it's a shell script, that's probably why	20:37
jast	;)	20:37
	→ opus joined	20:38
lindenle	imachuchu: just would be nice, we have a lot of submodules in a repo and it is kind of slow.	20:38
cmn	ah, wait, there /is/ a good reason	20:38
	← lresende left	20:38
cmn	parallel execution would mix the mesages	20:38
lindenle	cmn ?	20:38
	← alexukf left	20:38
jast	yeah, the output would suck	20:38
lindenle	cmn: yeah that is true	20:38
cmn	and an error wouldn't be traceable	20:38
	→ nasso joined	20:38
lindenle	true	20:38
_ikke_	EugeneKay would respond with ! why	20:38
jast	well you could work around that	20:38
cmn	sure, but nobody has	20:38
jast	yep	20:38
	because nobody has cared so far	20:38
	patches welcome, I'm sure ;)	20:39
EugeneKay	Well, it's the truth.	20:39
lindenle	I guess I should start digging into it ;)	20:39
jast	it's always the truth!	20:39
	.random	20:39
gitinfo	Please donate more random statements to feed the bot. You don't want the bot to starve, do you? Well, if you don't donate, it will, and it'll be your fault, and you'll have to suffer the accusing stares from everyone else in the channel. [6]	20:39
dunpeal	how do I donate random statements to the bot?	20:39
cmn	yeah, it came up in the ML, if someone figures out how to do it properly, it'll get integrated	20:39
	← specialGuest left	20:40
	→ specialGuest joined	20:40
	← arkiver left	20:40
jast	'.random add Random statement here'	20:40
lindenle	cmn: was that in our thread?	20:40
	← corburn left	20:40
cmn	yes	20:40
jast	.random	20:40
gitinfo	tails (chosen by fair coin flip) [4]	20:40
EugeneKay	Should teach it to .vend	20:41
	← linoj left	20:41
jast	write a plugin, see if I merge it	20:41
EugeneKay	I already wrote the API you can hit against, my part is done. :-p http://itvends.com/vend	20:41
jast	it doesn't work that way	20:41
	I only write code if I care about the feature. :}	20:41
EugeneKay	You should care! Think of the possibilities	20:42
jast	or if I get paid, but that's pretty unlikely with this IRC thingy	20:42
	→ torjus_ joined	20:42
_ikke_	:D	20:42
jast	well, I suppose a .vent feature would be interesting	20:42
	but that's a different story	20:42
EugeneKay	The API even supports returning a bunch of items as JSON, so you can cache them and refill as needed	20:43
_ikke_	jast: what would that even do?	20:43
jast	I don't know... scream obscenities at nobody in particular?	20:43
	← axl_ left	20:43
_ikke_	.random add A random statement	20:43
gitinfo	_ikke_: Okay.	20:43
	← _Vi left	20:43
jast	or, more probably, collect derisive statements about... stuff.	20:43
_ikke_	.random	20:44
gitinfo	<cmn> all that memory and processing power was just gonna sit there unused, we're helping [8]	20:44
jast	stuff that deserves to be derided, e.g. XML	20:44
	→ pdtpatrick_ joined	20:44
	→ _Vi joined	20:44
imachuchu	is there any way of asking how many random statements there are already stored?	20:44
jast	no	20:44
	← john2496 left	20:44
jast	but if you ask very nicely, I might tell you	20:44
EugeneKay	!botsnack	20:44
gitinfo	Om nom nom	20:44
_ikke_	did I wake EugeneKay up?	20:45
EugeneKay	No, but you did convince me to take a break from work.	20:45
_ikke_	:D	20:45
jast	(14)	20:45
	hah, I'm not at work for once	20:45
imachuchu	.random	20:46
gitinfo	<vork> Is there a git gc --rampage? [13]	20:46
	EugeneKay wanders down hill to get mail	20:46
_ikke_	lol	20:46
diminoten	how do you swap between branches in git flow	20:47
	if I just swap normally	20:47
	will it screw anything up in git flow or no?	20:48
imachuchu	jast: was just curious	20:48
dunpeal	diminoten: switching branches does not modify the graph.	20:48
imachuchu	jast: only 14, that's sad, I'll see what I can dig up	20:48
_ikke_	diminoten: git flow is not anything special, it's just a convention on branching stuff	20:48
diminoten	dunpeal: word, so I can commit some changes to one feature, swap to other features, commit there too, then swap back to publish features	20:48
	well I just wanted to make sure	20:48
dunpeal	yeah, what were you afraid would happen?	20:49
_ikke_	diminoten: The plugin doesnt track state or something, it just looks at the current situation	20:49
diminoten	it'd think one branch was a different branch	20:49
	like if I type git flow feature publish foo1, I just want to make sure it'd still publish foo1, even if I'm in the foo2 branch	20:49
_ikke_	diminoten: afaik, it doesn't really know what branches there are	20:49
	diminoten: it's just a static set of operations	20:49
	→ rehat joined	20:50
diminoten	well it leaves you in certain states	20:50
	← qwebirc79863 left	20:50
diminoten	I jsut hope it doesn't expect to find you still in that state when you're "done"	20:50
	→ alexukf joined	20:50
_ikke_	if you want to publish branch foo, I guess you can best be in branch foo	20:51
	→ chuckharmston joined	20:51
	← shreya left	20:51
	→ dr_lepper joined	20:52
	← dr_lepper left	20:52
	→ dr_lepper joined	20:52
diminoten	meh I'll find out when I do it	20:52
	what could possibly go wrong? :D	20:52
	← _Vi left	20:53
	← fission6 left	20:53
	→ mklappstuhl joined	20:54
jast	added two more randoms \o/	20:55
	← alexukf left	20:55
	← maletor left	20:55
	← dunpeal left	20:56
	← freeed left	20:56
	← KBme_ left	20:57
	→ KBme joined	20:57
	← hoschi left	20:57
	← ISF left	20:57
	→ _Vi joined	20:58
	← phishy left	20:59
	← titaniumNoob left	20:59
	← cannonball left	20:59
MetaCosm	When I do 'git branch -a' it is showing branches that have been removed remotely (using git branch origin :foo) -- is there a way I can reset that	21:00
cbreak	MetaCosm: man git-remote prune	21:00
gitinfo	MetaCosm: the git-remote manpage is available at http://git-scm.com/docs/git-remote.html	21:00
	← geekbri left	21:00
	← elux left	21:01
	→ scientes_ joined	21:02
scientes_	how do i make git push, push all branches?	21:02
cbreak	use --all	21:02
scientes_	yeah i know thtat	21:02
	but by default	21:02
_ikke_	scientes_: look at man git config push.default	21:02
gitinfo	scientes_: the git-config manpage is available at http://git-scm.com/docs/git-config.html	21:02
	← martinjlowm left	21:03
_ikke_	jast: Do statements have to be approved or something?	21:03
	← mishok13 left	21:04
_ikke_	oh, n/,	21:04
	← DrHouse\|TARDIS left	21:04
	→ aesptux joined	21:04
	→ axl_ joined	21:06
	→ ashirus joined	21:06
	→ giallu joined	21:06
	← beneggett left	21:06
	→ alexukf joined	21:07
	← skobiyan left	21:07
	← SaCu left	21:08
	→ SaCu joined	21:09
	← zastern left	21:10
	← sq-one left	21:11
	← scientes_ left	21:11
	← chuckharmston left	21:11
	→ chuckharmston joined	21:12
	← alexukf left	21:12
	← heinrich5991 left	21:12
	← spyro left	21:12
	← torjus_ left	21:14
	← Jon-- left	21:15
	→ kewah joined	21:16
	→ doug joined	21:16
doug	is there a good way to see what the last commit was for all the remote tracking branches in my local repo?	21:17
	← Zenopus left	21:17
	→ amcsi__ joined	21:17
	→ Zenopus joined	21:17
cmn	man git for-each-ref	21:17
gitinfo	the git-for-each-ref manpage is available at http://git-scm.com/docs/git-for-each-ref.html	21:17
	← helgikrs left	21:17
	→ opus__ joined	21:17
	← Maccer left	21:17
	→ FernandoBasso joined	21:18
	← mattp_ left	21:18
	→ mattp_ joined	21:18
	← flijten left	21:18
	← opus left	21:18
	opus__ → opus	21:18
	→ mischat_ joined	21:19
	← jnewt left	21:19
	← oojacoboo left	21:20
	← cooloney_ left	21:20
	→ cooloney joined	21:20
	→ jnewt joined	21:20
	→ Giddeon joined	21:20
	← mischat left	21:20
	← amcsi_ left	21:20
	mischat_ → mischat	21:20
	→ oojacoboo joined	21:21
	← ferdna left	21:21
Giddeon	I'm new to git. How do I pull down the latest master and switch to it?	21:21
	→ helgikrs joined	21:21
doug	into an existing repo?	21:21
Giddeon	yah, I've gone off working on my own branch, I want to see if anything newer has been released to master	21:22
	← whatthepoop left	21:22
doug	you can do a git fetch	21:22
	that'll get your tracking branches updated	21:22
Giddeon	git fetch origin master?	21:22
doug	just git fetch	21:22
	that oughta sync everything up	21:23
Giddeon	great, thanks for the tip	21:23
doug	it won't actually put anything into your local branches, though.	21:23
	you can switch to master (git checkout master) and git will tell you if you're up to sync	21:23
	if not, it'll advise merging	21:23
	→ scientes_ joined	21:23
doug	and you can decide to merge or rebase at that point	21:23
	→ heinrich5991 joined	21:23
Giddeon	got it	21:23
doug	git pull is what a lot of people use, although it'll automatically merge by default, which may not always be what you want	21:23
	→ alexukf joined	21:24
	→ Davey joined	21:24
	← marhaban left	21:25
	→ beneggett joined	21:25
	← aspotashev left	21:26
	→ olaf_ joined	21:27
	→ aspotashev joined	21:27
	← ddelrio1986 left	21:28
	← alexukf left	21:29
	← rehat left	21:30
	→ The24z joined	21:30
	← j416 left	21:32
	← wolftankk left	21:34
	← unnamedwill left	21:34
	→ The24z_ joined	21:36
	← olaf_ left	21:37
	→ AaronMT joined	21:39
	← Sky[x] left	21:39
	→ The24z__ joined	21:40
	→ darren joined	21:41
	→ alexukf joined	21:41
	→ unnamedwill joined	21:42
	← alexukf left	21:42
	← The24z left	21:44
	The24z__ → The24z	21:44
	← mike007 left	21:44
	← dv310p3r left	21:44
	← The24z_ left	21:46
	→ The24z_ joined	21:46
	← pdtpatrick left	21:47
	pdtpatrick_ → pdtpatrick	21:47
	→ dv310p3r joined	21:47
	← The24z left	21:48
	← zackiv31 left	21:48
	→ psoo joined	21:48
	→ soreau joined	21:48
	← alexisabril left	21:48
	← longbeach left	21:50
	← ph^_ left	21:51
	← AaronMT left	21:52
soreau	I have a patch that wont apply because of a one line discrepancy. I'd like to git apply it instead of git am. Is there a way to tell git to apply it with the opportunity to fix it? I'm thinking of when it puts >>>>>>> lines in the file	21:52
	← orkz left	21:52
	→ hidekin joined	21:53
	→ etcetera joined	21:53
joshc	soreau: git am -3 might be what you want.	21:53
	→ lresende joined	21:54
	← gfontenot left	21:54
	← etcetera left	21:54
	→ hobodave joined	21:55
	→ AlbireoX joined	21:55
	← ehsan left	21:55
	← hidekin left	21:55
	← _Vi left	21:56
soreau	joschi: Yes that worked.. is there a way to tell it to give a chance to fix whitespace problems?	21:56
	→ slimjimflim joined	21:56
	→ _Vi joined	21:57
	→ alexukf joined	21:57
slimjimflim	when i create a tag and my working directory is on a branch, is the new tag a copy of the branch i'm on or of the master?	21:58
	<--noob pls correct me if i'm using the wrong terminology	21:58
	→ thursday joined	21:58
	← Guest66958 left	21:59
cmn	the tag points to whatever you tell it to, defaulting to HEAD	21:59
	where !head	21:59
gitinfo	[!HEAD] HEAD is a 'pointer' to the currently checked out branch (or commit, if HEAD is !detached). In bare repositories it serves a different function: it tells clients which branch to checkout initially after cloning. HEAD is not something that exists separately for every branch; that's a common misunderstanding.	21:59
	→ Sky[x] joined	21:59
	← barq left	22:01
dogarrhea2	hrm. git status says: "Not currently on any branch"	22:01
	git checkout points my head to the latest revision and it still says "not currently on any branch"	22:01
	→ alanp joined	22:01
cmn	what command are you running?	22:01
	← dv310p3r left	22:01
	→ etcetera joined	22:01
dogarrhea2	git status	22:01
	i copied the folder with the .git file to a portable storage device and decided to work somewhere else	22:02
	← thursday left	22:02
cmn	the checkout	22:02
dogarrhea2	i have checked out something and it says "head now at blah blah" not sure if i need to clone	22:02
blendedbychris	cmn: hey sorry I keep stepping out. Do you know why git would complain about not being in the working path when moving GIT_DIR?	22:02
cmn	something? if you don't tell us what you did, we can't hlep	22:03
	← etcetera left	22:03
	← alexukf left	22:03
dogarrhea2	ok so i need to checkout master	22:03
	← pantsman left	22:03
cmn	if you want to switch to the master branch, yes	22:03
dogarrhea2	i tried checking out the latest revision	22:03
cmn	how did you try? you still haven't said what you did	22:03
dogarrhea2	git checkout 7ewhatever	22:03
	the hash	22:04
	keep forgetting this makes u go into neverland state where your next commit goes nowhere	22:04
	← alanp_ left	22:04
cmn	then don't use it to get to a branch	22:04
	← sirdancealot7 left	22:06
	→ spyro joined	22:06
	→ etcetera joined	22:06
cmn	blendedbychris: GIT_DIR would just be one part of the equation	22:08
	it depends on what the gitdir thinks the worktree is at	22:08
	or if it even thinks it should have one	22:09
	→ kcj joined	22:09
	← spyro left	22:09
	→ spyro joined	22:09
	← spyro left	22:09
	→ spyro joined	22:09
	← TeckniX left	22:10
	← gmartyn left	22:10
dogarrhea2	hrm how do you make the head point to the latest revision in the branch?	22:10
	git is no longer detecting changes i make to my repository	22:10
	→ Maccer joined	22:11
	← pavelz left	22:13
	← thefalling left	22:14
cmn	you use checkout	22:14
	if you want to switch to a branch, you use the name, otherwise the hash	22:14
slimjimflim	if a repo is hosted on, for example, github, is it possible to export the whole repo to a different server and preserve all historical changes?	22:14
	→ pavelz joined	22:14
	← fly9 left	22:14
cmn	slimjimflim: that's the point of git, yes	22:14
	→ Chani joined	22:14
	← hobodave left	22:14
slimjimflim	cool. do you know where that process is documented?	22:15
	→ alexukf joined	22:15
	← alexukf left	22:16
	← TheJH left	22:16
	oakdog8 → oakdog8_	22:17
cmn	man git clone	22:17
gitinfo	the git-clone manpage is available at http://git-scm.com/docs/git-clone.html	22:17
cmn	it sounds like you should read the !book	22:17
gitinfo	There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	22:17
	← aesptux left	22:18
slimjimflim	k u rock	22:18
dogarrhea2	is there a difference between git clone and copy the file system that contains the .git file?	22:18
	← beneggett left	22:19
cmn	the refs that get fetched	22:19
	← nglorioso left	22:20
	← Davey left	22:20
	← candybar left	22:20
	← jonshea left	22:21
	← Sebo left	22:22
	← joephelius left	22:22
	→ madewokherd joined	22:24
	← cakehero left	22:26
	← tinti_ left	22:26
	→ tinti_ joined	22:27
	→ MrRoot joined	22:27
	← tinti left	22:27
	← leeN left	22:29
	→ melee joined	22:31
	← Synthead left	22:32
	gitinfo set mode: +v	22:32
melee	i've made a booboo. my local branch has some stuff that i'm not yet ready to merge on my server so i've been cherry-picking commits that are ready to go. how should i go about resolving this so i can stop cherry-picking? branch the server and pull that in?	22:33
	→ nglorioso joined	22:34
	→ dinesh6654_ joined	22:34
	→ duckxx joined	22:35
	← SkAzZ left	22:35
	← kimico left	22:35
	← kewah left	22:35
	→ kimico joined	22:35
	← nglorioso left	22:35
	← aaronky left	22:35
	→ beneggett joined	22:36
	→ metcalfc joined	22:36
	→ glennpratt_ joined	22:36
	→ aaronky joined	22:36
	← artnez left	22:36
	→ SkAzZ joined	22:36
	← bronsen left	22:37
	← Orphis left	22:37
	→ Orphis joined	22:37
	← ShadeTornado left	22:37
	← Sky[x] left	22:38
	← duckx left	22:38
	← bogwonch left	22:38
	← dinesh6654 left	22:38
	← glennpratt left	22:38
	← erichynds left	22:38
	→ tnelson joined	22:40
	→ cakehero joined	22:41
cmn	melee: see !fixup	22:44
gitinfo	melee: 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!	22:44
	→ Escherial joined	22:45
Escherial	ok, another dumb question, but i have a lot of stuff staged that i've since realized i want to be on another branch	22:45
	is there any way to stash what's staged?	22:45
	(preferably only what's staged)	22:45
	Guest32093 → oakdog8	22:46
cmn	switch to whatever branch and then commit	22:47
Escherial	the stage follows you when you switch branches, then? also, i have things that i haven't yet staged; can i stash those without disturbing the staged stuff?	22:48
cmn	!float	22:49
gitinfo	If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there. If the files you changed differ between branches, the checkout will fail. In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.	22:49
cmn	stash works on all uncommitted changes	22:49
	only what's committed is fixed	22:49
	your workdir is independent	22:49
melee	cmn - what effect does cherrypicking have on the history? any? couldn't I just branch it, push to remote, pull to local and checkout?	22:50
	← chuckharmston left	22:50
cmn	a cherry-pick adds a commit to the current branch	22:50
	← mklappstuhl left	22:51
melee	hmm, ok	22:51
cmn	I don't see what you want to achieve with push+pul	22:52
	if you want to merge, just do that	22:52
	← mmc1 left	22:52
melee	well, my local and remote branch are out of sync	22:52
	← cakehero left	22:52
melee	causing me to cherrypick commits	22:52
	→ ShadeTornado joined	22:52
melee	because I don't want to merge (yet)	22:53
	basically I should have branched from the start but I didn't	22:53
	→ simesy joined	22:54
cmn	but a pull does that	22:54
	if cherry-picking is the right thing, then do that	22:54
	but don't pull	22:54
melee	ok I'll keep cherry picking for now	22:54
	← v0n left	22:58
	← axl_ left	22:58
	← cenuij left	22:58
	→ axl_ joined	23:01
	← SegFaultAX left	23:02
	→ joephelius joined	23:02
	→ lustucru_ joined	23:02
	→ eletuchy_ joined	23:03
	← thiago left	23:04
	← ShadeTornado left	23:04
	← lustucru left	23:05
	← afuentes left	23:05
	→ andy23 joined	23:05
	← blendedbychris left	23:05
	← eletuchy left	23:06
	oakdog8 → oakdog8__	23:06
	← eijk_ left	23:06
	→ dvide joined	23:07
	→ RRottmann3892 joined	23:07
	→ SegFaultAX joined	23:09
	← R40UL left	23:10
	← Sym3tri left	23:11
	← SirCmpwn left	23:13
	← lustucru_ left	23:14
	→ lustucru joined	23:15
	SegFault1X\|work2 → SegFaultAX\|work2	23:15
	← lustucru left	23:15
	← scientes_ left	23:15
	→ Davey joined	23:17
	← jason237 left	23:17
	← matthiasgorgens left	23:18
	← psoo left	23:18
slimjimflim	is the .git directory a fraction of the size of the working directory because it's contents are compressed into hashes?	23:20
	→ chuckharmston joined	23:21
	→ matthiasgorgens joined	23:22
	→ mike007 joined	23:24
	← gtrak left	23:25
	→ Esa joined	23:25
	→ cenuij joined	23:25
	← joephelius left	23:25
	→ palyboy joined	23:26
RichiH	slimjimflim: hashes are trapdoor functions	23:28
	they don't compress	23:28
	they throw data away	23:29
	← gusnan left	23:29
slimjimflim	right.	23:29
	→ scientes_ joined	23:29
slimjimflim	so it must compress the files somehow	23:29
	← giallu left	23:29
	→ raykyri joined	23:29
	← chuckharmston left	23:30
	→ Rakko joined	23:31
	→ Goplat joined	23:31
	→ jason237 joined	23:32
	→ ShadeTornado joined	23:32
Rakko	I keep having this problem where if I reset to a place before HEAD, checking out the branch (master) again doesn't fast-forward; it just says "Already on 'master'". How can I get back to HEAD after resetting backward?	23:33
	→ subbyyy joined	23:34
dogarrhea2	if it were me and i were a noob	23:35
	well i am a noob	23:35
	and i would do a git log	23:36
	→ pheaver joined	23:36
dogarrhea2	then a git checkout of the latest	23:36
slimjimflim	...me too. i was gonna say git checkout	23:36
	→ theCole joined	23:36
slimjimflim	i just did that this afternoon. i think that's how	23:36
frogonwheels	Rakko: !HEAD	23:37
gitinfo	Rakko: HEAD is a 'pointer' to the currently checked out branch (or commit, if HEAD is !detached). In bare repositories it serves a different function: it tells clients which branch to checkout initially after cloning. HEAD is not something that exists separately for every branch; that's a common misunderstanding.	23:37
Rakko	hmm :/ seems like there should be a more automagic way	23:37
	dogarrhea2: git reflog, rather	23:38
RRottmann3892	...	23:38
frogonwheels	Rakko: !repro	23:38
gitinfo	Rakko: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session, or at least explain exactly what you did that led up to the problem. This will help immensely with troubleshooting.	23:38
Rakko	frogonwheels: so this is not expected behavior?	23:38
frogonwheels	Rakko: I'm not sure what you are doing. It seems you have some confusion over terms and what things mean.	23:39
Rakko	Probably.	23:39
	← dasil003 left	23:39
Rakko	Basically I move HEAD backward within its branch, so then I lose track of the old HEAD unless I do a reflog (or I happened to tag it earlier)	23:40
frogonwheels	Rakko: if you give a transcript, it will be easier to see and help you work out any misconceptions.	23:40
Rakko	ok. next time I run into this I will	23:40
tystr	so I'm doing git fetch origin	23:40
	← raykyri left	23:40
imachuchu	Rakko: the basic idea is to use a ref (branch/tag) if you care about some point in time	23:40
tystr	and it's not getting any of the remote branches	23:40
frogonwheels	Rakko: do you mean you checkout a previous commit, or that you reset your branch to point to a previous commit	23:40
Rakko	frogonwheels: the 2nd option	23:41
frogonwheels	tystr: git branch -r	23:41
RRottmann3892	...	23:41
frogonwheels	Rakko: ok.. well in that case, don't talk about HEAD. that's just where you are. you're talking about changing your branch.	23:41
slimjimflim	in svn there's revisions. what would be the git equivilent?	23:41
tystr	frogonwheels hmm that lists the branches as origin/remote-branch	23:41
	← john_anderson left	23:41
tystr	but doing git checkout remote-branch doesn't work	23:41
Rakko	oh, what's the difference between checking out a previous commit and resetting to point to a previous commit?	23:41
imachuchu	slimjimflim: commits	23:41
slimjimflim	oic	23:42
frogonwheels	Rakko: if you use a 'reset' you are changing where your current branch is pointing to	23:42
Rakko	oh! then that's my problem	23:42
slimjimflim	so can you git checkout a commit number?	23:42
	→ harish joined	23:42
Rakko	yes you can, slimjimflim	23:42
imachuchu	Rakko: checkout is for copying files to your working checkout so that you can interact with them (like with vim or whatever)	23:42
frogonwheels	Rakko: if you want to go back and have a look at something, just checkout the commit. leaving you in a !detached state - but that's ok unless you want to commit	23:42
gitinfo	Rakko: A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach	23:42
tystr	I see this in git branch -r	23:43
	origin/master	23:43
	origin/visitor-count	23:43
	← Psycho_pr left	23:43
frogonwheels	Rakko: you can restore where your branch was pointing to use the reflog. git reflog branchname	23:43
imachuchu	slimjimflim: you can checkout any tree-ish object, where tree-ish is a very large set of things (tags/branches/commits/reflog entries)	23:43
	→ john_anderson joined	23:43
	→ Psycho_pr joined	23:43
	← ShadeTornado left	23:43
frogonwheels	Rakko: err git reflog show branchname iirc	23:43
tystr	but doing git checkout visitor-count i get this:	23:43
	error: pathspec 'visitor-count' did not match any file(s) known to git.	23:43
slimjimflim	detached head...that sounds painful	23:43
	imachuchu: right	23:43
frogonwheels	!zombie	23:43
gitinfo	Brainzz! More brainzzzz! For information about detached heads, see !detached	23:43
Rakko	thanks	23:44
imachuchu	tystr: is visitor-count a branch/tag or what?	23:44
frogonwheels	tystr: hmm.. version of git?	23:44
tystr	branch	23:44
frogonwheels	tystr: git checkout -t visitor-count origin/visitor-count	23:44
tystr	git version 1.7.5.4	23:44
slimjimflim	noooo zombies are eating my detached head :O	23:44
	RRottmann3892 → The24z_away	23:44
	← Rakko left	23:45
imachuchu	tystr: how does it show up on a "git branch"?	23:45
	← patient left	23:45
tystr	just master	23:45
frogonwheels	tystr: did you try that git checkout -t thing?	23:47
	tystr heh fatal: Missing branch name; try -b	23:47
tystr	wtf	23:47
	The24z_away → The24z	23:47
tystr	must have typed a / lol	23:47
	← The24z left	23:48
	← pdtpatrick left	23:48
	→ ShooterMG joined	23:49
	→ ccarella joined	23:49
	← ccarella left	23:50
	→ The24z joined	23:50
	← boombatower left	23:51
frogonwheels	tystr: doing git checkout visitor-count SHOULD auto-magically do the equiv of git checkout -t visitor-count origin/visitor-count	23:51
tystr	weird	23:52
	I think that repos jacked up somehow	23:52
	I have another clone of it and all is working normally	23:53
	← thelazydeveloper left	23:53
tystr	no idea how that happened, though	23:53
imachuchu	tystr: did you clone vs init?	23:53
	tystr: clone sets up the remotes, init just creates a new repo	23:53
tystr	right	23:53
	I cloned a long time ago	23:53
imachuchu	tystr: before the vistor-count branch?	23:53
tystr	yeah	23:53
	← scientes_ left	23:55
imachuchu	tystr: actually nix that, I believe fetch pulls all remote branches unless you specify elsewise	23:55
	→ scientes_ joined	23:55
	← The24z left	23:55
	← _Vi left	23:57
	← rohan32 left	23:57
	→ _Vi joined	23:58
	← iocor left	23:58
	→ The24z joined	23:58

Logs Search ←Prev date Next date→

Channels Documentation