IRCloggy #git 2016-03-02

Provider of IRC logs since 2005.

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

	2016-03-02
	← ramsub07 left	00:00
	← mattcen left	00:02
	→ diegoviola joined	00:05
	← xbob left	00:05
milki	configuration problably?	00:07
	→ daito joined	00:07
	→ fahadash joined	00:08
	← kermit left	00:09
	← pks left	00:09
	→ pks_ joined	00:09
	← knownasilya left	00:10
	→ dsdeiz joined	00:10
	← dsdeiz left	00:10
	→ dsdeiz joined	00:10
	→ mattcen joined	00:10
	← harish left	00:12
	← ywecur_ left	00:12
	← daito left	00:13
	→ aidalgol joined	00:13
	← WakiMiko_ left	00:15
	→ WakiMiko joined	00:15
	→ mezod joined	00:18
	← floatingpoint left	00:18
	← ajf- left	00:19
	← raijin left	00:19
	→ mizu_no_oto joined	00:21
	skastur1 → skasturi	00:21
	→ jmckind joined	00:23
	→ r_rios joined	00:23
r_rios	Hey. I accidentally created a local branch origin/branch and now I can't delete because git thinks I'm referring to remotes/origin/branch. What should I do? How can I specify I want to delete the local branch?	00:25
	→ xcpep joined	00:25
osse	r_rios: git branch -d refs/heads/origin/branch	00:25
	r_rios: rule of thumb: if something is ambiguous, try with the "full" name.	00:26
	might happen if you do stuff like push origin <sha1>:master and stuff like that	00:26
r_rios	error: branch 'refs/heads/origin/branch' not found.	00:26
	← gigq left	00:26
osse	then you don't have such a branch	00:27
r_rios	% git branch	00:28
	* branch	00:28
	origin/branch	00:28
	→ ajf- joined	00:28
osse	r_rios: try git for-each-ref 'refs/heads'	00:28
	by "try" I mean "what does this print?"	00:29
	← mattfoo left	00:29
	→ gigq joined	00:29
r_rios	https://gist.github.com/anonymous/5274fee5f2e2eb2413d7	00:30
	→ jason237 joined	00:31
osse	huh	00:31
	at least I can reproduce it	00:31
r_rios	So, is this a bug?	00:31
osse	git update-ref -d refs/heads/origin/branch works	00:31
	I dunno.	00:31
r_rios	By "works", you mean it deletes the branch?	00:32
osse	Maybe it's on purpose so that you can't use git-branch to delete stuff that aren't branches	00:32
	← eletuchy left	00:32
osse	yes	00:32
	→ citizen-stig joined	00:32
	← nwkj86 left	00:33
	← muld left	00:33
	← fmcgeough left	00:33
	→ McSorley joined	00:34
	→ mattfoo joined	00:34
osse	r_rios: Waaaiiit a minute. Here git branch -d origin/master works straight up without fuss :O	00:34
r_rios	uh	00:34
osse	That does make sense, because looking at the code it seems like it unconditionally prepends refs/heads.	00:34
r_rios	Well, already deleted it with update-ref, so I can't re-reproduce it anymore	00:35
osse	create it! :P	00:35
r_rios	I'm scared	00:35
	Let's see...	00:35
osse	Nah, you don't have to, but would be interesting. Maybe your git version is in some limbo state where it's both kinds of useless	00:35
	→ _wwwbukolaycom joined	00:36
r_rios	It worked now...?	00:36
osse	Hooray!	00:36
r_rios	Maybe some specific conditions made it not be deleted for some reason	00:36
osse	So how did you try to delete it that prompted you to come here?	00:36
	Maybe	00:36
	Can I go to bed now	00:37
	← citizen-stig left	00:37
r_rios	I think	00:37
	Anyway, thanks :D	00:37
	Sleep tight	00:38
McSorley	HI, i have two two tags v2.1 & v2.2. The v2.2 version is missing a single commit from v2.1. What is the best approach of getting this one change included into v2.2. Basic git experience here so the most straightforward approach appreciated! Thanks	00:38
	← bollullera left	00:38
preaction	tags are basically labels for commits. are you sure you don't mean branches?	00:39
	→ raijin joined	00:39
	→ kermit joined	00:40
	→ e01 joined	00:41
McSorley	preaction: So its is the one single branch that is tagged, basically something was hotfixed off of what should have been the latest tag and remerged but a single commit was missed.	00:42
	→ sssilver joined	00:42
	← ajf- left	00:44
	← AaronMT left	00:45
	← tang^ left	00:45
	← e01 left	00:46
McSorley	preaction: On Github, I can compare the two tags and see the earlier tag has an addition that the later tag does not. So what I would like to do is apply my working copy (latest tag) with the missed commit and re-tag. Possible?	00:47
	← dreiss left	00:47
	← mizu_no_oto left	00:47
preaction	can you show me the github repo? i think we're getting the terminology messed up	00:47
	← crose left	00:48
	← raijin left	00:49
	← McSorley left	00:52
	→ Lunatrius` joined	00:53
	→ fmcgeough joined	00:54
	Lunatrius` → Lunatrius	00:54
	← amikiri left	00:54
	→ ajf- joined	00:55
	→ nnyk_ joined	00:56
	→ dreiss joined	00:56
	← kilo_bravo left	00:57
	→ eletuchy joined	00:58
	← fstd left	00:59
	← clemf left	00:59
	→ fstd joined	01:00
	← sgen left	01:01
	← imachuchu left	01:01
	← kpease left	01:01
	→ daito joined	01:02
	← michelangelo left	01:03
BooK_	milki: sorry, was afk. did you mean that the git config could be different on my two systems?	01:03
	→ michelangelo joined	01:03
BooK_	I didn't about it, but I'll check	01:03
	← d4rklit3 left	01:03
	→ ensyde_ joined	01:04
	← kolobyte left	01:06
	← tristanseifert left	01:06
	→ fracting joined	01:06
	← italoacasas left	01:07
	← fmcgeough left	01:07
	← mayankgupta27 left	01:07
	→ rhnvrm joined	01:07
	← leprechau left	01:07
	← intrigueD left	01:07
	→ mayankgupta27 joined	01:08
	← moobee left	01:08
	← chitopunk left	01:09
	→ kolobyte joined	01:09
	← kolobyte left	01:09
	→ kolobyte joined	01:09
	← justanotheruser left	01:10
	← eletuchy left	01:11
	← sangy left	01:11
	→ tristanseifert joined	01:11
	→ justanotheruser joined	01:12
	→ leprechau joined	01:13
	→ deltab joined	01:14
	→ pigeon joined	01:17
	→ harish joined	01:22
	→ Tanger joined	01:22
	→ Craig joined	01:23
	← rhnvrm left	01:23
	← Craig left	01:24
	← thiago left	01:25
	→ espindola joined	01:26
	→ Lunatrius` joined	01:26
	→ Lyqyd joined	01:28
	← Lunatrius left	01:28
	Lunatrius` → Lunatrius	01:28
	→ stonerfish joined	01:30
	← Mobutils left	01:31
	← mayankgupta27 left	01:31
	→ joufflu joined	01:34
	← sylario left	01:36
	← robbyoconnor left	01:37
	→ bluezone joined	01:38
	← fracting left	01:38
	← akushner_ left	01:38
	← JanC left	01:38
	← rubyonrailed left	01:39
	← paddyez left	01:40
	← gtristan left	01:40
	← jonmorehouse left	01:40
	← EvilPenguin left	01:41
	→ harish_ joined	01:41
	← staticshock left	01:42
	← boombatower left	01:46
	← user083 left	01:46
	← dpower left	01:47
	← espindola left	01:47
	← githogori left	01:47
	→ user083 joined	01:48
	← cdg left	01:49
	→ cdg joined	01:50
	← urda left	01:50
	← ajf- left	01:51
	→ JanC joined	01:52
	← nurey left	01:53
	→ eletuchy joined	01:53
	← cdg left	01:54
	→ robbyoconnor joined	01:54
	→ mylord joined	01:55
mylord	how do I commit from a detached head, or otherwise make my current code atop this branch (master)?	01:55
	← harish_ left	01:55
	← mezod left	01:56
	← sgambino left	01:58
	← tlaxkit left	01:58
	→ sgambino joined	01:58
	← sgambino left	01:59
	← aaronj left	01:59
	← ahr3n_ left	01:59
	← diegoviola left	02:02
	→ rodolfowtf joined	02:03
ojacobson	!reattach	02:05
gitinfo	Letters refer to !detached. (a) and (b): 'git checkout branchname' to continue working on another branch, or 'git checkout -b branchname' to start a new one here; (c) git am --continue; (d) git rebase --continue	02:05
	→ xelxebar joined	02:06
	→ theskillwithin joined	02:08
	→ UniFreak joined	02:08
	→ clemf joined	02:10
	← UniFreak left	02:10
	← diegoaguilar left	02:11
	← user083 left	02:11
	→ italoacasas joined	02:11
	← italoacasas left	02:12
	→ italoacasas joined	02:13
	→ thiago joined	02:13
	→ unreal_ joined	02:14
	← oich left	02:15
	→ gtristan joined	02:16
	→ AndroUser joined	02:16
	daurn → daurnimator	02:17
	← unreal left	02:17
	→ citizen-stig joined	02:21
	← modocache left	02:21
	← Sasazuka left	02:22
	→ modocache joined	02:23
	→ mayankgupta joined	02:23
	← dsantiago left	02:23
	→ safe joined	02:24
	→ diegoaguilar joined	02:25
	→ strayPuppy joined	02:25
	← citizen-stig left	02:26
	← cmosguy left	02:26
	→ andrew_ joined	02:28
	→ e01 joined	02:29
	← e01 left	02:29
	→ e01 joined	02:29
	→ Goplat joined	02:30
	→ donmichelangelo joined	02:30
	→ rubyonrailed joined	02:31
	← michelangelo left	02:33
	← e01 left	02:34
	→ tantom joined	02:34
	→ nellicus joined	02:35
	→ jottr joined	02:35
	← italoacasas left	02:35
	→ mayankgupta_ joined	02:36
	gitinfo set mode: +v	02:37
tantom	hi guys. I have a question about 'git pull --rebase'. I have a remote branch and a local branch that mirrors it. I did a 'git pull --rebase' from local branch to the remote and i had some conflicts. after resolving all conflicts and finishing the rebase, when i do a git hist, i am missing the latest commit	02:37
	← noogler67 left	02:38
	→ EvilPenguin joined	02:38
tantom	during the rebase I remember it said it was trying to apply that commit but the changes were already made. how can i get that commit to show in my history	02:38
	→ noogler67 joined	02:38
	← robbyoconnor left	02:39
	← modocache left	02:40
	→ Vampire0_ joined	02:40
	jmckind → jmckind_	02:40
	← nellicus left	02:40
	→ spinningarrow joined	02:41
	← Vampire0 left	02:43
	→ jottr_ joined	02:44
	← jmckind_ left	02:46
	← jottr left	02:46
	← durham left	02:47
	← josuebrunel left	02:48
	→ rhnvrm joined	02:48
	→ nilsi joined	02:48
	← nilsi left	02:48
	→ pks- joined	02:48
	→ modocache joined	02:48
	→ nilsi joined	02:49
	← modocache left	02:49
	← rhnvrm left	02:49
	→ Coop joined	02:49
	← bronson left	02:49
	→ nellicus joined	02:49
	→ modocache joined	02:49
	← andrew_ left	02:50
	← mayankgupta_ left	02:50
	← nellicus_ left	02:51
	← pks_ left	02:52
	→ Silenced joined	02:52
	← Silenced left	02:52
	→ Silenced joined	02:52
	← clemf left	02:53
	← harish left	02:54
	→ MattMaker joined	02:55
	→ clemf joined	02:55
	← Noldorin left	02:58
	← justanotheruser left	02:59
	→ justanot1eruser joined	02:59
	← mayankgupta left	03:00
	← ensyde_ left	03:00
	→ whomp_ joined	03:01
	← whomp left	03:02
	← choki left	03:03
	→ andrew_ joined	03:04
	→ Rodya_ joined	03:05
	← AndroUser left	03:08
	→ harish joined	03:10
	← EvilPenguin left	03:11
	→ spinning_ joined	03:13
	→ kriskropd joined	03:14
	→ sangy joined	03:15
	← whomp_ left	03:15
	← spinningarrow left	03:16
	→ boombatower joined	03:18
	← The_Woodsman left	03:19
	← __xor left	03:20
	→ mostlybadfly joined	03:20
	→ bronson joined	03:20
	← Ahmed90 left	03:20
	→ _xor joined	03:20
	→ robbyoconnor joined	03:20
	← bronson left	03:21
	→ astrofog joined	03:21
	→ jmckind joined	03:22
	← rodolfowtf left	03:23
	→ mizu_no_oto joined	03:24
	→ rodolfowtf joined	03:25
	→ oich joined	03:26
	← chachasmooth left	03:26
	→ chachasmooth joined	03:27
	→ zotherstupidguy joined	03:27
	← iota_pi left	03:27
	← astrofog left	03:28
	→ iota_pi joined	03:28
	jmckind → jmckind_	03:29
	← nnyk_ left	03:30
	→ whomp joined	03:31
	← modocache left	03:32
	← joufflu left	03:33
	→ joufflu joined	03:33
	→ modocache joined	03:34
	→ kadoban joined	03:34
	← jmckind_ left	03:35
	→ ezefarina joined	03:35
	← whomp left	03:36
	← pcre_ left	03:36
	← modocache left	03:38
	← spinning_ left	03:38
	→ jmckind joined	03:39
	← ezefarina left	03:39
	→ fishcooker joined	03:41
	← daito left	03:42
	→ silentz0r joined	03:44
	← rubyonrailed left	03:45
	→ colona joined	03:47
	← D-Boy left	03:47
	← Wetmelon left	03:47
	→ Wetmelon joined	03:48
	→ whomp joined	03:49
	→ Mobutils joined	03:50
	← bluezone left	03:51
	← MattMaker left	03:51
	→ mehola joined	03:55
	gitinfo set mode: +v	03:55
	← rodolfowtf left	03:56
	← oich left	03:57
	→ leksster joined	03:59
	← harish left	04:00
	→ noogler6_ joined	04:00
	→ jonmorehouse joined	04:01
	← jagob left	04:02
	← aidalgol left	04:02
	→ floatingpoint joined	04:03
milki	BooK_: if you are compiling, that has nothing to do with git config. i mean compilation configuration	04:03
	BooK_: some of it is autodetected	04:03
	← noogler67 left	04:03
	← mizu_no_oto left	04:04
	→ D-Boy joined	04:04
	→ daito joined	04:06
	← xelxebar left	04:07
	← flavi0 left	04:08
	→ Dougie187 joined	04:09
	← jmckind left	04:09
	→ modocache joined	04:10
	→ harish joined	04:12
	→ jottr joined	04:13
	→ moL-Ou joined	04:13
	→ jetpack_joe joined	04:13
	← jottr_ left	04:15
	→ howdoi joined	04:16
	→ e01 joined	04:17
	→ a_thakur joined	04:17
	← waspinator left	04:21
	← noogler6_ left	04:21
	← e01 left	04:21
	→ noogler67 joined	04:21
	→ bronson joined	04:22
	← jetpack_joe left	04:23
	→ jetpack_joe joined	04:24
	← jetpack_joe left	04:24
	→ ramsub07 joined	04:24
	→ jetpack_joe joined	04:25
	→ rodolfowtf joined	04:26
	← bronson left	04:28
Wetmelon	Has anyone used GitKraken?	04:28
	← Dougie187 left	04:29
	← jason237 left	04:29
	→ watabou joined	04:31
	→ dsantiago joined	04:36
toothe	I don't understand git rebase...	04:37
thiago	it's very simple	04:37
	← presto left	04:37
toothe	please explain...	04:37
	← modocache left	04:37
thiago	sure	04:38
	→ MattMaker joined	04:38
thiago	it takes the patches, then applies them over the new base	04:38
	← robbyoconnor left	04:39
	← hfp left	04:39
	→ spinningarrow joined	04:39
toothe	so, that's the same as git pull?	04:39
	→ nnyk_ joined	04:39
thiago	no	04:39
	git pull = git fetch + git merge	04:39
	→ jmckind joined	04:39
thiago	git pull --rebase = git fetch + git rebase	04:39
	you can compare git rebase to git merge	04:40
toothe	so, it does the fetch and then...	04:40
	→ MutantMahesh joined	04:40
	← njbair left	04:40
thiago	merge	04:40
toothe	ahh...	04:40
	okay	04:40
	i think I understand...	04:40
	← spinningarrow left	04:43
	→ jonesinator joined	04:46
	→ njbair joined	04:48
	← njbair left	04:49
	→ njbair joined	04:49
	← kermit left	04:51
	← spock left	04:53
	← ToBeCloud left	04:54
	→ spock joined	04:54
	← fscala left	04:54
	spock → Guest4647	04:54
	← Rodya_ left	04:55
	→ Rodya_ joined	04:55
	→ fscala joined	04:56
	← Silenced left	04:56
	→ jagob joined	04:57
	← rodolfowtf left	04:57
	→ nazareno joined	04:57
	← rMdes left	05:00
	← daito left	05:00
	→ nevodka joined	05:00
	← nazareno left	05:01
	→ josuebrunel joined	05:01
	← PtxDK left	05:05
	→ daito joined	05:05
	→ PtxDK joined	05:05
	→ zivester joined	05:06
	← a_thakur left	05:07
	→ cdg joined	05:08
	← lindenle left	05:09
	→ cyan__ joined	05:09
	→ rscata joined	05:10
	← diogenese left	05:11
	← MutantMahesh left	05:11
	→ MutantMahesh joined	05:15
	→ AfroThundr joined	05:15
	← r_rios left	05:15
	→ r_rios joined	05:15
	→ diogenese joined	05:17
	→ kermit joined	05:18
	← Mobutils left	05:18
	← ramsub07 left	05:19
	→ Manikandan joined	05:20
	← cdg left	05:21
	← mase-tech left	05:21
	← sdothum left	05:22
	← joufflu left	05:22
	→ spinningarrow joined	05:26
	← Rodya_ left	05:27
	→ Mobutils joined	05:29
	← eletuchy left	05:29
	← MattMaker left	05:29
	→ jason237 joined	05:30
	→ d4rklit3 joined	05:30
	← a3Dman left	05:31
	→ eletuchy joined	05:31
	← eletuchy left	05:31
	← HelloComputer15 left	05:33
	← nnyk_ left	05:33
	→ Rodya_ joined	05:35
	→ a3Dman joined	05:36
	→ a_thakur joined	05:36
	← whomp left	05:37
	← Gege left	05:37
	→ whomp joined	05:38
	← Mobutils left	05:39
	← Rodya_ left	05:41
	→ boopathi joined	05:42
	← Cabanossi left	05:43
	← whomp left	05:43
	→ Gege joined	05:45
	→ Cabanossi joined	05:45
	→ robbyoconnor joined	05:45
	→ LeeXiaolan joined	05:45
	← LeeXiaolan left	05:46
	→ dinesh_ joined	05:47
	→ andrew__ joined	05:49
	→ mohabaks joined	05:49
	→ freimatz joined	05:49
	← NwS left	05:49
	→ NwS joined	05:50
	→ boopathi_ joined	05:50
	← elementalest left	05:51
	← nevodka left	05:51
	← andrew_ left	05:52
	→ elementalest joined	05:52
	← elementalest left	05:52
	→ elementalest joined	05:52
	← boopathi left	05:52
	← josuebrunel left	05:53
	← dinesh_ left	05:54
	→ dinesh_ joined	05:54
	→ Silenced joined	05:55
	← Silenced left	05:55
	→ Silenced joined	05:55
	→ dinesh__ joined	05:55
	→ roygbiv joined	05:55
	→ whomp joined	05:56
	← roygbiv left	05:57
	← Sleepy63 left	05:58
	→ eletuchy joined	05:58
	→ citizen-stig joined	05:58
	← jmckind left	05:59
	→ dineshp joined	06:00
	← dinesh__ left	06:00
	← whomp left	06:01
	→ daito_ joined	06:01
	← tpollard left	06:01
	← dinesh_ left	06:02
	← eletuchy left	06:02
	← dineshp left	06:03
	→ dineshp joined	06:03
	← citizen-stig left	06:03
	← dineshp left	06:04
	→ Rodya_ joined	06:04
	→ dineshp joined	06:04
	← dineshp left	06:04
	→ dineshp joined	06:05
	← daito left	06:05
	→ e01 joined	06:05
	← e01 left	06:05
	→ e01 joined	06:05
	← tantom left	06:05
	← dineshp left	06:05
	→ dineshp joined	06:06
	→ whomp joined	06:06
	← Rodya_ left	06:08
	← dineshp left	06:08
	→ dineshp joined	06:08
	→ oich joined	06:09
	→ lindenle joined	06:09
	← e01 left	06:09
	→ Rodya_ joined	06:10
	→ akagr joined	06:10
	← dineshp left	06:10
	→ `steph joined	06:10
	→ nnyk_ joined	06:10
	→ dineshp joined	06:10
	← whomp left	06:11
`steph	i want to dl and install git bash	06:11
	← arooni left	06:11
`steph	is there a working link ...not having any luck with https://git-scm.com/download/win	06:11
thiago	what's the issue with that?	06:12
_ikke_	`steph: works for me	06:12
dineshp	the link is working	06:12
	→ whomp joined	06:12
thiago	three people confirm the link works	06:12
`steph	wonder why it doesn't work for me	06:12
	hmmm	06:12
_ikke_	Direct link: https://github.com/git-for-windows/git/releases/download/v2.7.2.windows.1/Git-2.7.2-32-bit.exe	06:13
	Do you have noscript running?	06:13
	← dsdeiz left	06:13
	← lindenle left	06:14
`steph	hmm	06:14
	lemme try a different browser	06:14
	ok it didnt work for my opera browser	06:15
dineshp	what is the error message that you are getting?	06:15
`steph	but it worked for my chrome browser	06:15
	← PryMar56 left	06:15
	← dreiss left	06:15
`steph	that's the thing no error message just that the download stayed at 0%	06:16
	→ vincent42 joined	06:17
`steph	i just want to get the git bash and nothing else	06:17
	← floatingpoint left	06:17
	→ bronson joined	06:17
	← boopathi_ left	06:19
	→ nevodka joined	06:19
morfin	hmm git allows merging of branch with itself	06:20
	when diverged	06:20
	← Rodya_ left	06:21
	← Lyqyd left	06:21
	← bronson left	06:22
	← whomp left	06:22
	→ dinesh_ joined	06:22
	← strayPuppy left	06:22
`steph	i have github already installed	06:22
	→ Rodya_ joined	06:22
`steph	and the git shell which from what i understand is only powershell not bash	06:23
	so i need git bash to customize virtualenv and virutalenvwrapper	06:23
kadoban	morfin: Yes. That's not merging a branch with itself, that's two separate branches.	06:25
	← jottr left	06:25
	→ muthu joined	06:26
	← dineshp left	06:26
	→ Alienpruts joined	06:29
	justanot1eruser → justanotheruser	06:30
	← ChocoBar left	06:30
	→ z8z joined	06:31
	→ dreiss joined	06:31
	← dinesh_ left	06:32
	→ dineshp joined	06:32
	← sparetire left	06:33
	→ SimonNa joined	06:33
	← dineshp left	06:33
	→ dineshp joined	06:33
	← sangy left	06:35
	← k-man left	06:35
	→ choki joined	06:37
	← spinningarrow left	06:37
	← jagob left	06:37
	← Alienpruts left	06:38
	→ whomp joined	06:39
	→ jagob joined	06:39
	← RudolphFenz left	06:41
	→ Alienpruts joined	06:41
	← whomp left	06:43
	← mohabaks left	06:44
	← safe left	06:44
	→ ThomasLocke joined	06:45
	← Wetmelon left	06:47
morfin	2 branches with same name	06:47
	← kam270 left	06:47
	← choki left	06:49
	← kadoban left	06:50
	→ tvw joined	06:50
	← Rodya_ left	06:50
	← sea-gull- left	06:51
	→ sea-gull joined	06:52
	→ intrigueD joined	06:52
	← silentz0r left	06:53
	← dineshp left	06:54
	→ meadmoon joined	06:54
	→ daito joined	06:56
	← meadmoon left	06:57
	→ heroux joined	06:57
	→ eletuchy joined	06:59
	← daito_ left	07:00
	→ whomp joined	07:00
	→ tHEMtZ joined	07:02
	← weox left	07:03
	← whomp left	07:04
	→ radsy joined	07:05
	→ e01 joined	07:06
	← freimatz left	07:07
	← jetpack_joe left	07:07
	← WayToDoor left	07:07
	← robbyoconnor left	07:07
	← eletuchy left	07:08
	← boombatower left	07:09
	← daito left	07:09
	→ whomp joined	07:10
	← e01 left	07:11
	→ zeroed joined	07:11
	← zeroed left	07:11
	→ zeroed joined	07:11
	→ Fijit joined	07:13
	← jonmorehouse left	07:14
	→ mwhooker joined	07:15
	→ daito joined	07:15
	→ lb joined	07:17
	← intrigueD left	07:18
	← Puhe left	07:19
	→ acolson joined	07:19
	← whomp left	07:20
	→ wilsoncd35 joined	07:20
	→ roelmonnens joined	07:20
	← Alienpruts left	07:21
	→ e01 joined	07:22
BooK_	milki: ok, thanks for clarifying. is the autodetected compilation configuration stored somewhere?	07:23
	I've noted GIT-CFLAGS, for example	07:23
	→ freimatz joined	07:24
	→ wwwald joined	07:24
	← nilg left	07:24
	← samw left	07:27
	→ lamppid joined	07:27
	← Gitzilla_ left	07:27
	← radsy left	07:28
	→ nilg joined	07:28
	← hahuang65 left	07:29
	→ Wetmelon joined	07:30
	← harish left	07:30
	→ samw joined	07:31
	← clemf left	07:32
	→ eijk joined	07:33
	← mwhooker left	07:33
	← zeroed left	07:33
	→ zeroed joined	07:35
	← zeroed left	07:35
	← samw left	07:35
	→ zeroed joined	07:35
	← zeroed left	07:35
	→ zeroed joined	07:35
	← zeroed left	07:37
	← skapunker left	07:37
	← witquicked left	07:37
	→ skapunker joined	07:38
	→ hahuang65 joined	07:38
	→ Sceorem joined	07:38
	→ Alienpruts joined	07:38
	→ robbyoconnor joined	07:38
	← ShapeShifter499 left	07:41
	→ smithbone_ joined	07:42
	← mehola left	07:43
	→ mehola joined	07:43
	← armyriad left	07:43
	← mehola left	07:44
`steph	my installer is stuck at "Please wait while Setup Installs Git on Your Computer"	07:44
	→ PaulCape_ joined	07:44
	→ pantsman- joined	07:44
`steph	been stuck here for one hour now	07:44
	← fstd left	07:44
	← smithbone left	07:44
	→ fstd joined	07:44
	← fstd left	07:44
	→ fstd joined	07:44
	← ahel left	07:44
	← PaulCapestany left	07:45
	→ ahel joined	07:46
`steph	just hit the end process button	07:46
	what a shame	07:46
	← robbyoconnor left	07:46
	→ robbyoconnor joined	07:46
	← robbyoconnor left	07:47
	→ citizen-stig joined	07:48
	→ robbyoconnor joined	07:48
	← lamppid left	07:48
	→ Sleepy63 joined	07:48
	→ samw joined	07:49
	→ jonmorehouse joined	07:52
	← citizen-stig left	07:52
	← samw left	07:53
heftig	do unannotated tags point directly to commits?	07:54
	→ lamppid joined	07:54
Seveas	yes	07:54
	or trees or blobs	07:55
heftig	I noticed tags can be put on those	07:55
	any reason to?	07:55
	← Silenced left	07:56
	→ PHPanos joined	07:56
Seveas	the last non-git version of linux was imported later and its tree was tagged	07:58
	gig.git has junio's public key as an object that does not exist in history but is tagged	07:59
	→ dan2k3k4 joined	08:00
	← pantsman- left	08:00
	→ afuentes joined	08:00
	→ David1977 joined	08:01
	← PHPanos left	08:01
	→ atmosx joined	08:01
	← MutantMahesh left	08:03
	→ astrofog joined	08:03
	← mylord left	08:04
	→ emPi joined	08:05
_ikke_	Seveas++	08:06
`steph	ok uninstalling Git for Windows	08:07
	turned out to be a bad idea	08:07
	← robbyoconnor left	08:08
	← noogler67 left	08:08
	→ fwdit joined	08:08
	→ robbyoconnor joined	08:08
	← robbyoconnor left	08:09
	→ eletuchy joined	08:09
	← PaulCape_ left	08:09
	→ neohe_ joined	08:09
	← e01 left	08:09
	← thiago left	08:09
	→ TomyWork joined	08:09
	→ MutantMahesh joined	08:09
	→ PaulCapestany joined	08:09
	← a3Dman left	08:10
	← pks- left	08:10
	← eletuchy left	08:11
	→ citizen-stig joined	08:12
	← Gamecubic left	08:12
	→ harish joined	08:12
	← rasto left	08:14
	← a_thakur left	08:14
	→ rasto joined	08:15
	→ mohabaks joined	08:16
	→ pks_ joined	08:16
	← citizen-stig left	08:17
	← d4rklit3 left	08:17
	← MeltedLux left	08:18
	→ MeltedLux joined	08:19
	→ madebymarkca joined	08:19
	→ JeroenT joined	08:19
	← MutantMahesh left	08:20
	← dreiss left	08:20
	pks_ → pks	08:21
	→ bronson joined	08:23
	→ Silenced joined	08:24
	← Silenced left	08:24
	→ Silenced joined	08:24
	→ xbob joined	08:24
	→ _0xAX joined	08:24
	→ Balliad joined	08:25
	← `steph left	08:25
	→ WayToDoor joined	08:27
	→ fracting joined	08:27
	→ fees joined	08:27
	← watabou left	08:28
	← acolson left	08:28
	→ Raging_Hog joined	08:28
	← bronson left	08:29
	← neohe_ left	08:29
	→ eletuchy joined	08:30
	→ neohe joined	08:30
	← stonerfish left	08:31
	← Wetmelon left	08:32
	→ a_thakur joined	08:33
	← Fijit left	08:33
	← Raging_Hog left	08:34
	→ Hounddog joined	08:34
	← nnyk_ left	08:34
	→ jceb joined	08:34
	← jaafar left	08:35
	→ a3Dman joined	08:35
	→ ramsub07 joined	08:35
	← fracting left	08:36
	→ josuebrunel joined	08:38
	← Silenced left	08:39
	→ Gonzo89 joined	08:41
	→ _noblegas joined	08:42
	→ hahuang61 joined	08:42
	→ permalac joined	08:42
	← permalac left	08:42
	← JeroenT left	08:42
	→ Silenced joined	08:43
	← Silenced left	08:43
	→ Silenced joined	08:43
	← hahuang65 left	08:44
	← xanadu_ left	08:44
	→ dantix_ joined	08:46
	→ nikitasius joined	08:48
	← henbruas left	08:48
i7c	$sentenceWithWindows turned out to be a bad idea ;)	08:49
	← jonmorehouse left	08:49
	← akagr left	08:49
	→ mahendra_ joined	08:50
	← ericvw left	08:52
	→ nnyk_ joined	08:53
	← Goplat left	08:55
	→ Borkr joined	08:57
	← abh left	08:58
	→ abh joined	08:58
	← jceb left	08:58
	→ bongjovi joined	09:00
	→ permalac joined	09:00
	→ JeroenT joined	09:04
	→ wwwald_ joined	09:05
	→ mwhooker joined	09:05
	→ citizen-stig joined	09:07
	← otho left	09:07
	← ToxicFrog left	09:08
	→ Xatenev joined	09:09
	← wwwald left	09:09
Xatenev	hello	09:09
	→ _pix joined	09:09
Xatenev	how do I search for a text in all commit messages ever made?	09:09
	← pks left	09:09
Xatenev	Like for exmaple I wanna search a commit with 'Database' in the commit message	09:09
_ikke_	git log --grep	09:10
Xatenev	non case sensitive	09:10
	thank you _ikke_	09:10
jast	-i	09:10
	← cyan__ left	09:11
	← roknir left	09:11
Xatenev	=)	09:11
	← joki left	09:12
	← harish left	09:12
	→ troulouliou_div2 joined	09:12
Xatenev	Sorry, last question	09:13
	git log --grep:'PL-121' -i doesnt work	09:13
	how do I make - work?	09:13
	→ jceb joined	09:13
Xatenev	LOl whatever	09:14
	im dumb	09:14
jast	no comment ;)	09:14
	← ramsub07 left	09:15
	→ MutantMahesh joined	09:16
	→ ferr joined	09:17
	← Silenced left	09:17
	→ joki joined	09:18
	→ ToxicFrog joined	09:18
	→ Raging_Hog joined	09:18
	← JeroenT left	09:21
	→ JeroenT joined	09:21
	→ Silenced joined	09:23
	← Silenced left	09:23
	→ Silenced joined	09:23
	→ arjun_ joined	09:23
	→ MadHatter42 joined	09:23
	→ kurkale6ka joined	09:24
	→ clmsy joined	09:24
	→ mehola joined	09:24
	← eletuchy left	09:25
	→ dhilipsiva joined	09:25
	← MotoNyan left	09:26
mryanbrown	theres a gitproject i want to work on, but modify its name and file structure but still contribute file changes, how do i do that	09:26
	→ aviraldg joined	09:26
	→ nuge joined	09:27
	← Xatenev left	09:27
	→ Moto-chan joined	09:27
	← Tanger left	09:28
	← daito left	09:28
	→ daito joined	09:29
	← clmsy left	09:30
	→ daito_ joined	09:30
	← mehola left	09:30
	→ clmsy joined	09:31
	← daito left	09:34
	→ dsdeiz joined	09:37
	← dsdeiz left	09:37
	→ dsdeiz joined	09:37
	→ Gitzilla joined	09:37
	← astrofog left	09:37
	← jceb left	09:38
	Vampire0_ → Vampire0	09:38
Vampire0	mryanbrown, I'd suggest creating a branch from upstream, port over the changes you made in your changed structure and then contribute from that branch	09:39
	← dan2k3k4 left	09:42
	→ pwnz0r joined	09:45
sig	how's http://www.gitkraken.com/ vs sourcetreeapp	09:45
	→ net4all joined	09:45
net4all	so, I need to build git, can git do out of source builds?	09:46
	← dantix_ left	09:47
	→ dantix__ joined	09:47
	→ roknir joined	09:47
	← reim left	09:47
	← jagob left	09:48
pwnz0r	net4all: what? your question makes no sense	09:49
	← mohabaks left	09:49
	→ settermjd joined	09:50
	→ jceb joined	09:51
	→ dan2k3k4 joined	09:51
net4all	pwnz0r: can git be built outside its sourcecode directory?	09:51
dcpc007	can git follow simlinks	09:51
BlessJah	is there way to find out recursive size of treeish? a.k.a. someone commited large files long time ago, now I want to find out	09:52
dcpc007	i use etckeeper for the /etc, but a specific soft use /opt/soft/etc/ to keep its configs ...	09:52
pwnz0r	i am not sure	09:52
	→ thomas_d joined	09:52
pwnz0r	why do you need to build git?	09:52
dcpc007	i would create a link /etc/soft/	09:52
	← Gitzilla left	09:52
thomas_d	hey I want to use the git cmd to browse dirs/files in a remote branch. Do I want ls-remote or ls-files or...?	09:53
	I've looked at the --help for both and can't really discern, lol...	09:53
net4all	pwnz0r: i have infrastructure that is ancient (2003) and cannot be modified. so i have to build many things from source :/	09:53
BlessJah	dcpc007: git stores symlinks as symlinks, I guess you want it to dereference symlinks?	09:53
pwnz0r	ahh ic that poses an issue for sur	09:53
dcpc007	want to version the files inside the folder	09:54
	→ e01 joined	09:54
osse	net4all: you can use a shadowdir	09:54
	→ shaggycat joined	09:54
	→ bumbar_ joined	09:54
pwnz0r	so you basically want a version of git on the host, that is not installed to the system dirs?	09:54
osse	net4all: aka "poor man's out-of-source build"	09:54
net4all	pwnz0r: yes. and I have to build git many times (crosscompile) so I wanted to keep the sourcedir clean.	09:55
Vampire0	dcpc007, why not the other way round? Move the files to /etc/soft where they belong and then create a symlink from /opt/soft/etc to /etc/soft. Then you have no trouble with etckeeper	09:56
Seveas	dcpc007: git will store symlinks as is and has no option to dereference them.	09:56
dcpc007	think about this, but, i fear that next update overwrite them ..	09:56
net4all	osse: thanx, but then I have to get rake/ruby :)	09:57
osse	net4all: why?	09:57
net4all	i think i will just copy the directory for each build	09:57
osse	net4all: what I had in mind is using lndir.rake or ruby has nothing to do with it	09:57
thomas_d	Can anybody hear me?	09:58
	← e01 left	09:59
	→ ploopkazoo joined	09:59
net4all	osse: oh, google misled me. i will look at lndir. thx!	09:59
	→ LucaTM joined	09:59
osse	thomas_d: no	10:00
	thomas_d: you want ls-tree	10:00
thomas_d	Ah, ty! :)	10:00
	→ fracting joined	10:01
Vampire0	dcpc007, depends on whether it replaces the directory or the files in it. But it could be that you have to re-create the symlink, yes. But actually I doubt it, because it is a configuration directory, so an update should not replace the whole directory as there could be user-made changes	10:01
osse	net4all: mkdir buildir; cd builddir; lndir ../git; make; rejoice	10:01
	"command not found: rejoice" :'(	10:02
	← M3mphiZ left	10:03
dcpc007	Vampire0: i hope :) but you don't know what proprietary software are able to do :)	10:03
	and not respect any basic rules	10:03
Vampire0	dcpc007, well yes, you just have to try	10:03
	dcpc007, but you will probably have no other choice than doing it that way	10:04
	→ Gitzilla joined	10:04
Vampire0	dcpc007, git stores symlinks as symlinks and afaik you cannot tell it to dereference them	10:04
	dcpc007, otherwise a checkout would not restore the original state	10:04
dcpc007	yep, or find how to create a 2nd etckeeper process for another directory	10:04
Vampire0	dcpc007, yes, that could also work if possible	10:05
dcpc007	or create a real git standalone with personnal crontab script to autocommit ...	10:05
osse	net4all: it even works	10:05
	← roelmonnens left	10:06
	→ reim joined	10:06
	← wwwald_ left	10:06
	→ roelmonnens joined	10:06
	← madebymarkca left	10:06
Vampire0	dcpc007, yes, also possible. Maybe even better. You can use etckeeper in an arbitrary directory, but I guess it will not be triggered to commit like the standard etckeeper	10:06
	dcpc007, I personally would move the files to /etc and symlink them as I like my configuration files to be where they belong :-)	10:07
	→ wwwald joined	10:07
dcpc007	ok, will try, need a post-it to remember check auto update to see when system update modify those files and check ... hope not in 6 months	10:08
	← fbwnd left	10:08
Vampire0	dcpc007, if this software is new for you, just try it. Uninstall it, install an older version, move and link the files and then update :-)	10:09
dcpc007	1st version installed :)	10:09
	don't know when i'll get a newer	10:09
	→ PCatinean joined	10:09
dcpc007	i'll see	10:09
	thx for help	10:09
Vampire0	yw	10:10
	→ e01 joined	10:10
	← e01 left	10:10
	→ e01 joined	10:10
	← SimonNa left	10:11
	→ aard_ joined	10:12
	← JeroenT left	10:15
	← e01 left	10:15
	→ gechr joined	10:15
	→ sbasso joined	10:15
	← Hounddog left	10:17
	→ Jellyg00se joined	10:17
	→ notebox joined	10:18
	→ JeroenT joined	10:18
	→ senny joined	10:20
	← citizen-stig left	10:20
	← reim left	10:20
	← senny left	10:21
	→ weox joined	10:22
	→ dpower joined	10:22
	→ akagr joined	10:22
	← arjun_ left	10:23
	→ ErKa joined	10:23
	→ fbwnd joined	10:23
	→ Anticom joined	10:24
Anticom	Hi all. When i do `git log` in a submodule, it exits with code 141 (I'm using Git 1.9.1)	10:25
	Any clues, what 141 is?	10:25
	→ arup_r joined	10:25
	← jceb left	10:25
	→ youser joined	10:26
	→ bronson joined	10:26
gitinfo	This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person, but please do it via private message to avoid mass highlighting people.	10:27
arup_r	Hi, I created a feature branch, and committed it with a message. Then made a PR in Gitlab with master branch. After doing this all, I realized my commit message is wrong. So I did `git commit --amend` and corrected the message. But now not able to push it furthur. https://gist.github.com/aruprakshit/4de1c6a871e0c98a1d1f	10:27
	what should I do ?	10:27
osse	Anticom: git-submodule died from SIGPIPE	10:27
	I mean git log I guess	10:27
	← aard_ left	10:28
Vampire0	Anticom, well, according to the source this should not happen g	10:30
	/* Should never happen, but just in case... */	10:30
	exit(141);	10:30
	→ reim joined	10:30
	← ToxicFrog left	10:30
osse	huh	10:30
arup_r	any help to me ?	10:31
	→ ToxicFrog joined	10:31
osse	arup_r: there is nothing you can do.	10:31
	arup_r: force-pushes have been denied server-side	10:31
	← bronson left	10:31
arup_r	ok, then close the merge and create a new one again ?	10:32
	← nnyk_ left	10:32
osse	arup_r: call the IT department and say "I am a grown adult who knows what I am doing. Please let me force-push"	10:32
	→ citizen-stig joined	10:32
osse	yes, that'll work too	10:32
arup_r	ok.. :)	10:32
	→ chll joined	10:32
	← JeroenT left	10:32
	→ M3mphiZ joined	10:33
	← M3mphiZ left	10:33
	→ M3mphiZ joined	10:33
	→ JeroenT joined	10:33
Anticom	Vampire0: I guess you where looking at write_or_die.c ?	10:33
	arup_r: may the force be with you	10:35
	→ mischat joined	10:35
arup_r	:/	10:35
Anticom	Not to confuse with may 4th we'll be with you	10:35
Vampire0	Anticom, exactly, the only place where 141 is used as exit code as far as I can see	10:35
Anticom	hm	10:36
	oh wells, guess it's just cosmetics	10:36
	← ToxicFrog left	10:37
	← reim left	10:37
	→ mischat_ joined	10:37
	→ jceb joined	10:39
	← mischat left	10:40
Vampire0	A broken pipe sounds like a plumbing problem :-D	10:41
Anticom	Time to call Mario?	10:42
	← nilsi left	10:43
	→ akagr_ joined	10:43
	← akagr left	10:44
Vampire0	Aaaaand Luigi	10:44
	→ ToxicFrog joined	10:44
	← ErKa left	10:45
	← arup_r left	10:47
	→ samw joined	10:47
	→ [gmi] joined	10:47
	← MutantMahesh left	10:47
	→ juanmont joined	10:47
	→ xanadu_ joined	10:48
	gitinfo set mode: +v	10:49
juanmont	hi	10:49
gitinfo	juanmont: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	10:49
	← subbero left	10:49
	→ flavi0 joined	10:50
	→ Fissure joined	10:51
	→ MutantMahesh joined	10:53
	→ henbruas joined	10:54
	→ reim joined	10:55
	← juanmont left	10:57
	→ nnyk_ joined	10:57
	→ rnsanchez joined	10:59
	← JeroenT left	10:59
	← samw left	10:59
	→ FunkyAss joined	11:02
	← MutantMahesh left	11:03
	← ykrons left	11:03
	→ samw joined	11:06
	← punto left	11:06
	← fbwnd left	11:06
	← ToxicFrog left	11:09
	→ fishcooker1 joined	11:10
	← chovy left	11:10
	→ JeroenT joined	11:11
	← fscala left	11:11
	← JeroenT left	11:11
	← daito_ left	11:12
	→ chovy joined	11:12
	→ pks_ joined	11:12
	pks_ → pks	11:12
	← troulouliou_div2 left	11:12
	← fishcooker left	11:12
	→ punto joined	11:12
	← a3Dman left	11:13
	→ fscala joined	11:13
	← samw left	11:14
	→ ToxicFrog joined	11:14
	← roelmonnens left	11:15
	→ MutantMahesh joined	11:16
	← Atm0spher1c left	11:16
	← youser left	11:18
	← M3mphiZ left	11:18
	→ sdothum joined	11:19
	→ nnyk joined	11:19
	← leeN left	11:20
	→ samw joined	11:20
	← nnyk_ left	11:21
	← kugel left	11:21
	→ whomp joined	11:23
	→ kugel_ joined	11:24
	← ToxicFrog left	11:24
	→ ToxicFrog joined	11:25
	→ fbwnd joined	11:25
	← David1977 left	11:25
	→ David1977\|2 joined	11:25
	→ nadare joined	11:26
	→ GT4066 joined	11:27
	→ wrouesnel1 joined	11:27
	← whomp left	11:28
	← samw left	11:28
	← kugel_ left	11:29
	→ a3Dman joined	11:31
	← GT4066 left	11:32
	← blackwind_123 left	11:33
	→ samw joined	11:34
	→ Junior joined	11:35
	→ Dyonisos joined	11:36
	← neohe left	11:37
	→ neohe joined	11:37
	→ nettoweb joined	11:38
	← tvw left	11:38
	← nettoweb left	11:40
	← BeerSerc1 left	11:40
	→ nettoweb joined	11:41
	→ BeerSerc joined	11:41
	← samw left	11:42
	→ kugel joined	11:43
	← kugel left	11:43
	→ kugel joined	11:43
	→ Sephyros joined	11:43
	→ e01 joined	11:44
	→ JeroenT joined	11:44
	← fbwnd left	11:45
	← xanadu_ left	11:46
	→ M3mphiZ joined	11:48
	→ samw joined	11:49
	← jceb left	11:49
	← zotherstupidguy left	11:49
	← e01 left	11:49
	← samw left	11:53
	← flavi0 left	11:53
	→ ghormoon joined	11:54
	→ Afforess joined	11:54
	← ghormoon left	11:55
	→ ghormoon joined	11:55
	→ Foren joined	11:57
r_rios	Could someone help?: https://stackoverflow.com/questions/35578708/merge-conflict-resolution-how-to-accept-all-remote-changes-except-the-ones-in-f	11:57
	← reim left	11:59
	← nevodka left	12:01
	← fahadash left	12:01
	→ nilsi joined	12:02
tobiasvl	r_rios: something like this? http://stackoverflow.com/a/7292109/176464	12:02
	r_rios: or, since it seems you want to just overwrite all your changes, checkout each file from v2 that you want from there, and merge the rest?	12:03
	→ jceb joined	12:03
	← Junior left	12:03
	← nadare left	12:04
r_rios	No, I actually want the opposite of that: I want to keep all my changes	12:06
	→ MutantMa_ joined	12:07
	→ harsh joined	12:07
	harsh → Guest18980	12:07
	← MutantMahesh left	12:07
r_rios	I want to update my project to v2 while keep the changes I've made	12:07
	← Guest18980 left	12:08
	[BNC]jackburton → jackburton	12:10
	→ youser joined	12:11
	→ lindenle joined	12:12
	← dan2k3k4 left	12:14
r_rios	tobiasvl: But the first link seems pretty helpful, thanks	12:15
	← lindenle left	12:16
	→ mezod joined	12:17
	→ samw joined	12:19
	→ reim joined	12:20
	→ rMdes joined	12:20
	→ codeman joined	12:20
	← codeman left	12:20
	← WayToDoor left	12:21
	→ codeman joined	12:21
	← nuge left	12:26
Stummi	how can I get a submodules git url via command line?	12:27
	→ mehola joined	12:28
cbreak	Stummi: git config lets you access the one in the config	12:28
	→ dan2k3k4 joined	12:28
	← samw left	12:28
	→ bronson joined	12:28
Stummi	hm, I don't think thats what I need	12:29
	→ subscope joined	12:30
	← Manikandan left	12:30
	← sbasso left	12:31
	← slappymcfry left	12:32
	← mehola left	12:32
Stummi	well, since I have only one submodule I could grep .gitmodules for "url = " and parse	12:33
	→ samw joined	12:33
	← bronson left	12:34
	← a_thakur left	12:34
	→ gechr_ joined	12:35
	← subopt left	12:35
	← gechr left	12:36
	← Sceorem left	12:36
cbreak	Stummi: but that's not the submodule URL	12:36
	← subscope left	12:36
	→ ash_workz joined	12:36
	→ subopt joined	12:36
osse	git -C path config remote.origin.fetch maybe ?	12:37
cbreak	it's the default URL that will be used to initialize the submodule from	12:37
	→ Lunatrius` joined	12:37
	→ LBV_User joined	12:37
	← AfroThundr left	12:37
	→ AfroThundr joined	12:38
	← AfroThundr left	12:38
	← samw left	12:38
Stummi	osse, I have to do git submodule init and git submodule update before this, do I?	12:38
osse	man git-sub	12:38
	oops	12:38
	→ mflow joined	12:38
	← mflow left	12:38
	→ mflow joined	12:39
Stummi	already looked there (assuming you mean git submodules) but couldn't find anything helpful	12:39
osse	I was typing it for myself without looking at the screen.. .:/	12:39
Stummi	heh, okay	12:40
osse	Stummi: git config -f .gitmodules submodule."$name".url	12:40
	← neohe left	12:40
	→ UrsoBranco joined	12:40
	← JeroenT left	12:40
	← Lunatrius left	12:40
	Lunatrius` → Lunatrius	12:40
	→ harish_ joined	12:41
osse	this is literally the code used by git-submodule to copy the url info from .gitmodules to .git/config	12:41
	→ neohe joined	12:42
	← neohe left	12:42
	→ neohe joined	12:42
	→ gmichael joined	12:43
	→ sgambino joined	12:43
	← sgambino left	12:43
	→ subscope joined	12:43
	→ dstarh joined	12:44
	← subscope left	12:44
	→ JeroenT joined	12:45
	← nydel07 left	12:46
	→ subscope joined	12:46
	← atmosx left	12:46
	← andrew__ left	12:47
	← dsdeiz left	12:47
	→ samw joined	12:48
	← jeffreylevesque left	12:49
	← [gmi] left	12:50
	→ Eryn_1983_FL joined	12:51
Eryn_1983_FL	hi peeps	12:51
osse	Hi Erin from Florida, b. 1983	12:51
	I mean Eryn	12:51
Eryn_1983_FL	how do i add remote origin to a repoitory i already have in dir locally	12:52
osse	git remote add origin <URL>	12:52
Eryn_1983_FL	ahhh	12:52
	← samw left	12:52
BlessJah	is it possible to get list of changed files between two hashes without need for cloning repository?	12:53
	→ subbero joined	12:54
	→ pwnz0r_ joined	12:54
	← pwnz0r_ left	12:54
	← subbero left	12:54
	→ nydel07 joined	12:54
	← pwnz0r left	12:55
	→ pwnz0r joined	12:55
	← eka left	12:56
	→ MutantMahesh joined	12:56
	← MutantMa_ left	12:57
	→ samw joined	12:57
	← mmlb left	12:58
	← fstd left	12:59
	→ fstd joined	12:59
	→ Sceorem joined	13:00
Vampire0	BlessJah, you mean for a remote repository, also without any web frontend available, just a remote bare repository to which you also cannot SSH into the box?	13:01
	← gtristan left	13:01
	→ eka joined	13:02
	→ ezefarina joined	13:02
	→ daito joined	13:03
	→ synthroid joined	13:04
	→ liamonade joined	13:04
	→ neohe_ joined	13:05
BlessJah	yep	13:05
	→ wwwald_ joined	13:05
	← jceb left	13:05
	→ mizu_no_oto joined	13:05
	← samw left	13:05
	→ _wwwald_ joined	13:06
	← daito left	13:07
	→ johnmilton joined	13:07
	← neohe left	13:07
	← dantix__ left	13:07
	← JeroenT left	13:08
	← cagedwisdom left	13:08
	← wwwald left	13:08
	→ JeroenT joined	13:08
	← de-vri-es left	13:08
	← johnmilton left	13:08
	→ ywecur_ joined	13:09
	→ johnmilton joined	13:09
	→ mischat joined	13:09
	→ dantix__ joined	13:09
	← wwwald_ left	13:10
	→ ManicPanic joined	13:10
	→ de-vri-es joined	13:11
	← DonVitoCorleone left	13:11
	→ samw joined	13:12
ManicPanic	i want to delete all application files and directories, but there is one important directory i want to stay untouched. How do i do that ?	13:12
	→ Puhe joined	13:12
	← mischat_ left	13:13
	← dantix__ left	13:13
	→ dsdeiz joined	13:13
	→ DonVitoCorleone joined	13:13
	→ rwb joined	13:13
	→ dantix__ joined	13:14
i7c	Is that a git question?	13:14
selckin	commit the directory? :)	13:14
	← pwnz0r left	13:15
i7c	BlessJah, not with git, afaik.	13:16
	→ e01_ joined	13:16
i7c	git's remote abilities are quite limited.	13:16
ManicPanic	git rm -r * will delete all app files . I want to keep one directory	13:17
	← JeroenT left	13:17
	→ sbasso joined	13:17
i7c	You will have to use a more limiting pattern.	13:17
selckin	just do it, echo *; copy paste it, or mv it out the way and then back, just do it	13:17
BlessJah	i7c: I hoped someone would know some obscure plumming way of retrieving list of files available on two branches :/	13:18
	→ jceb joined	13:18
osse	ManicPanic: git rm -r '.' ':!onedirectory'	13:18
i7c	BlessJah, if you have local repo I know a way. ;)	13:19
ManicPanic	osse: is that command legal ?	13:19
osse	do you question my authority ?	13:19
	yes it's legal	13:20
	but it won't work with ancient gits	13:20
	→ JeroenT joined	13:20
i7c	Are we putting space before question marks again ?	13:20
ManicPanic	osse: ok i see	13:20
	← e01_ left	13:20
BlessJah	i7c: it's just diff --name-only, the thing is I dont want CI to clone/fetch just to see some diff	13:20
i7c	Well git can't do that. You will have to fetch.	13:22
	← tristanp_ left	13:22
	→ xanadu_ joined	13:22
grawity	how is git supposed to generate a diff from something it hasn't downloaded yet, anyway?	13:22
osse	by asking the remote repository for it	13:23
	git diff-remote \o/	13:23
	← JeroenT left	13:23
	→ jeffreylevesque joined	13:23
Vampire0	BlessJah, afaik you can only list the refs alongside with their sha from a remote repo	13:24
	← samw left	13:25
BlessJah	won't work	13:25
	← bongjovi left	13:25
BlessJah	thanks anyway	13:25
osse	would be nice with some sort of git remote exec that would exec read-only stuff on the remote, such as diff, log etc.	13:26
	(by default disabled, heh)	13:26
Vampire0	yehaw, built-in DOS attack :-D	13:26
	→ JeroenT joined	13:26
i7c	That's not how a distributed system works by putting load on some remote. :p	13:27
osse	i7c: a diff like that probably puts less load on the remote than clone :p	13:28
	→ wwwald joined	13:28
	→ tristanp joined	13:28
i7c	well second time it'd be a fetch	13:28
grawity	not if the clone just reuses a stored packfile	13:28
i7c	not a clone	13:28
	→ mehola joined	13:28
osse	is sending packfile less intensive than a diff?	13:29
	Maybe	13:30
	→ samw joined	13:30
osse	Anyway, I think it could bea useful feature	13:30
	← moL-Ou left	13:30
	← _wwwald_ left	13:30
	← eijk left	13:31
	→ jottr joined	13:31
	← MutantMahesh left	13:32
	← mehola left	13:33
	→ ErKa joined	13:35
	→ aclearman037 joined	13:35
	← fishcooker1 left	13:36
	← eka left	13:38
	← reim left	13:39
	← jason237 left	13:39
	← clmsy left	13:39
	→ leeN joined	13:40
	← Puhe left	13:40
	← samw left	13:40
	→ clmsy joined	13:41
	→ jason237 joined	13:42
	→ fmcgeough joined	13:42
	→ bongjovi joined	13:43
	→ DolphinDream joined	13:43
	← akagr_ left	13:43
	← mezod left	13:43
	→ flavi0 joined	13:43
	← aclearman037 left	13:44
	→ aclearman037 joined	13:44
	← neohe_ left	13:45
	← settermjd left	13:45
	→ eka joined	13:45
	→ neohe joined	13:45
	→ samw joined	13:45
	→ raijin joined	13:45
	← z8z left	13:46
	← dhilipsiva left	13:46
	→ wwwald_ joined	13:47
	→ rasguanabana joined	13:48
	← wwwald left	13:50
	← eka left	13:50
	← henbruas left	13:52
	→ ck_mfc joined	13:52
	← dstarh left	13:53
	← samw left	13:53
	→ livingstn joined	13:56
	← Silenced left	13:56
	← fwdit left	13:56
	← mizu_no_oto left	13:56
	→ eka joined	13:57
	← ywecur_ left	13:57
	← notebox left	13:58
	← tristanseifert left	13:59
	→ samw joined	14:00
	← rscata left	14:00
	← bsanford left	14:01
	← Borkr left	14:04
	← sbasso left	14:04
	← jceb left	14:04
	→ shiriru joined	14:05
	→ sbasso joined	14:05
	→ jceb joined	14:05
	← doppo left	14:07
	← samw left	14:07
	→ doppo joined	14:08
	→ cdg joined	14:09
	→ mizu_no_oto joined	14:09
	← cdg left	14:09
	→ cdg joined	14:09
	→ oxsyn joined	14:10
	→ mezod joined	14:11
	→ GT4066 joined	14:11
	← zivester left	14:11
	→ jimi_ joined	14:12
	→ mylord joined	14:14
	→ samw joined	14:14
	→ eletuchy joined	14:14
	← liamonade left	14:14
	→ bsanford joined	14:16
	← ManicPanic left	14:16
	→ Junior joined	14:17
	→ happy-dude joined	14:18
	← eletuchy left	14:18
	→ liamonade joined	14:18
	→ ays joined	14:19
ays	how do I revert changes with git?	14:19
	← subscope left	14:20
	gitinfo set mode: +v	14:20
Vampire0	ays, man git revert	14:21
gitinfo	ays: the git-revert manpage is available at http://jk.gs/git-revert.html	14:21
	→ sanketdg joined	14:22
rasguanabana	Hello. I have a strange problem. I'm trying to checkout to a remote branch, but git checkout gives no output and stays on the current branch. echo $? prints 0. Is this a normal behaviour?	14:22
	→ sgambino joined	14:23
	← liamonade left	14:24
canton7	rasguanabana, what exactly do you mean by "checkout to a remote branch"?	14:24
	that's not a phrase which is in common git usage :P	14:24
	→ liamonade joined	14:25
	→ cek joined	14:25
	→ subhojit777 joined	14:25
	→ reim joined	14:25
cek	how do i create an empty commit and reference a file?	14:26
grawity	depends on what you really meant by "referencing a file" here	14:26
Vampire0	or empty commit :-D	14:26
grawity	well empty commit is clear	14:26
	but empty commit combined with additional requirements isn't	14:26
	since that wouldn't really be an empty commit anymore	14:26
cek	commit with a mesasge, so that git log file, would output that commit	14:26
grawity	can't do that	14:27
	← samw left	14:27
cek	git sucks!	14:27
grawity	no u	14:27
cek	i too	14:27
	but git	14:27
canton7	cek, not sure how the commit can be both empty and have a message, an reference a file?	14:27
rasguanabana	canton7: well, good to know :D I just cloned repository and tried to checkout to a certain branch and it silently fails.	14:27
Vampire0	git does not suck, your requirement is just ridiculous cek	14:27
grawity	canton7: empty as in no changes	14:28
canton7	rasguanabana, what do you mean by "checkout to a certain branch"?	14:28
	rasguanabana, what command are you running?	14:28
grawity	cek: all commits already "reference" all files in the repo	14:28
	cek: so `git log <file>` specifically looks for those commits where that file was changed	14:28
cek	what do you propose?	14:28
rasguanabana	canton7: git checkout <branch-name>	14:28
grawity	cek: make some sort of dummy change	14:28
cek	i could change file attr, but that aint tracked	14:28
canton7	rasguanabana, ok, that's checking out a branch, not checking out to a branch	14:29
	rasguanabana, !repro	14:29
gitinfo	rasguanabana: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://gist.github.com/2415442 ) of your terminal session.	14:29
Vampire0	rasguanabana, if it does nothing you are probably on that branch already	14:29
grawity	cek: if the comment is important, maybe it's actually a good idea to edit the file itself to say "please see commit log for important details"	14:29
	cek: otherwise, do something like chmod +x the file	14:29
	though of course you'll need to chmod -x it back in another commit	14:29
	← flavi0 left	14:29
	→ reim_ joined	14:29
	→ mehola joined	14:29
	→ Macaveli joined	14:29
	→ dhilipsiva joined	14:30
cek	yes, that might work. thanks!	14:30
	← reim left	14:31
	→ bronson joined	14:31
	← _0xAX left	14:31
	← eka left	14:32
rasguanabana	Vampire0: no, git status says I'm not. That's the problem.	14:32
	→ italoacasas joined	14:32
	→ cyan__ joined	14:32
canton7	rasguanabana, pastebin showing everything you're seeing, please	14:32
	← mflow left	14:32
rasguanabana	canton7: just a sec, i'm on it.	14:32
	→ phaleth joined	14:33
	← Lunatrius left	14:33
	← raijin left	14:33
	← mehola left	14:34
	← cek left	14:34
	→ pandeiro joined	14:34
rasguanabana	canton7: https://gist.github.com/rasguanabana/c6c4b11f986c38cfb0c8	14:34
canton7	rasguanabana, output of 'git branch -a'?	14:35
	← bronson left	14:35
	← reim_ left	14:36
	→ mayankgupta joined	14:36
	← bsanford left	14:36
rasguanabana	canton7: https://gist.github.com/rasguanabana/d9cef0e0c47fc34aadf5	14:36
canton7	rasguanabana, interesting. what about the full form? git checkout -b cmake origin/cmake	14:37
	← mostlybadfly left	14:37
	→ t0by joined	14:38
rasguanabana	canton7: adrian@tux3 /tmp/sdr-2016 $ git checkout -b cmake origin/cmake	14:39
	Branch cmake set up to track remote branch cmake from origin.	14:39
	Switched to a new branch 'cmake'	14:39
	→ Lunatrius joined	14:39
	→ eka joined	14:39
rasguanabana	Now it works :)	14:39
	← chll left	14:39
Vampire0	rasguanabana, do you maybe have a tag "cmake" that points to development?	14:39
canton7	rasguanabana, do you have a file called 'cmake' in the root of your repo?	14:39
	a tag's also a good shout: check both	14:40
Vampire0	ah, or that	14:40
	→ Dougie187 joined	14:40
Vampire0	:-)	14:40
	I bet for the file	14:40
rasguanabana	Oh well, there's a directory called cmake	14:40
Vampire0	or that	14:40
canton7	that'll be it	14:40
Vampire0	so I guess "git checkout cmake --" would have worked	14:40
canton7	'git checkout <branch which doesnt exist locally, but origin/XXX exists>' is magic	14:41
	an probably gets tested after the usual cases: local branch exists, and file/dir exists	14:41
Vampire0	or "cd <some subdir> && git checkout cmake"	14:41
	← shiriru left	14:42
	→ Borkr joined	14:42
rasguanabana	Hm, that one was tricky :D canton7, Vampire0, Thanks for help guys!	14:43
canton7	:)	14:43
	→ acolson joined	14:43
	→ presto joined	14:43
	→ lindenle joined	14:45
	← ays left	14:45
	→ fishcooker joined	14:45
Vampire0	yw	14:45
	← fishcooker left	14:46
	→ fishcooker joined	14:46
	← mayankgupta left	14:47
	→ reim joined	14:47
	← LeBlaaanc left	14:47
	← rasguanabana left	14:48
	→ notebox joined	14:48
	← lindenle left	14:49
	← mylord left	14:50
	→ Gamecubic joined	14:51
	→ strayPuppy joined	14:52
	→ dersand joined	14:54
	← ruskie left	14:54
	→ ruskie joined	14:54
dersand	When pushing and the server has setup a post-recieve hook, will it load .bashrc when inside post-recieve i call "source ~/.bashrc"?	14:54
	→ jokester joined	14:55
	→ tomog999_ joined	14:55
	← Macaveli left	14:56
	→ samw joined	14:56
	→ King_Hual joined	14:57
	→ a_thakur joined	14:57
	← tomog999 left	14:59
	→ floatingpoint joined	14:59
	← jeffreylevesque left	14:59
dsdeiz	is there a way to get the name of the previous branch?	15:00
	← samw left	15:00
	→ lindenle joined	15:02
	← sbasso left	15:03
	→ achadwick joined	15:03
_ikke_	git rev-parse --abbrev-ref @{-1}	15:03
	→ e01_ joined	15:04
	← mizu_no_oto left	15:04
	→ jeffreylevesque joined	15:05
	David1977\|2 → David1977	15:05
	← dersand left	15:05
	→ AaronMT joined	15:06
	→ slayerjain joined	15:07
	→ mylord joined	15:07
	← reim left	15:08
	← e01_ left	15:08
	→ crose joined	15:08
	← JeroenT left	15:09
dsdeiz	_ikke_: perfect! thx!	15:10
	← Cata\|Work left	15:11
	→ JeroenT joined	15:12
DolphinDream	can you have client hooks reside in a global location ? instead of installing them in every single repo ?	15:12
	→ sbasso joined	15:12
	→ trini7y joined	15:13
	→ Silenced joined	15:13
	← Silenced left	15:13
	→ Silenced joined	15:13
osse	o	15:13
	no	15:13
	but you can make installing them easier	15:14
DolphinDream	:) yeah. i guess i can script that	15:14
osse	like for example putting the hooks in the repo and have build target that symlinks them	15:14
_ikke_	You can update the templates git uses fro creating the repositories	15:14
	→ eijk joined	15:14
	← sbasso left	15:15
	→ samw joined	15:15
DolphinDream	_ikke_, that would work for new repos. i'm considering having current repos have access to a common set of hooks	15:15
	→ eletuchy joined	15:15
	← jottr left	15:15
	← pandeiro left	15:16
DolphinDream	osse, you suggest putting common hooks in a repo.. and have other repo hooks symlink the hooks in the hookRepo ?	15:16
osse	DolphinDream: no I suggest putting hooks relevant for one repo into that repo	15:16
	→ sbasso joined	15:16
	→ whomp joined	15:16
DolphinDream	cool	15:17
	→ infra-red joined	15:17
	← notebox left	15:18
osse	is it?	15:18
	→ CheckDavid joined	15:18
	← sbasso left	15:19
	← jwest left	15:19
	← eletuchy left	15:20
	→ settermjd joined	15:20
	← lindenle left	15:20
	← whomp left	15:21
	← codeman left	15:22
	→ jottr joined	15:23
	← a_thakur left	15:23
	← eka left	15:23
	→ jwest joined	15:23
	→ sbasso joined	15:24
	→ eletuchy joined	15:24
	← fscala left	15:25
	→ dreiss joined	15:25
	← afuentes left	15:25
	← samw left	15:25
	→ fscala joined	15:26
	→ reim joined	15:26
	← sbasso left	15:26
	← King_Hual left	15:27
	← mahendra_ left	15:27
	→ a_thakur joined	15:28
	→ cmosguy joined	15:28
	→ sbasso joined	15:28
	→ JimZat joined	15:28
	→ bsanford joined	15:28
	→ King_Hual joined	15:28
	→ mmlb joined	15:29
	→ eka joined	15:30
	← Silenced left	15:32
	→ nofacade joined	15:32
	← eletuchy left	15:32
	← Meteorhead left	15:32
	← lb left	15:33
	→ reim_ joined	15:33
	← reim left	15:34
	→ dhollinger joined	15:34
	→ daito joined	15:34
	→ samw joined	15:35
	→ NOTevil joined	15:35
	← trini7y left	15:37
	→ dsop joined	15:37
	← wrouesnel1 left	15:38
	→ pandeiro joined	15:39
	← daito left	15:39
	← oich left	15:39
	→ xelxebar joined	15:40
	← JimZat left	15:41
	→ ajf- joined	15:41
	→ whomp joined	15:41
	→ dhilipsi_ joined	15:41
	← fishcooker left	15:41
	← infra-red left	15:42
	← King_Hual left	15:42
	→ jaafar joined	15:43
	← dhilipsiva left	15:43
	← sparetire_ left	15:43
	→ Silenced joined	15:43
	← Silenced left	15:43
	→ Silenced joined	15:43
	→ King_Hual joined	15:44
	→ JimZat joined	15:44
	← toothe left	15:44
	→ sangy joined	15:45
	← tomog999_ left	15:45
	→ neohe_ joined	15:46
	← whomp left	15:46
	← xelxebar left	15:46
	→ trini7y joined	15:47
	→ raijin joined	15:47
	→ ugjka joined	15:47
	← trini7y left	15:47
	→ trini7y joined	15:47
	← samw left	15:48
	→ codeman joined	15:48
	← neohe left	15:49
JimZat	I am using git to maintain a software repository for which we have multiple customers with custom changes which are isolated within branches. One of our customers has asked for our codebase, but I am unwilling to expose other customer's proprietary information. Is there a simple way to STRIP branches so only that customers's information (and generic) branches are retained?	15:50
	→ sparetire_ joined	15:50
	→ Cata\|Work joined	15:52
Hedgework	JimZat: There are two ways to go about this, depending on your exact needs:	15:52
	JimZat: You could host the repo with gitolite, which unlike other mechanisms allows you to do per-branch access control, then give the customer in question access only to their branch(es).	15:53
	→ htcoder joined	15:53
	→ here_and_there joined	15:54
Hedgework	JimZat: Or, if it's more complicated than that, you can spend some time with reposurgeon doing some work to isolate the history and content relevant to that customer and create a clean output repo. The script you use can be saved and re-run in the future with minimal additions if you need to do it again after the project has evolved.	15:54
	→ shinnya joined	15:54
bremner	restricting read access was a bit of a hack in gitolite; not sure the current status	15:55
	→ thiago joined	15:56
	← sbasso left	15:56
Hedgework	bremner: If you try to get more granular than per-branch...well, I want to look at that more closely before I trust it...but per-branch is fine.	15:57
	→ mayankgupta27 joined	15:58
bremner	ok.	15:58
	so it must do some magic behind the scenes, like making a temporary repo or so.	15:59
	← jceb left	15:59
	← acolson left	15:59
	← David1977 left	16:00
	→ chitopunk joined	16:02
	← dhilipsi_ left	16:02
	→ oich joined	16:02
	← reim_ left	16:02
JimZat	Hedgework: Thanks, I will take a look at reposurgeon.	16:03
	→ mizu_no_oto joined	16:03
	→ astrofog joined	16:03
	← Silenced left	16:03
	→ samw joined	16:04
	← lamppid left	16:04
bremner	JimZat: you could just export a zip / tarball and mail it to them.	16:04
	→ Wetmelon joined	16:05
	→ DARSCODE joined	16:06
	← DARSCODE left	16:06
	→ reim joined	16:06
	← youser left	16:07
	← mmlb left	16:08
	→ BigWillie joined	16:08
Vampire0	Hedgework, I'd say just make a clone of your repo, make local branches for what they should be able to see, delete the remote from that clone and then repack the repo. I think this should strip out everything you don't want to show them	16:09
	→ yash9274 joined	16:09
	← M3mphiZ left	16:10
	→ clemf joined	16:11
	→ kilo_bravo joined	16:11
	← Sceorem left	16:11
JimZat	bremner: That is a possibility, except for the fact that this customer has multiple custom machines with related branches so it would require SOME work to make their multiple tar fiels.	16:12
	→ tvw joined	16:13
	← raijin left	16:13
	→ tomog999_ joined	16:13
bremner	JimZat: shrug. You could probably script it. And you'd be _really_ sure about what you were releasing	16:13
	→ ericvw joined	16:13
	→ mmlb joined	16:13
	→ pandeiro` joined	16:13
	→ M3mphiZ joined	16:13
	← crose left	16:14
	→ Neal\|ZNC joined	16:14
	← mwhooker left	16:14
	→ imdsm_ joined	16:14
	→ slayerjain_ joined	16:14
	→ Blkt_ joined	16:14
	→ stonerfish joined	16:14
	→ daynaskully joined	16:14
	→ elastix joined	16:14
	→ rom1504_ joined	16:15
	→ ixian8 joined	16:15
Hedgework	Vampire0: I'm not sure how cleanly they separated things, which is why I offered reposurgeon as an option. It would allow things like hiding names of branches that merges came from if they didn't want to give up other customers' names and stuff like that.	16:15
	→ Mekkis_ joined	16:15
	← Fiouz left	16:15
	→ Remram_ joined	16:15
	→ _ikke__ joined	16:15
	→ whomp joined	16:15
	→ Fiouz joined	16:15
	→ kandros joined	16:15
Hedgework	Vampire0: The simpler solution you mention only works in cases where they did the separation very cleanly to begin with.	16:15
	← bjoe2k4 left	16:15
	← imdsm left	16:15
	← Tee_Pee left	16:15
	← manitu left	16:15
	← deepy left	16:15
	← sneke left	16:15
	← naitsirhc left	16:15
	← quizzi left	16:15
	← mjbrender left	16:15
	← cold_sauce left	16:15
	← antispaceman left	16:15
	← bittyx left	16:15
	← Chinorro left	16:15
	← t0by left	16:15
	← slayerjain left	16:15
	← johnny56_ left	16:15
	← modin left	16:15
	← timewalker left	16:15
	← _ikke_ left	16:15
	← Neal_ left	16:15
	→ BinGOs_ joined	16:15
	← rom1504 left	16:15
	← Remram left	16:15
	← ixian left	16:15
	← asd6a left	16:15
	← pandeiro left	16:15
	← synchronous left	16:15
	← Mekkis left	16:15
	← Blkt left	16:15
	← ohcibi left	16:15
	→ modin joined	16:15
	→ timewalker joined	16:15
	← mizu_no_oto left	16:15
	← nofacade left	16:15
	← sgambino left	16:15
	← BinGOs left	16:15
	← madduck left	16:15
	→ asd6a joined	16:15
	→ ohcibi_ joined	16:15
	→ naitsirhc joined	16:15
	→ madduck joined	16:15
	→ sgambino joined	16:15
	→ bittyx_ joined	16:15
	→ bjoe2k4 joined	16:15
	→ quizzi joined	16:16
	→ antispaceman joined	16:16
	slayerjain_ → slayerjain	16:16
	→ manitu joined	16:16
	→ Chinorro joined	16:16
	→ Tee_Pee joined	16:16
yoh	my laptop crashed and now git fsck reports that some object file is empty and overall "loose object ... is corrupt".	16:16
	imdsm_ → imdsm	16:16
	→ cold_sauce joined	16:16
	← samw left	16:16
	→ johnny56 joined	16:16
	→ deepy joined	16:16
	unreal_ → unreal	16:16
	← jeffreylevesque left	16:17
yoh	git log complaints yet about another object... how could I remedy the situation? everything but few last commits are on remotes	16:17
	(I think ;) )	16:17
	→ haaja joined	16:17
	→ synchronous joined	16:17
	→ t0by joined	16:17
	← Alienpruts left	16:17
	← noteness left	16:18
	→ bango2 joined	16:18
	→ mjbrender joined	16:18
	← NOTevil left	16:18
	← plasticboy left	16:18
JimZat	Vampire0: What exactly do you mean my "local branch"? "git checkout origin/<branch>"? Can I then do a "git clone --bare" to "delete the remote" and "repack"?	16:19
	← howdoi left	16:19
	← muthu left	16:20
	→ infra-red joined	16:20
	← a_thakur left	16:20
	← trini7y left	16:21
	← htcoder left	16:21
	← wwwald_ left	16:21
	→ plasticboy joined	16:21
	→ Silenced joined	16:21
	← madewokherd left	16:23
	→ noteness joined	16:24
Vampire0	JimZat, I mean "git branch foo origin/foo" and I mean man git repack	16:24
gitinfo	JimZat: the git-repack manpage is available at http://jk.gs/git-repack.html	16:24
	→ sbasso joined	16:24
	→ dhcpfreely joined	16:24
	→ a_thakur joined	16:25
	→ rubyonrailed joined	16:25
	← rom1504_ left	16:25
	→ KennyRayFL joined	16:26
	→ rom1504 joined	16:26
	→ reim_ joined	16:26
	← doppo left	16:26
	→ silentz0r joined	16:27
	← subhojit777 left	16:27
	→ tomog999 joined	16:27
	← tomog999_ left	16:27
	← reim left	16:27
	← Silenced left	16:27
	→ Silenced joined	16:27
	→ doppo joined	16:27
	← gfixler left	16:28
	→ staticshock joined	16:28
	← TomyWork left	16:28
	← ck_mfc left	16:30
	→ mehola joined	16:31
	← whomp left	16:32
	← reim_ left	16:32
	→ NOTevil joined	16:32
	→ akagr joined	16:32
	→ eletuchy joined	16:32
	→ diegoviola joined	16:32
	→ bronson joined	16:33
	← JeroenT left	16:33
	← Balliad left	16:34
	→ Alienpruts joined	16:34
	→ reim joined	16:34
	→ subhojit777 joined	16:35
	← mehola left	16:35
	→ Noldorin joined	16:35
	→ raijin joined	16:36
	← eletuchy left	16:37
	← bronson left	16:38
	← infra-red left	16:38
	→ mehwork joined	16:38
	← clemf left	16:38
	← timewalker left	16:38
mehwork	if i'm in a subdir of a branch and do commands like 'git merge master', it should work the same as if i was in the root of the project where the .git folder resides right?	16:38
	→ timewalker joined	16:38
	→ LeBlaaanc joined	16:39
Bombe	mehwork, what happens when you tried it?	16:39
	← clmsy left	16:39
	← LeBlaaanc left	16:39
	→ LeBlaaanc joined	16:40
	→ cagmz joined	16:40
	← sbasso left	16:41
	→ tang^ joined	16:41
	→ Grum joined	16:41
	→ RudolphFenz joined	16:43
	→ RudolphFnz joined	16:43
	→ sbasso joined	16:43
	→ infra-red joined	16:43
	← BigWillie left	16:45
	→ rodolfowtf joined	16:45
	← reim left	16:45
	→ samw joined	16:46
	← Raging_Hog left	16:46
	→ reim joined	16:47
	→ aard_ joined	16:48
	← eijk left	16:49
	→ akushner_ joined	16:49
	← infra-red left	16:49
	→ hvoigt joined	16:49
	→ whitby joined	16:49
	→ kadoban joined	16:50
grawity	mehwork: yes, such commands are repo-global	16:51
	mehwork: why do you ask?	16:51
	→ Ahmed90 joined	16:52
	→ e01_ joined	16:52
	← diegoviola left	16:53
	← sanketdg left	16:54
	← reim left	16:54
	→ mizu_no_oto joined	16:54
	← LBV_User left	16:54
	← oich left	16:55
	← samw left	16:56
	← clevodearia left	16:56
	→ Kicer86 joined	16:56
	← e01_ left	16:57
	→ oich joined	16:58
	→ medeirosthiiago joined	16:59
	→ madewokherd joined	17:00
	→ diegoviola joined	17:00
	→ reim joined	17:01
	← nilsi left	17:01
	← akagr left	17:02
	← Alienpruts left	17:02
	← Gonzo89 left	17:03
	→ crose joined	17:04
	→ acetakwas joined	17:04
	→ jonmorehouse joined	17:04
	gitinfo set mode: +v	17:04
	← medeirosthiiago left	17:05
	← thiago left	17:05
	→ JeroenT joined	17:05
	→ samw joined	17:06
mehwork	curious thx	17:06
	→ Rull joined	17:06
	← dantix__ left	17:06
	→ medeirosthiiago joined	17:06
	← JeroenT left	17:07
	→ Mobutils joined	17:08
	← Silenced left	17:08
	← daynaskully left	17:08
	← slayerjain left	17:09
	→ lindenle joined	17:10
	← samw left	17:10
permalac	hello guys.	17:10
	→ catphish joined	17:10
permalac	can I download a single file from a repo?	17:10
	I know the name of the file .	17:10
	or a single directory would also work .	17:10
	→ jottr_ joined	17:10
catphish	how is a server expected to handle "request-pull"?	17:11
_ikke__	catphish: what server?	17:11
	catphish: request-pull does not talk to any server	17:11
catphish	a git server	17:11
	← aclearman037 left	17:11
_ikke__	permalac: Where is this repository hosted?	17:11
	← r_rios left	17:11
	← CheckDavid left	17:11
	→ daynaskully joined	17:11
permalac	on another server , I have the keys exchanged and I can clone from it.	17:11
	← lindenle left	17:11
	→ r_rios joined	17:12
_ikke__	permalac: man git archive	17:12
gitinfo	permalac: the git-archive manpage is available at http://jk.gs/git-archive.html	17:12
permalac	but on an automated process I just want to download a single file , or directory.	17:12
	→ lindenle joined	17:12
	← Rull left	17:12
catphish	_ikke__: the man page says "you run this command...request-pull...which will produce a request to the upstream, summarizing the changes between the v1.0 release and your master, to pull it from your public repository"	17:12
	← jottr left	17:12
catphish	_ikke__: if it doesn't talk to a server, what does it do?	17:12
_ikke__	It produces a request	17:12
	Literally just that	17:12
catphish	oh, it just produces a document you can email to someone?	17:13
_ikke__	yes	17:13
	→ akagr joined	17:13
permalac	_ikke__, but I can not make it work with a remote repo.	17:13
catphish	_ikke__: oh ok, i wont worry about that then :)	17:13
_ikke__	It does contact another server, but that's to verify what the server has	17:13
catphish	_ikke__: thanks	17:13
	← lindenle left	17:13
_ikke__	permalac: What did you try?	17:13
	← JimZat left	17:14
	→ Silenced joined	17:14
	← Silenced left	17:14
	→ Silenced joined	17:14
	→ samw joined	17:15
	→ lindenle joined	17:16
	→ subbero_ joined	17:16
permalac	_ikke__, git archive git@server01:/home/git/repos/openstack.git HEAD script_post_install_kvm.sh	17:16
	_ikke__, git archive --remote=ssh://git@server01/home/git/repos/openstack.git HEAD script_post_install_kvm.sh	17:16
	_ikke__, the last one.	17:16
	jor_ → jor	17:16
	→ liri_ joined	17:17
	← presto left	17:17
	← dsantiago left	17:18
	→ axelitus joined	17:18
	← pandeiro` left	17:18
	← freimatz left	17:18
	← catphish left	17:18
permalac	_ikke__, my bad, I was not putting the full path of the file. Now I just have to fix how to store it as a text file	17:18
	← akagr left	17:18
	→ King_Hual` joined	17:19
	← a_thakur left	17:19
	← daynaskully left	17:19
	← Jellyg00se left	17:19
	← subhojit777 left	17:19
	→ subhojit777 joined	17:20
	→ Rodya_ joined	17:20
	← m1dnight_ left	17:20
	← rodolfowtf left	17:20
_ikke__	\| tar xf	17:20
	xf -	17:20
	→ daynaskully joined	17:20
	← samw left	17:21
	→ m1dnight_ joined	17:21
	→ imachuchu joined	17:21
	→ rodolfowtf joined	17:21
	→ clevodearia joined	17:21
	→ dersand joined	17:21
	← ThomasLocke left	17:21
dersand	I'm really confused atm. Which .dotfile like .bashrc and .profile run when post-receive executes?	17:22
	← King_Hual left	17:22
	← achadwick left	17:22
permalac	_ikke__, I'm not understanding. I'm downloading a .sh file	17:23
	→ MutantMahesh joined	17:24
	→ aditya_ joined	17:24
_ikke__	permalac: I might be mistaken, but I thought git archive by default uses a tar to transfer files	17:24
permalac	so \| tar - at the end	17:24
	→ jost joined	17:24
_ikke__	yes	17:25
	← staticshock left	17:25
	→ samw joined	17:25
	← ferr left	17:26
	← MadHatter42 left	17:26
	gitinfo set mode: +v	17:27
aditya_	hi i am new to git..although i have used git for sometime.now i wish to develop some small things for git.can anyone please guide me to it ?	17:28
permalac	_ikke__, excelent \| tar xf -	17:28
	_ikke__, thanks	17:28
	→ JeroenT joined	17:28
	← mizu_no_oto left	17:29
_ikke__	aditya_: development of git happens on the !mailing_list. You can send patches there. Make sure you read Documentation/SubmittingPatches in the git tree	17:29
gitinfo	aditya_: The mailing list can be reached via [email@hidden.address] You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://j.mp/gitlist	17:29
	→ fbwnnd joined	17:29
	→ JimZat joined	17:30
osse	dersand: none	17:30
	→ mayankgupta1996 joined	17:30
	← kurkale6ka left	17:30
	→ sergio1234 joined	17:31
aditya_	_ikke__:thanks	17:31
	→ mehola joined	17:31
JimZat	Vampire0: Thanks for the assistance, I will look into that.	17:32
dersand	osse, remember me from earlier? I was the one with the issue with post-receive. After some digging, when running source ~/.bashrc, it does NOTHING. So you can't export anything inside post-receive	17:32
	← astrofog left	17:33
osse	dersand: you can export anything you like	17:33
	← stonerfish left	17:33
	← leeN left	17:33
dsdeiz	is there a factoid for cherry picking?	17:34
	← mayankgupta27 left	17:34
milki	dsdeiz: !bot has a list	17:34
gitinfo	dsdeiz: [!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 (ab)use me.	17:34
	← mayankgupta1996 left	17:34
	→ freimatz joined	17:35
	← aditya_ left	17:35
	→ daito joined	17:35
	→ kpease joined	17:35
	→ staticshock joined	17:35
	→ jaaronamo joined	17:36
	← hahuang61 left	17:36
	← mehola left	17:37
	← _pix left	17:37
	ChanServ set mode: +o	17:37
dsdeiz	i see.. guess there isn't	17:37
	→ WayToDoor joined	17:37
	Eugene changed the topic to: Welcome to #git! First visit? Read: http://jk.gs/git \| Getting "cannot send to channel"? /msg gitinfo .voice \| Current stable version: 2.7.2 \| Commits are not objects of love, and should not be judged by their size.	17:37
	_ikke__ → _ikke_	17:37
	← mehwork left	17:38
Seveas	all that matters is the commit size vs commit message size ratio	17:38
_ikke_	lol	17:38
	Eugene set mode: -o	17:38
	→ d4rklit3 joined	17:39
	← jonesinator left	17:39
	← daito left	17:40
	← mezod left	17:40
	→ kballou joined	17:40
osse	dersand: there seems to be some confusion as to what exactly happens when a hook is executed	17:40
	→ zeroed joined	17:40
	← zeroed left	17:40
	→ zeroed joined	17:40
osse	dersand: bash does not read any files when you do bash -c 'foo' or execute a file with #!blabla at the top.	17:41
	← zeroed left	17:41
	← gechr_ left	17:41
osse	dersand: if you create a trivial hook that has env \| grep ROFL; export ROFL=lol; env \| grep ROFL in it I am confident that the first grep will don't print anything but the second one will.	17:41
	→ durham joined	17:42
dersand	osse, hold on, are you saying i should remove the #!/bin/bash declaration?	17:42
osse	no	17:42
	→ thiago joined	17:42
	← liamonade left	17:43
osse	I am just telling you what's what. I'm not sure what you're trying to accomplish	17:43
	You can export in a hook just fine, but the export will only be valid for the duration of the hook itself.	17:43
	Such are the brutal facts of the environment	17:44
	← sergio1234 left	17:44
	← exarch left	17:45
	← subhojit777 left	17:45
	← pflanze left	17:45
	← _noblegas left	17:46
	→ troulouliou_div2 joined	17:47
	← dreiss left	17:48
	→ bbbthunda joined	17:51
	→ IWishIKnew joined	17:51
	← dan2k3k4 left	17:51
	→ editshare-ericf joined	17:52
	→ aclearman037 joined	17:54
	← ErKa left	17:55
	→ Oog joined	17:55
	→ gtristan joined	17:55
	← Foren left	17:55
	→ Guest55 joined	17:55
	← Anticom left	17:57
	→ subhojit777 joined	17:57
	← medeirosthiiago left	17:57
	→ mns joined	17:58
	← strayPuppy left	17:58
	← thiago left	17:59
dersand	osse, wouldn't that mean that if i setup an environmental variable, run a program through $envnmntl_var/path/to/startup.sh and then the hook-scope dies out, the script could no longer execute since it's dependant on the environmental variable?	18:00
osse	dersand: whenver you start an new process that process receives a copy of the environment.	18:01
	TL;DR: no	18:01
	← mmlb left	18:01
dersand	Yeah, totally forgot about that.	18:01
osse	if that process does some daemonizing magic so that it continues to run in the background after the hook completes nothing changes	18:01
dersand	I find it just strange that i source'd bash and still hadn't any new exported variables, since i appended "export PATH=/blah/" in .bashrc.	18:02
	→ e01_ joined	18:03
	→ andres2 joined	18:03
	→ BigWillie joined	18:03
	← BigWillie left	18:03
osse	what does "source'd bash" mean?	18:03
	→ dsantiago joined	18:04
dersand	source ~/.bashrc	18:04
	→ dhollin3 joined	18:04
	andres2 → andres	18:04
osse	you did that in the hook ?	18:04
	← dhollinger left	18:05
dersand	Yes	18:05
	← daynaskully left	18:05
osse	if that does exports then I would expect to see them.	18:05
	← Borkr left	18:05
dersand	Well i double checked with $SHLVL which counts the level how many times you write bash	18:06
	default is 1, then i guess every time you write bash it stacks up	18:06
osse	But keep in mind it might source /home/git/.bashrc and not /home/dersand/.bashrc	18:06
dersand	Oh for the love of god	18:06
osse	depends a bit on how you host the repos	18:06
	do you push to [email@hidden.address] ?	18:06
	→ dreiss joined	18:06
	→ ramsub07 joined	18:07
dersand	git push live master, where live = git remote add ssh://user@ip-adress:/srv/repo	18:07
	← ash_workz left	18:07
	← e01_ left	18:07
osse	then it will use .bashrc in the home directory of 'user'	18:07
	← dhollin3 left	18:07
	← RudolphFnz left	18:08
dersand	i did whoami to debug, it was the same as the username	18:08
	i ssh'd to	18:08
	can i debug "~"?	18:08
	← RudolphFenz left	18:08
osse	sure	18:08
	echo ~	18:08
	→ RudolphFenz joined	18:08
	← Guest55 left	18:08
osse	or echo "$HOME". same thign	18:09
	→ Guest55 joined	18:09
dersand	It pointed to /home/usernameisshto	18:10
	← r_rios left	18:10
	→ thiago joined	18:10
	→ mischat_ joined	18:10
osse	and does /home/usernameisshto/.bashrc contain export FOO=bar ?	18:10
	← JimZat left	18:10
	← Guest55 left	18:10
dersand	Yep	18:10
osse	then I don't know	18:10
dersand	I guess i could try echoing some stuff inside .bashrc	18:11
grawity	`set -x` please	18:11
	→ douglascorrea joined	18:11
	→ HanClinto joined	18:11
osse	dersand: can you show me the hook and the installscript thingy? I suspect the source of the bug might be in there	18:11
	← Oog left	18:11
	→ mizu_no_oto joined	18:12
dersand	It's working, instead of trying to reload the .bashrc i'm just manually exporting to env	18:12
	→ BigWillie joined	18:12
dersand	It's just i want to really work out what's being wrong here	18:12
	→ r_rios joined	18:12
	← r_rios left	18:12
	→ r_rios joined	18:12
	→ mezod joined	18:12
	→ ribas joined	18:12
	← GT4066 left	18:13
	← bumbar_ left	18:13
osse	it's a learning opportunity!	18:13
	← clevodearia left	18:13
	← mischat left	18:13
	← mischat_ left	18:14
	→ ELFrederich joined	18:16
	← dreiss left	18:16
	→ Glooomy joined	18:16
	← ramsub07 left	18:16
	← mezod left	18:17
ELFrederich	is there a way to get a diff from Git which would represent the changes of something like a GitLab / GitHub merge request? Like, not the actual diffs between A) some_branch, and B) master, but a diff between A) an imaginary merge commit of some_branch + masterm and B) master	18:18
	→ ramsub07 joined	18:18
Seveas	ELFrederich: I think you're after what git merge-tree outputs	18:20
	→ ezefarin_ joined	18:20
	→ hate joined	18:21
	← subhojit777 left	18:21
	→ afuentes joined	18:22
	→ Guest55 joined	18:22
	→ blackwind_123 joined	18:22
	← acetakwas left	18:22
	← ezefarina left	18:22
	← Wetmelon left	18:23
	→ MutantMa_ joined	18:25
	← ezefarin_ left	18:25
	→ ezefarina joined	18:25
	→ btree joined	18:25
	→ gfixler joined	18:25
	← ramsub07 left	18:25
	← Guest55 left	18:26
	← MutantMahesh left	18:27
	→ terminal_echo joined	18:28
	gitinfo set mode: +v	18:28
	→ BigWilli_ joined	18:28
	← BigWillie left	18:29
	← terminal_echo left	18:29
	→ Darcidride joined	18:29
	← hate left	18:29
	← BinGOs_ left	18:30
	← btree left	18:31
	← rodolfowtf left	18:31
	← Rodya_ left	18:31
	→ BinGOs joined	18:32
	← sangy left	18:32
	→ EvilPenguin joined	18:32
	→ Rodya_ joined	18:33
	→ pantsman- joined	18:34
	→ eletuchy joined	18:34
	← ezefarina left	18:34
	← jottr_ left	18:34
	→ ezefarina joined	18:34
	← ezefarina left	18:34
	PaulePanter → PaulePanetr	18:35
	PaulePanetr → PaulePanter	18:35
	→ bronson joined	18:35
	← douglascorrea left	18:35
	→ rodolfowtf joined	18:35
	← rodolfowtf left	18:35
	→ douglascorrea joined	18:36
	← fracting left	18:37
	→ rodolfowtf joined	18:37
	← rodolfowtf left	18:37
	← josuebrunel left	18:37
	← PCatinean left	18:37
	← Rodya_ left	18:37
	← lolmac left	18:38
	← sbasso left	18:38
	→ Sasazuka joined	18:38
	← EvilPenguin left	18:38
	→ lolmac joined	18:38
	→ thebinary joined	18:39
	← eletuchy left	18:39
	→ rodolfowtf joined	18:39
	← rodolfowtf left	18:39
	← bronson left	18:40
	→ rodolfowtf joined	18:41
	← rodolfowtf left	18:41
	→ daynaskully joined	18:41
	→ infra-red joined	18:41
	→ ramsub07 joined	18:42
	← IWishIKnew left	18:44
	→ kfoonamalik joined	18:45
	← Remram_ left	18:45
	← tjbp left	18:45
	→ rodolfowtf joined	18:46
	← rodolfowtf left	18:46
	→ Remram joined	18:46
	← MutantMa_ left	18:47
	→ Timberwo\|f joined	18:47
	→ MutantMahesh joined	18:48
	→ rodolfowtf joined	18:48
	← rodolfowtf left	18:48
	→ LekeFly joined	18:49
	→ rodolfowtf joined	18:50
	← rodolfowtf left	18:50
	→ toogley joined	18:50
	→ zadock joined	18:50
	← Silenced left	18:50
	→ King_Hual_ joined	18:51
	← jost left	18:52
	← aard_ left	18:52
	→ meloc joined	18:52
	→ qballer joined	18:53
	→ hahuang61 joined	18:53
qballer	hey guys I can't seem to delete a sensitive file from all git repo, does anyone know a full prof way ?	18:54
	← emPi left	18:54
	← King_Hual` left	18:55
	→ boombatower joined	18:55
	← nettoweb left	18:56
	→ emPi joined	18:56
tobiasvl	qballer: !sensitive	18:56
gitinfo	qballer: [!filter_sensitive] You can use filter-branch to remove sensitive data from a repository's history. https://help.github.com/articles/remove-sensitive-data/	18:56
	→ bronson joined	18:57
	← troulouliou_div2 left	18:57
	← hahuang61 left	18:58
	→ troulouliou_div2 joined	18:58
	→ otho joined	18:58
	→ jagob joined	18:59
	← crose left	18:59
	→ paddyez joined	18:59
	← yash9274 left	19:00
	← mylord left	19:00
	→ whomp joined	19:01
	→ oghamb joined	19:01
	→ medeirosthiiago joined	19:02
Seveas	qballer: bfg.	19:02
	→ mischat joined	19:02
	→ EvilPenguin joined	19:03
	→ liamonade joined	19:05
	← nnyk left	19:05
	← thebinary left	19:05
	← MutantMahesh left	19:05
	← fbwnnd left	19:06
qballer	can you tell me the specific command because it doesn't seem to work Seveas	19:06
	→ MadHatter42 joined	19:06
Seveas	https://rtyley.github.io/bfg-repo-cleaner/	19:06
	→ e01_ joined	19:06
	→ MutantMahesh joined	19:07
	→ nettoweb joined	19:07
qballer	http://stackoverflow.com/questions/35755923/remove-file-from-all-git-history	19:07
	→ tanimislam joined	19:07
qballer	Seveas: I tried it.	19:07
	← oghamb left	19:09
	← raijin left	19:10
	→ roelmonnens joined	19:10
	← liamonade left	19:10
	→ leeN joined	19:11
	→ m0viefreak joined	19:13
	→ dreiss joined	19:14
	→ weylin joined	19:15
	← settermjd left	19:15
	→ tjbp joined	19:15
	← codeman left	19:15
	← sgambino left	19:17
	→ enter_ joined	19:17
	← lolmac left	19:17
	← MutantMahesh left	19:17
	← Glooomy left	19:17
	→ bongjovi_ joined	19:18
	→ settermjd joined	19:18
	→ clevodearia joined	19:19
	← doener left	19:19
	← e01_ left	19:20
	← tjbp left	19:20
	← settermjd left	19:20
	← punto left	19:21
	→ punto joined	19:21
	← enter_ left	19:22
	← bongjovi left	19:22
	→ infra-re_ joined	19:23
	→ nickthetait1 joined	19:24
	← infra-red left	19:25
	→ infra-red joined	19:26
	← nickthetait left	19:26
	→ liamonade joined	19:28
	← sauvin left	19:29
	← cdg left	19:29
	← infra-re_ left	19:29
	← daynaskully left	19:29
	← liamonade left	19:29
	← ramsub07 left	19:30
	→ mricon joined	19:30
	→ pfloyd joined	19:31
	← bronson left	19:31
	→ mi100hael joined	19:31
pfloyd	I have a situation where I have a git repo sitting on NFS, but need to allow users without the necessary Unix group to clone it. Does anyone have a pointer to the proper SSH key/auth magic to do this? This is not OpenSSH by the way, but F-Secure(commercial) SSH, so it's using the authorization file, not authorized_keys so slightly different format.	19:32
	→ daynaskully joined	19:32
	→ crose joined	19:32
	← NeverDie left	19:32
	→ sangy joined	19:32
Seveas	git repos on nfs sounds like a bad idea to start with. And ssh can't work around permission restrictions for you.	19:33
	so instead of working around the bad design, why not fix it? :)	19:33
pfloyd	not an option.	19:33
	I wish it were, but it's not. and ssh does work around it, because I have an account that has the necessary groups and was hoping to allow the users to execute the clone command as that user (via ssh) but obviously not arbitrary commands.	19:34
	→ bronson joined	19:34
	← roelmonnens left	19:34
Seveas	it's nice to mention such things when you ask a question. How could we guess that?	19:35
	anyway, openssh allows you to force a command in the authorized keys file. If f-secure ssh can do that, there's your solution	19:35
	man git-shell is your friend in that case	19:35
gitinfo	the git-shell manpage is available at http://jk.gs/git-shell.html	19:35
pfloyd	that requires them to chsh?	19:36
Seveas	no	19:36
	← wilsoncd35 left	19:36
pfloyd	ok	19:36
Seveas	in an openssh authorzied_keys file you'd add something like: command=/usr/bin/git-shell ssh-rsa AAAA....	19:36
	→ espindola joined	19:36
	← Mobutils left	19:36
Seveas	that forces all logins to use git-shell as command, whatever the user specifies.	19:36
	→ eletuchy joined	19:37
pfloyd	right, ok. yes I believe authorization in f-secure ssh has the same features, thanks.	19:37
	← fscala left	19:37
Seveas	another useful thing to do: in the same file you can set environment variables. Use that to set something to identify the user.	19:37
pfloyd	good point	19:38
	→ fscala joined	19:38
Seveas	environment="SSH_USER=someuser" command="/usr/bin/git-shell" ssh-rsa AAAAB3Nza	19:38
	→ MutantMahesh joined	19:39
	→ presto joined	19:39
pfloyd	yep. thanks again	19:39
	→ Mobutils joined	19:39
	→ enter_ joined	19:40
	→ ramsub07 joined	19:40
	← netj left	19:40
	→ netj joined	19:40
	← medeirosthiiago left	19:40
	→ infra-re_ joined	19:41
	→ colept joined	19:41
	← eletuchy left	19:41
	→ raijin joined	19:41
	gitinfo set mode: +v	19:42
enter_	hi, did someone here.	19:42
	I am cloning a repo then made few change. After that i make a PR,	19:42
	Sadly it should involve new commit. The expectation of the maintainer matches. But he ask to do some rebase.	19:42
	Ok then i rebase, but some file are changes maybe by git or by my text editor. Then i rebase again to exclude those file. but it fail.	19:42
	i try to rebase over and over, fail, or even i do stupid rebase. from the reflog i can tell that.	19:42
	i do 3 commit with ammend, 3 rebase and 3 rebase with pick.	19:42
	My goal just make clear PR with clean history, 1 file changes.	19:42
	i try make new branch and fetch from original repo but fail, when i compare it already have differences.	19:42
	i need some help and advice :(	19:42
	→ lolmac joined	19:42
	← daynaskully left	19:43
DolphinDream	if you have the hooks versioen controller (e.g. in a hooks folder) and have the ./git/hooks files symbolically linked to the ./hooks files, wouldn't this have an undesirable effect ? if you checked out a branch that has a different version of that hook ?	19:43
	← infra-red left	19:44
Seveas	not only that, it gives everybody with push access to your repo remote code execution on your box.	19:44
	'git pull' becomes 'git pull and execute unknown code before having a chance to even look at it'	19:44
mricon	when running "git bundle create" is there a way to maximize compression, or does it just reuse existing packs?	19:44
qsx	Seveas: well that’s why you don’t run git pull.	19:45
Seveas	qsx: try looking a few miles above you for the point :P	19:45
	→ daynaskully joined	19:45
DolphinDream	yeah.. so it's a potential security breach	19:45
	← kfunk left	19:45
	→ TomyLobo joined	19:46
	→ Rodya_ joined	19:46
DolphinDream	i've seen some posts online about hooks that suggest this method.. and made me cringe a little :\|	19:46
	← silentz0r left	19:47
qsx	DolphinDream: s/ln/cp/ :>	19:47
DolphinDream	yep	19:47
	it has to be a conscious user driven decision	19:47
	← oich left	19:48
	← HanClinto left	19:48
	← woxidu left	19:48
	→ tjbp joined	19:49
	→ radsy joined	19:49
	→ woxidu joined	19:50
	→ infra-red joined	19:50
	← infra-re_ left	19:52
	→ pandeiro joined	19:54
colept	Looking for advice how to manage two sites using the same code base.	19:55
	Should I use a Master Repo which is the upstream for two child repo's	19:55
	← troulouliou_div2 left	19:55
	→ liamonade joined	19:57
	← liamonade left	19:58
	→ sargas joined	19:58
	→ josuebrunel joined	19:59
	← RudolphFenz left	19:59
	→ PryMar56 joined	20:00
tobiasvl	colept: do the two sites have differences? what are they, if so?	20:00
	← ramsub07 left	20:00
	→ nb_bez___ joined	20:00
	→ liamonade joined	20:01
colept	tobiasvl: They will be visually different but running on the same code base	20:01
tobiasvl	visually different? what does that entail	20:01
colept	If I had an analogy, it would be like subreddits on different domains	20:01
	CSS and Configuration Differences	20:01
tobiasvl	ah. websites	20:01
	→ aidalgol joined	20:02
	→ ash_workz joined	20:03
	→ eijk joined	20:03
tobiasvl	colept: do you have a deploy mechanism? you could include everything in the repo, and the deployment renames the correct css files or config files so they're actually used by the deployed website?	20:04
	not sure what best practice is	20:04
	← MadHatter42 left	20:04
tobiasvl	but yes. two subrepos for each site and the common code in a super repo would also work fine	20:04
colept	Currently I deploy from a local repo to a remote which does a checkout to the production directory	20:04
	→ sgambino joined	20:04
tobiasvl	colept: this looks relevant https://groups.google.com/forum/#!topic/git-users/_zG5BqMRCTE	20:05
	(forks are obviously the wrong solution, but maybe it's helpful anyway)	20:06
	→ stephaneyfx joined	20:06
	→ ramsub07 joined	20:06
	→ fahadash joined	20:07
colept	By fork you mean the Master <-> 2X Child Repo?	20:07
	← nettoweb left	20:07
colept	Or Master <=> Master	20:07
	← enter_ left	20:07
tobiasvl	no fork is just a github think that was mentioned in that google groups post	20:08
	← stephaneyfx left	20:08
tobiasvl	also don't call the super repo "master", that might be confusing (master is usually a branch)	20:09
	→ stephaneyfx joined	20:09
	→ enter_ joined	20:09
colept	sure, Parent it is	20:09
	Base	20:09
	← mrkat left	20:10
	← infra-red left	20:13
	→ nettoweb joined	20:14
	gitinfo set mode: +v	20:14
	← EvilPenguin left	20:14
stephaneyfx	Hi everyone. Sorry if this is a silly question. With git-svn, .git/refs/remotes/origin is empty but "git branch -a" and "git show-ref" show all the svn branches and tags. I can see they are in .git/svn/refs/remotes/origin, but why would a non-svn git command look in there?	20:14
	← nettoweb left	20:14
	→ dhollinger joined	20:16
	← qballer left	20:17
	→ David1977 joined	20:17
	← MutantMahesh left	20:17
	→ MadHatter42 joined	20:18
pfloyd	Seveas: I must be doing something wrong, because I just get dumped to a git> prompt with git-shell if I try "git clone ssh://user@localhost/path/to/repo	20:18
tobiasvl	stephaneyfx: why would it? git-svn is a way to have a local git repo that has an svn remote	20:18
	← LekeFly left	20:19
tobiasvl	stephaneyfx: why would non git-svn commands need to be able to see the svn remote, and what would they be able to do with it?	20:19
	or am I misunderstanding something here	20:19
ToxicFrog	tobiasvl: the question is "non git-svn commands can see the git-svn remotes. Why?"	20:19
Seveas	pfloyd: or f-secure ssh doesn't set SSH_ORIG_COMMAND the way openssh does. git-shell uses that to know what it has to do.	20:20
ToxicFrog	Oh, I think I see what's going on	20:20
stephaneyfx	tobiasvl: Thank you for your answer. That's my question. I would like to understand how "git branch -a" and "git show-ref" list references I cannot see under .git/refs.	20:20
ToxicFrog	stephaneyfx: what you're seeing there are the branches and tags imported from svn, in .git/refs/{heads,tags}	20:20
	→ ahr3n joined	20:20
ToxicFrog	not the svn remotes	20:20
	Try "git remote" to list all remotes and you should see it empty.	20:20
	→ Tryop88 joined	20:21
pfloyd	Seveas: damn, if that's the case I'm SOL with git-shell then, might have to use gitolite	20:21
	← jimi_ left	20:22
tobiasvl	indeed. the remote-tracking branches could be confused for remote	20:22
	← UrsoBranco left	20:22
Seveas	pfloyd: you're SOL with that as well. Uses the same feature.	20:22
pfloyd	Seveas: well that I had working at one point	20:22
Seveas	pfloyd: set command="env" and see if the variable is set	20:22
stephaneyfx	ToxicFrog: Thank you. "git remote" indeed returns nothing. But it still doesn't explain why "git show-ref" shows references that are nowhere to be found in .git/refs.	20:22
ToxicFrog	stephaneyfx: "git show-ref" should show you not only the sha of the ref but where it's located in the filesystem	20:23
	e.g. 494f499c948a87038d6b31ba48e800133343e12a refs/heads/master	20:23
	What does it show for you?	20:23
pfloyd	Seveas: SSH_ORIGINAL_COMMAND=ls	20:23
	← staticshock left	20:24
tobiasvl	stephaneyfx: .git/packed-refs ?	20:24
stephaneyfx	ToxicFrog: 103bfdac6bba16e810285b9d9f6d75be569a263d refs/remotes/origin/v1.0.x	20:24
ToxicFrog	Oh, I totally forgot that packed-refs exists	20:24
stephaneyfx	but there is no such file	20:24
tobiasvl	probably packed-refs	20:24
pfloyd	Seveas: SSH_ORIGINAL_COMMAND=git-upload-pack '/path/to/repo' if I use command="/usr/bin/env > /tmp/env.dump" and grep env.dump for SSH_ORIG	20:24
stephaneyfx	tobiasvl: You're right! The packed-refs file contains the references. Thank you very much!	20:25
Seveas	pfloyd: hmm, in the only setup where I use this, the user's shell is git-shell.	20:26
	← woxidu left	20:26
Seveas	so I'm suddenly not so sure the force_command trick will work	20:27
tobiasvl	stephaneyfx: great! :)	20:27
	← liri_ left	20:27
	→ nnyk joined	20:27
	→ Artpicre joined	20:27
	→ codeman joined	20:27
	→ EvilPenguin joined	20:27
Seveas	pfloyd: ok, tried it and it works.	20:28
	$ ssh dennis@localhost	20:28
	fatal: Interactive git shell is not enabled.	20:28
	hint: ~/git-shell-commands should exist and have read and execute access.	20:28
	Shared connection to localhost closed.	20:28
	→ ErKa joined	20:28
pfloyd	Seveas: yes, now mkdir ~/git-shell-commands. does it work then? or do you get dumped to a git> prompt ?	20:29
	← liamonade left	20:29
	← permalac left	20:30
stephaneyfx	ToxicFrog: tobiasvl: Thanks for your help, both of you. I am trying to follow the svn to git migration guide at http://git-scm.com/book/en/v2/Git-and-Other-Systems-Migrating-to-Git. There is a part regarding moving the tags to proper git tags, but since my tags are not under .git/refs, should I just edit .git/packed-refs?	20:31
Seveas	git> prompt. I know what's going on.	20:31
	git-shell is not meant to be used this way, but can be used this way with a wrapper. That's what I got working in the past. Let's see if I can find it.	20:31
	→ cagedwisdom joined	20:32
pfloyd	Seveas: that would be terrific, thank you very much. Yeah, seems like it's intended to be in /etc/passwd and /etc/shells	20:33
	→ whomp_ joined	20:33
	← whomp left	20:34
	→ hahuang61 joined	20:34
	← tvw left	20:34
	← nickthetait1 left	20:35
	← ugjka left	20:35
	← eijk left	20:35
	→ nettoweb joined	20:36
Seveas	pfloyd: make the forced command this: https://dpaste.de/LbMV	20:36
	→ waspinator joined	20:36
Seveas	(so put that in /usr/local/bin/git-shell-wrapper, and do command="/usr/local/bin/git-shell-wrapper")	20:36
tobiasvl	stephaneyfx: hm, interesting. I think they mean .git/svn/refs/remotes/origin/tags/*	20:36
	perhaps it's a new change that git-svn has its own refs directory?	20:37
pfloyd	Seveas: thanks, testing now	20:37
	→ staticshock joined	20:37
	→ eletuchy joined	20:38
Seveas	tobiasvl: (responding without knowing context) git-svn used to store its refs in a stupid place (directly in refs/remotes/), in recent versions (2.0.0+) that moved to refs/remotes/git-svn/	20:38
	← hahuang61 left	20:39
pfloyd	Seveas: works great, will probably restrict which commands they can use to some extent, but I think this should work nicely, thanks again!	20:39
stephaneyfx	tobiasvl: Thank you again for taking the time to answer. The problem is that .git/svn/refs/remotes/origin/v1.0.x is not a file containg a sha-1, it is a directory. I thought reference files stored in .git/refs should just be files containing a sha-1.	20:39
Seveas	pfloyd: you're welcome :)	20:40
tobiasvl	stephaneyfx: what git version are you on? re: what Seveas said above	20:40
	→ liamonade joined	20:40
Seveas	.git/svn/ is probably just git-svn's internal storage, not actual git data	20:41
tobiasvl	hmmmm yes	20:41
Seveas	or at least it's not supposed to be	20:41
	(haven't done git-svn in ages)	20:41
tobiasvl	me neither :/	20:41
	s_/_)	20:42
	← staticshock left	20:42
Seveas	hehe	20:42
	← eletuchy left	20:42
	→ sbasso joined	20:43
stephaneyfx	Seveas: tobiasvl: I am using 2.7.0.windows.1. According the git-svn help, it's supposed to have a default prefix of "origin/" so as to not store stuff directly under remotes.	20:43
	according to*	20:43
Seveas	stephaneyfx: yeah, .git/refs/remotes, not .git/svn/	20:43
	→ terminal_echo joined	20:43
	→ kfunk joined	20:43
	→ mic4ael joined	20:44
	→ bollullera joined	20:44
	← gfixler left	20:45
stephaneyfx	but anyway in my case nothing is stored under .git/refs/remotes/origin aside from an empty "tags" directory	20:45
	→ oich joined	20:45
Seveas	yeah, because of the packed refs :)	20:45
	← PryMar56 left	20:45
	← Tryop88 left	20:45
	← phaleth left	20:46
stephaneyfx	so should I just go ahead and create my true git tags manually and delete the corresponding lines in packed-refs?	20:47
	→ mezod joined	20:47
	→ jwmann joined	20:47
Seveas	no	20:48
	→ mylord joined	20:48
	← beagleGuy left	20:48
	← ahr3n left	20:48
Seveas	you use git commands to manipulate tags and other git data, never hack in .git	20:48
	for example, git tag -d will delete a tag.	20:48
tobiasvl	Seveas: I think stephaneyfx wants to hack in .git because http://git-scm.com/book/en/v2/Git-and-Other-Systems-Migrating-to-Git tells us to	20:49
	← mns left	20:49
Seveas	well, that's pretty shitty then	20:50
	→ ahr3n joined	20:50
stephaneyfx	Seveas: Sorry for being unclear. By manually I meant creating the tags using "git tag" instead of moving files as described in the migration guide.	20:50
	← enter_ left	20:51
Seveas	stephaneyfx: as you might guess from my last few lines, I think that using git tag to create tags is a good idea :)	20:51
stephaneyfx	the only filesystem thing I am thinking of doing is editing packed-refs to remove references to these svn tags which were considered branches.	20:51
Seveas	don't. git update-ref -d refs/remotes/origin/tags/foo	20:51
	→ nickthetait joined	20:52
	→ enter_ joined	20:52
stephaneyfx	Seveas: oooh. yes that looks better! thanks.	20:52
Seveas	the only time hacking in .git is really justified is troubleshooting broken repos	20:53
stephaneyfx	Seveas: Makes sense.	20:53
Seveas	for normal uses, git has plumbing commands for everything and porcelain commands for lots of things.	20:53
	also, curiosity is a good reason to poke at .git :)	20:54
floatingpoint	hey. somehow, there are all these files in my branch that shouldn't be there. how can I determine how they got there?	20:54
Seveas	floatingpoint: git log path/to/file	20:54
stephaneyfx	Seveas: Yes, that's curiosity and trying to understand where those mysterious references were stored that got me looking into it.	20:54
	You have helped me a lot and I think I have enough information to get started. I will give a try to this migration and come back if I get stuck. Thank you again for all the help.	20:55
Seveas	stephaneyfx: man gitrepository-layout	20:55
gitinfo	stephaneyfx: the gitrepository-layout manpage is available at http://jk.gs/gitrepository-layout.html	20:55
	← mic4ael left	20:55
	→ woxidu joined	20:56
floatingpoint	Seveas nothing in git log mentions my current branch	20:56
	→ diego4 joined	20:56
Seveas	yes it does. All it does is mentioning your current branch (unless you specify other parameters)	20:56
	← diego4 left	20:57
	→ diego4 joined	20:57
floatingpoint	sorry. can you rephrease that	20:57
	→ rhnvrm joined	20:57
stephaneyfx	Seveas: I had looked at this page but missed the packed-refs section :p	20:58
Seveas	git log shows you all history that leads up to the current commit. So it shows the current branch.	20:58
	← sgambino left	20:58
	← diegoviola left	20:59
	← skapunker left	20:59
floatingpoint	the latest item in git log my_file shows a merge between two other branches	20:59
Seveas	and all of that is now part of your branch	20:59
floatingpoint	how can i determien when the other branches were merged into my branch?	21:00
Seveas	git log tells you that...	21:01
tobiasvl	wasn't that exactly what you just said you saw in the log?	21:01
	→ skapunker joined	21:01
	← bket left	21:01
	← stephaneyfx left	21:02
floatingpoint	no. There is a statement "Merge branch "develop" of GITREPO into SOME_OTHER_BRANCH"	21:02
	some other branch != my current branch	21:02
	→ sgambino joined	21:03
	→ nilsi joined	21:03
	→ tpollard joined	21:03
pfloyd	Seveas: well crap, our IT has it configured such that SSH drops user env variables, so I can't tell who the original user is that's executing the command.	21:03
tobiasvl	floatingpoint: ok, so that's an older merge commit. where did that branch (SOME_OTHER_BRANCH) merge into your current branch? that's what you're looking for.	21:03
floatingpoint	tobiasvl correct	21:04
	→ strayPuppy joined	21:04
tobiasvl	you should see that in the log. if you don't, gitk might help	21:04
	→ tek81 joined	21:04
Seveas	pfloyd: depending on how many users you have, you could copy the wrapper a few times and identify them in the wrapper :)	21:04
tobiasvl	or play around with the options to git log so it's easier to visualize. man git log	21:04
gitinfo	the git-log manpage is available at http://jk.gs/git-log.html	21:04
Seveas	pfloyd: obviously that doesn't scale :)	21:05
pfloyd	Seveas: or just have it pass $USER as an arg to git-shell-wrapper!	21:05
floatingpoint	tobiasvl there's no merge message for SOME_OTHER_BRANCH	21:05
	→ medeirosthiiago joined	21:05
	← diegoaguilar left	21:05
	← freimatz left	21:06
Seveas	pfloyd: but they're all logging in as the same $USER you say	21:06
	→ diegoaguilar joined	21:06
pfloyd	Seveas: right but the authorization file is where I tie the user to ssh key to command, so I can just pass that as an arg	21:06
Seveas	or do you mean command="git-shell-wrapper user1"? Not sure if that works	21:06
	but try it :)	21:06
pfloyd	yes :)	21:06
tobiasvl	floatingpoint: maybe it was merged without a merge commit?	21:07
floatingpoint	tobiasvl looks like it	21:07
	:\|	21:07
tobiasvl	you see it in the log for your branch so surely it has been merged into your branch, merge commit or not.	21:07
floatingpoint	is there an easy way to "unmerge" a branch?	21:07
pfloyd	Seveas: excellent, seems to work well. My concern was this single user would have access to N repositories, but I'd need to restrict on a per-user basis which they can see so this would work nicely. definitely a clunky setup, but then again gitolite isn't the most intuitive thing either	21:07
	← nilsi left	21:08
tobiasvl	floatingpoint: revert the merge'	21:08
	floatingpoint: man git revert - look at -m	21:08
gitinfo	floatingpoint: the git-revert manpage is available at http://jk.gs/git-revert.html	21:08
	→ jflav joined	21:08
tobiasvl	floatingpoint: and !faulty while we're at it	21:09
gitinfo	floatingpoint: [!faulty_merge] If you have published a merge commit that turned out to be faulty and you'd like to get rid of it, you're probably not going to have a good time. Here's the full story: https://raw.github.com/git/git/master/Documentation/howto/revert-a-faulty-merge.txt	21:09
	← rnsanchez left	21:09
	← diogenese left	21:09
	→ HelloAtMega joined	21:10
	← aclearman037 left	21:11
	← JeroenT left	21:12
	→ JeroenT joined	21:13
	← JeroenT left	21:13
	→ aswen joined	21:13
	→ elsevero joined	21:13
	→ UTAN_dev joined	21:14
	→ NeverDie joined	21:14
	← otho left	21:14
	← NeverDie left	21:14
	← AaronMT left	21:14
	← alanjf left	21:15
	← ajf- left	21:16
	→ alanjf joined	21:16
	→ daito joined	21:16
	→ bket joined	21:17
	← doppo left	21:17
	→ doppo joined	21:18
	→ chango joined	21:19
	← rwb left	21:20
	← toogley left	21:20
	← Chinorro left	21:20
	← manitu left	21:20
	← bjoe2k4 left	21:20
	← daito left	21:21
	→ bjoe2k4 joined	21:21
	→ Chinorro joined	21:21
floatingpoint	tobiasvl what is the "__history__" of the merge that linus talks about?	21:21
	→ tristanseifert joined	21:22
tobiasvl	floatingpoint: what do you mean?	21:23
	what paragraph are you talking about there	21:23
	→ manitu joined	21:23
floatingpoint	line 65	21:23
tobiasvl	the underscores are just emphasis	21:24
	commonly used to denote italics or underscores in ascii	21:24
floatingpoint	yes, but why does history matter in this case?	21:24
	← chango left	21:24
tobiasvl	because the merge will still be in the history of the branch	21:25
	the commits introduced in the merge will still be among the branch's ancestors	21:25
	so they can't be reintroduced in a new merge	21:25
	did you read the entire thing?	21:26
floatingpoint	i'm asking questions as i go	21:26
	← KennyRayFL left	21:26
	← enter_ left	21:26
	← tanimislam left	21:26
	→ haole joined	21:27
floatingpoint	generally speaking, i find it ineffective to continue reading something until you understand all referenced concepts	21:27
	→ enter_ joined	21:27
	← woxidu left	21:27
	← pfloyd left	21:27
	→ woxidu joined	21:28
haole	I'm trying to push to a remote git dir with ssh (no http server involved), but I'm getting this weird error: fatal: failed to read object c3e1b82a58a4ba0006774cf9f881bd4304302293: Protocol error	21:28
	→ KennyRayFL joined	21:28
haole	I can login to this server via ssh without issues and the permissions are fine... what could be happening here?	21:28
	← zadock left	21:28
	→ dan2k3k4 joined	21:29
floatingpoint	long story short, I don't want any of the files and/or changes that were introduced by the merge n commits ago	21:29
	← fstd left	21:29
	← mezod left	21:29
tobiasvl	floatingpoint: but having the commits is fine?	21:30
	floatingpoint: if so, just revert.	21:30
	← xbob left	21:30
	← medeirosthiiago left	21:30
	→ enter__ joined	21:30
	→ douglasc_ joined	21:31
	← enter_ left	21:31
floatingpoint	tobiasvl It sounds like it could be a problem. Lets say the current branch is A, the erroneously merged branch is B, and the mainline branch is C. Eventually A and B will be merged into C (seperately). Will a revert on A cause problems with the eventual merges to C?	21:31
	← KennyRayFL left	21:31
	→ qballer joined	21:33
	← qballer left	21:33
	← douglascorrea left	21:34
	← enter__ left	21:34
	→ LaptopBrain joined	21:34
floatingpoint	tobiasvl did your head explode? i hope not	21:35
	douglasc_ → douglascorrea	21:35
	→ enter_ joined	21:36
	← fmcgeough left	21:36
	→ ToBeCloud joined	21:36
	← flaguy48 left	21:37
tobiasvl	hmm let's see. you merged B to A by mistake, it should really be merged to C?	21:37
floatingpoint	I merged B to A by mistake. B should be merged to C (eventually)	21:38
	→ staticshock joined	21:38
tobiasvl	speaking of exploding heads, if reverting the merge causes any issues, you can revert the revert and merge that into C together with B. that should clear it up	21:38
	→ eletuchy joined	21:39
	← ramsub07 left	21:39
floatingpoint	oh boy	21:39
	→ enter__ joined	21:39
tobiasvl	reverting a merge will just reverse the diff of the merge. so any lines of code the merge introduced, the revert will remove them again, in a new commit.	21:39
	so reverting the revert will add them again	21:40
floatingpoint	yeah	21:40
	that makes sense	21:40
	what isn't clear is if I merge B into A, will C think B is already merged when I try to merge it in the future?	21:40
	sorry. let me rewrite	21:41
grawity	yes, I think it will	21:41
	← enter_ left	21:41
grawity	if you merge B into A, it's now part of A's history	21:41
floatingpoint	If I merge B into A, revert B, and then merge A into C, will C think B was merged in when i try to merge B into C	21:41
grawity	so if you then merge A into C, that will include everything A got from B	21:42
	→ WifiBrain joined	21:42
floatingpoint	yes, and I don't want that	21:42
grawity	at least, up to the A-B merge (though not what happens in B later)	21:42
tobiasvl	yes	21:42
	→ PryMar56 joined	21:42
	← WifiBrain left	21:42
	← johnmilton left	21:42
grawity	possible to hack around tbh, but it's an ugly situation	21:43
	← staticshock left	21:43
floatingpoint	ok. perhaps I should do a git checkout C of each file introduced by B in A	21:43
	← eletuchy left	21:43
grawity	e.g. if you rewrote (e.g. rebased or filtered) B, then the rewritten commits wouldn't be considered as "merged" anymore	21:44
	→ medeirosthiiago joined	21:44
	→ WifiBrain joined	21:44
grawity	well I'm guessing that would trick Git	21:44
	→ ywecur_ joined	21:44
floatingpoint	then the files will no longer exist in A, and I can merge into C. Then I can merge B into C and it should work, yes?	21:44
	← mricon left	21:44
	← LaptopBrain left	21:45
tobiasvl	that would be fine. essentially the same as reverting the revert.	21:45
	← FunkyAss left	21:45
	← tomog999 left	21:45
	→ staticshock joined	21:46
tobiasvl	if you manually reintroduce the changes that's obviously unproblematic for git and the branch's history, two commits can contain the same changes	21:46
	→ sssilver_ joined	21:46
floatingpoint	well, it's going to be annoying to have to do it manually, but i guess that's my only optino	21:46
	← sssilver_ left	21:47
tobiasvl	will A be merged into C before B will?	21:47
floatingpoint	yes	21:47
	→ sssilver_ joined	21:47
	← thiago left	21:49
	← sbasso left	21:49
	← sssilver left	21:49
	← WifiBrain left	21:50
	← durham left	21:50
	→ LaptopBrain joined	21:51
	→ tomog999 joined	21:51
	← synthroid left	21:53
	← mischat left	21:53
	← enter__ left	21:53
floatingpoint	ok. new question. if i git rm some files, and the files still exist in my main branch, will the files be deleted if i try to merge my branch into the main branch?	21:54
	→ Drugo joined	21:54
	← tek81 left	21:55
	← diegoaguilar left	21:55
	→ StuartMI joined	21:55
	→ mischat_ joined	21:56
	← sangy left	21:56
	← kermit left	21:56
ToxicFrog	floatingpoint: yes. If they've also been modified in main since the branch diverged, you'll get an edit/delete conflict you need to resolve	21:56
	← pantsman- left	21:57
	← nikitasius left	21:57
	← LaptopBrain left	21:57
floatingpoint	ok. how can i remove the files from my branch without having them affect what's in the main branch?	21:57
	→ ajm203 joined	21:58
	← ywecur_ left	21:58
	← shaggycat left	21:58
	← skirk left	21:58
milki	what kind of effect are you worried about?	21:58
	← nettoweb left	21:59
floatingpoint	you know what, this should work	21:59
	diego4 → diegoviola	21:59
	← ash_workz left	22:02
	← jonmorehouse left	22:02
ToxicFrog	floatingpoint: you can always remove them, and then when merging them back in use --no-commit and edit the merge result before committing	22:02
	← canton7 left	22:03
	→ ywecur_ joined	22:04
	→ canton7 joined	22:04
	← leksster left	22:04
	→ flaguy48 joined	22:04
	← Darcidride left	22:05
	→ zumba_addict joined	22:05
	→ thetrav joined	22:06
	← NOTevil left	22:06
	→ diegoaguilar joined	22:06
	← mischat_ left	22:07
	← emPi left	22:07
	→ MacWinner joined	22:07
	→ sangy joined	22:08
	→ emPi joined	22:08
	← jwmann left	22:08
	→ leksster joined	22:08
thetrav	http://pastebin.com/9v5bQtWj <- neither git clone --recursive nor git submodule update --init get that submodule cloned... is there something wrong with that config?	22:08
	→ jwmann joined	22:08
thetrav	I don't get any error messages, the command completes successfully but with no file system changes	22:09
	→ tvw joined	22:10
	→ scsix joined	22:10
	← David1977 left	22:12
	← System42 left	22:12
	← Dragooon left	22:12
	← ErKa left	22:14
	→ sbasso joined	22:14
	← codeman left	22:15
	← citizen-stig left	22:16
	← scsix left	22:16
thetrav	ahh, there was a file ansible/roles/jenkins that needed to be committed that I didn't	22:16
	weird that the metadata can be incorrect but no error generated	22:17
	→ fstd joined	22:17
	← liamonade left	22:18
	→ thiago joined	22:18
	← thiago left	22:18
	→ thiago joined	22:18
	← emPi left	22:19
	→ jottr_ joined	22:19
	← kpease left	22:19
	→ emPi joined	22:19
	→ Dragooon joined	22:20
	← pandeiro left	22:21
	→ diego2 joined	22:21
	→ kpease joined	22:22
	→ mezod joined	22:22
	← diegoviola left	22:23
	← fees left	22:24
	→ xbob joined	22:25
floatingpoint	ok. semi-related question: how can I get the files from froma specific branch into another branch without merging branches?	22:26
	← emPi left	22:26
osse	floatingpoint: git checkout branch -- file(s)	22:26
	→ ramsub07 joined	22:26
	→ emPi joined	22:27
floatingpoint	osse omg	22:27
	← _xor left	22:27
	→ hahuang61 joined	22:27
	← diego2 left	22:27
	→ diego2 joined	22:27
	diego2 → diegoviola	22:27
osse	floatingpoint lol	22:28
	→ kermit joined	22:29
	→ diogenese joined	22:30
	→ jberkus joined	22:31
	→ mmlb joined	22:31
jberkus	I accidentally based a feature branch off another feature branch instead of off of master	22:31
	← bango2 left	22:31
jberkus	how do I fix that without losing my work? there's no merge conflicts with anything	22:31
	→ jmmy joined	22:31
thetrav	floatingpoint: is that cherry picking?	22:31
	→ endiruna joined	22:32
thetrav	oh, osse already answered	22:32
	and actually knew the answer :D	22:32
	← hahuang61 left	22:32
	← thetrav left	22:32
	← medeirosthiiago left	22:33
osse	jberkus: git rebase --onto=master wrongbranch	22:33
jberkus	osse: ok, thanks for confirming	22:33
	trying ...	22:33
	gitinfo set mode: +v	22:33
jmmy	quick question here - I have a project and I want to re-organize the directory structure. Some of the directories that I am moving around contain files that are not tracked (.pyc for example). The issue I am having is that when I switch back to my master branch, I have some of the new folders with the ignored files present. Any way around this?	22:33
	← leksster left	22:34
osse	jmmy: git clean can help	22:34
	but is it actually a problem ?	22:34
jmmy	osse: yeah basically I have all these "untracked" folders when I move back to master	22:34
	osse: and I have bower_components folder for example that is now in a different location	22:35
jberkus	osse: ok, this is either scary magic or I just hosed my local copy. we'll see ...	22:35
osse	jberkus: https://github.com/Osse/git-stuff/blob/master/rebase-onto.txt	22:36
jmmy	osse: I will look into git clean	22:36
	osse: basically, I want to track the location of the folder even though I don't want to track the contents (for example a bunch of npm installed packages)	22:36
	← madewokherd left	22:37
	← jason237 left	22:37
osse	jmmy: that's not gonna happen. git refuses to track empty dirs	22:37
jberkus	osse: so that now results in me picking up a bunch of commits which were already added to master and re-applying them as part of the rebase	22:37
osse	jberkus: then you did something wrong	22:37
jberkus	I did git rebase --onto master wrongbranch	22:38
	however, master was ahead of wrongbranch	22:38
	← TomyLobo left	22:38
osse	aha	22:38
jberkus	osse: so, relevantly	22:39
	I want to take one commit from the newbranch	22:39
	so if there's an easier way to grab that ...	22:39
	← josuebrunel left	22:39
osse	do you want to move newbranch over too?	22:39
	or leve it alone and create a newerbranch?	22:39
jberkus	osse: I want a branch on the remote with the one commit I care about, the last one in newbranch. creating a newerbranch is perfectly OK if I can create one	22:40
	which I can merge with master and have only the one commit	22:40
	← strayPuppy left	22:40
	← vishal left	22:40
	→ fishcooker joined	22:40
osse	git checkout -b newerbranch correctbase; git cherry-pick newbranch	22:40
	← LucaTM left	22:41
jberkus	awesome	22:42
	→ jonmorehouse joined	22:42
jberkus	osse: thank you, that saved me a LOT of copying files	22:42
	← bongjovi_ left	22:42
	→ causasui joined	22:43
	← causasui left	22:43
	→ causasui joined	22:43
	← ahr3n left	22:45
	→ tomog999_ joined	22:45
	→ vishal joined	22:45
	← kballou left	22:46
	← diogenese left	22:47
	← tomog999 left	22:47
	→ tomog9991 joined	22:47
	→ liamonade joined	22:48
	← liamonade left	22:48
	← tomog999_ left	22:49
	→ diogenese joined	22:50
	→ jimi_ joined	22:50
	→ plonk joined	22:51
	→ durham joined	22:51
	← t0by left	22:51
	← ywecur_ left	22:52
	← Dougie187 left	22:53
	← dreiss left	22:54
	← zumba_addict left	22:54
	gitinfo set mode: +v	22:55
	→ EvilPeng1 joined	22:55
	← EvilPenguin left	22:55
	← livingstn left	22:55
	→ joufflu joined	22:56
	← sgambino left	22:57
	← blackwind_123 left	22:58
	← durham left	22:58
	← invisbl_ left	22:58
	→ durham joined	22:59
	← elastix left	22:59
	→ blackwind_123 joined	23:00
	→ invisbl_ joined	23:00
	→ madewokherd joined	23:01
	← crayon left	23:01
	→ BSaboia joined	23:02
	← durham left	23:02
	→ durham joined	23:03
	← espindola left	23:05
	← sbasso left	23:06
	→ AaronMT joined	23:07
	→ sbasso joined	23:07
	← diegoviola left	23:07
	→ dodobrain joined	23:08
dodobrain	hi all	23:08
	← fishcooker left	23:09
	← cagedwisdom left	23:10
	→ intrigueD joined	23:11
dodobrain	how do i find out what tags i have and what type they are?	23:11
	ok `git tag`shows me the list	23:11
	how do i now see which ones are annotated and which ones are lightweight?	23:12
	→ mwhooker joined	23:12
	← mwhooker left	23:12
	← AaronMT left	23:12
	→ mwhooker joined	23:13
	→ ShapeShifter499 joined	23:13
osse	dodobrain: git for-each-ref refs/tags	23:13
	dodobrain: tag = annotated. commit = lightweight	23:13
	← weox left	23:13
dodobrain	osse, thanks! that is super helpful	23:14
	→ mischat joined	23:15
osse	it's my best weapon in the fight against the bourgeouise	23:15
dodobrain	osse, ?	23:15
	← whitby left	23:15
osse	dodobrain: for-each-ref also accepts a format string that can print info of varying interest	23:16
	← rideh- left	23:16
	→ ahr3n joined	23:16
	→ rideh joined	23:17
osse	dodobrain: more compact output: git for-each-ref --format='%(objecttype) %(refname:short)' refs/tags	23:19
	as for the weapon comment, just a bad joke	23:19
dodobrain	well, i don;t know what `bourgeouise' is!	23:20
	← EvilPeng1 left	23:20
osse	dodobrain: An affluent and often opulent stratum of the middle class (capitalist class) who stood opposite the proletariat class	23:21
	→ the_cybersphinx joined	23:21
	→ [gmi] joined	23:21
	← staticshock left	23:22
	→ staticshock joined	23:22
	← MadHatter42 left	23:23
	→ cagedwisdom joined	23:25
	← dhollinger left	23:25
	← mizu_no_oto left	23:26
	← [gmi] left	23:26
	→ citizen-stig joined	23:27
	← Hello71 left	23:28
	→ KtoTo joined	23:29
	→ liamonade joined	23:30
	← citizen-stig left	23:31
	→ Hello71 joined	23:31
	← dersand left	23:32
	← terminal_echo left	23:32
	→ jfelchner joined	23:33
	← mwhooker left	23:34
	→ johnmilton joined	23:35
	← aswen left	23:36
	← Gamecubic left	23:37
	→ crayon joined	23:37
	→ Gamecubic joined	23:37
	← Rodya_ left	23:37
	← r_rios left	23:38
	← dsdeiz left	23:38
	→ xlegoman joined	23:38
	← diegoaguilar left	23:39
	→ LaptopBrain joined	23:40
	→ eletuchy joined	23:40
	← ramsub07 left	23:40
	← BigWilli_ left	23:40
	→ jmckind joined	23:41
	← boombatower left	23:42
	← jmckind left	23:42
	→ rMdes_ joined	23:42
	← haole left	23:42
	→ jmckind joined	23:42
	← colept left	23:44
	← eletuchy left	23:44
	← mmlb left	23:45
	← rMdes left	23:45
	→ nate_c joined	23:45
	→ n30 joined	23:46
	← kpease left	23:46
	← n30 left	23:46
dodobrain	osse, errr.. i've got a weird problem :( originally we had been using `git describe` to grab a version number. but then one of the devs made 0.4.0 a lightweight tag	23:47
	so i added --tags to the git describe command to get to the correct tag (in this case the light weight one). everything works fine locally. but on the server where there is a clone of the repo, git describe is matching an earlier 0.3.2 tag!	23:48
	← raijin left	23:49
	→ raijin joined	23:49
osse	dodobrain: describe prefers annotated tags over lightweight ones	23:50
	not sure how to deal with this	23:50
	→ n30 joined	23:50
dodobrain	adding --tags grabs the lightweight ones as well	23:50
	but it doesn't seem to work on the server	23:50
	i guess it could be he git version there lol	23:51
osse	is the tag present on the server?	23:51
	→ diegoaguilar joined	23:51
dodobrain	actually, when i list the tags, i can see the dev has switched the lioghtweight tag to an annotated one	23:51
	so now its even more4 strange why git describe would show an earlier tag	23:52
	→ ramsub07 joined	23:52
	← staticshock left	23:52
	← joako left	23:53
osse	try to delete the tag and have him push it again	23:54
	← paddyez left	23:54
dodobrain	err.. hes sleeping	23:54
	jmckind → jmckind_	23:54
osse	where do you list the tags? in the exact same repo that prints 0.3.2 ?	23:55
	→ joako joined	23:55
	← Kicer86 left	23:55
	← n30 left	23:55
	← editshare-ericf left	23:55
	→ n30 joined	23:56
	← floatingpoint left	23:56
osse	brb sleep	23:57
	→ staticshock joined	23:58
	← italoacasas left	23:58
	← xbob left	23:58
dodobrain	osse, you still around?	23:59

Logs Search ←Prev date Next date→

Channels Documentation