IRCloggy #git 2012-10-27

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-10-27
	← juril left	00:02
	← ryuzak82 left	00:02
	→ worstadmin_ joined	00:03
	← gitinfo left	00:04
	← timj left	00:04
	← jast left	00:04
	← dgbaley27 left	00:04
	→ pdtpatr1ck joined	00:07
	← moonkey_ left	00:08
	← barq left	00:08
	← jdunck left	00:10
	← yoklov left	00:10
	← boombatower left	00:10
	← Vert left	00:11
	→ yoklov joined	00:12
	← dijonyummy left	00:12
	→ marhaban joined	00:13
	→ hwrd\|work joined	00:14
	← VarmVaffel left	00:16
	← etcetera left	00:17
	→ VarmVaffel joined	00:17
	← klj613 left	00:18
	← gain left	00:18
	→ etcetera joined	00:19
	offby1 'd of guv dgbaley27 that link if he'd had it, too	00:19
	← ergZay left	00:21
	← acidjazz left	00:21
	← VarmVaffel left	00:21
	→ VarmVaffel joined	00:22
	← [vaelen] left	00:24
	← BSaboia__ left	00:24
	← VarmVaffel left	00:24
	→ VarmVaffel joined	00:24
	← mneorr_ left	00:26
	→ nowhere_man joined	00:27
	← VarmVaffel left	00:27
	→ VarmVaffel joined	00:27
	← Araxia left	00:29
	← pandeiro left	00:29
	← VarmVaffel left	00:30
	→ VarmVaffel joined	00:30
	← VarmVaffel left	00:32
	→ VarmVaffel joined	00:33
	← Fandekasp left	00:33
	Taoki → Taoki\|away	00:33
	→ Fandekasp joined	00:33
	← hwrd\|work left	00:33
	→ mneorr joined	00:33
	→ private joined	00:34
	private → Guest63390	00:34
	← NetJunky left	00:35
	← VarmVaffel left	00:35
	← mneorr left	00:36
	→ VarmVaffel joined	00:36
	→ mneorr joined	00:36
samir	hi guys	00:39
	← VarmVaffel left	00:39
samir	I'm trying to write a post-receive fetch. Basically when A user does a git fetch, I'd like to run a git submodule update	00:39
	→ VarmVaffel joined	00:39
samir	*hook I mean	00:39
cmn	that has nothing to do with post-receive	00:40
	→ AdrienBrault joined	00:40
samir	what hook should I be modifying?	00:40
	← tinti left	00:41
	← pfFredd left	00:41
cmn	there is none that runs after a fetch	00:41
	← VarmVaffel left	00:43
	→ VarmVaffel joined	00:44
	← daniel_- left	00:44
	→ moonkey_ joined	00:44
	← kpreid left	00:45
	← variousnefarious left	00:45
	→ kpreid joined	00:45
	→ BiggFREE joined	00:46
	← cannonball left	00:48
	← i42n left	00:48
	← xaka left	00:49
	← VarmVaffel left	00:49
	→ VarmVaffel joined	00:49
	→ hwrd\|work joined	00:49
	→ dnstbr joined	00:52
	← eijk_ left	00:52
	→ apok_ joined	00:55
	← apok_ left	00:56
	← VarmVaffel left	00:57
EugeneKay	Damnit jast, fix your shit.	00:57
	→ Lord_DeathMatch joined	00:57
	→ VarmVaffel joined	00:57
	← xrq left	00:57
	← hwrd\|work left	00:58
	← apok left	00:59
	← BiggFREE left	01:00
	→ Bmac joined	01:01
	← witul left	01:01
	→ ergZay joined	01:01
	→ witul joined	01:01
	← witul left	01:02
	← VarmVaffel left	01:02
	→ VarmVaffel joined	01:02
	→ angelsl joined	01:03
	← g0bl1n left	01:06
	← AdrienBrault left	01:06
	→ tinti joined	01:06
	← Tuna-Fish left	01:11
frogonwheels	EugeneKay: maybe somebody needs offer a fail-over server ;)	01:11
	← aspotashev left	01:12
EugeneKay	Sure	01:12
	← lresende left	01:12
EugeneKay	I'm too lazy to set it up though	01:12
frogonwheels	:) Exactly.	01:12
	EugeneKay: he did say that he was trying to get the bot to come back online after a reboot.	01:13
EugeneKay	Apparently not very well :-p	01:13
	→ Kichael joined	01:14
frogonwheels	apparently	01:14
	← tinti left	01:14
	← samphippen left	01:14
	← VarmVaffel left	01:15
	→ VarmVaffel joined	01:15
	← Akufen_ left	01:15
	→ Yuuhi` joined	01:17
	← Yuuhi left	01:19
	→ Akufen joined	01:19
	← Mocramis left	01:19
	→ Mocramis joined	01:20
	← Chillance left	01:20
	→ rchavik joined	01:21
	← rchavik left	01:21
	→ rchavik joined	01:21
	← arvind_khadri left	01:21
	← dvide left	01:22
	← camonz left	01:25
	← VarmVaffel left	01:25
	→ VarmVaffel joined	01:25
	← jpmelos left	01:25
	← Mocramis left	01:26
	← rchavik left	01:26
	→ jpmelos joined	01:26
	→ Mocramis joined	01:26
	← worstadmin left	01:26
	← worstadmin_ left	01:26
	← VarmVaffel left	01:32
	→ VarmVaffel joined	01:32
	→ nogagplz joined	01:33
	← marhaban left	01:33
	← Gitzilla left	01:34
	→ Gitzilla joined	01:34
	← hotovson left	01:34
	→ Tuna-Fish joined	01:34
	← Lord_DeathMatch left	01:36
	← thiago left	01:37
	← tvw left	01:38
	→ hwrd\|work joined	01:39
	← VarmVaffel left	01:39
	→ VarmVaffel joined	01:39
	← hwrd\|work left	01:39
	→ hwrd\|work joined	01:40
	→ infynyxx joined	01:40
	→ xaka joined	01:41
	← Tuna-Fish left	01:42
	← VarmVaffel left	01:42
	→ VarmVaffel joined	01:42
	→ Araxia joined	01:44
	→ Tuna-Fish joined	01:44
	→ Goplat joined	01:45
	← VarmVaffel left	01:45
	→ VarmVaffel joined	01:45
	→ intripoon_ joined	01:46
	← dreiss left	01:49
	← intripoon left	01:49
	← hwrd\|work left	01:49
	← VarmVaffel left	01:50
	→ VarmVaffel joined	01:50
	← pdelvo left	01:51
	← txomon left	01:51
	→ pdelvo joined	01:52
	← pdtpatr1ck left	01:53
	→ chaiz joined	01:54
	← etcetera left	01:54
	← VarmVaffel left	01:55
	→ VarmVaffel joined	01:55
	→ nitrix_ joined	01:56
	← goshawk left	02:00
	← VarmVaffel left	02:00
	→ VarmVaffel joined	02:00
	← VarmVaffel left	02:03
	→ VarmVaffel joined	02:03
	← infynyxx left	02:05
	→ infynyxx joined	02:06
	← api left	02:07
	→ api joined	02:08
	→ etcetera joined	02:10
	→ cakehero joined	02:10
	← sente left	02:10
	← sente` left	02:10
	← etcetera left	02:11
	← VarmVaffel left	02:13
	→ VarmVaffel joined	02:13
	→ sente` joined	02:14
	← cybersphinx left	02:15
	→ pegnuin joined	02:16
	tizzo → tizzo-afk	02:17
	← sgambino left	02:17
	← hilbert_ left	02:17
	→ sente joined	02:17
	← VarmVaffel left	02:17
	→ VarmVaffel joined	02:17
	← cakehero left	02:19
	← orafu left	02:21
	→ orafu joined	02:21
	→ kenperkins joined	02:21
	← chaiz left	02:21
	→ chaiz joined	02:22
	tizzo-afk → tizzo	02:22
	← VarmVaffel left	02:22
	→ VarmVaffel joined	02:22
	← pilgrum left	02:23
	→ etcetera joined	02:24
	← angelsl left	02:24
	← VarmVaffel left	02:27
	→ VarmVaffel joined	02:28
	← Bmac left	02:31
	→ dreiss joined	02:32
	→ intripoon joined	02:33
	← intripoon_ left	02:36
	constant → function	02:37
	tizzo → tizzo-afk	02:37
	← VarmVaffel left	02:38
	→ VarmVaffel joined	02:38
	← Linc left	02:40
	→ w09x joined	02:40
	← w09x left	02:41
	Karmaon → a	02:41
	a → Guest44554	02:41
	Guest44554 → e	02:42
	e → Karmaon	02:42
	← sluther left	02:43
	→ barneybook joined	02:46
	→ thiago joined	02:48
	← VarmVaffel left	02:49
	→ VarmVaffel joined	02:49
	→ cakehero joined	02:50
	→ rehat joined	02:51
	→ jdunck joined	02:51
	← arietis left	02:52
	← bapa left	02:54
	→ bapa joined	02:54
	← T4shi left	02:55
	← cakehero left	02:55
	← etcetera left	02:55
	→ macabre joined	02:55
	→ Chappo joined	02:55
	← VarmVaffel left	02:56
	→ VarmVaffel joined	02:56
	← aristidesfl left	02:57
	← jdunck left	03:01
	→ kcj_ joined	03:03
	← mgue left	03:03
	← kcj left	03:04
	← TheJH left	03:05
	→ mgue joined	03:05
	← kcj_ left	03:06
	→ vitor-br joined	03:06
	→ kcj joined	03:06
	← VarmVaffel left	03:07
	→ VarmVaffel joined	03:07
	→ sgambino joined	03:10
	← felipec left	03:14
	→ solofight joined	03:15
	← jpmelos left	03:16
	← VarmVaffel left	03:16
	→ VarmVaffel joined	03:16
solofight	when i add a remote usign git remote add... under the config file remote section gets created and url is tracked - ofcourse...but why this line ? fetch = +refs/heads/:refs/remotes/mainrepo/	03:17
	← orafu left	03:19
	→ OuLouFu joined	03:19
	OuLouFu → orafu	03:19
	← VarmVaffel left	03:21
	→ VarmVaffel joined	03:21
cmn	what problem do you have with that line?	03:22
	→ macrover joined	03:23
	← Chappo left	03:23
	→ whodevil joined	03:23
	→ Chappo joined	03:23
solofight	cmn: will read about refspec and return	03:23
	← dreiss left	03:24
ergZay	does git reset --soft myfile.c actually do anything?	03:26
	as it cant actually move the head position on a single file	03:26
	→ fisted_ joined	03:27
cmn	there is no such concept, no	03:28
solofight	cmn: no problem with that line :) getting to know that its a refspec notation to avoid mentioning in commands like fetch, pull and push got me going to understand the terms and purpose	03:28
	thanks	03:28
	→ macmartine joined	03:28
	← fisted left	03:28
	← sgambino left	03:30
	→ Wulf4 joined	03:32
	← macmartine left	03:32
	← VarmVaffel left	03:32
	→ VarmVaffel joined	03:32
function	is there a way to to determine "what percent of this file was modified per committer" ?	03:33
	I could do it with shortlog, but would like to do it with git buliting	03:34
	s/shortlog/blame	03:34
	← Wulf left	03:34
cmn	that's what blame is for	03:34
	← SkAzZ left	03:35
cmn	which data is relevant to your situation is something that only you an figure out	03:35
function	git blame book.xml \| awk '{print $3 }' \|sed 's/(//' \| sort \| uniq -c	03:36
	seems to work	03:36
	← VarmVaffel left	03:41
	→ VarmVaffel joined	03:42
	← rehat left	03:44
	← lahwran left	03:45
moondoggy	Freaking out during upgrade. Can someone take a look at my screenshot?	03:46
	I'm getting some kind of dialog box, but the characters are all blank, so I don't know what it's asking.	03:47
	← VarmVaffel left	03:47
	← Davey left	03:47
	→ VarmVaffel joined	03:47
	→ lahwran joined	03:49
	→ etcetera joined	03:50
cmn	what's showing you a dialog?	03:51
	← VarmVaffel left	03:54
	← dnstbr left	03:54
	→ VarmVaffel joined	03:54
	← resistivecorpse left	03:55
	→ resistivecorpse joined	03:56
	← AlexWaters left	04:01
	→ AlexWaters joined	04:02
	← ehsan left	04:03
	← kukks left	04:05
	→ sluther joined	04:06
	← milli left	04:07
	← mneorr left	04:07
	→ mneorr joined	04:08
	→ rakl joined	04:08
	← gerard0 left	04:08
	← Goplat left	04:10
	← VarmVaffel left	04:11
	← guampa left	04:11
	→ VarmVaffel joined	04:11
	→ macmartine joined	04:12
	→ milli joined	04:12
	← donri left	04:13
	→ gall joined	04:13
	→ Parhs joined	04:14
	← Parhs left	04:14
	→ Parhs joined	04:14
	→ gerard0 joined	04:14
	→ sertaconay joined	04:15
	← OOPMan left	04:16
	← VarmVaffel left	04:17
	← macrover left	04:17
	→ VarmVaffel joined	04:17
	→ Goplat joined	04:17
	← Parhs left	04:18
	← milli left	04:18
	→ Bmac joined	04:19
	← VarmVaffel left	04:21
	← etcetera left	04:22
	→ VarmVaffel joined	04:22
	→ irqq joined	04:22
	→ OOPMan joined	04:22
	→ milli joined	04:23
	← gerard0 left	04:23
	← adamben left	04:23
	← VarmVaffel left	04:26
	→ VarmVaffel joined	04:26
	← irqq left	04:27
	← Chappo left	04:28
	← sluther left	04:29
	← whodevil left	04:31
	← AlexWaters left	04:31
	→ Sky[x] joined	04:31
	← VarmVaffel left	04:32
	→ VarmVaffel joined	04:33
	← macmartine left	04:33
	→ AlexWaters joined	04:34
	→ ecksit joined	04:35
	→ subhojit777 joined	04:37
	← VarmVaffel left	04:40
	← glennpratt left	04:40
	→ macmartine joined	04:40
	→ VarmVaffel joined	04:40
	→ gerard0 joined	04:43
	← mneorr left	04:44
	← Bmac left	04:44
	← AlexWaters left	04:46
	→ AlexWaters joined	04:48
	← macmartine left	04:48
	← VarmVaffel left	04:53
	→ BadProphet joined	04:53
	→ VarmVaffel joined	04:53
	→ a-l-e joined	04:54
	→ mklappstuhl joined	04:56
	→ irqq joined	04:56
	← VarmVaffel left	04:57
	→ VarmVaffel joined	04:58
	→ chriskon149 joined	04:58
	→ PovAddict joined	04:58
PovAddict	hi	04:58
ecksit	hey PovAddict	04:58
	→ dreiss joined	05:00
PovAddict	fooapp needs libfoo, both in separate git repositories; in the master branch, people may often break the API of libfoo, updating fooapp to match	05:01
	← mattp_ left	05:02
PovAddict	for stable releases there's proper version numbering, but for the breaks in the master branch there isn't, so if you compile new fooapp with old libfoo or viceversa (across an API break), you just get compile errors	05:02
	← VarmVaffel left	05:02
PovAddict	now my question is	05:02
	→ VarmVaffel joined	05:03
PovAddict	how do you use git bisect under that environment and not lose your sanity in the process?	05:03
	→ pdtpatr1ck joined	05:04
	← Goplat left	05:07
	← gall left	05:07
	→ yakko joined	05:08
	← BadProphet left	05:10
	← moonkey_ left	05:19
	← diegoviola left	05:21
	→ mneorr joined	05:22
	← solofight left	05:23
	→ solofight_ joined	05:23
	← VarmVaffel left	05:23
	→ VarmVaffel joined	05:23
	← mneorr left	05:24
	→ siamect joined	05:24
	→ mneorr joined	05:25
	← subhojit777 left	05:25
	← madewokherd left	05:27
	← siamect left	05:29
	→ siamect joined	05:30
	→ Davey joined	05:31
	← d2dchat left	05:33
	← PovAddict left	05:34
	← siamect left	05:34
	→ longbeach joined	05:34
	← VarmVaffel left	05:35
	← yakko left	05:35
	→ VarmVaffel joined	05:35
	→ moonkey_ joined	05:36
	→ yakko joined	05:36
	→ yakko_ joined	05:39
	→ Wafflyn joined	05:40
	→ teamcoltra_ joined	05:40
teamcoltra_	How can I use git commit / git push from a different directory than my repo is in? like if I am in ~/ and my repo is in ~/my-project I am assuming I can still commit and push without cd'ing into my-project	05:41
	← yakko left	05:42
	→ subhojit777 joined	05:42
SamB_MacG5	teamcoltra_: why bother ? you could just (cd my-project && git this && git that)	05:42
teamcoltra_	I guess	05:43
	← mneorr left	05:44
	→ mneorr joined	05:44
	← yakko_ left	05:44
	← teamcoltra_ left	05:45
	→ yakko joined	05:45
	→ sluther joined	05:45
	← VarmVaffel left	05:47
	→ VarmVaffel joined	05:48
	← mneorr left	05:50
	← subhojit777 left	05:52
	→ subhojit777 joined	05:54
	→ gall joined	06:01
	← dreiss left	06:04
	→ ehsan joined	06:07
	→ mont453 joined	06:09
	→ jokar joined	06:09
	← SBoudrias left	06:09
	← VarmVaffel left	06:12
	→ VarmVaffel joined	06:12
	← ehsan left	06:12
	→ ehsan joined	06:13
	← yakko left	06:16
	→ yakko joined	06:16
	← resistivecorpse left	06:18
	→ alem0lars joined	06:18
	→ resistivecorpse joined	06:18
	← chriskon149 left	06:18
	→ maleknet joined	06:19
	← mont453 left	06:20
	← VarmVaffel left	06:20
	→ VarmVaffel joined	06:20
	→ yakko_ joined	06:21
	← yakko left	06:23
	← solofight_ left	06:25
	← VarmVaffel left	06:26
	→ VarmVaffel joined	06:26
	← _huoxito left	06:28
	← unreal left	06:29
	→ yakko joined	06:30
	→ unreal joined	06:30
	← yakko left	06:31
	← yakko_ left	06:32
	→ yakko joined	06:32
	← chaiz left	06:33
	← jcao219 left	06:35
	→ barq joined	06:35
	→ Paul92 joined	06:40
	← thiago left	06:43
	← resistivecorpse left	06:43
	→ resistivecorpse joined	06:44
	← resistivecorpse left	06:44
	→ resistivecorpse joined	06:44
	→ T4shi joined	06:44
	← T4shi left	06:44
	→ T4shi joined	06:44
	← gall left	06:44
	→ Parhs joined	06:45
	← Parhs left	06:45
	→ Parhs joined	06:45
	→ Winston_Smith joined	06:46
	← barq left	06:47
Parhs	http://farm6.static.flickr.com/5192/5884654725_10cccde808.jpg	06:47
	← osmosis left	06:49
	← WinstonSmith left	06:49
	Winston_Smith → WinstonSmith	06:49
	← thyseus left	06:50
	→ Tegi joined	06:50
	← ianmcorvidae left	06:51
	→ thyseus joined	06:51
	→ ianmcorvidae joined	06:52
	← Plouj left	06:53
	← Davey left	06:56
	← ecksit left	06:56
	→ whitman joined	06:57
	→ Plouj joined	06:58
	→ chovy joined	06:58
chovy	howdy	06:58
	we're using svn at work, and i wanted to know if two developers with git can push code back and forth to each other w/o a central repo.	06:58
	← rue_XIV left	06:59
	← gerard0 left	07:00
	→ tewecske joined	07:02
	→ mattp_ joined	07:03
	→ gerard0 joined	07:04
	→ PCChris joined	07:04
Parhs	maybe chove , there isnt really central repo as far as i know	07:04
	→ mishok13 joined	07:08
	← VarmVaffel left	07:08
	→ VarmVaffel joined	07:09
	→ Rix joined	07:09
	← mishok13 left	07:12
comps	chovy: yes, with git-svn	07:15
	← PCChris left	07:15
comps	err, with each other - using common git techniques	07:15
	← VarmVaffel left	07:15
	→ VarmVaffel joined	07:15
	← gerard0 left	07:17
	→ yakko_ joined	07:17
	← pdtpatr1ck left	07:19
	← yakko left	07:20
chovy	comps: so how do i push code to another dev? do i need ssh access to their machine?	07:20
	→ yakko joined	07:20
	← yakko_ left	07:23
	← hoschi left	07:23
	← SirCmpwn left	07:24
	→ pdtpatr1ck joined	07:24
	← yoklov left	07:31
chovy	.	07:32
	→ SirCmpwn joined	07:32
	→ psoo joined	07:33
	← subhojit777 left	07:33
EugeneKay	chovy - typically, you push/pul to/from a shared bare repo someplace. You can do it ad-hoc with a pile of non-bare repos, but when doing this you will want to fetch instead of pushing	07:33
	← Araxia left	07:35
	→ yakko_ joined	07:37
	→ mishok13 joined	07:38
	← yakko left	07:39
	→ hoschi joined	07:39
	→ gerard0 joined	07:42
	→ xiukun joined	07:44
	→ robustus joined	07:46
	→ anderse joined	07:47
	← mishok13 left	07:47
	→ rwq joined	07:48
	→ rob_w joined	07:49
	← anderse left	07:50
	← Paul92 left	07:50
	← yakko_ left	07:51
chovy	EugeneKay: is there any tutorial on how to do this?	07:51
	→ BiggFREE joined	07:51
	← OOPMan left	07:51
chovy	i'm thinking the workflow is developers working on the same project use git to push code to each other, and then when it is ready to be committed to trunk, one developer does svn commit.	07:51
	→ yakko joined	07:52
wereHamster	chovy: usually you still have a central repository somewhere, which you use to exchange your code.	07:53
	pushing directly to each others computers requires a lot more setup, you need to give each other access, and then the ip address changes then everybody has to update their configuration etc	07:54
	← blathijs left	07:55
chovy	ok	07:56
	i just want to be able to have 2-3 devs work on a project w/o the code hitting svn until its ready.	07:56
wereHamster	chovy: install gitolite on a server.	07:57
	→ blathijs joined	08:00
	→ pfFredd joined	08:00
	→ Back2Basics joined	08:01
Back2Basics	if you put a filename in .gitignore does it apply both ways? (not uploaded nor downloaded?)	08:02
	→ Rukan joined	08:03
	→ anj joined	08:05
	← VarmVaffel left	08:05
	→ VarmVaffel joined	08:05
	← anj left	08:05
	← rob_w left	08:06
	← yakko left	08:06
	→ koltroll joined	08:07
	→ yakko joined	08:08
	← phix left	08:08
	→ hendry joined	08:09
	→ phix joined	08:09
	← infynyxx left	08:09
hendry	i'm trying just to get one commit out and email details of it, to discuss it. But git format-patch seems to generate zillions of patches. How do I get just the one?	08:09
Parhs	chemtrails today	08:11
hendry	needed "-1" in my command, arghh	08:12
	→ devsharpen joined	08:12
	← VarmVaffel left	08:13
	→ VarmVaffel joined	08:13
	← maleknet left	08:15
	← Back2Basics left	08:15
	→ gavin_huang joined	08:15
	→ jdav_gon` joined	08:16
	→ daniel_- joined	08:16
	→ subhojit777 joined	08:17
	← VarmVaffel left	08:17
	→ VarmVaffel joined	08:17
	← xaka left	08:17
	← pdtpatr1ck left	08:18
	← jdav_gone left	08:19
	→ cakehero joined	08:19
	→ pdtpatr1ck joined	08:22
	→ BadDesign joined	08:23
	→ hotovson joined	08:24
	→ maleknet joined	08:27
	← VarmVaffel left	08:28
	→ VarmVaffel joined	08:28
	→ skorgon joined	08:31
	← subhojit777 left	08:32
	→ therod joined	08:33
	← Taoki\|away left	08:34
	→ N256 joined	08:37
	→ dc5ala joined	08:37
	← maleknet left	08:39
	← VarmVaffel left	08:41
	→ VarmVaffel joined	08:42
	→ Lord_DeathMatch joined	08:43
	→ suy joined	08:46
	→ subhojit777 joined	08:50
	← avtobiff left	08:51
	← VarmVaffel left	08:51
	→ VarmVaffel joined	08:51
	← rakl left	08:51
	→ ncd\|leeN joined	08:52
	← Wafflyn left	08:53
	→ ReekenX joined	08:53
	← ReekenX left	08:54
	→ ReekenX joined	08:55
	← ReekenX left	08:55
	→ the_cybersphinx joined	08:56
	→ ReekenX joined	08:57
	← VarmVaffel left	08:57
	ReekenX → ReekenX\|AFK	08:57
	→ VarmVaffel joined	08:57
	→ und3f joined	08:57
	ReekenX\|AFK → ReekenX	08:58
	→ maleknet joined	08:59
	ReekenX → ReekenX\|AFK	08:59
hendry	when linux does a merge, for e.g. http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=commit;h=e657e078d3dfa9f96976db7a2b5fd7d7c9f1f1a6 does he manually do the ordered list ?!	09:01
	← VarmVaffel left	09:01
	→ VarmVaffel joined	09:02
wereHamster	hendry: I'd guess it's compiled by davem	09:03
	hendry: http://permalink.gmane.org/gmane.linux.kernel/1383500	09:04
	→ callMeBaby joined	09:05
	← daniel_- left	09:07
	→ j416 joined	09:08
	← fsvehla left	09:08
hendry	wereHamster: ok, then dave manually does it. surely is more sensible to offer some sort of pretty stat	09:08
	← callMeBaby left	09:10
	← VarmVaffel left	09:10
	→ VarmVaffel joined	09:11
	→ demonfire joined	09:14
	← demonfire left	09:14
	← maleknet left	09:15
	→ arturaz joined	09:15
	← Guest63390 left	09:16
	← VarmVaffel left	09:17
	→ VarmVaffel joined	09:17
	← Strogg left	09:18
	→ Strogg joined	09:19
	→ yakko_ joined	09:19
	← yakko left	09:22
	← subhojit777 left	09:24
	← VarmVaffel left	09:24
	→ VarmVaffel joined	09:25
	→ maleknet joined	09:28
	← VarmVaffel left	09:28
	→ VarmVaffel joined	09:29
	← Mocramis left	09:30
	← VarmVaffel left	09:33
	→ VarmVaffel joined	09:33
	→ AdrienBrault joined	09:33
	→ Lord_DeathMatc joined	09:37
	← VarmVaffel left	09:37
	→ traby joined	09:37
	← T4shi left	09:37
	→ VarmVaffel joined	09:37
	← Lord_DeathMatch left	09:38
	→ marhaban joined	09:38
	→ Element9 joined	09:38
	→ ziro` joined	09:40
	← VarmVaffel left	09:40
	Lord_DeathMatc → Lord_DeathMatch	09:40
	→ VarmVaffel joined	09:40
	← BadDesign left	09:41
	→ subhojit777 joined	09:41
	← arturaz left	09:41
	→ pqr joined	09:42
	← VarmVaffel left	09:44
	→ VarmVaffel joined	09:44
	→ chaiz joined	09:46
	← chaiz left	09:47
	→ flavius joined	09:47
	← VarmVaffel left	09:47
	→ chaiz joined	09:48
	→ VarmVaffel joined	09:48
	→ sbodo joined	09:49
	← AdrienBrault left	09:49
	→ AdrienBrault joined	09:50
	← irqq left	09:50
	← devsharpen left	09:53
	→ kumbayo joined	09:55
	→ FernandoBasso joined	09:56
	→ ipalaus joined	09:56
	→ arturaz joined	09:57
	→ rdqfdx joined	09:57
	← VarmVaffel left	09:58
	→ VarmVaffel joined	09:58
	→ jaseemabid joined	09:58
	→ angelsl joined	10:00
	← VarmVaffel left	10:00
	→ VarmVaffel joined	10:00
Element9	what's happening with http://git-scm.com/docs	10:01
	lots of commend aren't accessible	10:01
	s/commend/commands	10:01
	→ gusnan joined	10:03
	← VarmVaffel left	10:05
	→ VarmVaffel joined	10:05
	← SeySayux left	10:05
	→ devsharpen joined	10:06
	← Villadelfia left	10:06
	→ SeySayux joined	10:07
	→ Villadelfia joined	10:07
	← antihero left	10:08
	→ mr007x joined	10:10
	← VarmVaffel left	10:10
	→ VarmVaffel joined	10:11
	← ipalaus left	10:11
	← maleknet left	10:11
	← mr007x left	10:12
	→ mr007x joined	10:12
	→ ipalaus joined	10:16
	← VarmVaffel left	10:16
	→ dangerousdave joined	10:16
	→ VarmVaffel joined	10:16
	← milian left	10:16
	← traby left	10:16
	→ rob_w joined	10:17
	→ NetJunky joined	10:19
	← VarmVaffel left	10:19
	→ VarmVaffel joined	10:20
NetJunky	Guys, read about rebasing and still don't get it. Why is history after rebasing held as cleaner one rather than just simple merge. With you merge the graph is more detailed imho or I'm missing some larger picture here?	10:21
	← kcj left	10:21
	← gavin_huang left	10:22
	→ private joined	10:22
	→ gavin_huang joined	10:23
	← VarmVaffel left	10:23
	← sluther left	10:23
	private → Guest76923	10:23
	→ VarmVaffel joined	10:23
	→ gitinfo joined	10:23
	ChanServ set mode: +o	10:23
Nevik	Element9: https://github.com/github/gitscm-next/issues/191	10:24
	problems started occurring when they pushed the git1.8 docs. someone is apparently looking into it though	10:24
	as indicated in that issue thread, you can access the docs by explicitly appending a version number	10:24
Element9	Nevik: cool. thanks	10:24
	← pdtpatr1ck left	10:25
Nevik	no worries; i had the same question a few days ago ;)	10:25
	← VarmVaffel left	10:26
	→ VarmVaffel joined	10:26
	→ milian joined	10:27
	→ pandeiro joined	10:27
	← ehsan left	10:27
	← gavin_huang left	10:29
	← VarmVaffel left	10:31
	→ VarmVaffel joined	10:32
	← pqr left	10:32
	→ fsvehla joined	10:32
	← pandeiro left	10:33
	← john3 left	10:33
	← asakura left	10:33
	→ john3 joined	10:35
	→ asakura joined	10:35
	jez → jez9999	10:37
	← VarmVaffel left	10:37
	ChanServ set mode: -v	10:37
	→ VarmVaffel joined	10:37
	← VarmVaffel left	10:42
	→ VarmVaffel joined	10:43
	← skorgon left	10:44
	← VarmVaffel left	10:48
	→ VarmVaffel joined	10:48
Element9	there might be a small mistake in git-reset docs. none of the three listed forms accept "git reset"	10:48
	which is the equivalent of "git reset --mixed", right?	10:49
	→ daniel_- joined	10:50
	← yakko_ left	10:50
	← xiukun left	10:51
	→ Chappo joined	10:51
	→ yakko joined	10:51
	← VarmVaffel left	10:54
	→ VarmVaffel joined	10:54
	← marhaban left	10:54
	← fsvehla left	10:57
wereHamster	Element9: eh?	10:57
	→ fsvehla joined	10:57
	← VarmVaffel left	10:58
	→ VarmVaffel joined	10:58
	→ dr_lepper joined	11:00
Nevik	Element9: more like an imprecision imo	11:01
	the third form states that --mixed is the default action	11:01
	← VarmVaffel left	11:01
Nevik	or rather, the explanation for --mixed does	11:01
	→ mafix joined	11:01
	→ VarmVaffel joined	11:01
	→ txomon joined	11:02
	→ dsirijus joined	11:02
	→ rchavik joined	11:03
	← fsvehla left	11:03
	→ legnaleurc joined	11:04
	← cakehero left	11:06
	← VarmVaffel left	11:07
	→ VarmVaffel joined	11:07
	← psoo left	11:09
Element9	Nevik: so there should square brackets around (--soft \| --mixed \| --hard \| --merge \| --keep). not a biggy	11:11
	← jokar left	11:11
	← VarmVaffel left	11:13
	→ VarmVaffel joined	11:13
Nevik	yeah	11:14
	→ jwmann joined	11:14
Nevik	you could post that as an issue or fork+pull request; i just dont know which repo hosts the man pages/doc contents	11:14
cbreak	NetJunky: after a rebase, history is usually cleaner because you CAN CLEAN IT UP. With merging, you can't clean history. All you do is glue two different streams of history together.	11:14
	rebasing is often used to hide the actual development and instead represent logical steps of development	11:15
	← yakko left	11:15
cbreak	for example, squashing several commits into one single for a feature that you had to commit multiple times	11:15
	or by reordering things	11:15
	by removing bug fixes from a feature branch history	11:16
	and so on	11:16
Element9	Nevik: tried, but the mailing list does not accept email from gmail, so I sort of gave up there :)	11:16
cbreak	Element9: ?!	11:16
	why the hell is that?	11:16
	→ yakko joined	11:16
	← actel left	11:17
	→ actel_ joined	11:17
Element9	cbreak: now I read the error message thoroughly, it's not becase of gmail, but because the message had html in it. I guess I have html turned on in my gmail. lets turn that off	11:19
cbreak	html is an abomination in email :)	11:19
NetJunky	cbreak: I see. Thank you.	11:20
cbreak	<html><body><h1>Almost as bad as it would be on IRC</h1></body></html>	11:20
	← VarmVaffel left	11:20
cbreak	NetJunky: there's a trigger for that... !sausage or something	11:20
gitinfo	NetJunky: [!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	11:20
	→ VarmVaffel joined	11:21
	← michel_v left	11:21
	← kerrick left	11:21
NetJunky	cbreak: How do you know, what commands does @gitinfo accept?	11:22
	→ marhaban joined	11:22
cbreak	by experience.	11:22
	I've been here for years :)	11:22
	(I think)	11:22
NetJunky	I see. Okey.	11:22
cbreak	most of them are answers to FAQ	11:23
	→ jokar joined	11:24
	← VarmVaffel left	11:27
	→ Chillance joined	11:27
	→ Haikarainen joined	11:28
	→ VarmVaffel joined	11:28
	→ pandeiro joined	11:29
	→ Xethron joined	11:29
	→ xiukun joined	11:29
	← yakko left	11:32
	→ yakko joined	11:34
	← xiukun left	11:34
	← gitinfo left	11:34
	→ marthinal joined	11:37
	← Guest76923 left	11:39
	← pfFredd left	11:41
	← WaterRatj left	11:41
	→ dfanjul joined	11:41
	← VarmVaffel left	11:43
	→ VarmVaffel joined	11:44
	← gusnan left	11:45
	← jokar left	11:45
	→ jceb joined	11:47
	→ yakko_ joined	11:47
	← VarmVaffel left	11:48
	← marthinal left	11:49
	← yakko left	11:50
NetJunky	cbreak: so let me see if I got it right. When I rebase one branch on to another and they bouth have some amount of commits after diverging, then my current branch commits are added after the commits in branch on which I rebase them. After I switch to that branch I just move my pointer to last rebased commit and go from there. Would, that be the correct description of rebase?	11:51
cbreak	the second part is optional	11:51
	you do not have to merge after a rebase	11:51
	(the merge would be ff though)	11:51
	← ipalaus left	11:52
	← jaseemabid left	11:52
	→ gusnan joined	11:52
	→ chaiz_ joined	11:55
	← dfanjul left	11:55
	← __main__ left	11:55
	← jceb left	11:56
	→ _main_ joined	11:56
	→ jokar joined	11:57
	← chaiz left	11:58
	_main_ → __main__	11:59
	→ raatiniemi joined	12:00
	← The_Ball left	12:01
	→ timj joined	12:01
	← raatiniemi left	12:04
	← hotovson left	12:05
	→ samphippen joined	12:06
	→ aristidesfl joined	12:09
	← flaguy48 left	12:12
	← nitrix_ left	12:12
	→ chisler joined	12:13
	← yakko_ left	12:13
	→ yakko joined	12:15
	← nowhere_man left	12:15
	← subhojit777 left	12:17
	→ nowhere_man joined	12:17
	← alem0lars left	12:18
	← daniel_- left	12:19
	← Onkeltem left	12:19
	← jhuntley left	12:21
	← Chappo left	12:22
	→ solofight joined	12:22
	← mafix left	12:22
NetJunky	cbreak: friendly fire? :)	12:22
solofight	am trying to understand whether its possible to have a default remote for each branch in local repo	12:22
	→ ipalaus joined	12:23
solofight	i tried creating two repos A, B with some contet and commits but both have only one branch - master. cloned C from A now i have master branch of C containing content of A	12:24
NetJunky	solofight: I'm new to git, but I don't see why not. As I was told remotes are just bookmarks of your local branches	12:24
solofight	if i make any changes to the content of C and do a git push and pull it directly talks to A	12:24
NetJunky	Ou. Sorry. Misread you Q.	12:24
	Don't know about default for each branch.	12:25
solofight	now if i add B as remote and fetch	12:25
	← devsharpen left	12:25
solofight	i have a local branch master and remote branch master in C which are from A and B	12:25
	so if i do a push, pull from remote branch master of C it should directly talk to B right ?	12:25
	→ subhojit777 joined	12:26
solofight	when i switch to it - i hear detached head, so create a new branch from it with -b option and when do a git pull say no remote specified ! ! !	12:29
	this behavior is confusing - can somebody throw ome light	12:29
	→ rednaks joined	12:30
solofight	wy would it say no remote when i create this branch from the remote tracking branch itself !	12:31
	→ bibinou joined	12:31
solofight	i understand that you need to specify --track for a new branch to talk to remote. But this branch is created from remote branch right ! ? why the same behavior ?	12:33
	← pandeiro left	12:34
	→ flaguy48 joined	12:34
	→ pandeiro joined	12:35
	← txomon left	12:35
	→ hilbert joined	12:35
	← subhojit777 left	12:36
	← moonkey_ left	12:38
	→ devsharpen joined	12:38
	← ipalaus left	12:39
	→ maleknet joined	12:39
	→ skorgon joined	12:39
	→ daniel_- joined	12:41
	→ ipalaus joined	12:42
	← yakko left	12:43
	→ jackh joined	12:44
	→ yakko joined	12:44
	← bibinou left	12:45
	← mastro left	12:45
	→ erichynds joined	12:46
	→ agile joined	12:48
	→ soc42 joined	12:48
	← Alan left	12:49
	→ subhojit777 joined	12:50
	→ coffer joined	12:52
	→ fluffiey joined	12:53
	← arielpts left	12:55
	tizzo-afk → tizzo	12:56
	→ arietis joined	12:58
	→ arielpts joined	12:58
	← ipalaus left	12:59
	← dermoth\|work left	13:00
	→ acl_ joined	13:00
	← solofight left	13:03
	← daniel_- left	13:03
	tizzo → tizzo-afk	13:04
	→ mastro joined	13:05
	function → trout	13:05
	← reisi left	13:08
	← subhojit777 left	13:08
	→ JohnBat26 joined	13:11
	← sbodo left	13:12
	→ battye joined	13:14
	← erichynds left	13:15
battye	Hi, there was a fantastic resource I saw in this channel recently that gave an overview of all the git functions	13:15
	Someone brought the link up through a shortcut... does anyone know which one I am talking about?	13:16
	→ babilen joined	13:18
	→ Paul92 joined	13:18
	← pandeiro left	13:18
battye	jk.gs/git appears to be down so I can't search through the resources there.	13:19
	→ Dutt_Away joined	13:19
	→ holodoc joined	13:19
NetJunky	cbreak: I found a bit odd thing I did rebase. I see that it applied my commits to the master branch, but it didn't add files, that I commited. How come?	13:21
	← holodoc left	13:21
	← ergZay left	13:25
	← asakura left	13:25
	→ i42n joined	13:25
	← xiangfu left	13:25
	→ ergZay joined	13:25
Nevik	battye: could you mean http://git-scm.com/docs ?	13:28
battye	No that is not it	13:28
Nevik	battye: have you tried looking through your browser history :P	13:28
battye	Basically what I'm trying to find out is how I know which github repository I'm pushing to	13:29
	← Dutt_Away left	13:29
canton7	battye, git remote -v will tell you that	13:29
battye	okay cheers. how does git know?	13:29
canton7	I'm trying to think what page you might have seen on jk.gs ... I didn't think much was hosted there any more	13:29
	← angelsl left	13:29
canton7	maybe man git ?	13:29
	all that info's stored in .git/config	13:29
battye	oh, depending on the directory?	13:30
	Ah I see	13:31
canton7	there's only one .git folder per repository	13:31
battye	One other thing, if I type commit --amend... etc	13:31
	I see "Author" and "Committer"	13:31
	Author is correct	13:31
	but Committer has the name of my PC in it?	13:31
	How do I change the Committer?	13:31
	so it is the same as Author	13:32
canton7	The commit is drawn from the config keys user.name and user.email	13:32
fluffiey	Hello #git. A project member accidentally made a "git disaster 2: http://randyfay.com/content/avoiding-git-disasters-gory-story" with the merge workflow in master branch (instead of git pull --rebase). In the local merge that occurred he deselected changes made by other members and pushed therefore deleting commits. Can I rebase the master branch moving those commits to the front and push? I tried "git rebase -i HEAD~4" but git threw an err	13:32
canton7	*committer	13:32
	git tries to guess those if you don't explicitely set them	13:32
battye	But isn't user.email used in Author as well?	13:32
	the email is correct in Author	13:32
canton7	yes, it should be.... I'm guessing the commit was made on another machine?	13:32
battye	no	13:32
	Anyway, if I change user.email in the config... how do I ensure that the Committer is correctly updated before I push?	13:33
	→ tmcmahon joined	13:33
battye	Actually - how do I verify user.email?	13:33
canton7	(when you amend/rebase commits, the author stays but the committer changes)	13:33
	'git config user.email'	13:33
battye	git config user.email didn't do anything	13:34
	is it supposed to return the current value?	13:34
canton7	yes. returning blank means there's no value set	13:34
battye	ah, weird that author is okay then	13:34
canton7	git config --global user.email 'my.email@address'	13:34
	also check user.name	13:34
battye	that is correct	13:35
canton7	I suspect you did something to nuke the user.email value between creating that commit and amending it	13:36
battye	okay, so git config --global user.email "email here" to change it?	13:36
canton7	just check 'git config user.email' again, after setting it	13:36
	yup, that's right	13:36
	(--global config is stored in ~/.gitconfig, while local config is stored in .git/config, and there's a possibility that the email's set correctly in ~/.gitconfig but is being overridden to a blank value in .git/config)	13:37
cbreak	NetJunky: rebase doesn't apply commits. It takes your commits, makes patches from them, and applies those on top of the new base	13:38
	if you have a commit with new files, then the new files will be taken over too of course	13:38
battye	ok, it looks okay now	13:39
	→ talmuth joined	13:39
battye	so just git add * to add everything, git commit -m "Message"?	13:39
	then git push, should do it right?	13:39
	← dsirijus left	13:39
canton7	fluffiey, that's a really really stupid bit of tortoisegit behaviour. imo it's a pretty shit tool anyway... he wont' have deleted commits anyway. not a chance. he'll just have create a commit which removes files again	13:40
	battye, what are you trying to do? that'll create a new commit which contains all as-yet-uncommitted changes	13:40
battye	I created a new repo at github, I just want to get my files on there	13:41
	← marhaban left	13:41
NetJunky	cbreak: but you see, they were not.	13:41
cbreak	no, I don't see.	13:41
canton7	using * as an argument to git commands can do unexpected stuff, as it's expanded by the shell and not git. using a period is often better	13:42
battye	I have a bunch of files and subdirectories, do you mean git add . will prepare everything for checkin?	13:42
canton7	battye, but yeah, git add . && git commit will create a new commit containing all uncommitted files	13:42
battye	as long as it adds everything contained in that directory and subdirectories, that's fine by me then	13:43
NetJunky	cbreak: I will make a gist for you.	13:43
	← jirka_on_d left	13:43
	→ xiangfu joined	13:43
	← xiangfu left	13:44
	→ gitinfo joined	13:44
	ChanServ set mode: +o	13:44
canton7	battye, (as a matter of interest, using 'add *' will be expanded by the shell into also listing any ignored files you have. git will then print a warning saying 'are you sure?')	13:44
battye	I used git add ., then git status	13:44
	it seems to have picked everything up	13:44
canton7	that's what you wanted, no?	13:45
battye	yes	13:45
	so it's all good	13:45
	I've commited too	13:45
	so just git push before it is on github yes?	13:45
	→ dv310p3r joined	13:45
	→ wsfulton joined	13:46
canton7	yup	13:46
	well, depending on some stuff	13:46
	but probably, yup	13:46
battye	On some websites I see "git pull origin master"	13:46
	sorry	13:46
	wrong copy/paste	13:46
canton7	don't do that :P	13:47
battye	"git push origin master"	13:47
canton7	that's fine	13:47
battye	is that just defining the branch?	13:47
canton7	add -u to set up tracking information	13:47
	!fetch4	13:47
gitinfo	[!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:47
canton7	(also, welcome back bot)	13:47
battye	ok, but on push it's ok?	13:47
	and that will send the changes to github?	13:47
	→ Fatalis joined	13:48
battye	and only to the repo defined in git remote -v?	13:48
canton7	push it's fine, and often required	13:48
battye	ok, and it'll only go to the push repo I see in the remove -v command?	13:48
canton7	if you say 'git push origin master', it'll push the master branch to the remote that's define as 'origin' in your config	13:48
battye	okay, I just want to be 100% it'll only go the push origin I see in remote -v though - because I am connected to other repos as well, obviously I don't want it going to anything but the one I'm expecting it to go to!	13:50
	so if I'm seeing what I expect in remote -v, I am safe to push?	13:50
	→ tinybluepixel joined	13:51
Nevik	NetJunky: btw, regarding your earlier question, the gitinfo bot has a list of its faq entries. now that the website is back, you can see it at http://jk.gs/git/bot/faq.php	13:51
	→ txomon joined	13:51
	← Fatalis left	13:51
canton7	battye, define 'connected to other repos'	13:51
battye	well, in other directories I have cloned some other repos	13:52
	and I have push permission as well	13:52
canton7	that are utterly irrelevant to the current repo	13:52
battye	yes	13:52
	so I don't want anything going to that repo	13:52
	just the one I'm seeing in remote -v	13:52
milian	how do I get the reverse diff for something like "git diff otherbranch", including local uncommited changes? HEAD does not include those...	13:53
canton7	if there's only one remote configured for the current repo, that the only place stuff can be pushed to	13:53
	repos don't know about each others' config	13:53
battye	www/Repo1 and www/Repo2 is basically how it is now	13:53
milian	i.e. git checkout b; # change something without committing it; git diff a (but reverse the diff here)	13:53
battye	and if I do a git remote -v on Repo2 - I see the repository that I want to send to	13:53
	okay	13:53
	It sounds like I am good to go then	13:53
	→ angelsl joined	13:53
NetJunky	Nevik: awesome. Thank you. I did try to access it ealier, but it loaded and loaded and didn't give a response. Seems to work now.	13:53
wsfulton	Hi, I'd appreciate some advice on what to do after attempting a git svn rebase and my network connection dropped out halfway through the svn commits resulting in numerous "needs update" messages on the files for my last but one commit being pushed to svn.	13:54
	← fluffiey left	13:54
battye	canton7: it worked	13:54
	thanks very much for your help, I appreciate it	13:55
	← tmcmahon left	13:55
NetJunky	Nevik: by the way it doesn't have "sausage" command in the list.	13:55
Nevik	NetJunky: my bad, there's another list of working triggers: http://jk.gs/git/bot/trigger.php	13:56
NetJunky	Nevik: sorry. This is trigger. I see now.	13:56
Nevik	(i dont maintain the bot, i just knew there were lists)	13:56
	;)	13:56
	→ Innocentus joined	13:59
	→ madewokherd joined	13:59
	← maleknet left	13:59
	→ svetlyak40wt joined	14:00
	← dr_lepper left	14:01
wsfulton	If I re-commit this, then afterwards I can redo the svn rebase, but how do I retrieve the commit that originally came after this one?	14:03
	← AdrienBrault left	14:06
cbreak	wsfulton: well, git reflog	14:07
	reset --hard to the commit you were on before the rebase	14:07
	→ sbodo joined	14:07
	→ irqq joined	14:08
NetJunky	cbreak: https://gist.github.com/3964758	14:08
	→ AdrienBrault joined	14:08
NetJunky	So as you see files wheren't transfered to branch where I rebased commits from my secondary branch	14:09
	weren't*	14:09
	← FernandoBasso left	14:09
	← therod left	14:09
wsfulton	cbreak, thanks... looking at reflog (it is a new command to me)	14:10
cbreak	netj: which file?	14:10
	← und3f left	14:11
cbreak	NetJunky: what do you think should have happened but did not?	14:11
NetJunky	Well I created .htaccess file in branch experiment and during rebase I thought, that it will be transfered as a change to master branch	14:12
	← Paul92 left	14:12
cbreak	when?	14:12
	you created a .htaccess on master	14:12
	→ _huoxito joined	14:13
	← tinybluepixel left	14:13
NetJunky	no	14:13
cbreak	yes...	14:13
NetJunky	I created and commited it on experiment.	14:13
cbreak	and that commit is not preserved?	14:13
NetJunky	And there is no .htaccess in final listing on master branch	14:14
cbreak	yeah, and?	14:14
	why should there be any?	14:14
	if you said you did it on experiment	14:14
	then why should it be on master?	14:14
	→ dvide joined	14:14
cbreak	NetJunky: !lol	14:14
gitinfo	NetJunky: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	14:14
cbreak	use that	14:14
NetJunky	cbreak: because of rebase.	14:14
cbreak	NetJunky: then you didn't get git at all	14:14
	git commands change the current branch	14:15
	git rebase while you are on experiment changes experiment	14:15
	it does NOT change master in any way	14:15
NetJunky	emmm. Then I didn't get it. What does this rebase do then?	14:16
cbreak	as I said above: !lol	14:16
gitinfo	A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	14:16
	← cagedwisdom left	14:16
cbreak	NetJunky: it rebases ... the ---> current <--- Branch	14:16
	→ glen joined	14:17
cbreak	------------------------------^	14:17
NetJunky	where? as an alpha to the end of master branch?	14:17
	← rwq left	14:17
glen	hey, i commited bunch of commits under wrong name, can i amend them to right one before i push?	14:17
cbreak	alpha?	14:17
	NetJunky: it rebases the current branch onto what ever you tell it to	14:17
canton7	glen, wrong author/committer name? you can amend them	14:18
cbreak	NetJunky: just think a bit: If you put a table cloth and a plate and a pizza onto a table	14:18
canton7	rebase -i is your friend (assuming it's a linear history), with appropriate flags, depending on what exactly you want to do	14:18
cbreak	did you change the table?	14:18
canton7	glen, search for 'author' or 'committer' in man git-rebase	14:18
gitinfo	glen: the git-rebase manpage is available at http://jk.gs/git-rebase.html	14:18
	← JohnBat26 left	14:20
	→ mont453 joined	14:20
canton7	glen, actually I forgot there's an extra step. if you want to reset the author, you have to 'edit' every commit using rebase -i, then run 'git commit --amend --reset-author && git rebase --continue' every time it stops	14:20
	→ SkAzZ joined	14:20
	← soc42 left	14:21
	→ ipalaus joined	14:21
NetJunky	cbreak: so the rebase should add something somewhere (if it wasn't there)	14:22
	?	14:22
wereHamster	NetJunky: are you asking what rebase does?	14:22
NetJunky	well, yes.	14:23
wereHamster	NetJunky: man git-rebase	14:23
gitinfo	NetJunky: the git-rebase manpage is available at http://jk.gs/git-rebase.html	14:23
cbreak	NetJunky: what do you think it should add?	14:23
wereHamster	NetJunky: read the description. It explains exactly what the command does.	14:23
cbreak	and why do you think it should add anything?	14:23
	it's rebase, not rebaseandadd	14:23
wereHamster	step by step..	14:23
glen	canton7: i want to change Your Name [email@hidden.address] with something appropriate	14:24
NetJunky	Since my table is master branch and commited .htaccess file would be a pizza, then appling it to the table would mean transfering changes regarding this file to master branch.	14:24
canton7	glen, is that the author or committe value?	14:24
	*committer	14:24
cbreak	glen: man git-filter-branch for an alternative way of large-scale authorship changing	14:24
gitinfo	glen: the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html	14:24
NetJunky	okey	14:25
cbreak	NetJunky: nope.	14:25
wereHamster	wtf has food and furniture to do with git?	14:25
canton7	glen, yeah, filter-branch is going to be quicker for anything above 20 or so commits	14:25
glen	canton7: author definately, maybe committer too	14:25
	i have 7 commits	14:25
cbreak	NetJunky: as I said: only the current branch is changed	14:25
	NetJunky: !lol	14:25
gitinfo	NetJunky: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	14:25
cbreak	again	14:25
	read it	14:25
canton7	glen, ok. git rebase -i <commit before first one to edit>; change all 'pick' lines to 'edit'; save and close; every time rebase stops, run 'git commit --amend --reset-author && git rebase --continue'	14:26
	that is, assuming user.name and user.email are correctly set now	14:26
	← chisler left	14:26
	→ dr_lepper joined	14:27
	← dr_lepper left	14:27
	→ dr_lepper joined	14:27
glen	damn, it's still wrong in git log, even i did exactly as you said and git config --global shows user.name and email are correct	14:27
	oh. of course. there's wrong values in git local config!	14:28
	→ weiyang joined	14:28
glen	using vim to fix that :)	14:28
canton7	g	14:28
	git config user.name 'blah' will fix local config	14:28
glen	was easier with vim this time	14:28
	as it was needed to be removed	14:29
canton7	cool. there is an option to 'git config' for that, but vim's quicker than looking it up :P	14:29
	oh, you can also throw --no-edit at that commit --amend command to stop the editor firing up	14:29
glen	ok. one commit i've already pushed out with bad author :(	14:30
	→ defts joined	14:30
canton7	you can !rewrite the history if it isn't public	14:30
gitinfo	[!rewriting_public_history] Rewriting public history is a very bad idea. Anyone else who may have pulled the old history will have to jump through hoops (and you have to tell them to), so it's infinitely better to just move on without rewriting. That said, you can use `git push -f` to force your new history through (may get rejected, though). See http://git-scm.com/docs/git-rebase.html#_recovering_from_upstream_rebase	14:30
	→ JohnBat26 joined	14:30
glen	i have pushed out one commit to public, but, i could probably create similar branch once again, where the one commit is rewritten	14:31
canton7	does it matter? :P	14:31
	→ rchavik_ joined	14:31
glen	yeah, it looks ugly like somebody needs profanity filter shouting YO MAMA	14:32
	ok, i'll ask other guys using that repo what they think. thanks so far :)	14:33
	→ jaseemabid joined	14:34
	← rchavik left	14:35
	→ LeMike joined	14:35
	→ [sr] joined	14:35
[sr]	howdy	14:35
Xethron	What hook runs first? post-merge or post-recieve?	14:35
[sr]	i'm having a problem running git gc	14:35
	where i get a: error: failed to run repack14663/17496)	14:35
	→ vals_ joined	14:35
[sr]	what could i eventually do about this to solve it?	14:36
	← tango_ left	14:36
	vals_ → tango_	14:36
	→ dvaske joined	14:38
	← coffer left	14:38
	→ rvl joined	14:38
	← glen left	14:39
	← skorgon left	14:39
Xethron	ignore my previous question 0.o	14:39
	← dr_lepper left	14:39
	← mont453 left	14:40
	← heytrav left	14:40
	← FabTG left	14:41
	→ FabTG joined	14:43
	→ rafter joined	14:44
	← rob_w left	14:44
	→ erichynds joined	14:48
	← Caelum left	14:48
	→ moonkey_ joined	14:49
	→ Caelum joined	14:50
	→ felipec joined	14:52
	← sbodo left	14:54
[sr]	some google told me what was low memory, just incresead... and worked, tks!	14:54
EugeneKay	Xethron - yeah, there is no reason those two hooks would ever run in the same operation.	14:55
	→ CaptainKnots joined	14:56
	→ sbodo joined	14:57
	→ TheJH joined	14:58
trout	is there a way to get a "historical blame" on a line	14:59
	i.e for a specific line in a file	14:59
	I want to see who last modified it	15:00
	where it came from, etc	15:00
	← hyperair left	15:00
	→ edrx joined	15:01
	→ hyperair joined	15:01
	← weiyang left	15:03
EugeneKay	It's not really possible because each change can(does) change the line numbers	15:03
	About the best you can do is to use !dashes to see the git-log for a specific file	15:03
gitinfo	Use a double-dash(--) to separate refs or arguments from file paths. This is especially useful when dealing with ambiguous names. Ex: `git checkout origin -- master` will check out the file "master" from branch "origin"	15:03
	← hellopat left	15:03
	→ maleknet joined	15:05
	→ wagle joined	15:06
	← jaseemabid left	15:06
edrx	is there a way to clone just the current version of a	15:06
	repository, without the history? this,<http://angg.twu.net/tmp/o.txt> is the output of du -c on the result of "git clone git://git.code.sf.net/p/untwisted/code untwisted-code"... 16MB of history for something whose current version is just 472KB...	15:06
EugeneKay	YOu can sort of do this with a shallow clone, but the "proper" way is to get a git-archive tarball from the source epo. github provides these via the Download button, dunno about sf.net	15:08
Xethron	I need some help...	15:08
edrx	EugeneKay: trying... thanks!	15:09
Xethron	I have a post-recieve hook containing "GIT_WORK_TREE=/var/www/dir/ git checkout -f"	15:10
	← Lord_DeathMatch left	15:10
EugeneKay	Xethron - !deploy	15:10
gitinfo	Xethron: 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	15:10
Xethron	EugeneKay: I know	15:10
	→ ghartmann joined	15:11
	← dvide left	15:11
Xethron	I was just wondering if you could give me advice for building one around it...	15:11
EugeneKay	See the link	15:11
	→ Vampire0 joined	15:11
	← Sky[x] left	15:11
	← svetlyak40wt left	15:11
Xethron	I want to excecute a command after the checkout	15:11
	ok	15:11
	← jackh left	15:12
Xethron	thanks	15:12
	← rchavik_ left	15:12
	→ cybersphinx joined	15:12
	→ Lord_DeathMatch joined	15:13
	← maleknet left	15:15
	→ dvide joined	15:16
	← the_cybersphinx left	15:16
	← LotR left	15:19
	→ xjimmyshcn joined	15:20
	← resistivecorpse left	15:21
	→ resistivecorpse joined	15:21
hays	so i understand mostly how git is a distributed system with no central server... but.. how does it work that i clone from someone else? there has to be some sort of daemon or something running that listens on some port or another	15:22
bremner	yes, or you need ssh access	15:22
	→ mishok13 joined	15:22
edrx	EugeneKay: all working perfectly. Thanks! =)	15:23
	← edrx left	15:23
hays	ssh.. i see. ah i found it, in the docs	15:23
bremner	or local file system access, for the pedants in the crowd	15:23
	→ Vile joined	15:23
	← dropdrive left	15:24
EugeneKay	hays - man git-clone; see the section "GIT URLS"	15:24
gitinfo	hays: the git-clone manpage is available at http://jk.gs/git-clone.html	15:24
	→ maleknet joined	15:25
	→ dropdrive joined	15:25
	→ adamben joined	15:27
	→ LotR joined	15:29
	← maleknet left	15:30
	→ fisted joined	15:32
	← angelsl left	15:33
	← fisted_ left	15:33
	← adamben left	15:35
NetJunky	cbreak: read it. read it even my native language and still I can't seem to grasp the work of rebase command. So there is a C2 on main master branch. From there it diverged into separate branch called experiment. Some development was done there. Next it was checked out back to master branch and some work was done there. Then one thought to apply changes from experiement branch to master, but with `git rebase <branch>` command. So	15:37
	as I would seem to understand this. My current branch is experiment. I would like to rebase my changes to master branch. So then this command should find a common ancestor of two of them and apply changes from current branch to the rebasing branch.	15:37
hays	is git add * recursive?	15:37
EugeneKay	hays - !tryit	15:38
gitinfo	hays: [!tias] Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://sitaramc.github.com/1-basic-usage/tias.html may help with git-specific TIAS.	15:38
hays	EugeneKay: im looking up the command to list git files right now actually	15:38
	→ aspotashev joined	15:39
hays	status	15:39
	got it :)	15:39
	→ mikepack_ joined	15:42
	→ macUzer joined	15:42
	← macUzer left	15:44
	→ chaiz__ joined	15:46
	→ thiago joined	15:46
battye	Hi - using the command line to git pull the latest code from github, how will file conflicts be handled?	15:46
	Will I see a list of conflicts in the terminal window?	15:47
	Or does git auto merge?	15:47
canton7	a conflict is, by definition, something that can't be auto-merged	15:47
	git pull will tell you there are conflicts, and (in newer gits at least) tell you what to do	15:47
	← Xethron left	15:47
battye	okay, so if there is a conflict - does it say I can merge it manually?	15:48
	or does it give me prompt to select which conflicts to choose (ie. local file lines or server file lines)	15:48
	← chaiz_ left	15:48
canton7	all conflicted files will be marked as such (use 'git status' to list them), and if you open one in an editor you'll see the conflict markers in it	15:48
	→ ayaka joined	15:49
canton7	(>>> === <<< etc)	15:49
	← chaiz__ left	15:49
	← ayaka left	15:49
canton7	so either edit the file by hand (remembering to remove the conflict markers), and 'git add' it; or fire up 'git mergetool'	15:49
battye	ah okay	15:49
	→ chaiz joined	15:49
battye	so it will be like conflictedfile.php.server and conflictedfile.php.local?	15:49
	something like that?	15:49
	with markers in it?	15:49
canton7	nope, there's one file with markers in it	15:50
battye	why would I need to git add it then?	15:50
canton7	if you use 'git mergetool', then git will generate temporary files for local/remote/etc and pass them to the mergetool	15:50
	git will refuse to finish the merge if there are still files marked as conflicted. 'git add'ing a file marks it as resolved	15:50
	(use 'git commit' to finish the merge, once you've resolved all conflicts)	15:51
	← mishok13 left	15:51
battye	ah ok	15:51
	great, that sounds fine	15:52
canton7	(this isn't svn :P)	15:52
hays	EugeneKay: hola	15:52
	EugeneKay belches loudly	15:52
	→ alkino joined	15:55
	→ maleknet joined	15:56
	← NetJunky left	15:59
	→ anderse joined	16:00
	→ rob_w joined	16:00
	→ diverdude joined	16:00
	← kpreid left	16:01
	→ Araxia joined	16:01
	← hilbert left	16:01
	→ kpreid joined	16:01
	← xjimmyshcn left	16:02
diverdude	Hello. I am starting to have a lot of setup files and configuration scripts spread around on my machine and other machines.....The problem is that each configuration file takes a lot of time to create and its a lot of work if they are lost....So I was thinking if it was possible to somehow version control them using git? How do people normally keep track of all their conf files?	16:02
bremner	diverdude: I use !vcsh	16:03
gitinfo	diverdude: https://github.com/RichiH/vcsh -- version control shell - manage dotfiles using git's fake bare repos to put more than one working directory into $HOME	16:03
bremner	there are less fancy solutions involving symlinks	16:03
	→ cakehero joined	16:04
battye	canton7, thanks for all your help this evening	16:05
	→ Xethron joined	16:05
canton7	no problem	16:05
	← irqq left	16:09
	→ RaceCondition joined	16:10
	→ mishok13 joined	16:11
	← erichynds left	16:12
	→ Croms joined	16:13
	→ sq-one joined	16:13
	→ dreiss joined	16:19
	← anderse left	16:21
	← mikepack_ left	16:23
	→ cnythnk joined	16:28
	→ solofight joined	16:28
cnythnk	Hello anyone know how to hide a specific repo (gitosis-admin)	16:28
solofight	http://pastebin.com/F4yRh5uN am trying to understand whether its possible to have a default remote for each branch in local repo	16:28
	→ ojacobson joined	16:28
	→ jcao219 joined	16:30
	→ jimmyeatworld joined	16:31
	→ hellopat joined	16:31
milki	cnythnk: "hide" how? and !gitosis	16:32
gitinfo	cnythnk: gitosis is no longer maintained and supported by the author; we usually recommend gitolite instead which has much better documentation and more features: http://github.com/sitaramc/gitolite -- if you're already stuck with gitosis we'll try to help, but no promises!	16:32
	→ yoklov joined	16:32
	← JohnBat26 left	16:32
cnythnk	thanks, yes the repository gitosis-admin, appears within my gitweb ui, which i do not want to	16:33
	so i would like the web ui not to display it	16:33
milki	solofight: sounds like a gitweb configuration problem	16:33
	← solofight left	16:33
milki	i dont know gitweb	16:34
sitaram	cnythnk: look in the gitweb documentation for some variable whose name contains the word "strict", and then remove the admin repo from the projects.list file (wherever that is)	16:34
cnythnk	thanks i'll take a look	16:35
	← hellopat left	16:35
	← battye left	16:36
	→ owzim joined	16:36
diverdude	bremner: so vsch can only manage config files residing in $HOME?	16:36
	← mklappstuhl left	16:36
bremner	diverdude: incorrect.	16:36
diverdude	bremner: "vcsh - manage config files in $HOME via fake bare git repositories"	16:38
EugeneKay	You're confusing "can" and "designed to"	16:39
bremner	diverdude: please either believe me or go read some docs	16:39
	more than one line of docs ;)	16:39
	or ask a more specific question.	16:39
diverdude	bremner: hehehe :D ok	16:41
	← owzim left	16:41
	→ daniel_- joined	16:44
	→ mikepack_ joined	16:44
	← troyt left	16:45
cnythnk	sitaram: I did find the "stric" in the documentation file and found the project.list, however, the project.list file is empty :-s	16:47
	→ tinybluepixel joined	16:47
	→ gain joined	16:48
	→ troyt joined	16:48
	→ jn_ joined	16:49
	→ chisler joined	16:49
	→ sgambino joined	16:50
	→ JohnBat26 joined	16:55
	→ maletor joined	16:55
	→ OOPMan joined	16:56
	← OOPMan left	16:58
	← JohnBat26 left	16:58
	→ OOPMan joined	16:59
	← pegnuin left	17:00
	→ Seoz joined	17:01
	→ JohnBat26 joined	17:01
	← SeoZ-work[AWAY] left	17:02
	→ skorgon joined	17:02
	← Seoz left	17:09
	← OOPMan left	17:11
	→ alee joined	17:11
	→ dr_lepper joined	17:11
	← tinybluepixel left	17:11
	← NimeshNeema left	17:12
	← GameGamer43 left	17:12
	← digitalfiz left	17:12
	← pl0sh_ left	17:12
	← actel_ left	17:12
	← jmcantrell left	17:12
	→ jceb joined	17:15
	← mishok13 left	17:15
	← barneybook left	17:15
	→ infynyxx joined	17:16
	→ Goplat joined	17:17
Rukan	how to exit from git diff?	17:17
milki	Rukan: depends on your PAGER	17:18
	→ andrew__ joined	17:18
milki	try q	17:18
Rukan	yeah it worked	17:18
	thanks	17:18
	→ worstadmin joined	17:18
	andrew__ → andrewhl	17:19
	← Lord_DeathMatch left	17:20
	← defts left	17:21
	→ svetlyak40wt joined	17:24
	← Tegi left	17:24
	← RaceCondition left	17:25
	→ OOPMan joined	17:26
	→ delight joined	17:26
	→ RaceCondition joined	17:26
	→ tomas__ joined	17:26
	→ defts joined	17:26
	← delight left	17:28
	← maletor left	17:28
	→ mysmysery joined	17:29
osse	Can I merge two branches (I know it will be a ff) while having another branch checked out?	17:29
_ikke_	osse: Nope	17:30
	Well	17:30
	You can move branches	17:30
	basically doing a ff-merge yourself	17:30
	git branch -f <branch_to_move> <branch_to_move_to>	17:31
	→ Imaginativeone joined	17:32
	→ boombatower joined	17:32
osse	my hypothetical situation would be where I was working on a dev branch and wanted to pull origin/master into master.	17:32
_ikke_	osse: Are you use master doesn't have any commits origin/master doesn't have?	17:34
EugeneKay	osse - man git-stash	17:34
gitinfo	osse: the git-stash manpage is available at http://jk.gs/git-stash.html	17:34
osse	_ikke_: yes, I'm sure.	17:34
	EugeneKay: Yep, I suppose that is the best solution	17:34
	→ wald0 joined	17:35
	→ klj613 joined	17:35
	→ Paul92 joined	17:35
wald0	git diff is useful for view what changed before to commit them, but i found a lot more userfriendly to view them using "meld", how i can use it for that ?	17:36
osse	wald0: git difftool -t meld	17:36
	← jceb left	17:37
	→ florin joined	17:37
	→ g_bleezy joined	17:37
	florin → Guest18744	17:37
wald0	nice!	17:37
	← rrs left	17:38
	← mikepack_ left	17:38
osse	wald0: run 'git config --global diff.tool meld', that way you don't have to type '-t meld' all the time	17:38
	→ arvind_khadri joined	17:38
	→ SBoudrias joined	17:39
wald0	osse: for use it on that way i need to run "git difftool" instead of "git diff", right ?	17:41
	← Imaginativeone left	17:41
osse	wald0: yes. you can make an alias, though. So that you can e.g. type 'git dt' or something	17:41
moondoggy	Hi there. If I am in one uncommitted branch "A", and I want to jump to another branch "B" to make a change, then come back to "A," do I need to commit?	17:44
	→ actel_ joined	17:45
osse	moondoggy: you can run 'git stash', do what you need, and when you come back run 'git stash pop'	17:45
	← sq-one left	17:46
moondoggy	osse, thanks. It's just a stack? LIFO?	17:46
	← chisler left	17:46
	← acl_ left	17:46
	→ Sky[x] joined	17:46
osse	moondoggy: supposedly. But you can pop any of the elements in the stash at any time	17:46
	→ maletor joined	17:47
moondoggy	Hmmm... It should pop the one from the branch I'm in? Or can I accidentally pop the wrong branch and really pooch it up?	17:47
	← arvind_khadri left	17:48
	→ Winslow joined	17:48
osse	moondoggy: you can stash anywhere and pop it anywhere, so be careful	17:48
	moondoggy: if you use 'apply' instead of 'pop' it's not automatically removed from the list of stashes	17:48
	← reshtnk7 left	17:49
osse	moondoggy: and 'git stash list' will show you exactly where you made each stash	17:49
moondoggy	Oh, really LIFO. It doesn't automatically put the correct stack item into the branch?	17:49
	Oh, list.... ok.	17:49
	Maybe gitk will show it too. I like git, but I feel a bit blind while I'm learning.	17:49
_ikke_	moondoggy: have you read !gcs?	17:50
gitinfo	moondoggy: [!concepts] "Git Concepts Simplified" explains the basic structures used by git, which is very helpful for understanding its concepts. http://sitaramc.github.com/gcs/	17:50
moondoggy	Thanks, osse, _ikke_, gitinfo .	17:50
gitinfo	moondoggy: you're welcome, but please note that I'm a bot. I'm not programmed to care.	17:50
	→ jceb joined	17:51
moondoggy	How did the bot know what I needed?	17:51
osse	moondoggy: _ikke_ triggered it by typing '!' and a keyword	17:52
_ikke_	!bot	17:52
gitinfo	[!gitinfo] I am an IRC bot which responds to certain keywords to provide helpful(?) information to humans. Please see http://jk.gs/git/bot for more information about how to use me.	17:52
moondoggy	Oh!	17:52
	→ jirka_on_d joined	17:52
_ikke_	It is our knowledge system ;)	17:52
moondoggy	Creepy.	17:52
_ikke_	And jast is the hero that built it	17:52
moondoggy	Very cool.	17:53
_ikke_	see !trigger	17:53
gitinfo	[!triggers] Please don't spam me! I'm just a poor bot! Here's everything I know: http://jk.gs/git/bot/trigger.php	17:53
	← Guest18744 left	17:53
_ikke_	for a list of all things it knows	17:53
moondoggy	Can I write a bot in python for a python irc channel I'm in?	17:53
_ikke_	moondoggy: Of course	17:53
	moondoggy: But their are plenty ones existing	17:53
	← SkAzZ left	17:54
moondoggy	Hey, neat project for our python group, then!	17:54
	#rocpy. We meet physically in Rochester, NY.	17:54
	→ jmcantrell joined	17:54
moondoggy	(roc python)	17:54
_ikke_	ah ok	17:54
moondoggy	Anywho... Thanks a lot.	17:55
	→ ehsan joined	17:55
	← dvaske left	17:55
	→ digitalfiz joined	17:57
osse	Can I ask a question?	17:57
	← tomas__ left	17:57
_ikke_	!ask	17:57
gitinfo	Yes, it's okay to ask questions here.... in fact, you just asked one! ;-) Pretty much any question is fine. We're not terribly picky, but we might be asleep. Please be patient and you should get an answer soon.	17:57
	← microcode left	17:58
osse	I was wondering whether the bot did that by itself :P	17:58
_ikke_	haha, nope	17:58
	The only thing it does by itself is respond to when new people say hi	17:58
	→ JaredMiller joined	17:58
osse	Ahh, I see	18:00
	← neersighted left	18:00
	← daniel_- left	18:02
	→ mikepack_ joined	18:03
	→ gtrak joined	18:03
	← chaiz left	18:04
	→ arvind_khadri joined	18:04
cnythnk	so im trying to hide a repository, but without any success, this is an extract of my current configurations: http://pastebin.com/TUYE2iRe	18:04
	→ neersighted joined	18:04
	← mritz left	18:05
	← jceb left	18:05
_ikke_	cnythnk: Why do you need to hide a repo?	18:05
	← cakehero left	18:05
_ikke_	Oh, and !gitosis	18:05
gitinfo	gitosis is no longer maintained and supported by the author; we usually recommend gitolite instead which has much better documentation and more features: http://github.com/sitaramc/gitolite -- if you're already stuck with gitosis we'll try to help, but no promises!	18:05
cnythnk	because i dont want the gitosis-admin repo to show, as it contains files which shouldnt be accessable for others	18:05
Learath2	yay bot alive again	18:06
	→ mritz joined	18:06
	gitinfo set mode: +v	18:06
	← babilen left	18:06
	← dv310p3r left	18:07
	← resistivecorpse left	18:07
	→ resistivecorpse2 joined	18:07
	→ storrgie joined	18:08
milki	cnythnk: you didnt paste the projects.list	18:09
	→ tinybluepixel joined	18:09
	← defts left	18:09
cnythnk	the projects.list is empty as default (atleast for me)	18:09
milki	why didnt you fill it up then?	18:10
	o, you mean its still showing all repos rather than none?	18:10
cnythnk	yes its showing all repos	18:10
	because now i have the following line: $projects_list = $projectroot;	18:11
milki	well, those gitweb = yes should probably populate the projects.list automatically	18:11
	← storrgie left	18:11
milki	i dont know how $projectroot will work for the list	18:11
	← ghartmann left	18:12
	← dreiss left	18:12
cnythnk	thanks it works now!	18:12
	was just my bad, it did as you said populate automatically	18:12
milki	yay	18:12
cnythnk	:-)	18:13
	didnt know that i actually had to add the gitweb = yes to make it populate the project.list	18:13
milki	but the comments you pasted said so	18:13
cnythnk	yes that was the "issue" i had, beacuse i didnt use the "gitweb = yes" in prior my configuration, so i was of the impression that the projects.list didnt get populated, so thought i made something wrong somewher else	18:15
	← jn_ left	18:15
	← JaredMiller left	18:16
	← mikepack_ left	18:19
	→ nitrix_ joined	18:19
	← svetlyak40wt left	18:19
	→ miphe joined	18:20
	→ NimeshNeema joined	18:20
	→ pl0sh_ joined	18:20
cnythnk	milki, so well as i said now it did populate projects.list, and i changed the projects_list, to the path where the actual projects.list is found, now however, no repository show up: http://pastebin.com/DzKiBLVB	18:22
	:-p	18:22
	← Poapfel left	18:23
	→ mishok13 joined	18:23
	→ mneorr joined	18:23
	→ Poapfel joined	18:24
	← infynyxx left	18:24
	→ corburn joined	18:25
moondoggy	_ikke_, gcs is nice, but I haven't found one simple (?) thing...	18:26
_ikke_	moondoggy: Most people tend to think otherwise	18:27
moondoggy	If I make a branch "Z" with some change that I want applied to all branches "master," "A," "B,"... immediately, can I do that in one step?	18:27
_ikke_	moondoggy: No :)	18:27
	they wouldn't be branches	18:27
moondoggy	Ok, then... If I just want the same line changed in all branches, because my code won't work without that change...	18:28
	← mishok13 left	18:28
	→ thinkdevcode joined	18:28
_ikke_	moondoggy: git cherry pick copies a commit to another branch	18:28
moondoggy	Or, do I have to check each branch out?	18:29
_ikke_	moondoggy: Yes	18:29
	moondoggy: Because each branch has different code	18:29
moondoggy	Or cherrypick to each branch separately?	18:29
	one at a time?	18:29
_ikke_	yup	18:29
	I'm not sure how different each branch is?	18:30
moondoggy	Ok. Hmmm.... I'm not used to thinking this way.	18:30
_ikke_	moondoggy: In git, a branch means a different line of work	18:30
moondoggy	They each have changes I want to remain separate for now.	18:30
	(each branch)	18:31
	← malesca left	18:31
moondoggy	So, at the top of the main program in all branches, I want to change #!/usr/bin/env python2.6 to #!/usr/bin/env python...	18:31
_ikke_	moondoggy: you could apply the change to a parent branch and rebase the branch	18:31
	branches*	18:31
moondoggy	Pfffffff.... ok, maybe I'll just learn that later and type the new line in each branch.	18:32
	You must do a lot of programming _ikke_ .	18:33
	← mneorr left	18:33
	← SirCmpwn left	18:33
	→ jaseemabid joined	18:33
_ikke_	moondoggy: Why do you think so?	18:34
	→ scarlisle joined	18:34
moondoggy	Well, until yesterday, I have just copied my one-file code to many version names. Now it's getting confusing to work on several improvements at once.	18:34
	← ipalaus left	18:35
	→ rehat joined	18:35
	gitinfo set mode: +v	18:35
miphe	Is there a way to ignore already tracked files? I have a head ache seeing hundreds of thumbnails being updated in my project that I should never commit, I want to ignore them but they are (and should be) tracked.	18:35
_ikke_	miphe: They either should be tracked, or they shouldn't	18:35
moondoggy	Anyway, I'll keep it simple for now, _ikke_	18:35
	← tinybluepixel left	18:35
miphe	_ikke_, they should be - but I dont want them in my list for modified files.	18:36
	→ GameGamer43 joined	18:36
	→ hilbert joined	18:36
_ikke_	miphe: Why should they be tracked?	18:36
	It seems like they are automatically generated, aren't they?	18:37
	→ FernandoBasso joined	18:37
	→ ZyX-I joined	18:37
miphe	They are manually added, but automatically updated. When my changes are deployed they will be updated automatically and my modifications shouldn't be committed	18:37
ZyX-I	Hello. How can I know list of commands that run “git gc” automatically?	18:38
	→ sluther joined	18:38
_ikke_	ZyX-I: Why do you need to know?	18:39
	→ SirCmpwn joined	18:39
cmn	assume all do	18:39
ZyX-I	_ikke_: Just arguing about git behavior of keeping old commits after rebase can (not) be used to do a rollback.	18:40
EugeneKay	!gc	18:41
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/	18:41
EugeneKay	No you stupid bot	18:41
	← dr_lepper left	18:41
EugeneKay	!lost	18:41
gitinfo	As long as you have `git commit`ed your changes (or even `git add`ed them), your changes will not be lost for over two weeks unless you work really hard at it. There are two places where "lost" changes can be hiding. They might be in the reflog (`git log -g`) or they might be in lost&found (`git fsck --unreachable`). Type "!dangling" and "!reflog" into IRC for more info.	18:41
	→ jalama joined	18:42
miphe	!reflog	18:42
gitinfo	The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details. WARNING: reset --hard will trash any uncommitted changes! Visualize with: gitk --all --date-order `git log -g --pretty=%H`	18:42
EugeneKay	The man page for gc only says that commands which create "lots of dangling objects" will run gc.	18:42
	Likely candidates are rebase, filter-branch, and anything which deletes a ref	18:43
	But these objects are only deleted if they are dereferenced for 2 weeks	18:43
wereHamster	I'd say any command which creates a commit does it. Including pull, commit, merge etc.	18:44
cmn	ZyX-I: gc doesn't delete the objects you just rebased	18:44
wereHamster	but it's bad to rely on gc being called by some particular command, That may change at will in the future.	18:44
_ikke_	gc is an implementation detail	18:45
EugeneKay	The important thing to take away is that nothing is GCed until 2 weeks	18:45
wereHamster	EugeneKay: 90 days + 2 weeks	18:46
	reflog expires after 90 days.	18:46
EugeneKay	"after dereferencing"	18:46
wereHamster	hm. reflogExpireUnreachable is 30 days.	18:47
	← rafter left	18:47
wereHamster	in any case, plenty of time. And you can increase it if you want.	18:47
ZyX-I	Thanks. It appears that opponent is right.	18:49
	← SJS left	18:49
	← ehsan left	18:51
	→ kukks joined	18:53
	← kukks left	18:53
	→ kukks joined	18:53
	→ SJS joined	18:56
	← sitaram left	18:56
	→ jmaya joined	18:57
	→ xaka joined	18:58
	→ aldodelgado joined	18:59
	← Goplat left	19:00
	→ JaredMiller joined	19:01
	→ d2dchat joined	19:02
	← hays left	19:02
	→ sitaram joined	19:03
	← sitaram left	19:03
	→ sitaram joined	19:03
	→ dv310p3r joined	19:04
	→ etcetera joined	19:04
	→ Xizor joined	19:05
	→ SeoZ joined	19:06
	→ charley_ joined	19:07
	← nitrix_ left	19:07
	→ rakl joined	19:07
	→ hays joined	19:07
	← SeoZ left	19:07
	→ X1z0r joined	19:08
	← jmaya left	19:09
	← Xizor left	19:10
	← aldodelgado left	19:10
	← maleknet left	19:12
	← JaredMiller left	19:12
	→ hwrd\|work joined	19:13
	← phaedrix left	19:14
	→ cagedwisdom joined	19:15
	→ Bmac joined	19:16
	→ svetlyak40wt joined	19:17
	← dc5ala left	19:23
	→ kcj joined	19:23
	← jalama left	19:24
	→ dvaske joined	19:24
	← AdrienBrault left	19:25
	→ infynyxx joined	19:29
	← alkino left	19:30
	← cnythnk left	19:31
	← infynyxx left	19:32
	→ maleknet joined	19:33
	← kcj left	19:36
	← resmo_ left	19:38
	→ jalama joined	19:38
	→ AdrienBrault joined	19:39
	→ mikepack_ joined	19:39
	← jalama left	19:40
	← hwrd\|work left	19:41
	← klj613 left	19:41
	→ jalama joined	19:42
	← devsharpen left	19:42
	→ cakehero joined	19:42
	→ hwrd\|work joined	19:43
	← jalama left	19:43
	→ nicoulaj joined	19:45
	← dvaske left	19:47
	→ ampz joined	19:48
	← ampz left	19:48
	← Dreamer3 left	19:49
	→ Dreamer3 joined	19:49
	→ resmo_ joined	19:51
sh4rm4	when i try to pull from upstream, i get error about non-checked-in files that would be overwritten	19:51
	is there a way to force them to get overwritten ?	19:51
	pull -f doesnt work	19:52
_ikke_	sh4rm4: What does it say?	19:52
	← Paul92 left	19:52
sh4rm4	Updating 82a5a89..701094c	19:52
	error: The following untracked working tree files would be overwritten by merge:	19:52
	package/libs/libnl-tiny/src/include/netlink/genl/ctrl.h	19:52
	...	19:52
_ikke_	git merge -f @{u}	19:53
	← felipec left	19:53
sh4rm4	this are remnants of a failed pull from a different mirror when the official one was offline	19:53
	git-mirror/openwrt-trunk[master]$ git merge -f @{u}	19:53
	error: unknown switch `f'	19:53
_ikke_	just guessed the -f option	19:54
	well	19:54
	just do git reset --hard then	19:54
	at least, if it's the only file	19:54
sh4rm4	no, there are thousands	19:55
	at first i pasted them into a delete list and run a script to delete them	19:55
	but i stopped after the 5th page or so	19:55
	← maletor left	19:55
sh4rm4	the reset didnt seem to help	19:55
	→ devsharpen joined	19:55
_ikke_	sh4rm4: All those files need to be gone?	19:56
sh4rm4	yeah they can all be erased	19:56
	→ honschu_ joined	19:56
	← honschu_ left	19:56
	→ honschu_ joined	19:56
	← maleknet left	19:56
_ikke_	git reset --hard should do	19:56
sh4rm4	everything that's not checked can be deleted	19:56
_ikke_	not checked?	19:56
sh4rm4	*checked in	19:56
_ikke_	You mean, has unstaged changes?	19:56
	→ maleknet joined	19:57
	→ kcj joined	19:57
_ikke_	Uncomitted*	19:57
sh4rm4	no	19:57
	files that are not committed	19:57
_ikke_	Oh	19:57
sh4rm4	i.e. untracked	19:57
_ikke_	git clean	19:57
	man git clean	19:57
gitinfo	the git-clean manpage is available at http://jk.gs/git-clean.html	19:57
sh4rm4	grr	19:58
	→ jalama joined	19:58
sh4rm4	doesnt help either	19:58
	it removed some things, but not all	19:59
	hmm maybe i should simply clone into a different dir	19:59
_ikke_	what did you execute?	19:59
sh4rm4	git clean -f	19:59
	and	19:59
	git clean -f -x	19:59
	← honschu left	20:00
	→ kerrick joined	20:00
	offby1 doesn't always use git-clean, but when he does, he uses "git clean -dxf"	20:00
osse	stay thirsty, my friends	20:00
EugeneKay	dfx is better	20:01
sh4rm4	haha	20:01
	works after doing a local clone	20:01
	then changing the git url and then pull	20:01
	← d2dchat left	20:01
	← nlpplz left	20:02
	← etcetera left	20:04
	→ daniel_- joined	20:05
	← optixx left	20:07
	→ griotspeak joined	20:08
	→ Xizor joined	20:08
	→ dr_lepper joined	20:08
	→ solofight joined	20:08
	← maleknet left	20:08
solofight	people - how does a merge operation takes place ?	20:08
	Please validate my understanding	20:09
	Based on the params specified, Git will identify both merge candidates from heads directory	20:09
	and then find their common ancestor to perform a comparison	20:10
	→ Samual joined	20:10
offby1	sounds right	20:10
solofight	Now comes the black area (How exactly does the file by file coparison and merge happens ) ?	20:10
offby1	beats me!	20:10
	the source is there for you to read :)	20:10
	← X1z0r left	20:11
solofight	offby1: i had looked at the source hosted in github, and didnt even know where to start	20:11
Seveas	git will find a common base, diff base against head 1 and apply that diff against head 2	20:11
	(roughly)	20:11
	→ donri joined	20:11
solofight	afraid of all the directory structures there - can you point me in the right direction ?	20:11
Seveas	solofight, you'll want merge-*.c	20:12
solofight	Seveas: oh, diff sha1 of common base with sha1 of head1	20:13
	?	20:13
	← Innocentus left	20:13
	→ felipec joined	20:15
	→ Parhs8 joined	20:15
solofight	Seveas: https://github.com/git/git/blob/master/merge-file.c	20:16
	correct ?	20:16
	← Parhs left	20:16
Seveas	yeah, that's part of it	20:17
solofight	or this https://github.com/git/git/blob/master/merge-recursive.c	20:17
	oh	20:17
	← Dreamer3 left	20:18
	→ Davey joined	20:18
Seveas	both :)	20:18
offby1	diffing shas doesn't sound useful	20:18
	← bloony left	20:18
	← jalama left	20:18
	← corburn left	20:19
	→ bloony joined	20:19
	→ goshawk joined	20:21
	← sirdancealot7 left	20:21
	→ corburn joined	20:24
masak	those virtual commits created during merge-recursive... are they ever represented in .git/objects ?	20:25
solofight	masak: why do you call them virtual commits ?	20:26
wereHamster	masak: every object is represented in .git/objects	20:27
	if it's not an object, it's not stored there	20:28
	← kumbayo left	20:28
	→ resmo joined	20:29
	→ Innocentus joined	20:29
_ikke_	wereHamster: Not even in memory?	20:30
	→ mklappstuhl joined	20:31
masak	right, the alternative would be that virtual commits were only stored in memory.	20:33
	solofight: I call them virtual commits because merge-recursive.c does.	20:33
	→ mishok13 joined	20:33
wereHamster	masak: there are no 'virtula commits'	20:33
solofight	masak: still, objects - right ?	20:34
	masak: if its just store in memory how do you build history on top of that !	20:34
	← andrewhl left	20:34
	→ andrewhl joined	20:35
	← mikepack_ left	20:35
masak	because the virtual commits are not used to build history. only to sort out the merge.	20:35
	→ PCChris joined	20:35
masak	wereHamster: what would you prefer me to call the intermediate commits created during a recursive merge. I'm happy to use your terminology.	20:35
	→ shirajermilio joined	20:37
	→ sirdancealot7 joined	20:38
	← shirajermilio left	20:39
	← PCChris left	20:40
	→ Goplat joined	20:40
	→ shirajermilio joined	20:41
	← shirajermilio left	20:41
	→ the_cybersphinx joined	20:41
solofight	masak: aren't they part of the history ?	20:41
	← Bmac left	20:42
	← dangerousdave left	20:42
masak	solofight: in what sense? the parents of the merge commits are the two branch tips, no?	20:43
	→ mikepack_ joined	20:43
	→ hellopat joined	20:43
_ikke_	The name recursive merge already says that there are multiple merges involged	20:44
	But the result is only one merge	20:44
masak	I'm with you thus far.	20:44
_ikke_	I guess those merges are the one you are talking about	20:45
masak	my question was whether the results of the other merges are also stored as objects under .git/objects	20:45
	yes, those merges are what I'm talking about.	20:45
	← cybersphinx left	20:45
_ikke_	I don't have a clue	20:45
	But I don't think so	20:45
	→ joshsmith joined	20:46
	→ sentinal8473 joined	20:46
masak	I don't think so either. I think they are in-memory only.	20:47
solofight	masak: how do you unwind a merge which does not have a commit ? say you understood that all changes you made to the bug fix was wrong and want to remove the already merged code to prodn	20:47
	?	20:47
masak	solofight: I don't see the issue. I'd just reset to a previous commit.	20:47
	solofight: I'm not saying merges don't have commits. that's not what I've been saying.	20:48
	solofight: maybe read what _ikke_ just said. he summarizes it better than me.	20:48
	→ PCChris joined	20:49
	← xaka left	20:50
	← dwmw2_gone left	20:50
	← rehat left	20:54
	→ irqq joined	20:54
	← devsharpen left	20:55
	← hellopat left	20:55
	→ lb joined	20:56
	← longbeach left	20:56
	← lonewulf` left	20:57
	← dermoth_ left	20:58
	→ lonewulf` joined	20:58
	→ lausi joined	20:58
	← lausi left	20:59
	← cakehero left	20:59
	← boombatower left	21:00
	→ boombatower_ joined	21:00
	→ maletor joined	21:00
	← corburn left	21:02
	→ tenmilestereo joined	21:03
	→ tvw joined	21:04
	→ boombatower joined	21:05
	← svetlyak40wt left	21:05
	← dimka left	21:05
	→ cakehero joined	21:06
	→ dimka joined	21:06
	→ devsharpen joined	21:07
	→ SeoZ joined	21:07
	← dimka left	21:07
	→ GHAI joined	21:07
GHAI	aye	21:07
	→ dimka joined	21:07
GHAI	i have a piece of opensource software with a git repo at sf.net	21:08
	→ etcetera joined	21:08
	→ X1z0r joined	21:08
GHAI	i would like to always hava a mirror of that repo at bitbucket	21:08
	as in tracks changes automatically	21:08
	is there any convenient tool for that purpose?	21:09
	← boombatower_ left	21:09
_ikke_	GHAI: The only way is to have something in between that synchronizes them	21:09
	GHAI: Not that I know	21:09
GHAI	what would one need to sync them	21:09
	i could place a shellscript on $server	21:09
	→ peff joined	21:09
	← mishok13 left	21:09
GHAI	and i wonder if there is something that allows access to git-hosted repos with hg	21:10
	push, pull, etc	21:10
	without any msys or whatnot mess	21:10
_ikke_	There is hg-git	21:10
	← bapa left	21:11
	→ dermoth_ joined	21:11
	← Xizor left	21:11
GHAI	all in all git still seems not very mature aside form linux	21:11
	→ bapa joined	21:11
GHAI	so i'll probably want to stay away from that if possible	21:11
	← JohnBat26 left	21:12
	← Davey left	21:13
	→ [CaEk]trikol joined	21:13
	← PCChris left	21:13
bremner	!refund	21:14
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.	21:14
wereHamster	GHAI: git fast-export/import. hg supports that to some extent	21:14
	→ hotovson joined	21:14
	← wsfulton left	21:14
	← resistivecorpse2 left	21:14
	→ resistivecorpse2 joined	21:15
	→ Davey joined	21:15
	← bwidmer left	21:16
	→ optixx joined	21:16
	← griotspeak left	21:16
	← bapa left	21:16
	→ infynyxx joined	21:16
GHAI	bremner haha, your average opensource response	21:16
	→ rednaks_ joined	21:16
	→ corburn joined	21:17
_ikke_	It's a bit of a tongue-in-the-cheek response	21:17
GHAI	actually its everything that characterizes opensource and why only tiny parts have made it to the enterprise	21:18
	;)	21:18
	← rednaks left	21:18
	→ bapa joined	21:19
	← bapa left	21:19
	← infynyxx left	21:20
_ikke_	I find that open source has come quite far for something that is developped for free by volunteers	21:20
	→ bapa joined	21:20
GHAI	and maybe one of the reasons why it'd get an impression of "immature"	21:20
	← j416 left	21:20
	→ dwmw2_gone joined	21:20
	→ oneacross joined	21:20
_ikke_	GHAI: immature: another word for "it doesn't do what I want"	21:21
	lb giggles	21:21
	← peff left	21:21
	→ infynyxx joined	21:21
	→ bwidmer joined	21:21
_ikke_	GHAI: open source works mainly with scratch your own itch	21:21
	← dwmw2_gone left	21:22
wereHamster	_ikke_: .. and nobody's willing to change it to do what I want for free.	21:22
	→ dwmw2_gone joined	21:22
	← Davey left	21:22
_ikke_	wereHamster: Indeed	21:22
	git is absolutely not immature, not even on windows	21:22
	← bapa left	21:22
GHAI	hm, /win 21	21:22
lb	dont feed the trolls :D	21:22
	← dwmw2_gone left	21:23
	← Tommy[D] left	21:23
	→ dwmw2_gone joined	21:23
_ikke_	GHAI: irssi / weechat?	21:23
	allquixotic_ → allquixotic	21:23
	→ Tommy[D] joined	21:23
	→ bapa joined	21:24
	← dwmw2_gone left	21:24
	→ dwmw2_gone joined	21:24
	← Element9 left	21:24
	← rdqfdx left	21:25
	← rednaks_ left	21:26
	→ derpops joined	21:27
	→ rednaks joined	21:27
	← ergZay left	21:28
	← rob_w left	21:28
	← sbodo left	21:29
	← resmo left	21:29
	← robustus left	21:30
	← mikaelj left	21:32
	→ mikaelj joined	21:32
	→ lb1 joined	21:33
	← oneacross left	21:33
	← solofight left	21:34
	lb1 almost missed irssi look and feel	21:34
	← arturaz left	21:35
	← gain left	21:37
	← cakehero left	21:38
	→ PCChris joined	21:41
	← LeMike left	21:46
	← boombatower left	21:47
	→ Ugallu joined	21:48
	gitinfo set mode: +v	21:50
	→ cybersphinx joined	21:51
	← the_cybersphinx left	21:53
	← skorgon left	21:53
	→ BadProphet joined	21:53
	← Sky[x] left	21:53
	← corburn left	21:54
	← infynyxx left	21:54
	→ resmo joined	21:55
	← irqq left	21:55
	← colindh_ left	21:56
	← etcetera left	21:56
	→ colindh joined	21:57
	→ infynyxx joined	21:57
	← PCChris left	22:01
	← Goplat left	22:03
	→ scotty joined	22:03
	→ glennpratt joined	22:06
	→ wsfulton joined	22:06
	← glennpratt left	22:07
	← Croms left	22:07
	→ Xizor joined	22:08
	→ corburn joined	22:09
	→ glennpratt joined	22:09
	→ FrostyX joined	22:09
	← X1z0r left	22:11
FrostyX	hi. is it someway possible to copy only one directory from git repository ?	22:12
	← glennpratt left	22:13
FrostyX	*copy/clone whatever .. i mean download ..	22:13
	→ anderse joined	22:14
	← anderse left	22:14
	← imarcusthis- left	22:14
	← scotty left	22:15
	← sluther left	22:15
	→ imarcusthis joined	22:16
	← sentinal8473 left	22:16
m1sc	FrostyX: no	22:17
	→ jave joined	22:17
FrostyX	even some unofficial way?	22:17
	→ Dreamer3 joined	22:18
oojacoboo	FrostyX: http://blog.quilitz.de/2010/03/checkout-sub-directories-in-git-sparse-checkouts/	22:20
	← mklappstuhl left	22:21
	→ Cassiel joined	22:22
FrostyX	btw i wonder .. why it is not possible ? Anyone think it will be good feature ?	22:23
Fandekasp	hi there. I'm trying to get the colors of git status for a script, but "git config --get-color color.status.added" etc don't return any color. Any idea why and how to grab those colors ?	22:24
chovy	how do i get the diff of preivous commit?	22:26
cbreak	source code? :)	22:26
	chovy: man git-show	22:26
gitinfo	chovy: the git-show manpage is available at http://jk.gs/git-show.html	22:26
cbreak	chovy: or man git-diff	22:26
gitinfo	chovy: the git-diff manpage is available at http://jk.gs/git-diff.html	22:26
cbreak	chovy: or man git-log -p	22:26
gitinfo	chovy: the git-log manpage is available at http://jk.gs/git-log.html	22:26
cbreak	there are a few other ways	22:26
	→ leen^\| joined	22:26
cbreak	FrostyX: no way.	22:26
	FrostyX: and I doubt it's useful	22:27
	← ncd\|leeN left	22:27
cbreak	FrostyX: every single commit contains every single file in that commit. So even if you only download the most recent commit, you get everything	22:27
	(and you'd get a broken repository)	22:27
	← AdrienBrault left	22:28
	← donri left	22:28
	← thiago left	22:28
	← whitman left	22:28
	→ nzaccardi joined	22:29
	→ Jacob_ joined	22:29
FrostyX	I have for example repository where i want to have all my important system configs ... and when i want copy only irssi folder to some another computer ..	22:29
lb1	damn it's late again	22:29
chovy	thanks	22:29
nzaccardi	Hey all. Is there an easy way to push all repos to a remote?	22:30
	← Jacob_ left	22:30
	→ Guest20202 joined	22:30
cbreak	FrostyX: makes no sense.	22:30
lb	nzaccardi, foreach loop. shellscript	22:30
cbreak	FrostyX: a git repository contains one single project	22:30
	← Guest20202 left	22:31
nzaccardi	Woops, not repo's... branches (not sure where my brain is at.	22:31
	I have tried git push remote --all	22:31
	← sertaconay left	22:31
lb	nzaccardi, "git push" pushes all branches that tracks some remote branch	22:31
	→ JB3181 joined	22:32
nzaccardi	lb: Let's back up a step and maybe you can help	22:32
	I created a repo locally. Now I want to put it on github. I created the repo on github and am now trying to push the branches	22:33
	← charley_ left	22:33
nzaccardi	git push name --all gives me errors	22:33
	→ sluther joined	22:33
	← nicoulaj left	22:33
	← sluther left	22:34
cbreak	lb1: not exactly	22:34
	nzaccardi: git push pushes all matching branches by default.	22:34
nzaccardi	lb: It talkes about being behind...	22:34
cbreak	git push --all pushes all branches	22:34
lb	cbreak, also if they doesn't exist on the remote (because it's a fresh github repo) ?	22:35
cbreak	lb: matching means that a branch with the same name exists on the remote	22:35
pdelvo	Is there a git lib that supports clone, push and pull in file system in .net?	22:35
cbreak	if none exists, none will be pushed	22:35
CareBear\	pdelvo : no	22:35
	← mikepack_ left	22:35
cbreak	(until they change push.defaults to upstream)	22:35
pdelvo	:(	22:36
cbreak	pdelvo: what's wrong with git? :)	22:36
	← resmo left	22:36
lb	pdelvo, http://www.ohloh.net/p/git-sharp	22:36
	cbreak, in meant "git push --all"	22:37
cbreak	--all pushes all refs	22:38
pdelvo	thanks lb. i will have a look into it	22:38
cbreak	(all branches)	22:38
	← Rukan left	22:38
osse	FrostyX: maybe you could 'git clone --no-checkout --depth 1' and then checkout only the irssi directory from that.	22:38
lb	cbreak, so it should work with nzaccardi ?	22:38
cbreak	yes...	22:39
	← lb1 left	22:39
cbreak	and he hasn't pastebined anything indicating that it doesn't.	22:39
nzaccardi	cbreak, lb, It gives me an error saying that the changes are rejected..	22:39
lb	nzaccardi, then !repro	22:39
gitinfo	nzaccardi: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session. This will help immensely with troubleshooting.	22:39
	→ Goplat joined	22:40
	← miphe left	22:40
FrostyX	ok i'll try	22:40
	← koltroll left	22:40
	← suy left	22:41
	→ erichynds joined	22:41
	← Haikarainen left	22:41
cbreak	FrostyX: that won't help you, you'll still download a full commit worth of history	22:41
	← worstadmin left	22:43
	→ worstadmin joined	22:43
cbreak	FrostyX: http://jasonkarns.com/blog/subdirectory-checkouts-with-git-sparse-checkout/, but as said above: it will still download everything.	22:43
	→ mklappstuhl joined	22:44
	← worstadmin left	22:44
	← aspotashev left	22:44
nzaccardi	gitinfo: will do.	22:44
	→ worstadmin joined	22:44
nzaccardi	lb: What do you mean by !repo?	22:45
gitinfo	lb: Repo is a tool produced by Google for the AOSP project(and others) which wraps git and provides its own set of commands. While it is possible to use git with repositories that are managed by repo, it is not always easy. http://source.android.com/source/version-control.html	22:45
	→ griotspeak joined	22:45
	← worstadmin left	22:45
	→ neataroni joined	22:45
	→ worstadmin joined	22:45
neataroni	i just merged, tried to use mergetool, didnt seem to do anything, then commited and pushed, and now i have lot of >>>>> head >>>>> master stuff in my code	22:46
	← dwmw2_gone left	22:46
lb	nzaccardi, !repro	22:46
gitinfo	nzaccardi: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session. This will help immensely with troubleshooting.	22:46
lb	read	22:46
	← worstadmin left	22:46
	→ worstadmin joined	22:47
cbreak	nzaccardi: git push --all will push all branches.	22:47
	nzaccardi: use it. then pastebin why you think it is not the answer you are looking for.	22:47
nzaccardi	cbreak: I am doing that right now	22:47
	← worstadmin left	22:47
	→ worstadmin joined	22:48
	→ dwmw2_gone joined	22:48
neataroni	how do i tell one branch to make itself look like another branch	22:49
lb	neataroni, then git revert HEAD (if that's still the dirty commit) and try again	22:49
	← FernandoBasso left	22:49
	→ asakura joined	22:50
nzaccardi	[email@hidden.address]	22:50
	Whoops, here is the link: https://gist.github.com/9aff09a407c09c94db5d	22:50
neataroni	lb: it says "already up to date" but i look at the code and its different than other branch	22:51
lb	neataroni, you're mixing stuff up	22:51
cbreak	neataroni: git reset --hard otherbranch	22:51
	easy	22:51
	that will nuke away everything in the current branch's history	22:52
lb	nzaccardi, did you read the message you just pasted?	22:52
neataroni	cbreak: that makes the current branch identical to the other branch?	22:52
cbreak	and replace it with otherbranch	22:52
neataroni	ok cool	22:52
cbreak	not identical	22:52
	just identical history	22:52
nzaccardi	lb: Yep... what am I missing.	22:52
cbreak	nzaccardi: so, what's the problem?	22:53
	seems everything works fine	22:53
lb	"Updates were rejected because a pushed branch tip is behind its remote	22:53
	hint: counterpart. "	22:53
cbreak	(apart from you not even specifying --all as I told you...)	22:53
nzaccardi	lb: OKay	22:53
lb	i'll take a nap...	22:53
nzaccardi	same... thing happens	22:54
cbreak	no...	22:55
	with --all, you push all branches	22:55
	not just matching ones...	22:55
	← lb left	22:55
	← jave left	22:55
nzaccardi	cbreak: let's back up.	22:56
	start afresh	22:57
pdelvo	-.- gitsharp does not support local fetch and push	22:57
	→ talmuth[tlmt] joined	22:57
	← talmuth left	22:58
	← mritz left	22:58
nzaccardi	cbreak: https://gist.github.com/9aff09a407c09c94db5d	22:59
	→ mritz joined	23:00
	← tvw left	23:00
	← griotspeak left	23:00
	← tenmilestereo left	23:00
	→ mikepack_ joined	23:01
cbreak	yeah, and?	23:02
nzaccardi	cbreak:	23:02
cbreak	nzaccardi: why do you not like that reply?	23:02
nzaccardi	cbreak: Because I don't know what to do now...	23:02
cbreak	why not?	23:03
EugeneKay	pdelvo - try a file:// URL?	23:03
	→ defts joined	23:03
cbreak	it tells you to git pull	23:03
nzaccardi	cbreak: Because when I try and do a git pull remote "branchname" I get "already up to date"	23:03
cbreak	not remote branchname!	23:04
	just git pull	23:04
	in master.	23:04
	you merge master into your current branch if you git pull origin master	23:04
	that's usually NOT what you want	23:04
pdelvo	Not implemented: https://github.com/henon/GitSharp/blob/master/GitSharp.Core/Transport/TransportLocal.cs#L74	23:04
cbreak	so don't do it...	23:04
nzaccardi	$ git pull tells me to specify the remote name...	23:05
	git pull remote tells me to give a branch	23:05
cbreak	nzaccardi: do it on master.	23:06
	you probably didn't set upstream	23:06
	→ fusillia joined	23:06
nzaccardi	whats that?	23:06
cbreak	so switch to master...	23:06
	and pull there	23:06
	← Innocentus left	23:06
cbreak	nzaccardi: man gitglossary	23:06
gitinfo	nzaccardi: the gitglossary manpage is available at http://jk.gs/gitglossary.html	23:06
	→ donri joined	23:07
	← dv310p3r left	23:07
pdelvo	A there are forks of this project avialable with local support :)	23:07
	→ mneorr joined	23:07
	← defts left	23:07
nzaccardi	gitinfo, cbreak: thanks for the help all worked out.	23:08
gitinfo	nzaccardi: you're welcome, but please note that I'm a bot. I'm not programmed to care.	23:08
	← daniel_- left	23:08
	← wsfulton left	23:08
	→ X1z0r joined	23:08
	← mneorr left	23:09
	→ mneorr joined	23:09
	← mneorr left	23:10
	→ meLon joined	23:10
	← jaseemabid left	23:11
	← Xizor left	23:11
	← hotovson left	23:12
	→ hellopat joined	23:14
	← hellopat left	23:18
	→ jwillia3 joined	23:19
EugeneKay	FrostyX - man git-archive; if you have the repo cloned locally you can get a tarball of just a <path>	23:19
gitinfo	FrostyX: the git-archive manpage is available at http://jk.gs/git-archive.html	23:19
	→ Linc joined	23:22
	← RaceCondition left	23:25
EugeneKay	What's the plumbing command I want to get the tree object associated with a commit?	23:27
	→ AdrienBrault joined	23:27
	→ Turicas joined	23:28
	← talmuth[tlmt] left	23:28
	→ Sg joined	23:28
	Sg → Guest15667	23:28
milki	^{tree}	23:29
	committish^{tree}	23:29
frogonwheels	EugeneKay: man git-rev-parse	23:30
gitinfo	EugeneKay: the git-rev-parse manpage is available at http://jk.gs/git-rev-parse.html	23:30
EugeneKay	Figures.	23:30
	← rednaks left	23:31
EugeneKay	I would have thought git-show, but....	23:31
	→ mneorr joined	23:31
	→ cakehero joined	23:32
	→ rednaks joined	23:32
	← jwillia3 left	23:33
	← Guest15667 left	23:33
	→ Sg83help joined	23:33
	→ Chib joined	23:33
	gitinfo set mode: +v	23:34
Sg83help	hello. i'm hoping someone can help me...i'm trying to figure out if there is a way to alias a branch.	23:34
	← tewecske left	23:34
EugeneKay	Sg83help - man git-symbolic-ref	23:35
gitinfo	Sg83help: the git-symbolic-ref manpage is available at http://jk.gs/git-symbolic-ref.html	23:35
Sg83help	i will have multiple release branches, but want an easy way for someone to do git checkout Latest, and then get the right branch,	23:35
	→ hellopat joined	23:35
	← SBoudrias left	23:35
EugeneKay	Sg83help - the proper way to do that would be to just create another branch named Latest and update it according to what you want it to be, possibly using git reset	23:36
Sg83help	i tried symbolic-ref, but was getting 'detached head' messages	23:36
EugeneKay	Remember that a branch pointer only costs you a few bytes of disk space.....	23:36
	← NfNitLoop left	23:36
	← TheJH left	23:37
Sg83help	if i make a release branch, then branch Latest...somone checks out latest, then i reset latest to release v2, what do my users need to do to update?	23:37
	they meed to reset as well?	23:38
EugeneKay	They need to fetch Latest and update their local copy to match	23:38
	← infynyxx left	23:38
EugeneKay	So long as they've not commited anything they can just use 'git merge', but this is becoming a !deploy problem ;-)	23:38
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	23:38
Sg83help	thats essentially what i'm looking to do. seems many people start down this path as well. thanks!	23:39
	← Sg83help left	23:41
	← andrewhl left	23:42
	← thinkdevcode left	23:43
	→ thinkdevcode joined	23:44
	← cakehero left	23:44
	← mikepack_ left	23:47
	← leen^\| left	23:48
	← Turicas left	23:48
	← devsharpen left	23:50
	→ daniel_- joined	23:52
	← daniel_- left	23:53
	← hellopat left	23:55
	← _huoxito left	23:55
	← Linc left	23:56
	→ pjs joined	23:56
pjs	what could cause this error when using --git-dir? http://dpaste.com/819177/	23:58
	→ tenmilestereo joined	23:59
	→ w09x joined	23:59

Logs Search ←Prev date Next date→

Channels Documentation