IRCloggy #git 2014-02-20

Provider of IRC logs since 2005.

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

	2014-02-20
	← jluc left	00:00
	→ simesy joined	00:00
	← JosephFerano left	00:01
	imMute^ → imMute	00:01
	← livingstn left	00:01
	← infynyxx left	00:01
	← dancat left	00:01
	← _iron left	00:01
	← axl_ left	00:02
	← airdisa left	00:02
	← joelroa left	00:03
	← koell left	00:03
	→ meLon joined	00:04
	← durianshredder left	00:04
	← zorbash left	00:04
	← felipewm left	00:04
	← David left	00:04
	← plushy left	00:05
	→ felipewm joined	00:05
	→ plushy joined	00:05
	← pfg left	00:06
	← nnyk_ left	00:06
	→ The-Mad-Pirate joined	00:07
	→ koell joined	00:07
	← alexlindenlevy left	00:08
	→ dancat joined	00:09
	← xSmurf left	00:09
	← bwreilly left	00:09
	← nivoc left	00:10
	← plushy left	00:10
	→ acl_ joined	00:10
	→ mimoo joined	00:11
	→ ErKa joined	00:11
	→ Vivekananda joined	00:11
	← ariscop left	00:14
	← tagomag0 left	00:14
	→ srji_ joined	00:16
	← AaronMT left	00:16
	→ solker joined	00:17
	← ShooterMG left	00:18
	← jcvfen left	00:18
	← srji left	00:19
	← chrisshattuck left	00:20
	← juliohm left	00:20
	→ diegoviola joined	00:20
	← aslaen left	00:21
	→ Leoneof joined	00:22
	← acl_ left	00:22
	← solker left	00:23
	← WaReZ left	00:23
	← lolmaus left	00:23
	→ acl_ joined	00:23
	← acl_ left	00:23
	→ alexlindenlevy joined	00:25
	← primitive left	00:26
	← cjsarette left	00:26
	← senj left	00:26
	← hahuang65 left	00:28
	→ cjsarette joined	00:29
	→ hahuang65 joined	00:29
	→ srji joined	00:30
	→ dyng joined	00:30
	→ mizu_no_oto joined	00:30
	← dyng left	00:31
	→ Kayra joined	00:31
	→ dyng joined	00:31
	→ infynyxx joined	00:31
	← srji_ left	00:32
	← osse left	00:32
	→ JosephFerano joined	00:33
	zz_karupanerura → karupanerura	00:34
	← oracal left	00:34
	← MattStratton left	00:34
	← maestrojed left	00:34
	← dyng left	00:35
	→ dyng joined	00:35
	← JosephFerano left	00:36
	← srji left	00:36
	→ ShooterMG joined	00:36
	→ Zaknefain joined	00:36
	→ srji joined	00:36
	← infynyxx left	00:37
	→ infynyxx joined	00:37
	← mr_red left	00:37
	→ mr_red joined	00:39
	→ woollyams joined	00:40
	→ zumba_addict joined	00:40
	← Zaknefain left	00:41
	→ pfg joined	00:41
	→ osse joined	00:42
	→ BBBThunda joined	00:42
	← Nizumzen left	00:42
	← tvw left	00:44
	← luxgeek left	00:44
	← hwrdprkns left	00:45
	← halu left	00:45
	← freestyl3r left	00:45
	← RaceCondition left	00:45
	→ trinque joined	00:46
	← cjsarette left	00:47
	← aberrant left	00:47
	← wongon left	00:48
	→ aberrant joined	00:49
	→ cjsarette joined	00:49
	→ lolmaus joined	00:49
	← george2 left	00:50
	← hahuang65 left	00:52
	→ hahuang65 joined	00:52
	← satiricon left	00:53
	← woollyams left	00:53
	← hahuang65 left	00:54
	← Mousse__ left	00:56
	→ rchavik joined	00:57
	→ hahuang65 joined	00:57
	← pheaver left	00:58
	→ chrisshattuck joined	00:58
	← infynyxx left	00:59
	← mikecmpbll left	01:00
	→ Sabbath joined	01:01
	→ john2x joined	01:02
	flazz_gone → flazz	01:04
	← LeMike left	01:05
	← imachuchu left	01:06
	← robustus left	01:06
	← Kayra left	01:07
	→ fairuz joined	01:08
	→ jgoss joined	01:09
	← jgoss left	01:09
	→ jgoss joined	01:09
	→ robustus joined	01:09
	← harish left	01:09
	← glebihan left	01:09
	← becks__ left	01:09
	→ glebihan joined	01:09
	← alexlindenlevy left	01:10
	← ecualombian left	01:11
	→ solker joined	01:12
	→ Nizumzen joined	01:12
	← n8chur__ left	01:12
	← rchavik left	01:13
	→ phuh joined	01:13
	→ daito joined	01:13
phuh	Anybody home?	01:13
	← dyng left	01:14
	→ dyng joined	01:14
	← fairuz left	01:15
	→ fairuz joined	01:15
	← hahuang65 left	01:15
fairuz	phuh: sure	01:15
	→ weiyang joined	01:16
	→ Vampire0_ joined	01:16
phuh	fairuz: There's a constantly changing repository and I'd like to clone it and track its changes and apply the diffs occasionally going forward. How can I do this without polluting my commit log? (only want to import the source code changes when I want to bring in new updates)	01:16
	← solker left	01:17
	→ johnkevi_ joined	01:17
	← veebers left	01:18
	← daito left	01:18
	← Exancillatus left	01:18
fairuz	phuh: What do you mean by pluuting your commit log?	01:18
	← ianmcorvidae left	01:18
	← dyng left	01:19
fairuz	You can update your local repo. by pulling new update from the remote. It can be done by git pull	01:19
	← BBBThunda left	01:19
	← johnkevinmbasco left	01:19
	← Vampire0 left	01:19
fairuz	or a fetch then a merge/rebase	01:19
	← gnugnu5 left	01:19
	→ n8chur_ joined	01:19
phuh	I just need to track it in a way that I only bring in the diffs from the last merge. I want a manual execution of this merge process. How would I be able to do this?	01:19
	→ gnugnu5 joined	01:20
	← daikichi left	01:20
	→ alexlindenlevy joined	01:20
	→ ianmcorvidae joined	01:20
	← gnugnu5 left	01:20
	← beyondcreed left	01:20
	→ gnugnu5 joined	01:21
	← thalisson_ left	01:21
	→ aMoniker joined	01:21
	→ decotii-alt joined	01:22
aMoniker	Is anyone familiar with testing pull requests from bitbucket locally?	01:22
	I don't have access to the forked repo the request comes from, but I can see the request...	01:22
	nitrix → Master	01:22
	← SHyx0rmZ left	01:22
	→ ariscop joined	01:23
	← _Vi left	01:23
	← decotii left	01:24
	→ dyng joined	01:24
fairuz	phuh: git pull is manual if that what you mean	01:25
	← dec left	01:25
	← martianlobster left	01:26
	← fanno left	01:26
	Master → nitrix	01:27
	← mizu_no_oto left	01:27
aMoniker	Do I need access to the forked repo in order to pull down changes locally?	01:27
	→ johnkevinmbasco joined	01:27
	← gnugnu5 left	01:27
	← tyreld left	01:28
	← johnkevi_ left	01:29
	← ErKa left	01:29
	← starkhalo left	01:30
	← dfarler left	01:30
	→ FogleBird joined	01:30
	← polyzen left	01:30
	→ Zaknefain joined	01:31
	← Xiti left	01:31
	→ regreddit joined	01:31
	← regreddit left	01:31
	→ regreddit joined	01:31
	← budrose left	01:31
	← Zaknefain left	01:31
	← bodom left	01:32
	→ gregsmith joined	01:33
	← dancat left	01:33
	→ napcae joined	01:34
	← nilg left	01:35
	← gregsmith left	01:36
	← Nizumzen left	01:38
	→ johnkevi_ joined	01:38
	→ salamanderrake joined	01:39
	← johnkevinmbasco left	01:39
	→ tmcmahon joined	01:39
	→ woollyams joined	01:40
	→ _5kg joined	01:40
	→ Diemuzi joined	01:40
	gitinfo set mode: +v	01:40
	← Diemuzi left	01:41
	→ hwrdprkns joined	01:41
	→ lifelike joined	01:41
	→ kerrick joined	01:41
	→ LBV_User joined	01:41
	→ petey joined	01:41
	← NBhosting left	01:42
	→ ehmatthes joined	01:42
	→ sohail__ joined	01:43
	→ thalisson_ joined	01:44
	← shruggar left	01:44
	← vijay13 left	01:45
	→ akiress joined	01:45
	→ francisfish joined	01:46
	→ Nizumzen joined	01:47
	← tmcmahon left	01:49
	→ veebers joined	01:50
	← kcj left	01:51
	→ luxgeek joined	01:51
	← francisfish left	01:51
	← sgambino left	01:51
	← koda left	01:53
	← LBV_User left	01:53
	→ Exancillatus joined	01:54
	← mellernoia left	01:54
	→ fatalhalt joined	01:55
	→ mellernoia joined	01:55
	→ kukks joined	01:55
	→ Chwing joined	01:55
	← woollyams left	01:56
	→ koda joined	01:56
	→ cereffusion joined	01:56
	← koda left	01:57
	→ dmnd joined	01:57
	→ bwreilly joined	01:58
	← dmnd left	01:58
	→ dmnd joined	01:58
	← Nizumzen left	01:58
	→ woollyams joined	01:59
	← Zifre_ left	01:59
	← ariscop left	01:59
	→ joelroa joined	02:00
	← aartist left	02:00
	→ RaceCondition joined	02:00
dmnd	question to which the answer is probably that I'm doing it wrong: I have a bunch of local commits. I realize there is a mistake in HEAD^ that I want to fix, and have it go to that commit. So, I `git checkout HEAD^` and end up on a detached head. Then I make my change, and `git commit --amend` in hopes that git will amend the commit on my branch. But that doesn't happen. Is there a quick way to edit prior commits?	02:00
kadoban	dmnd: you might be looking for git rebase -i	02:01
	→ inahandizha joined	02:01
	→ Dougie187 joined	02:01
dmnd	kadoban: yeah, that works I guess	02:02
	← lifelike left	02:02
	← inahandizha left	02:03
	← mribeirodantas left	02:03
	→ lifelike joined	02:03
	→ joelroa_ joined	02:04
dmnd	kadoban: a small complaint about using rebase to do it is that I have to know before I `git checkout HEAD^` that I want to do something. By that I mean I was just testing out the code as of HEAD^ when I realized I wanted to make that tweak. I'm in the habit of using git checkout to navigate around pending commits to do that. Having to then go back to HEAD, then git rebase -i, then edit the commit I was just looking at seems like a hassle	02:05
	flazz → flazz_gone	02:05
	→ dsantiago joined	02:05
	→ Xiti joined	02:05
	← Exancillatus left	02:05
	→ solker joined	02:06
kadoban	i very very rarely find myself on detached heads like that...i'm not sure if that means your doing something wrong or not	02:06
fairuz	dmnd: You can the tweak directly when you are in detached head	02:06
	← joelroa left	02:06
fairuz	stash it, then rebase,	02:07
	then just pop the modification back	02:07
	← ehmatthes left	02:07
dmnd	fairuz: that's better, but it's still a few extra steps. I guess I could script this but I just wondered if there was a "built in" way to do that	02:07
	→ luc_ joined	02:07
	→ daito joined	02:08
	→ jrdavid_ joined	02:08
	→ Zifre joined	02:09
	← Vampire0_ left	02:10
	← solker left	02:11
	← jrdavid left	02:11
	← jhulten left	02:11
	← deuti left	02:13
	→ Goplat joined	02:13
	← joelroa_ left	02:13
	→ johnkevinmbasco joined	02:14
	← johnkevi_ left	02:14
	← jday_ left	02:15
	← Noldorin left	02:15
	← clarmo left	02:16
	← veebers left	02:16
	← robsonpe_ left	02:16
	→ therealGent joined	02:16
	→ robsonpeixoto joined	02:17
	→ codeFiend joined	02:18
	→ Noldorin joined	02:19
	→ wongon joined	02:19
	← dmnd left	02:20
	← wongon left	02:20
	→ Vampire0_ joined	02:22
	← fatalhalt left	02:23
	← cereffusion left	02:23
	← simesy left	02:24
	← paulweb515 left	02:24
	→ Drone4four joined	02:25
	← Drone4four left	02:25
	→ fatalhalt joined	02:25
	→ Zaknefain joined	02:26
	→ ariscop joined	02:26
	← shinnya left	02:26
	→ Cyb3r_Assassin joined	02:27
	→ Cyb3r-Assassin joined	02:27
	← Cyb3r_Assassin left	02:27
	← Cyb3r-Assassin left	02:29
	flazz_gone → flazz	02:29
	← Zaknefain left	02:31
	← Mitchbones left	02:31
wagle	ia there an easy way to list all files modified between two sha1's, or do I make up something?	02:31
	is there an easy way to list all files modified between two sha1's, or do I make up something?	02:31
	→ GT4066 joined	02:32
Hello71	!dots	02:32
gitinfo	A..B = stuff that happened between A and B (if A and B are related; otherwise refer to the more technical definition in "man gitrevisions"), A...B = (a) in history viewers: stuff that isn't in both A and B yet; (b) in "git diff": stuff that happened in B since the two diverged. "master.." is the same as "master..HEAD" and "..master" is the same as "HEAD..master", and so forth.	02:32
wagle	i know that, need just a list of file names	02:32
	← ariscop left	02:33
Hello71	git diff --stat?	02:33
	wagle wonders how to make himself clear	02:33
	← chrisss404 left	02:33
kaictl	wagle: `git diff --stat a..b` or add a -p to show the actual patches.	02:34
	wagle: `git log --stat a..b` or add a -p to show the actual patches.	02:34
	my bad.	02:34
	→ o9 joined	02:34
	← vvetter left	02:34
	← CKyle left	02:34
	→ chrisss404 joined	02:35
Hello71	git log --name-only?	02:35
	*diff	02:36
	git diff --name-only a..b	02:36
	→ CKyle joined	02:36
wagle	--name-only is on the right track.. i'll figure out how to eliminate everything besides the file names	02:37
	thanks!	02:37
	oh wait, diff might do it	02:38
	← bhldev left	02:38
wagle	yes!	02:39
	exactly	02:39
Hello71	!name-only	02:39
	!names	02:39
	hm, no !	02:40
jon-mac	if someone commits something, and you dont believe its "ready", what do you do? if you revert it, you would never be able to merge it back in, right? you would have to do a force push to set the head back?	02:40
Hello71	!revert	02:40
gitinfo	That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?	02:40
Hello71	you want a	02:40
	or possibly e	02:40
jon-mac	Hello71: but say its fixed up, it would never merge, would it?	02:41
	because you already "have" the commit	02:41
	→ ariscop joined	02:41
fairuz	jon-mac: Do you use a code review system? If not, you can revert it	02:41
	and revert it back when it's ready	02:41
jon-mac	revert the revert?	02:41
fairuz	why not	02:41
	← therealGent left	02:42
jon-mac	seems like the best solution is a force push if its fast enough to not effect others	02:42
	← dreiss left	02:42
	Chwing → Jeremy_Nodasys	02:43
	← thalisson_ left	02:43
	→ Nizumzen joined	02:45
	← dyng left	02:45
aMoniker	How can I test a pull request on my local machine?	02:46
	I don't have access to the forked repo	02:46
	← v0n left	02:46
	← hwrdprkns left	02:48
	→ xSmurf joined	02:49
fairuz	aMoniker: not even read access?	02:49
aMoniker	fairuz: I don't think so	02:49
	I can see the diff	02:49
	obviously that should be enough info to pull/patch/whatever	02:50
	← dagnachew left	02:51
	← codeFiend left	02:52
	→ tomengland joined	02:52
	→ martianlobster1 joined	02:52
	← tomengland left	02:53
	→ tomengland joined	02:53
	→ hyperair joined	02:55
	→ rchavik joined	02:57
	→ ArcTanSusan joined	02:57
	← elbeardmorez left	02:57
	← SamB left	02:58
	← tomengland left	02:58
	← CKyle left	02:58
	← lethjakman left	02:59
	→ mdhopkins joined	02:59
	→ el3ctron_ joined	03:01
	← jonatasnona left	03:01
	→ budrose joined	03:02
	→ wrouesnel joined	03:02
	← felipewm left	03:03
	→ becks__ joined	03:04
	→ v0n joined	03:04
	← lithiumjake left	03:04
	→ joelroa joined	03:05
	← joelroa left	03:05
	→ solker joined	03:05
	→ tmcmahon joined	03:05
	→ hahuang65 joined	03:06
	→ joelroa joined	03:06
	← joelroa left	03:06
	← vkrest left	03:06
	→ vkrest joined	03:07
	→ joelroa joined	03:07
	← joelroa left	03:07
	→ simesy joined	03:08
	← boblee left	03:08
	→ boblee joined	03:09
	← scarabx left	03:09
	← solker left	03:11
	← glaksmono left	03:11
	← jaf2k left	03:11
	← FogleBird left	03:11
	→ lithiumjake joined	03:12
	← nathancahill left	03:12
	← ArcTanSusan left	03:14
	→ ArcTanSusan joined	03:14
	← tmcmahon left	03:14
	→ nathancahill joined	03:14
	← sohail__ left	03:15
	← Gamecubic left	03:15
	← akim left	03:16
	← armyriad left	03:16
	← Nizumzen left	03:16
	→ Gamecubic joined	03:16
	→ akim joined	03:16
	← hockmeister left	03:16
	→ armyriad joined	03:16
	→ Nizumzen joined	03:16
	→ sohail__ joined	03:16
	← joelm left	03:16
	← Not_Whatever left	03:16
	← jim--- left	03:16
	→ hockmeister joined	03:17
	→ jim--- joined	03:17
	→ joelm joined	03:17
	→ tmcmahon joined	03:17
	→ noisewaterphd_ joined	03:18
	→ jhulten joined	03:19
	← vkrest left	03:19
	→ David joined	03:19
	→ Zaknefain joined	03:20
	← tmcmahon left	03:20
	→ vijay13 joined	03:20
	← thiago left	03:21
	← cads left	03:23
	← mellernoia left	03:24
	← jhulten left	03:24
	← Zaknefain left	03:24
	← petey left	03:25
	→ petey joined	03:26
	flazz → flazz_gone	03:26
	→ yacks joined	03:26
	← TheMoonMaster left	03:26
	→ TheMoonMaster joined	03:27
	→ wongon joined	03:30
	← petey left	03:30
	← kongthap left	03:32
	← maroloccio left	03:32
	← bhek left	03:33
	← kalz left	03:34
	→ CKyle joined	03:35
	← mdhopkins left	03:35
	← sohail__ left	03:36
	← jim--- left	03:37
	→ tbmiller joined	03:37
	→ oojacoboo joined	03:39
	← mani2399 left	03:40
	→ kalz joined	03:40
	→ dreiss joined	03:42
	→ dagnachew joined	03:45
	zz_chamunks → chamunks	03:45
	← abbey left	03:46
	→ mdhopkins joined	03:47
	→ mizu_no_oto joined	03:47
	→ vkrest joined	03:47
	→ francisfish joined	03:47
	← becks__ left	03:47
	← makubi left	03:48
	→ jim--- joined	03:48
	→ makubi joined	03:49
	← lifelike left	03:50
	← vkrest left	03:50
	→ cads joined	03:50
	← mr_red left	03:50
	→ lifelike joined	03:50
	→ vkrest joined	03:51
	→ mr_red joined	03:51
	← francisfish left	03:52
	← RaceCondition left	03:56
	← tbmiller left	03:57
	← vijay13 left	03:58
	→ hwrdprkns joined	03:58
	← Zifre left	03:58
	→ tbmiller joined	03:58
	→ tomengland joined	03:59
	→ solker joined	04:00
	→ johnkevi_ joined	04:00
	← johnkevinmbasco left	04:00
	→ mikepack joined	04:00
	← wongon left	04:01
	← d2dchat left	04:01
	→ dmnd joined	04:01
	← Noldorin left	04:01
	→ thiago joined	04:02
	← tbmiller left	04:03
jmpp_	how can I amend the log of an unpublished commit, but one that's also not the last one?	04:05
	← solker left	04:05
jmpp_	I know git commit --amend lets me rewrite the log of the last commit	04:05
	but I want to add something to the log of some commits back	04:05
	→ solker joined	04:05
skorgon	jmpp_: git rebase	04:05
	--interactive	04:06
jmpp_	is that the only way?	04:06
kadoban	jmpp_: git rebase -i HEAD~50, or some big number	04:06
	there's other ways i'm sure, but that's the convenient one	04:06
jmpp_	I've never rebased before, but I hear it's something that should be done with extreme care...	04:06
skorgon	jmpp_: more or less, but that is the easisest i think	04:06
	jmpp_: that's silly. you have a !reflog	04:07
jmpp_	what risks do I run with that? I only want to add something to the log	04:07
gitinfo	jmpp_: The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details. WARNING: reset --hard will trash any uncommitted changes! Visualize with: gitk --all --date-order `git log -g --pretty=%H`	04:07
kadoban	sure, but interactive rebase is pretty easy. it'll show you a list of commits, find the one you want to change and change the "pick" in front of it to "reword"	04:07
	→ h0bbit_ joined	04:07
skorgon	jmpp_: that is exactly what rebase is there for	04:07
kadoban	jmpp_: you do want to be careful with it, but that's not the same thing as avoiding it like the plague	04:08
skorgon	jmpp_: when in doubt just create a backup branch of the current state. then you can easily come back (without too, but it might comfort you :) )	04:08
	← luxgeek left	04:08
	→ joelroa joined	04:08
	← koell left	04:08
	→ luxgeek joined	04:08
	← Luke-Jr left	04:08
jmpp_	korOK, I'll branch for backup	04:08
skorgon	jmpp_: as long as stuff is commited you have really good chances to get back to where you were (just don't wait several months)	04:09
	→ Luke-Jr joined	04:09
jmpp_	skorgon: what was it that you said about th reflog, if I may ask again? didn't quite follow you...	04:09
skorgon	!reflog	04:09
gitinfo	The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details. WARNING: reset --hard will trash any uncommitted changes! Visualize with: gitk --all --date-order `git log -g --pretty=%H`	04:09
kadoban	in other words, even if you muck it up, you can fix it	04:09
skorgon	it records all changes to HEAD	04:09
	← chrisshattuck left	04:09
skorgon	right	04:09
	← solker left	04:10
	← Dougie187 left	04:10
	← David left	04:10
	← pbrobst left	04:10
	← joelm left	04:10
	← robsonpeixoto left	04:10
	← CKyle left	04:11
	← l0x3py left	04:12
	← joelroa left	04:12
	→ chrisshattuck joined	04:13
	← alvaro_o left	04:13
	jmpp_ tries to fix his irssi session due to a busted Growl plugin, and reads...	04:13
	← keller left	04:14
	→ Zaknefain joined	04:14
skorgon	usually, all you may have to worry about are uncommited changes. everything else will be part of the git repo for a while. even unreachable commits will remain for a while until the garbage collector throws them away	04:15
	← dglambert left	04:15
	jmpp_ nods	04:16
	→ mattraby joined	04:17
	← dmnd left	04:19
jmpp_	would someone be so kind to please highlight my name?	04:19
	← Zaknefain left	04:19
skorgon	jmpp_:	04:19
jmpp_	great, irssi session back to normal	04:19
	thanks1	04:19
	!	04:19
	busted growl plugin was messing everything up every time anyone mentioned me	04:20
	jmpp_ now looks back for what he was told...	04:20
	← mattraby left	04:21
jmpp_	OK, so, since I'll be rebasing... the commit whose log I want to edit is one in which I accidently deleted a file. The file was meant for deletion, but not in that particular commit	04:21
	when rebasing, can I undo de deletion?	04:22
	if so, I'd create a new commit just deleting that file	04:22
	→ saurabh joined	04:22
	jmpp_ praises granularity	04:22
	→ l0x3py joined	04:22
skorgon	you can do everything yes	04:22
	saurabh → Guest76380	04:22
jmpp_	how would I go about doing that, if I may ask...?	04:22
	← tureba left	04:22
skorgon	for that you'd chose 'edit' for that given commit. then undo the deletion when rebase is at that commit, stage the change and commit --amend the change	04:23
	→ george2 joined	04:23
skorgon	then you could start a new commit and delete the file again and just commit normally	04:23
	and then rebase --continue	04:23
	jmpp_ tries to parse all that...	04:23
	← pfg left	04:24
	→ David joined	04:24
skorgon	jmpp_: at the end of the day you have to just !try	04:24
gitinfo	jmpp_: [!tias] Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/tias.html may help with git-specific TIAS.	04:24
jmpp_	so I rebase interactive.... find the commit and choose edit....	04:24
	;)	04:24
skorgon	it all sounds more complicated than it is	04:24
	and as discussed above, recovering is easy	04:24
jmpp_	OK	04:24
	jmpp_ breathes deeply!	04:24
jmpp_	;)	04:24
skorgon	and mastering rebase is gaining you a lot. it's a really powerful feature and i use it a lot. wouldn't know how to live without it :)	04:26
	→ CKyle joined	04:26
	jmpp_ is losing his virginity	04:27
jmpp_	how do I, eeerrr... pull out? ;)	04:27
	the rebase session I started is not listing the commit I want	04:28
	→ Pullphinger joined	04:28
skorgon	rebase --abort	04:28
	just quit the editor	04:28
	← dougsland left	04:28
skorgon	you need to pass the latest commit you do _not_ want to change to git rebase	04:28
jmpp_	but I'm inside an EDITOR (emacs) session... what happens if I exit?	04:28
	→ tureba joined	04:28
	→ irqq joined	04:28
skorgon	i think if you don't modify the list it will do nothing and just exit	04:28
jmpp_	eeecckk! it says "successful rebase", but I didn't do anything	04:29
	well, it does say that... "successful rebase, and updted the ref"	04:29
skorgon	if you quit with an error code it will definitely not do anything (leaarned about vim :cquit because of this situation)	04:29
	did anything actually change?	04:29
jmpp_	OK, doesn't seem like it, git diff master..master-backup shows now differences	04:30
	so I can assume there are none, right?	04:30
skorgon	(git reflog would tell you) or your backup branch	04:30
	← diegoviola left	04:30
skorgon	compare the sha1 of the current HEAD with the one on master-backup	04:30
	→ dik_dak joined	04:30
skorgon	but yeah, nothing should have happened	04:30
jmpp_	hhhmmm, how would I go about doing that? ;)	04:30
	jmpp_ is a bit embarrassed in n00bishness	04:31
skorgon	i use something like !lol	04:31
gitinfo	A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	04:31
skorgon	actually wrong one, i don't use --graph and --all, to list the branches	04:31
	or use git show <branch>	04:32
jmpp_	* 0e714cd (HEAD, master-backup, master)	04:32
	I guess that's telling me both branches are at the same point, so nothing changed...	04:32
skorgon	good. that means HEAD, master and master-backup all point to the same commit (0e714cd)	04:32
	right	04:33
jmpp_	right	04:33
	so I start a rebase -i again... and how do I set it to pick the commit I want? git rebase -i HEAD~3?	04:33
	3, 4... or however many commits back is the one I want	04:33
skorgon	pass the commit sha of the latest commit you do _not_ want to change	04:34
	yeah, HEAD~n would work too, but then you have to count	04:34
jmpp_	I do _not_ want to change, OK...	04:34
pasky	(or id of the first commit you want to change, and append ^ or ~1)	04:34
jmpp_	losing this virginity at 12 at night, after an entire day of work, is not an easy feat...	04:34
kadoban	can't you just pick a really big number and it doesn't hurt anything? i thought any you left alone just didn't affect anything at all	04:35
	→ bwreilly_ joined	04:35
skorgon	kadoban: well, it would increase runtime and the list in your browser gets bigger, but other than that, sure, it'll work	04:35
	s/browser/editor	04:35
	← akiress left	04:36
kadoban	k, thought so. yeah i'm just too lazy to count usually, and vim doesn't complain so far	04:36
skorgon	kadoban: just pass it a sha1	04:36
	git log --oneline --decorate, pick the sha1, rebase	04:36
kadoban	i always forget which i'm suppose to pass, haha...the one i want to change, or one past, or one before or :/	04:36
	but yeah, i probably should just learn that part	04:36
skorgon	lol	04:36
jmpp_	OK, so my rebase session is pointing right where I want it, three commits with the pick command next to it, and I want to edit the first one...	04:37
	← daito left	04:37
jmpp_	do I now delete the pick command & write "edit"? then what?	04:37
skorgon	yep	04:37
	← bwreilly left	04:37
skorgon	though 'e' would do as well	04:37
kadoban	then save the file and exit	04:37
jmpp_	and save the editor session?	04:37
	OK	04:37
	aha...	04:37
	→ diegoviola joined	04:38
skorgon	it'll drop you back to your shell, but you are now at the commit you chose to edit	04:38
jmpp_	OK, there...	04:38
skorgon	not you can change that commit by doing your changes and use commit --amend	04:38
jmpp_	how do I now undo the mistaken deletion?	04:38
skorgon	or insert commits in between by simply editing and commiting stuff	04:38
	git checkout HEAD~ -- <file>	04:38
jmpp_	HEAD~ 'cause now HEAD points at the commit in question, in which the file doesn't exist, and I want to grab it from the previos rev	04:39
	that right?	04:39
skorgon	correct	04:39
	jmpp_ blushes	04:39
jmpp_	crap, getting an error about the file not being known to git...	04:40
	:(	04:40
	← lolmaus left	04:41
skorgon	did you delete it in this commit?	04:41
	→ lolmaus joined	04:41
jmpp_	git co HEAD~ -- database/Models/mssql-ER.png <-- error: pathspec 'database/Models/mssql-ER.png' did not match any file(s) known to git.	04:41
	→ eletuchy_ joined	04:42
	→ aartist joined	04:42
	→ max_ joined	04:42
	→ stellarhopper joined	04:42
jmpp_	commit 9d7e73391e502e9c732ff9f34645af0365b6cda1: database/Models/mssql-ER.png \| Bin 804818 -> 0 bytes	04:42
	and when I escaped from the rebase session, git told me: Stopped at 9d7e73391e502e9c732ff9f34645af0365b6cda1	04:43
	max_ → Synthead	04:43
jmpp_	so I think I did choose the right commit to edit	04:43
	and co HEAD~ for the file should be a valid pathspec	04:44
	or am I missing something?	04:44
	→ starkhalo joined	04:44
jmpp_	nevermind	04:44
	silly me	04:44
skorgon	it should work, though, i told you 'co' which should have been checkout (i have that aliased)	04:44
jmpp_	I also have that alias, long time svn user ;)	04:45
kadoban	any way you can get the file would be fine i suppose, but that seems like it should work	04:45
	jmpp_ hides!	04:45
	skorgon is curious	04:45
jmpp_	the problem was that I was co'ing from a directory that wasn't at the root of my repo	04:45
	so <path> wasn't mapping to anything real	04:45
	cd'd to the root of the repo and the co worked	04:45
	silly me!	04:45
	← eletuchy left	04:45
	← cads left	04:46
skorgon	nice, mystery solved :)	04:46
jmpp_	;)	04:46
kadoban	ahh	04:46
jmpp_	so, the file is back in the working copy, and it's added to the index	04:46
	I can just ci --amend?	04:46
skorgon	yes	04:46
jmpp_	kadoban: that pwd + path really scared me! ;)	04:47
	← eletuchy_ left	04:47
jmpp_	and that'll keep the old commit log?	04:47
	OK, I have the old one	04:47
skorgon	it fires upu the editor	04:47
jmpp_	which I want to keep, fine	04:47
	→ evilbug joined	04:47
	→ SocalNick joined	04:48
skorgon	just a note on the side: having binaries in git is usually not a good idea	04:48
jmpp_	('cause the file deletion was a mistake for that commit, nothing is said about it in the log, as it shoud be)	04:48
	why's that?	04:48
	skorgon wonders what the mathich !factoid is	04:48
skorgon	!binary	04:48
gitinfo	Storing binary files in git causes repo balloon, because they do not compress/diff well. In other words, each time you change a file the repo will grow by the size of the file. See !annex for some solutions	04:48
jmpp_	thanks for the info	04:49
skorgon	hehe, that was easy :)	04:49
	← oojacoboo left	04:49
	→ nafg__ joined	04:49
jmpp_	unfortunately, this repo has a binary file which has been edited a zillion times!	04:49
	OK, so, commit amended...	04:49
skorgon	jmpp_: alternatively you could have chosen 'reword' in the rebase session and just added that to the commit message	04:49
	→ oojacoboo joined	04:49
	← nafg_ left	04:50
jmpp_	skorgon: nah, 'cause I want to create a specific commit deleting the file in question	04:50
	← dreiss left	04:50
jmpp_	I want to make it a separate action	04:50
	← Synthead left	04:50
skorgon	okay	04:50
jmpp_	so now I git rebase --continue... and that'll drop me into the editor again?	04:50
skorgon	wait	04:50
	no	04:50
jmpp_	aha	04:50
skorgon	it will just continue with the actions you told it	04:50
	but...	04:50
	jmpp_ holds off that return key!	04:51
skorgon	if you want to delete the file now, you can just do git rm <file> and commit that as a new commit (without --amend)	04:51
	→ w0ng_ joined	04:51
skorgon	or you can do the deletion after the rebase. depends on how you want history to look like	04:51
jmpp_	hhhmm, I think I want to delete it at the tip of the branch...	04:51
	I think I want it at the end, yes	04:51
	← w0ng left	04:52
skorgon	okay, then do the continue thing	04:52
	← SocalNick left	04:52
skorgon	if you change yoru mind you can always start another rebase session and reorder the commits according to your liking	04:52
	→ Mitchbones joined	04:52
jmpp_	sweet!	04:53
skorgon	sounds like success :)	04:53
	← o9 left	04:53
jmpp_	hhhmmm, the rebase continue didn't fire-up another editor, it just, sort of, "committed" my actions, as in, perpetuated them in the "log"	04:53
	I mean, in the repo history	04:53
	that sound good?	04:53
skorgon	i said that above	04:54
jmpp_	that wasn't so hard	04:54
skorgon	you choose the actions when you start the rebase, then it will only stop for reword and edit actions or when a conflict occurs	04:54
jmpp_	nor painful!	04:54
	← irqq left	04:54
	← oojacoboo left	04:55
jmpp_	and then when you continue, the amendments are recorded in the history, and done with it?	04:55
skorgon	you did commit --amend right? so you edited the commit you were at that time. all remaining ones in the list are applied on top of that	04:55
jmpp_	yeah, commit --amend	04:56
	I see	04:56
	→ nZac joined	04:56
jmpp_	and history is re-written in a pretty 1984-ish way	04:56
	;)	04:56
	→ SocalNick joined	04:56
jmpp_	only, as opposed to 1984, where nothing ever really happens, here the sha of the amended commit is indeed changed	04:56
	← ArcTanSusan left	04:57
skorgon	rebase essentialy resets your HEAD do the commit you pass it and then applies all commits in your rebase list using cherry-pick. and depending on choosing reword or edit it gives you some options to change things on the way	04:57
	not only that one	04:57
	everything afterwards should have a different sha as well	04:57
jmpp_	oh, OK	04:58
	→ ArcTanSusan joined	04:59
jmpp_	never really understood where the sha in a commit comes from... a checksum of the diff against the current HEAD?	04:59
	→ solker joined	04:59
skorgon	it's a checksum over the whole commit object. not sure what all is included, but things like the parent are part of it. hence the sha1 changes if you change a commits parent	05:00
	i guess git show --pretty=raw gives a good idea of what is part of the commit object	05:01
	← the_cybersphinx left	05:01
	jmpp_ tries that	05:03
	← zumba_addict left	05:03
	→ zumba_addict joined	05:04
	→ Synthead joined	05:04
	← solker left	05:04
	← mimoo left	05:04
thegorn	jmpp_: i always assumed it was sha1 of commit message + tree + parent commit	05:04
	commit mesage including date, etc..	05:05
skorgon	pretty much right, i think, so when you change any given commit in a series you also change any desendant since 'parent commit' is part of commit	05:06
jmpp_	right	05:06
	skorgon: thanks for walking me through it, it all went pretty smoothly!	05:07
	jmpp_ deletes the backup branch!	05:07
skorgon	you're welcome	05:07
	→ eletuchy joined	05:08
	→ Zaknefain joined	05:09
	→ michelleglauser joined	05:09
	→ harish joined	05:10
	→ simesy_ joined	05:10
	→ jaf2k joined	05:10
michelleglauser	Hi, my friend just installed git on Windows7 and is unable to run it without being in the git folder, which is at <:\Users\HisName\Projectname	05:11
	What do we need to do so he can run it from any folder?	05:11
	→ joelroa joined	05:12
	← simesy left	05:12
	← Zaknefain left	05:13
fairuz	michelleglauser: add git so the system path maybe?	05:14
	← anli_ left	05:14
	→ anli_ joined	05:14
thiago	the git for windows installer asks whether you want to add git to PATH, all of the shell utilities or none	05:15
	← anli_ left	05:15
thiago	he must have selected none	05:15
	→ anli_ joined	05:15
michelleglauser	Oops. We'll try moving it to the system path and see what happens.	05:16
thiago	you can't move	05:16
	you can edit the PATH setting, though	05:16
michelleglauser	Oh, okay. Where would we do that?	05:16
	← CKyle left	05:17
thiago	somewhere in Control Panel	05:17
	I don't have a Windows machine here to check	05:17
	→ alexO joined	05:17
thiago	try pressing Win+Pause. I think it opens the right dialog.	05:17
	← vpl left	05:17
fairuz	control panel -> system -> advanced system setting	05:17
Eugene	That one ^	05:17
	→ vpl joined	05:17
fairuz	Then environment variables	05:17
	→ anli__ joined	05:17
thiago	or you could just rerun the installer	05:17
phuh	:( I need some help with my git skills	05:17
thiago	phuh: to improve your skills, keep trying and learning	05:18
phuh	http://pastebin.com/YQJzXzgm This is what I ran and I don't know how to resolve a diverge.. Could someone please enlighten me?	05:18
thiago	read the manual pages, experiment, etc.	05:18
	phuh: there's nothing wrong	05:19
phuh	thiago: thanks for your advice. i really struggle with things like diverge, conflicts, etc.	05:19
	← brushlandBhai left	05:19
	← Exio4 left	05:19
phuh	thiago: would you be able to see the code in that link?	05:19
	← joelroa left	05:19
	← asakura0 left	05:19
thiago	phuh: I have opened it.	05:19
	phuh: there's nothing wrong there	05:19
	phuh: it has diverged. Yes. That's normal operation.	05:20
	← skorgon left	05:20
	← qsuscs left	05:20
	← michael_mbp left	05:20
	→ ben_alman joined	05:20
	← anli_ left	05:20
	→ skorgon joined	05:20
thiago	phuh: what do you want to do now?	05:21
	→ Exio4 joined	05:21
	→ qsuscs joined	05:21
	← Hamled left	05:21
	→ asakura0 joined	05:21
	→ Hamled joined	05:21
	→ brushlandBhai joined	05:22
	→ pheaver joined	05:22
	→ yaru22 joined	05:23
	→ michael_mbp joined	05:23
yaru22	thiago: I'm with phuh. We'd like to develop remote repo and merge the changes to local repo time to time.	05:24
	← ben_alman left	05:25
yaru22	remote == seed*	05:25
thiago	did you read what git status said?	05:25
yaru22	yeah, it says "Your branch and 'seed/master' have diverged, and have 1 and 2 different commits each, respectively."	05:26
	← fatalhalt left	05:26
	→ daito joined	05:26
	← JesseC-Work left	05:26
	← Gamecubic left	05:26
	→ JesseCW joined	05:27
yaru22	So seed/master diverging from local repo is fine. We want one way merge only (from seed/master to local).	05:27
michelleglauser	thiago, we've changed the paths but aren't having success still. We'll try to re-download into the same path. Thanks for your help.	05:27
	← boombatower left	05:28
	← nicedice left	05:28
yaru22	I guess it's easier to explain our use case first. We have a seed project off of which we base our project repo (i.e. local repo). We're developing on project repo but whenever there is a change in seed project, we'd like to merge those changes to project repo.	05:28
	→ fatalhalt joined	05:28
	← nZac left	05:29
	→ marthinal joined	05:29
yaru22	thiago, so we never merge from project repo to seed repo. It's only seed repo -> project repo.	05:30
thiago	michelleglauser: "redownload into" ? What are you downloading?	05:31
	yaru22: what's the next line?	05:31
	yaru22: from git status, I mean	05:31
michelleglauser	thiago: installing git	05:32
thiago	michelleglauser: what file did you download?	05:32
	→ NoMethodError joined	05:32
	← mdhopkins left	05:32
yaru22	thiago, "(use "git pull" to merge the remote branch into yours)"	05:33
thiago	yaru22: have you tried that?	05:33
yaru22	so I did git pull.	05:33
thiago	yaru22: ok	05:33
	yaru22: then you're done	05:33
michelleglauser	thiago: Git 1.9.0 for Windows	05:34
thiago	michelleglauser: ...	05:34
	michelleglauser: please re-read my question	05:34
michelleglauser	I meant install.	05:34
	→ mdhopkins joined	05:34
	NoMethodError → tc_greg	05:35
	← regreddit left	05:35
michelleglauser	But it is Git-1.9.0-preview20140217.exe	05:35
yaru22	thiago, but what we'd like to do is not normal merging (git pull == git fetch & git merge, right?) but something like git merge --squash or git rebase --auto-squash	05:35
	← ArcTanSusan left	05:35
thiago	michelleglauser: ok	05:35
	michelleglauser: so run the installer	05:36
	yaru22: ok	05:36
michelleglauser	thiago: we did	05:36
thiago	yaru22: what happens when you do that?	05:36
	michelleglauser: at the end, it asks you how you want to set up PATH. What option did you choose?	05:36
michelleglauser	thiago: I don't remember what it said, but I think it was the first one.	05:37
yaru22	thiago, so if we do git merge --squash, it says automatic merge went well. So far so good. And there is a change to be committed. So we committed the change.	05:37
thiago	michelleglauser: does it work now?	05:37
michelleglauser	No.	05:37
yaru22	The problem occurs from here.	05:37
thiago	michelleglauser: what did the first option say?	05:37
	← johnkevi_ left	05:37
michelleglauser	thiago: I don't remember, but aaaaaah, he has to go now (bad timing). I guess I'll get back on for him if he doesn't figure it out. Thank you for your help and patience, and nice job multi-tasking.	05:38
	→ ewet joined	05:38
thiago	yaru22: describe the problem	05:38
	→ dmnd joined	05:38
	← michelleglauser left	05:38
	← ewet left	05:39
	→ johnkevinmbasco joined	05:39
	← lolmaus left	05:39
	→ regreddit joined	05:39
yaru22	thiago, at this point, if I update the seed repo again and merge that change into local repo again, it results in merge conflict.	05:40
	→ lolmaus joined	05:40
	← GT4066 left	05:40
thiago	yaru22: I can see why that could happen.	05:40
	→ ewet joined	05:40
yaru22	thiago, don't understand why that's the case. I haven't touched anything in local repo but only merged changes from seed repo. So why do I get merge conflict?	05:40
thiago	yaru22: git is smart in doing merges, but sometimes it can't do it on its own	05:41
	yaru22: because you didn't record the previous merge	05:41
	yaru22: git doesn't know about it.	05:41
yaru22	thiago, how do I record the previous merge?	05:41
thiago	yaru22: you skipped the recording the moment you used --squash	05:41
	yaru22: remove the --squash option	05:41
yaru22	thiago, hm... the reason we used --squash option is because in the seed repo, there are messages like "#1, #2, #3 or etc." in git commit logs, which results in github issue creation in local repo, which we don't want.	05:43
	thiago, does my expalanation make sense..?	05:43
thiago	yaru22: yes	05:43
yaru22	thiago, we're using github and if we just merge without using --squash, as commits from seed repo get merged into local repo, github mistakenly creates github issues in local repo due to commit message in seed repo like "Fix #1.".	05:44
thiago	yaru22: but you don't have an option. If you want the best chance of not having conflicts, you need to use regular merges.	05:44
yaru22	thiago, hm... so not even rebase can solve that problem?	05:44
thiago	yaru22: no	05:44
	← mdhopkins left	05:44
thiago	yaru22: you need to bring the commits in, one by one. Both rebase and regular merges do that.	05:45
	→ covi_ joined	05:45
	← David left	05:45
	← tc_greg left	05:46
	← kpreid left	05:46
yaru22	thiago, is it possible to merge commits from certain commit? e.g. git merge --from-comit=52a8fe25 something like that?	05:46
covi_	I have a git repo resided in local path "path/repo_root". This repo has some local branches and some remotes (living in a gitHub repo) that I don't want to lose. However, right now I have to change the local git repo root to "path/new_repo_root/repo_root". What's the best way to do this without losing anything, or with minimal damages?	05:46
	→ mdhopkins joined	05:46
yaru22	thiago, if there is an option like that, we might be able to workaround the problem we have.	05:47
	← mizu_no_oto left	05:47
thiago	yaru22: when you merge, you merge the history up until that commit	05:47
	yaru22: there is no other option	05:47
	→ francisfish joined	05:48
	← lithiumjake left	05:48
yaru22	thiago, not sure if i conveyed my question correctly. I meant if we could merge from certain point to the most recent point. So let's say, in my local repo, I'd like to merge commits in seed repo starting from 5ba5fe to the most recent commit.	05:49
	thiago, the answer is no in this case, too?	05:50
thiago	yaru22: you conveyed your question correctly	05:50
	yaru22: the answer is that you always merge everything from the beginning up until the commit you specified	05:50
	yaru22: you cannot specify a first commit	05:50
	← alexlindenlevy left	05:51
	← w0ng_ left	05:52
	← scottyob left	05:52
	← joehh left	05:52
	← wendellM left	05:52
	← webguynow left	05:52
	← Tabmow left	05:52
	← karupanerura left	05:52
	→ MplsGreg joined	05:52
	← francisfish left	05:53
yaru22	thiago, I see... sad to hear that. But thanks a lot for listening to our question intently and answering it. Really appreciate it!	05:53
	→ solker joined	05:54
	← chrisshattuck left	05:54
thiago	yaru22: you may be able to apply the changes as patches	05:54
	yaru22: go to the seed, do git diff <lastmerge>..	05:54
	yaru22: where <lastmerge> is the SHA-1 of the last merge you've done. Include the two dots.	05:54
	→ chrisshattuck joined	05:54
thiago	yaru22: save that diff, then go to the other repository and run: git apply /path/to/diff	05:55
	yaru22: there might still be conflicts	05:55
yaru22	thiago, I think that's proably the best solution we can approach this problem with.	05:55
	→ Tommy[D]_ joined	05:55
yaru22	thiago, yeah conflicts are expected. As long as we can do it that way, it would be much better than nothing at all!	05:55
	← tic left	05:57
	← marlun left	05:57
	→ w0ng_ joined	05:57
	→ scottyob joined	05:57
	→ joehh joined	05:57
	→ webguynow joined	05:57
	→ Tabmow joined	05:57
	→ karupanerura joined	05:57
	→ aucecil joined	05:57
	→ marlun joined	05:58
	← marlun left	05:58
	→ marlun joined	05:58
	→ tic joined	05:58
	← Tommy[D] left	05:58
	← mikepack left	05:59
	← solker left	05:59
	→ solker joined	05:59
	→ mikepack joined	05:59
	← tpollard left	06:01
	→ beautifulmind joined	06:02
	→ Zaknefain joined	06:03
	→ Renex joined	06:03
	← mikepack left	06:03
	← Vivekananda left	06:04
	← solker left	06:04
	← chrisshattuck left	06:04
	→ dreiss joined	06:04
	→ jargon joined	06:06
	← tummy left	06:06
	→ wendellM joined	06:07
	→ tummy joined	06:07
	← Zaknefain left	06:07
	← mdhopkins left	06:08
	← Synthead left	06:08
	→ ehmatthes joined	06:09
	← beautifulmind left	06:09
	→ ntio joined	06:10
	→ lindenle joined	06:10
	→ beautifulmind joined	06:11
	← toobluesc left	06:11
	← lifelike left	06:11
	← SocalNick left	06:13
	← pheaver left	06:13
	→ joelroa joined	06:13
	← wendellM left	06:14
	→ wendellM joined	06:15
	← kini left	06:15
	← wcpan left	06:15
	→ netcarver joined	06:15
	→ wcpan joined	06:16
	← dreiss left	06:16
	← kermit left	06:16
	→ kermit joined	06:17
	→ kini joined	06:18
	→ SorenHolm joined	06:18
	→ kcj joined	06:19
	← joelroa left	06:19
	← MplsGreg left	06:20
	← dagnachew left	06:20
	→ azathoth_ joined	06:21
	← johnkevinmbasco left	06:21
	→ arvind_khadri joined	06:23
	← nathancahill left	06:23
	→ johnkevinmbasco joined	06:24
	← budrose left	06:26
	→ Raging_Hog joined	06:28
	← el3ctron_ left	06:28
	← lolmaus left	06:28
	← ClientAlive left	06:29
	→ nathancahill joined	06:30
	→ Zaknefain joined	06:30
	← azathoth_ left	06:32
	← ntio left	06:33
	→ azathoth_ joined	06:34
	→ Kicer86 joined	06:34
	→ lite_ joined	06:35
	→ takamichi joined	06:36
	→ tmfsd joined	06:38
	→ mdhopkins joined	06:39
	← Fandekasp left	06:39
	→ MrRoot joined	06:40
	← hwrdprkns left	06:40
	→ hoschi joined	06:40
	→ Fandekasp joined	06:40
	← aMoniker left	06:40
	→ hwrdprkns joined	06:41
	→ joelroa joined	06:41
	← napcae left	06:41
	→ ayaz joined	06:42
	← MrRoot left	06:44
	← User458764 left	06:45
	→ ThomasLocke joined	06:47
	→ Synthead joined	06:47
	← ariscop left	06:47
	→ MplsGreg joined	06:50
	← mdhopkins left	06:51
	→ closures999 joined	06:51
	→ kbart joined	06:51
	→ johnkevi_ joined	06:52
grumbel_	covi_: just move the complete repository: mv path/repo_root path/new_repo_root/repo_root	06:52
	the repo itself will be fine, but if it's a remote to some other repository, you'd need to update that	06:52
	← SorenHolm left	06:52
	→ Macaveli joined	06:52
	← johnkevinmbasco left	06:52
	→ SorenHolm joined	06:53
	→ solker joined	06:53
	← Synthead left	06:53
	← daito left	06:55
	← MplsGreg left	06:56
	→ ArcTanSusan joined	06:57
	→ bicyclette joined	06:57
	← woollyams left	06:57
	← ewet left	06:57
	→ ntio joined	06:58
	← solker left	06:58
	→ psoo joined	06:59
	← SorenHolm left	06:59
	← psoo left	06:59
	← MattMaker left	07:00
	→ MattMaker joined	07:00
	← luxgeek left	07:01
	← bgerber left	07:02
	→ ewet joined	07:02
	→ MplsGreg joined	07:02
	← ewet left	07:03
	→ dc5ala joined	07:03
	← johnflux__ left	07:03
	→ johnflux__ joined	07:04
	→ nick108 joined	07:04
	→ ewet joined	07:04
	→ pantsman- joined	07:05
	→ joshcryer joined	07:05
joshcryer	heya guys, would anyone happen to recommend to me their favorite windows gui for git?	07:05
	→ psoo joined	07:05
j416	joshcryer: git-bash	07:06
	← noisewaterphd_ left	07:06
	← simesy_ left	07:07
	← MplsGreg left	07:07
	→ papegaaij joined	07:07
	→ daito joined	07:08
	→ Synthead joined	07:08
grumbel_	joshcryer: git extensions	07:10
	← tirengarfio left	07:11
	← azathoth_ left	07:11
	← dik_dak left	07:12
	→ treehouse joined	07:13
	← enzipher left	07:14
	→ roelmonnens joined	07:14
	→ tirengarfio joined	07:14
	→ napcae joined	07:14
	→ taijeen joined	07:16
	→ cbreak-work joined	07:16
	→ ntio_ joined	07:17
	← ntio_ left	07:18
	← ntio left	07:18
	→ johnkevinmbasco joined	07:19
	← psoo left	07:20
	→ ben_alman joined	07:20
	← johnkevi_ left	07:20
	← saorge left	07:21
	→ vince_prignano joined	07:21
	→ saorge joined	07:21
	→ nfk joined	07:22
	→ IVplay joined	07:23
	← pantsman- left	07:24
	← ben_alman left	07:24
	← cbreak left	07:24
	→ nilg joined	07:25
	→ specious joined	07:26
	→ LeMike joined	07:26
	← jim--- left	07:27
osse	sourcetree	07:27
	→ _iron joined	07:28
	← tmfsd left	07:29
	→ cbreak joined	07:29
	← joelroa left	07:30
	→ ariscop joined	07:30
	→ ben_alman joined	07:30
	→ tmfsd joined	07:31
	← closures999 left	07:32
	→ chiromante joined	07:32
	→ closures999 joined	07:33
	Keridos → Keridos_off	07:35
	← ben_alman left	07:35
	→ kriks joined	07:35
	← starkhalo left	07:35
	← treehouse left	07:35
	→ jluc joined	07:35
	→ Gizburdt joined	07:35
	→ ferreum joined	07:36
	← closures999 left	07:37
	→ closures999 joined	07:37
	→ starlays joined	07:37
	→ arif-ali joined	07:37
starlays	where is the content from git fetch stored? i want to do a git diff to see what changed	07:38
	→ woollyams joined	07:38
grumbel_	starlays: it's referenced by <name-of-remote>/<branch-of-remote>, for example origin/master	07:39
	→ psoo joined	07:40
starlays	grumbel_: OK, and how are called the HEAD and {@} and the other notations?	07:40
	← Nizumzen left	07:40
_ikke_	man gitrevisions	07:40
gitinfo	the gitrevisions manpage is available at http://jk.gs/gitrevisions.html	07:40
grumbel_	starlays: I don	07:41
	← hwrdprkns left	07:41
grumbel_	't think the remote HEAD is fetched, correct me if wrong	07:41
	← Goplat left	07:41
	← beautifulmind left	07:41
starlays	I tried git log HEAD..origin and it is not showing any log entry but git status is reporting that my local branch is one commit behind origin/branch	07:42
_ikke_	starlays: origin is not a branch	07:42
starlays	ohh	07:42
	→ hwrdprkns joined	07:43
	→ mj12albert joined	07:43
starlays	_ikke_ & grumbel_ thank you	07:43
grumbel_	starlays: you can use @{u} to reference the default tracking branch of your current branch	07:43
	i.e. git log HEAD..@{u}	07:43
	← eletuchy left	07:45
	← cbreak-work left	07:45
	→ cbreak-work joined	07:45
	→ eletuchy joined	07:45
	→ Misan joined	07:45
	→ jceb joined	07:46
	← vince_prignano left	07:46
	→ vurma joined	07:47
	→ trusktr joined	07:47
	→ solker joined	07:47
	← bwreilly_ left	07:48
	→ francisfish joined	07:49
	← bdavenport left	07:49
	→ mdhopkins joined	07:49
	← eletuchy left	07:49
	→ SorenHolm joined	07:50
	→ ifdm_ joined	07:51
	← solker left	07:52
	→ mlechner joined	07:52
	→ solker joined	07:53
	← francisfish left	07:53
	← aartist left	07:53
	→ rjhunter joined	07:56
	← solker left	07:57
	← m0viefreak left	07:58
	→ shruggar joined	07:58
	→ iwantoski joined	07:58
	← hwrdprkns left	07:59
	→ odinsbane joined	08:00
	→ xlinkz0 joined	08:01
covi_	grumbel_: in this case, can my collaborators on the same repo just pull this commit to get the new directory structure, without needing to do anything themselves?	08:01
	← woollyams left	08:02
	← arif-ali left	08:02
	→ lgargu joined	08:03
odinsbane	I get a warning that some files will be overwritten if by git if I pull. I want them to be overwritten, how do I make that happen?	08:03
	→ MplsGreg joined	08:03
kadoban	are you sure the message doesn't tell you? usually it does. not familiar with that exact one, but...	08:04
grumbel_	covi_: if you just move the complete repository to another place, that's not a commit	08:04
odinsbane	kadoban: it says to stash the changes.	08:04
covi_	grumbel_: yeah, it's implied that after that 'git mv' i will do a commit & push	08:04
	→ hkon_ joined	08:04
arand__	odinsbane: save/discard those changes by stashing or hard-resetting.	08:05
	← jluc left	08:05
ewet	is there a rev you can use to generalize merge-base as in: `git log merge-base..` (like `git log master..topic`)	08:05
grumbel_	covi_: just to be sure, do you want to move the complete repository, or do you want to move everything _inside_ the repository (i.e. refactor your directory layout)?	08:05
odinsbane	arand__: so I stash, and then it says something has been saved. And then I can discard that stash?	08:05
	← lgargu left	08:06
	→ jluc joined	08:06
	→ a-l-e joined	08:07
arand__	odinsbane: you can if you want (no harm in keeping it), via stash drop.	08:07
	→ kimchi joined	08:08
	← MplsGreg left	08:08
odinsbane	I didn't realize just using 'git stash' would stash the changes, I thought it had to have an argument and I couldn't figure it out from git stash help. Thank you though that worked.	08:08
	← vurma left	08:08
covi_	grumbel_: the latter, refactor the layout	08:09
	→ ghostlines joined	08:10
	→ solker joined	08:10
	← mdhopkins left	08:11
grumbel_	covi_: ah, then I misunderstood; it's best to have one commit doing that, and that commit should only move files but not alter them	08:11
	→ koell joined	08:11
	→ Vivekananda joined	08:11
	← ehmatthes left	08:11
	→ jnavila joined	08:12
	→ simesy joined	08:13
	→ mongor joined	08:14
	→ mybit joined	08:14
	→ unstable joined	08:15
iwantoski	I'm trying to post-receive hook a sed string replacement. Even though the match seems to be working in shell (using echo and pipe it to sed), the post-receive hook refuses to execute (or fails) the string replacement. Anyone had similar issues?	08:16
	→ lb__ joined	08:16
covi_	grumbel_: ok thanks	08:16
unstable	I did a PR, then I did 'git push origin --delete branch_I_pred'	08:16
	Then the PR disappeared	08:16
	← closures999 left	08:16
unstable	How can I get it back?	08:16
covi_	grumbel_: do my teammates need to fix merge issues etc if I do one commit?	08:16
unstable	I can see the closed PR on github	08:16
	← koell left	08:16
	← dmnd left	08:16
	→ closures999 joined	08:17
	→ koell joined	08:17
	lb__ → a1bl	08:17
	→ HelperW joined	08:18
moritz	unstable: try to push the branch again, and if necessary, manually re-open the PR	08:18
	← simesy left	08:18
	→ Devastatr joined	08:19
	← mongor left	08:19
	← Devastator left	08:21
	→ joelroa joined	08:22
	← mybit left	08:23
	→ veebers joined	08:23
	→ lavong joined	08:25
	→ arif-ali joined	08:25
unstable	o yea, it doesn't delete locally	08:25
	ok	08:25
	← Danielss89 left	08:25
	→ gua_ould joined	08:25
unstable	I pushed again and re-opened the PR	08:25
	Thanks moritz!	08:26
	← unstable left	08:26
	← evilbug left	08:26
phuh	Is BitBucket better than GitHub?	08:26
osse	yes and no	08:26
	← hahuang65 left	08:26
	→ Plummer joined	08:26
	→ LimeBlast joined	08:26
milki	maybe os	08:27
	→ pduin joined	08:27
	→ simesy joined	08:27
	← LimeBlast left	08:27
	← joelroa left	08:28
moritz	bitbucket offers free private repos; github offers a massive user base of potential contributors	08:28
	→ King_Hual joined	08:28
osse	Bitbucket has free private repos. But I like that Github shows the repo contents ino the "front page" of a repo	08:28
	← brushlandBhai left	08:29
osse	bitbucket's commit listing shows a graph	08:29
	→ jefflyne joined	08:29
	← simesy left	08:29
	→ simesy joined	08:30
a1bl	when doing opensource, github is free, when doing closed source GTFO ^^	08:31
kadoban	except like 90% of stuff on github is not really open source, it's "never defined a license, it's just out there", from what i can tell	08:31
	← veebers left	08:31
	→ harobed joined	08:32
fairuz	no licence means we can use freely :p	08:32
	← LeMike left	08:32
osse	laziness rules.	08:32
moritz	"90% of everything is crud" applies to github repos too, I guess :-)	08:32
osse	I don't think any of my stuff has a licence	08:32
moritz	but it'd surprise me if it were any different on bitbucket	08:32
	← hagabaka left	08:32
odinsbane	moritz: what is crud?	08:33
	→ hagabaka joined	08:33
osse	odinsbane: crap	08:33
odinsbane	That makes sense. Most of the stuff I put on there is crap I don't know what to do with.	08:33
	→ axl_ joined	08:34
ohcibi	we change from github to bitbucket for our lecture this semester because we actually don't care about the platform but about git.... at least for us (meaning students at a universtity) github also offers free private repos, but at the end they both function well and its a matter of taste what you/your company needs from such a platform... e.g. in my company we use gitlab as we don't want any public service for it...	08:34
kadoban	fairuz: hehe, unfortunately not really :(	08:34
	← jefflyne left	08:35
kadoban	github is really pretty, but i like bitbucket better overall i think...or just gitolite on my home server, but that's not really the same thing	08:35
	→ brushlandBhai joined	08:37
	→ aspiers joined	08:37
	← jonny\| left	08:39
	→ jonny\| joined	08:40
	→ elbeardmorez joined	08:40
	← tomengland left	08:41
	← Dreadnaught left	08:42
	→ tomengland joined	08:42
	→ francisfish joined	08:42
joshcryer	grumbel_, thanks, I apparently installed it when I installed git, works nicely, just what I was wanting.	08:43
	→ Balliad joined	08:43
	← Balliad left	08:43
	← shruggar left	08:43
	→ Balliad joined	08:43
	→ rethus joined	08:44
	← ArcTanSusan left	08:44
	→ SLY1986 joined	08:45
	← johnkevinmbasco left	08:45
	← tomengland left	08:46
	← Hunner left	08:47
	→ mewm joined	08:48
	← jonny\| left	08:48
	→ goTAN joined	08:49
	→ Hunner joined	08:49
	← axl_ left	08:49
	→ dmnd joined	08:49
	← v0n left	08:50
	→ jonny\| joined	08:50
	← solker left	08:50
	→ Gonzo89 joined	08:51
	→ tawane joined	08:51
ewet	hmm, this is trickier than anticipated. I'm looking for all commits of to the current branch up to the point where it was originally branched. However, I don't really want to know where it branched from. And it's not just finding unmerged commits.I think I'm looking for the oldest ancestor, but I'm not quite sure ...	08:52
	← koell left	08:52
	→ arand joined	08:53
	→ merica joined	08:54
	← joshcryer left	08:55
	→ BiggFREE joined	08:55
	← dmnd left	08:55
	← a-l-e left	08:55
	→ a-l-e joined	08:56
	← harobed left	08:57
	→ tvw joined	08:59
thiago	ewet: it's tricky	09:01
	→ plushy joined	09:01
thiago	ewet: best solution is to write down the SHA-1 of the branch point	09:01
	→ vince_prignano joined	09:01
	→ Kartagis joined	09:01
Kartagis	hi	09:01
	git branch 7.x-1.x	09:02
	fatal: Not a valid object name: 'master'. <--- why did I get that?	09:02
	← jonny\| left	09:02
	← Synthead left	09:02
	← teran left	09:02
ewet	thiago: so following the reflog might be an idea? it should write down the branch point after all, shouldn't it?	09:03
	→ teran joined	09:03
	← kcj left	09:03
	→ poulson joined	09:03
	→ jonny\| joined	09:03
ewet	hmm no, it's probably too ambiguous	09:04
	→ GT4066 joined	09:04
	→ MplsGreg joined	09:04
	→ matteo joined	09:04
thiago	Kartagis: you're getting that because there's no branch called "master"	09:04
	← a-l-e left	09:04
	→ Exancillatus joined	09:05
	← phuh left	09:05
	← odinsbane left	09:05
	→ phuh joined	09:06
	← RagBal left	09:06
	→ RagBal joined	09:07
	→ subhojit777 joined	09:07
	← teran left	09:07
	← Devastatr left	09:07
	→ Devastatr joined	09:07
	← goTAN left	09:07
	→ daddy1 joined	09:08
	← daddy1 left	09:08
	← MplsGreg left	09:08
	← phuh left	09:09
	→ phuh_ joined	09:09
	→ cllamas joined	09:10
	← jaeckel left	09:10
	← dsantiago left	09:11
	← thiago left	09:11
	→ WaReZ joined	09:11
	→ teran joined	09:11
	← closures999 left	09:11
	→ mdhopkins joined	09:12
	→ LimeBlast joined	09:12
	← jonny\| left	09:13
	→ teran_ joined	09:13
	→ woollyams joined	09:14
	→ jonny\| joined	09:15
	← teran left	09:16
	← ifdm_ left	09:16
	→ intellix joined	09:17
ewet	well at this point I go with `git log master..` -- it's the most common use case	09:17
	→ ik__ joined	09:17
	→ jagob joined	09:17
	→ lolmaus joined	09:18
ik__	while checking out a branch	09:18
	→ goTAN joined	09:18
	→ canton7-mac joined	09:18
ik__	well I'm facing issue while checking out the code	09:18
	→ ArSn joined	09:18
ik__	code is checked out	09:19
	← LimeBlast left	09:19
ik__	but code points to something "merge <commit_name> into <branch_name>" when I commit the changed files.	09:19
	→ alexlindenlevy joined	09:19
ik__	is anyone aware of this?	09:20
	← nick108 left	09:20
ik__	I am just new to git	09:20
	→ LimeBlast joined	09:20
	→ nick108 joined	09:20
	→ shruggar joined	09:20
	→ dfanjul joined	09:20
frogonwheels	ik__: did you do a pull?	09:21
	ik__: !repro	09:21
gitinfo	ik__: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will help immensely with troubleshooting.	09:21
	→ y0j joined	09:21
	← chrisss404 left	09:22
	→ chrisss404 joined	09:22
	← nick108 left	09:22
y0j	hi folks	09:22
gitinfo	y0j: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	09:22
y0j	is anyone use msysgit client for windowns?	09:22
frogonwheels	y0j: many people do.	09:23
ik__	after checkout	09:23
	nope	09:23
frogonwheels	y0j: but yes, I happen do tbe one of them :)	09:23
	← Atrumx left	09:23
y0j	when i try to do "git push origin master" it tels me "git: 'http-push' is not a git command. See 'git --help'	09:23
	"	09:23
	i set up git remote set-url origin https://balblabla/repo but no luck	09:23
ik__	frogonwheels: I tried now	09:23
frogonwheels	ik__: I've not got a clear picutre of what you're doing.	09:23
ik__	it says "Already up-to-date"	09:24
frogonwheels	y0j: are you in a git shell or cmd.exe ?	09:24
ik__	frogonwheels: here are the commands	09:24
y0j	in git shell	09:24
	→ deuti joined	09:24
frogonwheels	y0j: sounds like something is not set up properly. which install did you use?	09:24
ik__	frogonwheels: git checkout <git_repo_url>	09:24
	frogonwheels: sorry	09:25
frogonwheels	frobware: url?	09:25
	ik__: url?	09:25
y0j	i've downloaded it from http://msysgit.github.io/	09:25
ik__	frogonwheels: First I'd cloned	09:25
frogonwheels	frobware: sorry.	09:25
ik__	frogonwheels: then I've checkout the code	09:25
	← chrisw_ left	09:25
ik__	frogonwheels: url is internal to corporate :)	09:25
frogonwheels	ik__: you're giving me vague directions, which sound roughly right but a little confused. so !repro	09:26
gitinfo	ik__: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will help immensely with troubleshooting.	09:26
frogonwheels	ik__: why are you doing git checkout <url>	09:26
	← wethu left	09:27
	← mdhopkins left	09:27
y0j	may be i should install something for http-push?	09:27
	← weiyang left	09:28
ik__	frogonwheels: :) that's written in the manual I'm following	09:28
	← cebor left	09:28
ik__	frogonwheels: our internal repo is structured with head and dev branch	09:28
y0j	i haven't got the problem on linux, only on windowns .. with msysgit	09:28
ik__	frogonwheels: so I will clone the git repo	09:29
	→ plitzenberger joined	09:29
ik__	frogonwheels: then I will checkout a branch	09:29
frogonwheels	ik__: sure	09:29
	y0j: what's the url?	09:29
	← fairuz left	09:29
ik__	frogonwheels: so the problem here is	09:30
frogonwheels	y0j: for the repo I mean..	09:30
	→ jaeckel joined	09:30
ik__	when I do some changes and commit code	09:30
	← xintron left	09:30
frogonwheels	y0j: have you searched for git-http-push ?	09:30
	→ ben_alman joined	09:31
ik__	frogonwheels: after commit when it comes to merge I get this error "Merge <older_commit_msg> into dev-branch"	09:31
y0j	frogonwheels, sorry it's my firms private repo and i want to share it but not allow because of NDA	09:31
	→ wethu joined	09:31
frogonwheels	ik__: I've explained why vague indications of commands are not helpful. What you've given me is not an error.	09:31
y0j	i think may be i just should install something for git-http-push ..	09:32
	→ fanno joined	09:32
frogonwheels	y0j: I don't need you to share the repo, I need a transcript -- you can redact out the bits that are sensitive.	09:32
y0j	or set up properly	09:32
frogonwheels	y0j: yeah - I don't think it's set up properly. have you logged out and logged back in?	09:32
	← Gizburdt left	09:33
	→ cebor joined	09:33
frogonwheels	y0j: I've been building my own for a while - so haven't used the installer in a bit.	09:33
	→ irqq joined	09:33
	← teran_ left	09:34
	→ teran joined	09:34
frogonwheels	y0j: YOu are better of using ssh instead of http as a transport	09:34
ik__	frogonwheels: it's not error tho my merge doesn't happen. the merge will be dependent on a new commit that has same msg I've mentione before	09:34
y0j	frogonwheels, i've set up user and pass in .git/config file and use it, it's correct i'm using it on other systems	09:34
frogonwheels	*off	09:35
	← ben_alman left	09:35
y0j	frogonwheels, i know about ssh but we use https over ldap in our corp	09:35
	← bbloom left	09:35
frogonwheels	sorry - gotta go guys.	09:36
	→ AccessibleWeb joined	09:36
y0j	and i haven't got permitions to create ssh repo	09:36
frogonwheels	ik__: write it down in a pastebin.. get your facts straight.	09:36
	y0j: try googling for a bit, or emailing the list.	09:36
	y0j: the msysgit list I mean.	09:36
ik__	frogonwheels: I might be conveying in bad way.. my bad :(	09:37
	→ mikecmpbll joined	09:37
frogonwheels	ik__: Yes. I'm trying to follow two threads there. I've explained what you need to do. !repro	09:37
gitinfo	ik__: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will help immensely with troubleshooting.	09:37
frogonwheels	ik__: see the response from gitinfo ?	09:37
	ik__: I triggered that with the ! repro thing.	09:38
	← vkrest left	09:38
y0j	frogonwheels, i've googled already without results, i hopped to IRC as of the last resort :) i'll try to emailing to the msysgit list, thank you for your help :)	09:38
	→ ChrisAnn joined	09:38
frogonwheels	ik__: feel free to edit the session	09:38
	← diegoviola left	09:39
frogonwheels	y0j: yeah -sorry I can't be more help. it's a weird one. It's prob to do with the smart http transport.	09:39
	y0j: which I have zero experience with.	09:39
	→ dreiss joined	09:39
	← teran left	09:39
	→ diegovio1 joined	09:39
	→ samsamm777 joined	09:39
	diegovio1 → diegoviola	09:40
	→ Gizburdt joined	09:41
mepl	Do I have to install anything on my git server? Any library or such? Server where I store my repositories	09:41
	→ ben_alman joined	09:41
	← goTAN left	09:41
frogonwheels	mepl: ?? You have to have git	09:42
	→ tomengland joined	09:42
mepl	I only thought the dev and clients needed it.	09:42
frogonwheels	mepl: if you want you can install something like !gitolite	09:42
gitinfo	mepl: Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/	09:42
frogonwheels	mepl: it's required for the transport.	09:42
	← intellix left	09:43
frogonwheels	mepl: the ssh protocol runs git commands on the host to efficiently pack the required commits &c.	09:43
y0j	may be someone will suggest another git client for windows except msysgit?	09:43
	→ D4v33 joined	09:43
rjhunter	mepl: it is possible to use a plain shared filesystem for git, but it works much better with git+ssh	09:44
	← Balliad left	09:44
frogonwheels	y0j: YOu can use cygwin if you're in a cygwin environment - but otherwise msysgit is it. I've found it quite good.	09:44
	frogonwheels shudders at the theought of using git over a shared filesystem.	09:44
rjhunter	y0j: if you'd like a graphical git client, there are a few available	09:44
frogonwheels	rjhunter: they're still based on msysgit :)	09:45
y0j	:)	09:45
frogonwheels	rjhunter: maybe you can work out why he's getting a "git: 'http-push' is not a git command. See 'git --help'	09:45
mepl	I hate msysgit, but what can you do	09:45
	← Devastatr left	09:45
frogonwheels	mepl: help improve it?	09:45
	→ ggonzalez_ joined	09:45
	→ nivoc joined	09:45
ggonzalez_	hi	09:45
mepl	sounds very time demanding	09:45
frogonwheels	mepl: yeah.	09:46
rjhunter	frogonwheels: that sounds like http-push isn't in the libexec dir	09:46
	→ Balliad joined	09:46
	→ rath joined	09:46
frogonwheels	y0j: ^^	09:46
ggonzalez_	I have gone back to a previous commit made some changes and now I would like to create a branch from this previous commit and add this new changes to it, how could I properly get this done?	09:46
	→ Devastator joined	09:47
	← tomengland left	09:47
	← Devastator left	09:47
	→ Devastator joined	09:47
y0j	rjhunter, frogonwheels thank a lot guys! =) i'll check libexec dir	09:47
	→ intellix joined	09:47
	← takamichi left	09:47
	← ben_alman left	09:48
rjhunter	ggonzalez_: first find the commit you'd like to branch from (say 12ab43) then make a branch from it's parent: `git branch mynewbranch 12ab43^`	09:49
ggonzalez_	ah ok	09:50
	thx	09:50
rjhunter	ggonzalez_: the next part depends on what you mean by "add this new changes to it"	09:50
	→ dangerousdave joined	09:50
ggonzalez_	yeah some local un staged changes	09:50
	→ takamichi joined	09:51
	← iwantoski left	09:51
	→ mdhopkins joined	09:51
	→ iwantoski joined	09:51
	→ bliker joined	09:52
	← bliker left	09:52
	→ goTAN joined	09:52
ik__	frogonwheels: thanks	09:53
rjhunter	ggonzalez_: a common interaction pattern is to `git stash` your unstaged changes, then checkout a new branch (or whatever) then re-apply your stashed changes with `git stash apply`	09:54
diegoviola	is there a way to find out the date for a specific tag?	09:54
	← DrNick left	09:54
rjhunter	diegoviola: `git show mytag` might be enough, depending on what you need	09:55
diegoviola	ty	09:56
	← ggonzalez_ left	09:56
	← Exancillatus left	09:57
	→ Streward joined	09:58
	→ DrNick joined	09:58
	→ robbyoconnor joined	09:59
	→ yrro joined	10:00
	← lite_ left	10:00
yrro	is there a way to see the 3 way diff of a merge commit--like what 'git show' does?	10:01
	→ [gmi] joined	10:01
moritz	git show -m	10:01
rjhunter	yrro: you mean apart from `git show`?	10:01
yrro	i mean on the github web ui, sorry	10:01
	→ johanhar joined	10:02
yrro	jsut realised i typed the wrong channel name, sorry :)	10:02
johanhar	How can I push a folder to another repository? I did "git push url_to_repository_on_github +master:master" (other repository is empty). It pushed everything when I was inside the subfolder tho :(	10:02
	← scottyob left	10:03
moritz	johanhar: push pushes commits, not folders	10:03
	johanhar: git isn't svn	10:03
johanhar	I see	10:03
	:)	10:03
	→ lite joined	10:03
johanhar	How can I make a commit with that one folder then and push it to another rep?	10:03
	← GT4066 left	10:03
	→ Sendoush_ joined	10:03
	→ ggonzalez_ joined	10:04
	← goTAN left	10:04
rjhunter	johanhar: `git add myfolder` then `git commit` and `git push` (you'll probably want some extra arguments on those)	10:04
moritz	git add -A yourfolder/; git commit	10:04
	and then push	10:04
johanhar	ok, ill try, ty	10:04
	→ MplsGreg joined	10:05
	→ nick108 joined	10:05
	← yrro left	10:05
	← LimeBlast left	10:06
	→ harobed_ joined	10:06
	→ eaj joined	10:07
	← kukks left	10:07
	→ scottyob joined	10:08
	← dreiss left	10:09
	→ xintron joined	10:09
	→ goTAN joined	10:09
	← goTAN left	10:09
	← MplsGreg left	10:09
	← nick108 left	10:10
	← jaf2k left	10:12
	→ Exancillatus joined	10:13
	→ ifdm_ joined	10:14
	→ teran joined	10:14
	← xlinkz0 left	10:14
	← Exancillatus left	10:14
	← nivoc left	10:14
	→ Exancillatus joined	10:15
	→ ngw joined	10:15
	← Exancillatus left	10:16
	← hkon_ left	10:16
	→ beautifulmind joined	10:17
	← daito left	10:18
	→ LimeBlast joined	10:20
	← mdhopkins left	10:20
	← AccessibleWeb left	10:21
	← alexlindenlevy left	10:21
	→ Exancillatus joined	10:21
	← Exancillatus left	10:21
	→ alexlindenlevy joined	10:22
	→ Exancillatus joined	10:24
	→ freestyl3r joined	10:25
	→ joelroa joined	10:25
	← trusktr left	10:25
	← alexlindenlevy left	10:25
	→ AccessibleWeb joined	10:26
	← joelroa left	10:26
	→ joelroa joined	10:27
	← Rylee left	10:27
	← boblee left	10:27
	→ Rylee joined	10:27
	→ joelroa_ joined	10:28
	→ hkon_ joined	10:28
	→ boblee joined	10:29
	→ bvi joined	10:30
	← joelroa left	10:31
	← Exancillatus left	10:31
	→ Sonderblade joined	10:31
	← Sonderblade left	10:32
	→ Sonderblade joined	10:32
	← Renex left	10:33
	→ Renex joined	10:35
	← Sabbath left	10:35
	→ daito joined	10:36
	→ carbon joined	10:37
	← daito left	10:37
	→ paulweb515 joined	10:38
	→ lopezt joined	10:38
lopezt	Hey guys	10:38
	→ draftqin joined	10:38
	→ daito joined	10:38
	→ daniel31 joined	10:38
	→ Dudi joined	10:38
lopezt	is there a way i can get all commits of a repository, including all branches?	10:39
	i need all commits, not only the commits of the given branch	10:39
YoungFrog	I think there's a --mirror option	10:39
daniel31	sorry for the stupid question, but how can I fix 'src refspec master does not match any'? is it telling me that there is no branch 'master' on the remote?	10:39
	→ Kayra joined	10:40
	← joelroa_ left	10:40
	← phuh_ left	10:40
	→ halu joined	10:41
	← luc_ left	10:41
intellix	I've got a really old branch with a feature, I want to update it to what's currently in develop	10:41
	→ Gavrisimo joined	10:41
	← WaReZ left	10:41
intellix	got a lot of conflicts and alot of these I just want the absolute latest from what's in develop... how can I just.... choose the develop version over what's local?	10:42
	karupanerura → zz_karupanerura	10:42
	→ Exancillatus joined	10:42
canton7-mac	so what did you do? merge 'develop' into 'branch'?	10:42
intellix	yep	10:42
canton7-mac	you can 'git co --theirs path/to/confliced/file'	10:43
	→ tomengland joined	10:43
arand	lopezt: git rev-list --all ?	10:43
intellix	ok thanks	10:43
	← draftqin left	10:43
lopezt	arand: letts have a look	10:43
	← h0bbit_ left	10:44
canton7-mac	in general, you can 'git merge -Xtheirs develop' to automatically do that	10:44
daniel31	how can I fix 'src refspec master does not match any'? is it telling me that there is no branch 'master' on the remote? (sorry for the noob question, still tryin to get to grips with git..)	10:44
rjhunter	lopezt, YoungFrog: `git clone` takes all branches by default (technically, all the refs under refs/heads and refs/tags )	10:45
	← johanhar left	10:46
rjhunter	lopezt: you can see all branches including those from a remote with `git branch -a`	10:46
	→ h0bbit_ joined	10:46
	← tomengland left	10:47
	← daniel31 left	10:48
	→ nick108 joined	10:48
rjhunter	intellix: your basic options: merge with the merging strategy "theirs" (like canton7-mac suggests), or drop the old branch entirely and make a new one.	10:49
intellix	would rebased have helped me at all? not sure what that does exactly :P	10:49
canton7-mac	learn what it does before trying it!	10:50
	rebase would have presented the conflicts bit-by-bit instead of all at once	10:50
	but it would have had the same conflicts	10:50
lopezt	rjhunter: i need all commits and iterate through them, including the commits of all branches not only the given one	10:51
rjhunter	intellix: i'd actually suggest trying out rebase in a safe copy, to help learn what it does. just don't push the results anywhere until you do understand :-)	10:51
	→ Synthead joined	10:52
	← AccessibleWeb left	10:52
lopezt	arand: git rev-list --all seems to be pretty much what i need	10:53
	arand: thank you	10:53
	← cbreak-work left	10:53
	← Pullphinger left	10:54
	→ chrisw_ joined	10:57
	← ifdm_ left	10:58
	→ koda joined	10:58
	← daito left	11:00
	→ m0ltar joined	11:00
	→ jcvfen joined	11:01
	← takamichi left	11:01
	← lindenle left	11:02
	→ bjornbjorn joined	11:03
	← diegoviola left	11:03
	→ cbreak-work joined	11:03
	→ takamichi joined	11:03
	→ MplsGreg joined	11:05
	← bvi left	11:06
	← koda left	11:06
	← carbon left	11:06
	→ bvi joined	11:06
	← iwantoski left	11:06
	← MplsGreg left	11:07
	→ MplsGreg joined	11:07
	→ JDIZM joined	11:08
	← sluther left	11:08
	→ Error404NotFound joined	11:09
	→ SHyx0rmZ joined	11:11
	← MplsGreg left	11:12
	← harobed_ left	11:12
	→ vtunka joined	11:12
	→ koell joined	11:13
	→ angelsl joined	11:13
	→ AccessibleWeb joined	11:14
	← SLY1986 left	11:16
	→ Agen_Terminator joined	11:16
	→ User458764 joined	11:17
	← Leoneof left	11:17
	→ xlinkz0 joined	11:17
	← Agen_Terminator1 left	11:17
	← cbreak-work left	11:18
	← Gizburdt left	11:19
	→ MachineX joined	11:19
	← alvesjnr left	11:19
	→ leandrosansilva joined	11:21
	← Harzilein left	11:21
	← freestyl3r left	11:22
	→ amcsi_work_ joined	11:22
	→ bgerber joined	11:23
	← brushlandBhai left	11:23
	← ghostlines left	11:26
	← amcsi_work left	11:26
	→ ghostlines joined	11:26
	← Sonderblade left	11:26
	← deuti left	11:27
	Sendoush_ → Sendoushi	11:28
	→ cbreak-work joined	11:28
	→ soya joined	11:28
	← plitzenberger left	11:29
	→ lithiumjake joined	11:30
	→ joelroa joined	11:30
	→ the_cybersphinx joined	11:30
	← Synthead left	11:30
	← vince_prignano left	11:31
	→ harobed joined	11:31
	→ marcjs joined	11:31
	← Tommy[D]_ left	11:32
	← ggonzalez_ left	11:33
	→ Leoneof joined	11:33
	← mtk left	11:34
	→ Sonderblade joined	11:34
	← Sonderblade left	11:35
	← wethu left	11:35
	← Leoneof left	11:35
	→ Leoneof joined	11:36
	← joelroa left	11:36
	→ gelardi_ joined	11:37
	→ SWakey joined	11:37
	→ mtk joined	11:37
	← woollyams left	11:37
	→ jimmy_the_geek joined	11:38
	← halu left	11:38
	← jimmy_the_geek left	11:38
SicoWork	Is there any way to add a submodule which doesnt have a master branch?	11:39
	← harobed left	11:39
raniere	SicoWork: submodule use the SHA1 as reference	11:39
canton7-mac	man git submodule	11:39
gitinfo	the git-submodule manpage is available at http://jk.gs/git-submodule.html	11:39
canton7-mac	look at the args for 'add'	11:39
	but yeah, once added, branches are largely irrelevant in most cases	11:40
SicoWork	canton7-mac: I have been, but cant figure out a way of doing it, thought someone here might know a trick	11:40
	← alexO left	11:40
	← simesy left	11:40
	→ ben_alman joined	11:42
	→ jas4711 joined	11:42
	→ daedeloth joined	11:42
SicoWork	This is what I get when I try to do it, http://bin.fuelphp.com/snippet/view/zx, but it does not create the .gitmodules file, nor is there a submodule to add	11:43
	→ tomengland joined	11:43
	→ koltroll joined	11:43
	→ solker joined	11:44
	← ferreum left	11:45
	← ben_alman left	11:46
	← Leoneof left	11:46
	→ Leoneof joined	11:47
	→ Gizburdt joined	11:47
	→ Tommy[D]_ joined	11:47
	← dermoth\|home left	11:48
	← tomengland left	11:48
	← m0ltar left	11:49
	← bvi left	11:50
	← Segfault_ left	11:50
	→ mimoo joined	11:51
	→ dougsland joined	11:51
	→ Segfault_ joined	11:52
	→ ben_alman joined	11:52
	→ dermoth\|home joined	11:53
	→ xrlk joined	11:53
	← xrlk left	11:53
	→ deuti joined	11:54
mepl	how can I specify port in my git clone?	11:54
	ssh port	11:54
	← koell left	11:54
	→ jatt joined	11:55
shruggar	mepl, there may be another way, but the easiest way I know of for the long-term at least is to tell your .ssh/config which port to use for that host	11:55
	← dangerousdave left	11:55
	← nick108 left	11:56
	→ freestyl3r joined	11:56
mepl	where do I find the .ssh/config in MINGW32?	11:56
nevyn	ugh	11:56
	→ nick108 joined	11:56
	→ dav1d joined	11:57
	← intellix left	11:57
dav1d	hey I just tried to push a commit but I got the message: A full name is needed for a commit, this one does not comply	11:57
	how can I change the name?	11:58
	← ben_alman left	11:58
dav1d	(only for that repo if possible)	11:58
	→ ferreum joined	11:58
	→ JeanCarloMachado joined	11:58
	← paulweb515 left	11:59
	← Luke-Jr left	11:59
	← comps left	11:59
	→ Luke-Jr joined	11:59
	← nick108 left	12:00
	→ dsantiago joined	12:00
	→ draftqin joined	12:01
	→ daito joined	12:01
	→ daedeloth_ joined	12:01
	→ iwantoski joined	12:01
	→ miqueias joined	12:02
	← cbreak-work left	12:02
osse	dav1d: commits don't have names. Is that the full error message?	12:02
dav1d	osse: http://vp.dav1d.de/SqP	12:03
	→ Balliad_ joined	12:04
osse	dav1d: that is an error coming from a hook on the server, not from Git itself	12:04
	← bicyclette left	12:04
	← daedeloth left	12:04
dav1d	even though: git commit --amend --author "David Herberth [email@hidden.address] and git log confirms, the author was changed	12:04
	→ PeterBooker joined	12:04
osse	dav1d: try git log --pretty=fuller	12:04
	dav1d: is both author and committer changed?	12:04
	← fatalhalt left	12:04
dav1d	osse: ahhh	12:05
	Commit: David [email@hidden.address]	12:05
	CommitDate: Thu Feb 20 13:00:26 2014 +0100	12:05
	← Balliad left	12:05
dav1d	osse: no, how can I change that one?	12:05
osse	dav1d: try --amend --reset-author	12:05
	ahh, it even says (hook declined). Nice	12:06
dav1d	osse: oh I have to set author for the repor first I guess?	12:06
mepl	Since my git frontend does not support remote git repositories, I have to move them from my gitserver to my frontend. How can I do this? A simple scp which moves the project.git does not seem to work. How can this be done?	12:06
osse	dav1d: I don't think so, but it's a good idea	12:06
dav1d	osse: your command reset both (author and committer) to my global defaults	12:06
	yap, that did it, thanks!	12:07
osse	mepl: how doesn't it work?	12:08
	→ MplsGreg joined	12:08
mepl	well, the repository I move is not empty, however after I move it to the new server, clone it, it appears empty.	12:08
	→ bicyclette joined	12:08
osse	mepl: what does 'git status' say inside the copied repo after scping	12:08
	← daito left	12:09
mepl	it must be done in a working tree	12:09
	← dav1d left	12:09
mepl	I copied the entire .git folder	12:09
	← koltroll left	12:10
osse	mepl: it wasn't a bare repo to begin with? What path did you give to git clone when you tried to clone it?	12:11
	→ hunt3r joined	12:11
osse	mepl: a better way than scp is to git clone --bare directly from the original location	12:11
	→ comps joined	12:11
	→ wethu joined	12:12
	← MplsGreg left	12:12
mepl	osse: will this copy my project.git including all commits and so on?	12:13
	← King_Hual left	12:14
mepl	from the original location, do you mean the repo srv?	12:14
	→ tarkus joined	12:14
	→ King_Hual joined	12:14
osse	mepl: yes. yes.	12:14
	→ daito joined	12:14
osse	it's a clone.	12:14
tarkus	Is there a way to merge two commits into one in an existing pull request? Or I have to drop pull request and create a new one for that?	12:14
	→ RaceCondition joined	12:15
	← gelardi_ left	12:15
osse	tarkus: a github pull request? If you push with the same branch name then the pull request is automatically updated	12:15
mepl	thing is osse, I need to move not only git files but also folders	12:15
osse	push -f if needed	12:15
	mepl: why?	12:15
mepl	so that I need only 1 crontab instead of one for each git file	12:15
	← chrisss404 left	12:15
	→ chrisss404 joined	12:16
ik__	hi all	12:16
	→ bhldev joined	12:16
ik__	anyone tried havan on centos 5.8?	12:16
osse	mepl: huh?	12:16
ik__	*havana	12:16
	← ik__ left	12:16
	← rjhunter left	12:16
mepl	ok osse, nvm.	12:17
	← poulson left	12:17
	← mimoo left	12:17
osse	mepl: I've probably misunderstood something...	12:18
mepl	osse: how do I do this? On the gitserver, git clone --bare project.git [email@hidden.address] ?	12:18
	Osse: yeah but my question is really basic. Move a repository from gitsrv to frontendsrv	12:19
	← daito left	12:19
osse	mepl: Easiest way to move a repo is to clone it.	12:19
ixon	move? just rsync it over.	12:19
osse	which server is which I don't know	12:19
mepl	why would rsync work if scp does not?	12:20
osse	mepl: that example command you wrote there is wrong. You need to switch the dir and URL arguements (or leave out dir)	12:20
	mepl: sounds to me like you're cloning/scping/whatevering a non-bare repo, since you mentioned a .git dir	12:20
ixon	mepl: why would scp not work for you?	12:20
mepl	it copies an empty repository	12:20
	no commits or anything follow	12:20
	← hunt3r left	12:21
ixon	I generally eschew scp because it does not transfer acls or xattrs	12:21
mepl	well if I wanna do it the git way	12:21
osse	mepl: what does 'git log' say in the local dir after scping ?	12:21
mepl	hmm	12:22
	→ poulson joined	12:22
mepl	it does say "ADDED FILE: readme"	12:22
	but the file does not follow	12:22
	→ doev joined	12:22
osse	sounds to me like you cloned a non-bare repository	12:22
	← draftqin left	12:22
ixon	the file is in the index	12:22
mepl	how can I view the files?	12:22
	git ?	12:22
	→ m0ltar joined	12:22
osse	but that output makes no sense for git log	12:22
ixon	Well, it does.	12:23
osse	how?	12:23
mepl	can I see if the README file is in the index?	12:23
ixon	If you copy only the .git/ directory, then the working files are absent, but since the index lives in .git/, files in the index (and of course all previous history) will be "there".	12:23
	In principle, if it's bare, rsyncish is possible, and for everything else use git clone	12:24
osse	ixon: but it doesn't make sense for git-log to show that message	12:24
mepl	it works now	12:25
	for some reason, didnt change shit	12:25
	← _5kg left	12:26
	→ LBV_User joined	12:26
	→ _5kg joined	12:27
	→ msafi1 joined	12:27
	← lolmaus left	12:27
	← lithiumjake left	12:29
	← msafi left	12:29
	→ colli5ion joined	12:30
	← colli5ion left	12:30
	→ colli5ion joined	12:31
	→ intellix joined	12:31
	→ dexen joined	12:31
dexen	hello	12:31
	→ omarek joined	12:31
dexen	given two revs A and B, i want to check whether A is descendant of B. what's the tool for that?	12:32
	← merica left	12:33
_ikke_	git branch --contains	12:33
	← Leoneof left	12:33
_ikke_	Although, it's not exactly what you look for	12:33
dexen	t/y	12:33
	what i want to know is whether rev B can be fast-forwarded to A	12:34
	i see git-merge-base --is-descendant, is that OK?	12:34
	→ grilix joined	12:34
dexen	err, --is-ancestor	12:34
	← grilix left	12:34
	→ grilix joined	12:35
_ikke_	I guess so	12:35
	← grilix left	12:35
	→ freimatz joined	12:35
	← miqueias left	12:35
_ikke_	Yeah, that's what you want indeed	12:35
	← _5kg left	12:39
	→ fatalhalt joined	12:39
	← wrouesnel left	12:39
	→ draftqin joined	12:40
	← JeanCarloMachado left	12:40
	→ vince_prignano joined	12:41
	← MattMaker left	12:42
	→ freeed joined	12:44
	→ dangerousdave joined	12:44
	→ tomengland joined	12:44
	← Guest76380 left	12:44
	← iwantoski left	12:45
	← fatalhalt left	12:45
	← shingshang left	12:46
	→ iwantoski joined	12:46
	← tomengland left	12:49
	→ msafi joined	12:49
	← msafi1 left	12:50
potatoe	i somehow managed to diverge my master with a merge	12:50
	how do i discard all and just merge again	12:50
	← Error404NotFound left	12:50
ArSn	Question: I merged a dev branch to master, pushed to origin, then did another commit on the dev branch, merged that to master again, and now want to push it	12:51
	→ simesy joined	12:51
ArSn	it seems git wants to push ALL the commits from my prior dev branch again - how come?	12:51
	→ joelroa joined	12:52
_ikke_	ArSn: Either the first push did not succeed, or something else is going one	12:52
	← User458764 left	12:52
	← Gizburdt left	12:52
ArSn	the first push commit was alright, it is definetly on origin	12:53
	← the_cybersphinx left	12:53
grumbel_	ArSn: How do you know it tries to push all of them?	12:53
ArSn	I expected this behavior to be a display issue, and it would be actually doing what I want to to	12:53
	← kriks left	12:53
_ikke_	grumbel_: My question	12:53
ArSn	grumbel_: I am using PHPStorm with git integration, the push dialog shows that all the commits are going to be pushed if I click the button	12:54
	← hoschi left	12:54
	← Balliad_ left	12:54
	→ paulweb515 joined	12:54
	→ the_cybersphinx joined	12:55
	→ hoschi joined	12:56
	← simesy left	12:56
	← joelroa left	12:56
	→ lithiumjake joined	12:56
	→ nick108 joined	12:57
grumbel_	ArSn: No idea what PHPStorm is doing then; you can check if the push succeeded by looking at git show @{u}	12:57
	if it was successfull, then your UI is probably misinforming you	12:58
ArSn	ok	12:58
	what does "git show @{u}" do exactly?	12:59
	→ shingshang joined	12:59
	→ Error404NotFound joined	12:59
grumbel_	@{u} is a reference to the upstream branch (such as origin/master) of your current branch; git show @{u} shows you the last commit in that branch	12:59
	→ Xethron joined	13:00
grumbel_	if it's the first merge, you'll know that upstream has your first merge/push; if it's not, the first push did not succeed	13:00
_ikke_	git log --oneline @{u} would be more usefull though	13:00
	→ cff joined	13:00
_ikke_	ArSn: See also man gitrevisions	13:00
gitinfo	ArSn: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html	13:00
	→ renovo joined	13:01
	← jatt left	13:01
bernalex	I've asked this before w/o getting an answer, but... is there a way to do git push [multiple remotes]?	13:01
	← nick108 left	13:01
cff	What might be the problem when I try to do a rebase and I hit TAB to autocomplete the branch name and it hangs for several seconds?	13:01
	→ jatt joined	13:01
masak	cff: is it a local branch?	13:01
	cff: what's the underlying file system?	13:01
	← Kayra left	13:02
cff	masak: ext4, remote branch	13:02
	→ Kayra joined	13:02
ArSn	"git log origin/master..master" shows all the commits	13:02
	that the IDE is showing too	13:02
	→ luxgeek joined	13:04
masak	cff: should be OK. I'm thinking something like the disk was sleeping and then it took some time for it to spin up.	13:04
_ikke_	ArSn: Try git fetch	13:04
	→ JeanCarloMachado joined	13:04
_ikke_	ArSn: That will update the remote tracking branches	13:04
cff	masak: If I do a git fetch --all maybe it'll help	13:04
	→ nick108 joined	13:05
ArSn	hmmm	13:05
	→ DoniRS joined	13:06
	← gua_ould left	13:06
	→ o9 joined	13:06
ArSn	its still strange that only those from the original dev branch seem to be pushed again	13:06
	← jatt left	13:06
	← Kayra left	13:06
	→ tbmiller joined	13:08
_ikke_	ArSn: Even after the fetch?	13:08
	← luxgeek left	13:08
masak	cff: in my experience, the bash tab completion only goes looking remotely if I do 'git push origin some-br<tab>'	13:08
	→ MplsGreg joined	13:09
	← nick108 left	13:10
	→ jatt joined	13:10
	→ okaido joined	13:10
	→ Gizburdt joined	13:11
	← daedeloth_ left	13:11
	→ dirte joined	13:11
	gitinfo set mode: +v	13:12
	← Mitchbones left	13:12
	← Error404NotFound left	13:12
	→ Balliad joined	13:13
	→ Error404NotFound joined	13:13
	← MplsGreg left	13:13
	← Zaknefain left	13:14
grumbel_	bernalex: http://stackoverflow.com/questions/849308/pull-push-from-multiple-remote-locations/3195446#3195446	13:16
	← renovo left	13:17
	← Sendoushi left	13:17
	→ Not_Whatever joined	13:18
	→ andr3a joined	13:18
	→ bhek joined	13:19
	← Kartagis left	13:19
	← john2x left	13:20
	← Chel left	13:20
	→ john2x joined	13:21
	→ Sly1986 joined	13:22
	→ _5kg joined	13:23
	← mrgrieves left	13:23
	→ MplsGreg joined	13:23
	← draftqin left	13:23
	← jas4711 left	13:24
	→ jusLookinAroun joined	13:25
	→ nick108 joined	13:25
	← jperry left	13:26
	← johnflux__ left	13:26
	← subhojit777 left	13:27
	→ jperry joined	13:27
	→ daedeloth_ joined	13:28
	→ jas4711 joined	13:28
	→ Kayra joined	13:29
	← lite left	13:29
	← Kayra left	13:29
	→ Kayra joined	13:29
	→ jonatasnona joined	13:31
	→ smashwilson joined	13:31
	→ alvesjnr joined	13:32
	← Error404NotFound left	13:32
	→ psyl0n_ joined	13:32
	→ johnflux__ joined	13:32
	← vince_prignano left	13:34
	→ vince_pr_ joined	13:34
	← MarcWeber left	13:35
	→ harobed joined	13:35
	← harobed left	13:35
	→ cbreak-work joined	13:36
	→ harobed joined	13:36
	← john2x left	13:36
	→ johnkevinmbasco joined	13:37
	→ joelroa joined	13:37
	→ joelroa_ joined	13:39
	→ Sendoushi joined	13:40
	→ nZac joined	13:41
	← joelroa left	13:41
	→ livingstn joined	13:42
	→ alexlindenlevy joined	13:42
	→ john2x joined	13:42
	← Not_Whatever left	13:42
	← bjornbjorn left	13:42
	→ tgkokk joined	13:43
	← martianlobster1 left	13:44
	→ tomengland joined	13:45
	→ fairuz joined	13:46
	→ jackneill joined	13:46
	→ ehmatthes joined	13:46
	← joelroa_ left	13:47
	← kermit left	13:47
	→ Error404NotFound joined	13:49
	→ luxgeek joined	13:49
	→ fission6 joined	13:49
	→ Leoneof joined	13:49
	← tomengland left	13:49
	→ crankyadmin_ joined	13:50
	→ hunt3r joined	13:50
	→ tummy_ joined	13:50
	→ IVplay_ joined	13:50
	→ Sly1986_ joined	13:51
	← hunt3r left	13:51
	→ mikecmpb_ joined	13:51
	→ Kayra_ joined	13:51
	← tgkokk left	13:51
	→ BaluseT joined	13:51
	← tvw left	13:51
	→ conan_ joined	13:51
	← paulweb515 left	13:52
	→ m0viefreak joined	13:52
	← Sendoushi left	13:52
	→ DanielHollands joined	13:52
	→ Sendoushi joined	13:52
	→ r0bby_ joined	13:53
	→ SpaghettiCat joined	13:53
	→ WaReZ joined	13:54
	→ sanmarco1 joined	13:54
	→ draftqin joined	13:54
SpaghettiCat	Hello, I was wondering why I have to name stashes like so: 'stash@{2}' rather than just giving '2'. Is there a workaround for this?	13:54
	→ njsg__ joined	13:54
	→ brewmast1r joined	13:54
	→ jrdavid joined	13:54
	→ philp_ joined	13:54
	→ Caelum_ joined	13:54
	→ ec_ joined	13:55
	→ tubaman_ joined	13:55
	→ biomind_ joined	13:55
	← hyperair left	13:55
	→ vansever1 joined	13:55
Nevik	SpaghettiCat: because stashes use the reflog for their magic	13:55
	→ xxtjaxx_ joined	13:55
	→ hypera1r joined	13:55
	→ lu_zero_ joined	13:55
	← lu_zero_ left	13:55
	→ lu_zero_ joined	13:55
	→ Mez_ joined	13:55
	← Mez_ left	13:55
	→ Mez_ joined	13:55
	→ Pieter___ joined	13:55
Nevik	@{num} notation refers to reflog entries	13:55
osse	hmm, I suppose you could argue that @2 should be the same as @{2}	13:55
	→ gdmfsob joined	13:55
	→ _main_ joined	13:56
Nevik	but that's not how the notation is defined, is it	13:56
	→ cbreak_ joined	13:56
	→ shinnya joined	13:56
SpaghettiCat	Ahh, these internals are beyond me. Thanks for answering anyway	13:56
	← kimchi left	13:56
	← Sendoushi left	13:56
_ikke_	SpaghettiCat: man gitrevisions	13:57
gitinfo	SpaghettiCat: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html	13:57
	← Dudi left	13:57
	← MplsGreg left	13:57
Nevik	yeap @num is not defined	13:57
	→ Dudi joined	13:57
Nevik	SpaghettiCat: im not currently aware of a builtin workaround. you could jsut use an alias though, i guess	13:57
	→ tvw joined	13:57
SpaghettiCat	But with `git stash apply` can you apply anything but stashes? Is the "stash" part of "stash@{2}" not redundant?	13:57
Nevik	be it git-alias or shell-alias, depending on how complex you want it to be	13:57
	→ aep_ joined	13:58
	→ DonVitoC- joined	13:58
	→ meatmanek_ joined	13:58
Nevik	SpaghettiCat: the problem here is that the stash subcommand is a lazy script ;)	13:58
	→ mtj_- joined	13:59
	← Gizburdt left	13:59
Nevik	by using the reflog notation, it didnt have to reinvent the wheel, but can pass the input to the plumbing commands it uses	13:59
	→ joelsmith_ joined	13:59
	← livingstn left	13:59
	← cbreak-work left	13:59
	← Kayra left	13:59
	← Sly1986 left	13:59
	← hoschi left	13:59
	← dermoth\|home left	13:59
	← Tommy[D]_ left	13:59
	← JDIZM left	13:59
	← LimeBlast left	13:59
	← robbyoconnor left	13:59
	← mikecmpbll left	13:59
	← jnavila left	13:59
	← IVplay left	13:59
	← tirengarfio left	13:59
	← tummy left	13:59
	← harish left	13:59
	← jrdavid_ left	13:59
	← conan left	13:59
	← jakob left	13:59
	← Demego left	13:59
	← cagedwisdom left	13:59
	← philp left	13:59
	← Baluse left	13:59
	← Olipro left	13:59
	← uu1101 left	13:59
	← mishok13 left	13:59
	← chuckharmston_ left	13:59
	← twisted` left	13:59
	← crankyadmin left	13:59
	← Asenar left	13:59
	← raccoon_ left	13:59
	← Nothing4You left	13:59
	← tfnico left	13:59
	← xiong left	13:59
	← Mez left	13:59
	← ec left	13:59
	← knownasilya left	13:59
	← tubaman left	13:59
	← meatmanek left	13:59
	← njsg_ left	13:59
	← Arokh left	13:59
	← jmcantrell left	13:59
	← Pieter left	13:59
	← felher left	13:59
	← aep left	13:59
	← biertie left	13:59
	← JStoker left	13:59
	← supermat left	13:59
	← yano left	13:59
	← Bombe left	13:59
	← grawity left	13:59
	← averell left	13:59
	← tgummerer left	13:59
	← ramlev left	13:59
	← evanc left	13:59
	← Seveas left	13:59
	← Mapley left	13:59
	← brewmaster left	13:59
	← ohcibi left	13:59
	← Ywa left	13:59
	← breiti left	13:59
	← joelsmith left	13:59
	← MissionCritical left	13:59
	← vmiklos left	13:59
	← midnightmagic left	13:59
	← __main__ left	13:59
	← harleypig left	13:59
	← xxtjaxx left	13:59
	← milki left	13:59
	← dr_lepper left	13:59
	← Fuxx left	13:59
	← Zimsky left	13:59
	← lu_zero left	13:59
	← Caelum left	13:59
	← vanseverk left	13:59
	← biomind left	13:59
	← sanmarcos left	13:59
	← tusbar left	13:59
	← DonVitoCorleone left	13:59
	← mtj_ left	13:59
	← Kulrak left	13:59
	← i7c left	13:59
	← D-Boy left	13:59
	← realzies left	13:59
	meatmanek_ → meatmanek	13:59
	_main_ → __main__	13:59
	→ KevinJRice joined	13:59
	→ matheus23 joined	14:00
	→ milki joined	14:00
	→ i7c joined	14:00
	→ Demego joined	14:00
	← Gavrisimo left	14:00
SpaghettiCat	Nevik: Is it re-inventing the wheel to parse a single number and wrap that "stash@{}" part around it?	14:01
Nevik	no, but the author(s) of stash were probably too lazy to do that	14:01
	→ mdhopkins joined	14:02
	← m0ltar left	14:02
Nevik	partly because applying instead of popping is not the main use-case	14:02
	→ IrishPrime joined	14:02
	← kapowaz left	14:02
	→ delboy1978uk joined	14:02
Nevik	SpaghettiCat: it's probably not that hard to put that parsing on top of it with an alias in your shell, or if youre feeling helpful, suggest a fix to the mailing-list	14:02
	stash might not even a C builtin, but just a script	14:02
	SpaghettiCat: if you know shell scripting, hack away: https://github.com/git/git/blob/14598b907008dc9952428662a30ecfd74dc90a79/git-stash.sh	14:03
	→ someElise_ joined	14:03
	→ nZac_ joined	14:04
	→ vmiklos joined	14:04
	Caelum_ → Caelum	14:04
	→ SpaghettiCat_ joined	14:04
	→ JSharpe_ joined	14:04
	DonVitoC- → DonVitoCorleone	14:04
	← DonVitoCorleone left	14:04
	→ DonVitoCorleone joined	14:04
	→ xlinkz0_ joined	14:04
Nevik	SpaghettiCat: or poke osse about it, who last modified it ;)	14:04
	→ sgambino joined	14:04
SpaghettiCat_	Nevik: Well, `pop` can't take a single number either. Yeah, it's not much work to create a function in my shell to make use of the shorthand way	14:05
	→ xiong joined	14:05
	→ Tommy[D]_ joined	14:05
	← alexlindenlevy left	14:06
	→ felher joined	14:06
	→ cagedwisdom joined	14:06
	→ alexlindenlevy joined	14:06
Nevik	and after that, it's not much work to push that function into the stash script and submit the patch to the ml ;)	14:06
	→ elbeardmorez_ joined	14:07
	→ Mission-Critical joined	14:07
	→ MplsGreg joined	14:07
	→ sgh joined	14:07
	→ hellopat joined	14:07
	→ harish_ joined	14:08
	→ bwreilly joined	14:08
SpaghettiCat_	Yeah, if `stash` is a Bash script I'll be able to do that	14:08
	→ ec joined	14:08
	→ joevandy1 joined	14:08
	→ jxpx777_ joined	14:08
	→ diegoviola joined	14:08
Nevik	it is, as i linked above	14:08
	→ jargon_ joined	14:08
	→ tirengarfio joined	14:09
	→ Arokh joined	14:09
	→ Nothing4You joined	14:09
	→ jnavila joined	14:09
	→ jakob joined	14:09
	→ uu1101 joined	14:09
	→ chuckharmston_ joined	14:09
	→ twisted` joined	14:09
	→ evanc joined	14:09
	→ Asenar joined	14:09
	→ raccoon_ joined	14:09
	→ tfnico joined	14:09
	→ knownasilya joined	14:09
	→ Mapley joined	14:09
	→ jmcantrell joined	14:09
	→ biertie joined	14:09
	→ JStoker joined	14:09
	→ supermat joined	14:09
	→ Bombe joined	14:09
	→ grawity joined	14:09
	→ averell joined	14:09
	→ tgummerer joined	14:09
	→ ramlev joined	14:09
	→ Seveas joined	14:09
	→ ohcibi joined	14:09
	→ Ywa joined	14:09
	→ breiti joined	14:09
	→ midnightmagic joined	14:09
	→ harleypig joined	14:09
	→ dr_lepper joined	14:09
	→ Fuxx joined	14:09
	→ Zimsky joined	14:09
	→ potatoe joined	14:09
	→ Alenah joined	14:09
	→ Derega joined	14:09
	→ swpd joined	14:09
	hobana.freenode.net set mode: +vv	14:09
	→ Olipro joined	14:09
	→ livingstn joined	14:09
	→ realzies joined	14:09
	→ rouf_ joined	14:09
	← ArSn left	14:09
	← Olipro left	14:10
	→ takamich_ joined	14:10
	← realzies left	14:10
	← nZac left	14:10
	← ec_ left	14:10
	→ m0ltar joined	14:10
	← camt left	14:10
	← jargon left	14:10
	← xlinkz0 left	14:10
	← someElise left	14:10
	→ D-Boy joined	14:10
	← frobware left	14:10
	← sanmarco1 left	14:10
	← elbeardmorez left	14:11
	← alexlindenlevy left	14:11
	← joelsmith_ left	14:11
	← IVplay_ left	14:11
	← Yomi left	14:11
	→ joelsmith joined	14:11
	→ kapowaz joined	14:11
	← kapowaz left	14:11
	→ kapowaz joined	14:11
	→ Yomi joined	14:11
	← Mission-Critical left	14:11
	→ hays_ joined	14:11
	→ dfanjul_ joined	14:11
delboy1978uk	If i do a git reset --hard HEAD, can I get it to delete any uncommited files?	14:11
	→ IVplay joined	14:11
	→ Maelstrom joined	14:11
	Maelstrom → LocalPCGuy	14:11
	→ ArSn joined	14:12
	← Error404NotFound left	14:12
	← bwreilly left	14:12
masak	delboy1978uk: uncommitted, or untracked?	14:12
	← jagob left	14:12
	nZac_ → nZac	14:12
masak	delboy1978uk: a 'reset --hard' generally deletes uncommitted files that Git knows about.	14:12
	delboy1978uk: but it leaves files you've never added alone.	14:13
	← mdhopkins left	14:13
	← SpaghettiCat_ left	14:13
masak	delboy1978uk: if you want to delete the latter kind, use 'git clean'	14:13
	← jonny\| left	14:13
	← john2x left	14:14
	→ sanmarcos joined	14:14
	← Fandekasp left	14:14
delboy1978uk	one of our old cake php sites got hacked and there are new files lying around in our webroot! i thought i could revert back and lose whatever got changed	14:14
	→ hoschi joined	14:14
	← aberrant left	14:14
	→ dermoth\|home joined	14:14
	→ sente_ joined	14:14
	→ Kulrak joined	14:14
	← Kulrak left	14:14
	→ Kulrak joined	14:14
	← jokajak left	14:15
	← jusLookinAroun left	14:15
	→ Error404NotFound joined	14:15
	→ hike_ joined	14:15
	← Rylee left	14:15
	← SpaghettiCat left	14:15
	← dfanjul left	14:15
	← rethus left	14:15
	← SorenHolm left	14:15
	← hike left	14:15
	← JSharpe left	14:15
	← jxpx777 left	14:15
	← rouf left	14:15
	← hays left	14:15
	← sente left	14:15
	→ jokajak` joined	14:15
delboy1978uk	guys, how can i reset back to a commit, and have any uncommited new files etc deleted?	14:15
	← jokajak` left	14:15
	→ jokajak` joined	14:15
	→ camt joined	14:15
	→ Rylee_ joined	14:16
	→ Stravy joined	14:16
	→ Zaknefain joined	14:16
delboy1978uk	git clean? thanks masak	14:17
_ikke_	git reset --hard would change all files back to their old state	14:17
	← Rylee_ left	14:17
	← johnkevinmbasco left	14:17
delboy1978uk	yeah i done that but the other files were still in place on the server	14:17
	← takamichi left	14:17
	← joevandyk left	14:17
_ikke_	delboy1978uk: git clean is for untracked files	14:17
	→ Rylee joined	14:17
delboy1978uk	fatal: clean.requireForce defaults to true and neither -n nor -f given; refusing to clean	14:17
	-f then?	14:17
_ikke_	yes	14:18
	← Yomi left	14:18
	← jas4711 left	14:18
	→ joelroa joined	14:18
	← MplsGreg left	14:18
	→ yano joined	14:19
	→ jonny\| joined	14:19
	→ johnkevinmbasco joined	14:19
Celelibi	What git object have a sha1 id?	14:19
	I know commit, tree, blob.	14:19
	Is there another one?	14:19
_ikke_	note	14:19
	tag	14:20
	← livingstn left	14:20
	← Arokh left	14:20
	← Nothing4You left	14:20
	← jnavila left	14:20
	← jakob left	14:20
	← uu1101 left	14:20
	← chuckharmston_ left	14:20
	← twisted` left	14:20
	← Asenar left	14:20
	← raccoon_ left	14:20
	← tfnico left	14:20
	← knownasilya left	14:20
	← jmcantrell left	14:20
	← biertie left	14:20
	← JStoker left	14:20
	← supermat left	14:20
	← Bombe left	14:20
	← grawity left	14:20
	← averell left	14:20
	← tgummerer left	14:20
	← ramlev left	14:20
	← evanc left	14:20
	← Seveas left	14:20
	← Mapley left	14:20
	← ohcibi left	14:20
	← Ywa left	14:20
	← breiti left	14:20
	← midnightmagic left	14:20
	← harleypig left	14:20
	← dr_lepper left	14:20
	← Fuxx left	14:20
	← Zimsky left	14:20
	← potatoe left	14:20
	← Alenah left	14:20
	← Derega left	14:20
	← swpd left	14:20
mepl	RAGESTOOORM	14:20
	→ Gizburdt joined	14:22
delboy1978uk	a lot of files are not removing. for instance:	14:22
	Not removing _make.money.at.home/	14:22
	→ lifelike joined	14:22
_ikke_	That's a directory	14:22
	→ fr33 joined	14:22
_ikke_	add a -d to delete them	14:22
	→ Yomi joined	14:22
delboy1978uk	so it is	14:23
	ls -la	14:23
	oops	14:23
ArSn	_ikke_: the fetch created multiple conflicts	14:23
_ikke_	ArSn: git fetch cannot create conflicts	14:23
ArSn	seems that stuff happens when the local master was not updated?	14:23
Celelibi	_ikke_: I thought tags were just refs.	14:23
	→ AaronMT joined	14:23
ArSn	uh oO	14:23
Celelibi	immutable refs.	14:24
_ikke_	Celelibi: lightweight tags are, annotated tags aren't	14:24
Celelibi	ok	14:24
	→ ErKa joined	14:24
Celelibi	I don't know about those.	14:24
	← kbart left	14:25
	→ jerius joined	14:25
	← sgh left	14:25
	→ kbart joined	14:25
	→ MissionCritical joined	14:25
	← jonny\| left	14:25
	→ Dougie187 joined	14:25
	← AccessibleWeb left	14:25
	→ AccessibleWeb joined	14:26
	← diegoviola left	14:26
	→ jonny\| joined	14:27
	→ grawity joined	14:27
	→ Walex joined	14:27
	→ Mendenba_ joined	14:27
	→ zumba_addict_ joined	14:27
	→ aslaen joined	14:28
	→ frobware joined	14:28
mepl	to remove files from my repo, I just clone it, remove the files and then push it back?	14:28
	aslaen → aslaen_	14:28
	→ travisstaton joined	14:28
mepl	or that sounds dangerous	14:28
	flazz_gone → flazz	14:28
	→ miqueias joined	14:28
grawity	no – you clone it, remove the files, stage & commit the changes, then push back	14:28
	since pushing always works in terms of commits	14:28
	→ mj12albe_ joined	14:28
mepl	I thought the commit part were obvious.	14:29
	→ jokajak joined	14:29
	← mj12albe_ left	14:29
	→ Renex`afk joined	14:29
grawity	many users asking for help here don't.	14:29
	→ wongon joined	14:29
	→ jmpp joined	14:29
	← psyl0n_ left	14:29
	→ tmart_ joined	14:29
	→ mdpatrick_ joined	14:29
	→ Cros79_ joined	14:30
	→ Gavrisimo joined	14:30
	→ hagebake joined	14:30
	→ NBhosting joined	14:30
	→ vadviktor_ joined	14:30
	→ Accessib_ joined	14:30
finster	mepl: please note that the file you removed will still be available when checking out a commit hash where the file was present	14:30
	← AccessibleWeb left	14:30
	← Streward left	14:30
	← colli5ion left	14:31
	→ CodeShar_ joined	14:31
	← Accessib_ left	14:31
	→ mizu_no_oto joined	14:31
	→ edwardly_ joined	14:31
	← luxgeek left	14:31
	→ tubaman joined	14:31
	→ Davey_ joined	14:31
	→ tier_ joined	14:31
	→ AccessibleWeb joined	14:31
	→ tureba_ joined	14:31
	→ leptonix_ joined	14:31
	→ thegorn_ joined	14:31
	→ cjwilburn joined	14:31
	→ luxgeek joined	14:31
	→ delboy1978uk1 joined	14:32
	→ gnugnu5 joined	14:32
	→ psyl0n joined	14:32
	→ sente joined	14:32
	→ toothr joined	14:32
	← gnugnu5 left	14:32
	→ bhek_ joined	14:32
	→ Pieter joined	14:32
	← AccessibleWeb left	14:32
	→ harv_ joined	14:32
	→ mellernoia joined	14:32
	→ tonyj_ joined	14:32
	→ coderdad_ joined	14:32
	→ styx__ joined	14:32
	→ Guest80050 joined	14:33
	→ dsdeiz_ joined	14:33
	→ AccessibleWeb joined	14:33
	→ bjornbjorn joined	14:33
	→ hoschi_ joined	14:33
	→ tusbar joined	14:33
	→ Arokh joined	14:33
	→ livingstn joined	14:33
	→ biertie joined	14:33
	→ Olipro joined	14:33
	→ Nothing4You joined	14:33
	→ jnavila joined	14:33
	→ jakob joined	14:33
	→ uu1101 joined	14:33
	→ chuckharmston_ joined	14:33
	→ twisted` joined	14:33
	→ evanc joined	14:33
	→ Asenar joined	14:33
	→ raccoon_ joined	14:33
	→ tfnico joined	14:33
	→ knownasilya joined	14:33
	→ Mapley joined	14:33
	→ jmcantrell joined	14:33
	→ JStoker joined	14:33
	→ supermat joined	14:33
	→ Bombe joined	14:33
	→ averell joined	14:33
	→ tgummerer joined	14:33
	→ ramlev joined	14:33
	→ Seveas joined	14:33
	→ ohcibi joined	14:33
	→ Ywa joined	14:33
	→ breiti joined	14:33
	→ midnightmagic joined	14:33
	→ harleypig joined	14:33
	→ dr_lepper joined	14:33
	→ Fuxx joined	14:33
	→ Zimsky joined	14:33
	→ potatoe joined	14:33
	→ Alenah joined	14:33
	→ Derega joined	14:33
	→ swpd joined	14:33
	hobana.freenode.net set mode: +vv	14:33
	aslaen_ → aslaen	14:33
	→ dirt_t joined	14:34
	→ kossy_ joined	14:34
	← Olipro left	14:34
	gitinfo set mode: +v	14:34
	gitinfo set mode: +v	14:34
	← mizu_no_oto left	14:34
	→ mattcen_ joined	14:34
	→ JerryT joined	14:35
	→ helium-3 joined	14:35
	→ ShooterM_ joined	14:35
	→ Olipro joined	14:35
	→ ajpiano_ joined	14:36
	← shingshang left	14:36
	← draftqin left	14:36
	→ gnugnu5 joined	14:36
	← w0ng_ left	14:36
	→ hike joined	14:36
	→ raniere_ joined	14:36
	← AccessibleWeb left	14:36
	→ polyrob_ joined	14:37
	→ AccessibleWeb joined	14:37
	→ dc5ala_ joined	14:37
	→ scorphus` joined	14:37
	→ polyzen joined	14:38
	← rylinaux left	14:38
	← jokajak` left	14:38
	← Renex left	14:38
	← hoschi left	14:38
	← aspiers left	14:38
	← jmpp_ left	14:38
	← Tasartir left	14:38
	← Davey left	14:38
	Davey_ → Davey	14:38
	← Cros79 left	14:38
	← Kulrak left	14:38
	← bicyclette left	14:38
	← mj12albert left	14:38
	← zumba_addict left	14:38
	← tureba left	14:38
	zumba_addict_ → zumba_addict	14:38
	→ aspiers_ joined	14:38
	← mdpatrick left	14:38
	← thegorn left	14:38
	← toothrot left	14:38
	← WormDrink left	14:38
	← KK4MGV left	14:38
	← MissionCritical left	14:38
	← hike_ left	14:38
	← sente_ left	14:38
	← dermoth\|home left	14:38
	→ bipolar_ joined	14:38
	← hagabaka left	14:38
	← edwardly left	14:38
	← githogori left	14:38
	← Exdaix left	14:38
	← tmart left	14:38
	← scorphus left	14:38
grawity	yes, because Git's purpose is to keep history	14:38
	← Mendenbarr left	14:38
	← avelldiroll left	14:38
	← vadviktor left	14:38
	← tubaman_ left	14:38
	← daedeloth_ left	14:38
	← delboy1978uk left	14:38
	← tier left	14:38
	← _tickez left	14:38
	← flaguy48 left	14:38
	← Walex2 left	14:38
	← polyrob left	14:38
	polyrob_ → polyrob	14:38
	← Dougie187 left	14:38
	← IVplay left	14:38
	← Pieter___ left	14:38
	← bhek left	14:38
	← dirte left	14:38
	← dc5ala left	14:38
	← armyriad left	14:38
	← osse left	14:38
	← ShooterMG left	14:38
	← dsdeiz left	14:38
	← CodeShark left	14:38
	← mattcen left	14:38
	← tieTYT2 left	14:38
	← kossy left	14:38
	← styx_ left	14:38
	← bipolar left	14:38
	← jave left	14:38
	← harv left	14:38
	← dilfridge left	14:38
	← thelamest left	14:38
	← johntitor2036 left	14:38
	← raniere left	14:38
	← leptonix left	14:38
	← murr4y left	14:38
	← tonyj left	14:38
	← Guest7673 left	14:38
	← ajpiano left	14:38
	← njsg left	14:38
	aspiers_ → aspiers	14:38
	→ thelamest1 joined	14:38
	→ xsbeats joined	14:38
	mattcen_ → mattcen	14:38
	→ tieTYT2 joined	14:38
	harv_ → harv	14:38
	ajpiano_ → ajpiano	14:38
	→ Gamecubic joined	14:38
	→ IVplay_ joined	14:38
	→ Kulrak joined	14:38
	→ WormDrink joined	14:38
	← WormDrink left	14:38
	→ WormDrink joined	14:38
grawity	changing the past to disappear a file requires some effort	14:38
	→ jave joined	14:38
	→ armyriad joined	14:38
	→ dermoth\|home joined	14:38
	← IVplay_ left	14:39
	→ githogori joined	14:39
	→ flaguy48 joined	14:39
	→ IVplay joined	14:39
	→ daedeloth_ joined	14:39
	→ bicyclette joined	14:39
	→ chrisshattuck joined	14:39
	→ w0ng joined	14:39
	→ paulweb515 joined	14:39
	→ _tickez joined	14:40
	→ avelldiroll joined	14:40
	← AccessibleWeb left	14:40
	← francisfish left	14:40
	← w0ng left	14:40
	← fairuz left	14:40
	→ fairuz joined	14:40
	→ Exdaix joined	14:40
	→ AccessibleWeb joined	14:40
	→ Dougie187 joined	14:41
	→ w0ng joined	14:42
	→ rylinaux joined	14:43
	→ osse joined	14:43
	→ njsg joined	14:43
	→ CKyle joined	14:43
	→ FortySix2 joined	14:43
	← rylinaux left	14:43
	← wethu left	14:44
	→ rylinaux joined	14:44
	← paulweb515 left	14:44
	→ paulweb515 joined	14:44
	← fairuz left	14:44
	→ zapb joined	14:44
	← j0ran left	14:45
	← beautifulmind left	14:45
	← AccessibleWeb left	14:46
	→ poliveirap joined	14:46
	→ fairuz joined	14:46
Nevik	i like how grawity uses "to disappear" transitively	14:46
	Nevik disappears the grawity	14:46
	→ MissionCritical joined	14:46
	→ KK4MGV joined	14:47
	← tureba_ left	14:48
_ikke_	lol	14:48
	→ tureba joined	14:48
	← tirengarfio left	14:48
	→ shingshang joined	14:49
	→ ehynds joined	14:49
	← IVplay left	14:49
	→ tirengarfio joined	14:49
	← freestyl3r left	14:50
	→ michael_lee joined	14:50
	← jonny\| left	14:51
	→ AccessibleWeb joined	14:51
	→ MrRoot joined	14:55
	→ becks__ joined	14:55
	← freeed left	14:55
	→ budrose joined	14:55
	→ Hecter joined	14:56
	→ Sendoushi joined	14:56
	→ freeed joined	14:56
	→ sohail__ joined	14:57
	← irqq left	14:57
	→ johnmilton joined	14:58
	← Macaveli left	14:58
	← Misan left	14:58
	→ jonny\| joined	14:58
	← becks__ left	14:59
	← JeanCarloMachado left	14:59
	← polyzen left	14:59
	← King_Hual left	15:00
	→ becks__ joined	15:00
	← joelroa left	15:01
	← omarek left	15:01
	← ewet left	15:04
	→ Hounddog joined	15:05
osse	shruggar:	15:05
	oops	15:05
shruggar	ono, a spurious notification!	15:05
	← Gorroth left	15:05
offby1	Ono, an avant-garde artist!	15:06
	← ayaz left	15:06
	→ NBhostin_ joined	15:06
	Keridos_off → Keridos	15:07
	← chiromante left	15:07
	→ Gorroth joined	15:07
	← NBhosting left	15:08
	→ bdavenport joined	15:08
	→ LeMike joined	15:08
	← hkon_ left	15:09
	→ ayaz joined	15:09
	← ayaz left	15:09
grawity	Nevik: in the same sense as governments disappear people from history	15:09
	→ phantomtiger joined	15:10
offby1	Los desaparecidos	15:11
	← nZac left	15:11
	→ RizKhan joined	15:11
	← Jeremy_Nodasys left	15:11
	← Gavrisimo left	15:13
	→ nZac joined	15:13
	← Sendoushi left	15:15
	lu_zero_ → lu_zero	15:15
	→ Sendoushi joined	15:15
	← psyl0n left	15:15
	→ kriks joined	15:15
	→ dreiss joined	15:15
	jargon_ → jargon	15:15
	→ Hylke joined	15:17
moritz	that's because people aren't tracked by git	15:17
arand	Hmm git-subtree and git-submodule doesn't mix very well... git doesn't like .gitmodules files halfway down the tree :/	15:18
	← CKyle left	15:18
	raniere_ → raniere	15:18
	← jluc left	15:18
	← Hylke left	15:19
	→ CKyle joined	15:20
	← Sendoushi left	15:20
cff	Can I get somehow the revision I was at before update ?	15:20
	→ noisewaterphd joined	15:20
	→ crazydiamond joined	15:20
cff	I can't remember where I was and the update brings problems	15:20
	← fairuz left	15:21
	← poliveirap left	15:21
	← yhager left	15:21
	← kbart left	15:21
	→ aberrant joined	15:21
osse	cff: try git rev-parse ORIG_HEAD	15:22
	→ yhager joined	15:22
osse	it's also present in the pull/merge output	15:22
	← h0bbit_ left	15:22
	→ hftf joined	15:22
	→ leeN joined	15:23
	← cjwilburn left	15:23
hftf	How do I correctly git-svn clone (with all history) a repo that started out not using stdlayout?	15:23
	→ osvimer joined	15:24
	→ v0n joined	15:24
	← papegaaij left	15:24
	→ Saurabh joined	15:25
	Saurabh → Guest36557	15:25
moritz	hftf: by providing the urls manually	15:25
	man git-svn	15:25
gitinfo	the git-svn manpage is available at http://jk.gs/git-svn.html	15:25
	← Joost left	15:25
	← jargon left	15:27
	→ Joost joined	15:28
	AccessibleWeb → reskp	15:28
	← soya left	15:28
	→ Sendoushi joined	15:29
	← lifelike left	15:29
hftf	Do you mean -T/-t/-b? Just tried that.	15:29
	← coderdad_ left	15:29
hftf	git svn clone -T trunk myrepo only starts pulling revisions from when files were moved into the trunk folder (they were all in root before).	15:29
	→ phile joined	15:29
hftf	Sorry if the question was unclear	15:29
	← fanno left	15:30
cff	osse: no, that shows the current head	15:31
	bhek_ → bhek	15:31
	→ ewet joined	15:31
	→ lifelike joined	15:32
	→ coderdad_ joined	15:32
	→ bwreilly joined	15:32
	← nZac left	15:33
	← biertie left	15:33
	→ biertie joined	15:33
	← Dudi left	15:33
osse	cff: then either find the output of pull/merge/fetch (they say foo..bar) and foo is what you're after.	15:33
	Or use git-bisect to find the error	15:33
	→ jargon joined	15:33
cff	osse: it only shows one hash	15:33
	← FortySix2 left	15:33
hftf	If I don't use -T/-t/-b/-s, then the move history is copied, but the files do end up in trunk. (Not that bad, but I wanted to see if there was a workaround)	15:34
	← Guest36557 left	15:36
	← poulson left	15:36
	→ SicoAnimal joined	15:36
	← Xethron left	15:36
	→ kaze joined	15:36
	→ chiromante joined	15:36
	← bwreilly left	15:37
	→ rubatdub joined	15:37
	→ SorenHolm joined	15:37
	→ carbon joined	15:38
	← SicoWork left	15:38
	← bjornbjorn left	15:38
	→ diraol joined	15:38
	← dangerousdave left	15:39
	← Kayra_ left	15:40
	← yhager left	15:40
	← r0bby_ left	15:40
	← carbon left	15:41
	← crazydiamond left	15:41
	← noisewaterphd left	15:44
	→ colli5ion joined	15:44
	→ joelroa joined	15:44
	← joelroa left	15:44
	← ferreum left	15:44
	→ joelroa joined	15:45
	→ tomeram joined	15:46
tomeram	Hi, how can I disconnect my computer from a reposytory/	15:47
	?	15:47
canton7-mac	how do you mean?	15:47
	your computer isn't connected to any repositories, as such	15:48
	← v0n left	15:48
	← OnkelTem left	15:48
	→ martianlobster joined	15:48
	← lavaman left	15:48
canton7-mac	your computer can have multiple repositories on it - just as it has multiple files and folders	15:48
	a repository can have other repositories added as remotes...	15:48
	what do you mean?	15:48
	← TheMoonMaster left	15:49
	← iwantoski left	15:49
	→ TheMoonMaster joined	15:49
	← osvimer left	15:49
	→ OnkelTem joined	15:49
	← Plummer left	15:50
	Vampire0_ → Vampire0	15:50
	→ iwantoski joined	15:50
	← shinnya left	15:50
	← joelroa left	15:50
	→ DarkStompy joined	15:51
	→ bbloom joined	15:52
	→ hbf joined	15:52
	← Hello71 left	15:53
	← Gamecubic left	15:53
	← reskp left	15:54
	→ reskp joined	15:55
	→ Hello71 joined	15:55
Nevik	hftf: you can svn-clone with the appropriate T/b/t options set, and specify the revision range before the layout was changed; then afterward change the options (they get saved in your repo config file), and svn-fetch the rest of the history	15:56
	(you can also pass the T/b/t options to fetch, but i dont know if it then updates the config file)	15:56
	← martianlobster left	15:56
	← cff left	15:57
Nevik	hftf: this is just how i imagine it to work, i have not tested this, so no guarantees ;)	15:57
hftf	I found a little bit more info with some more refined googling	15:57
	Gonna cargo-cult some commands	15:57
	← bbloom left	15:57
Nevik	cargo what?	15:57
hftf	http://mg.pov.lt/blog/eazysvn-git-migration.html#c1329734473.89	15:58
	https://en.wikipedia.org/wiki/Cargo_cult_programming#Overview	15:59
	→ reskp_ joined	15:59
	→ Kayra joined	15:59
	→ bwreilly joined	15:59
	← nick108 left	15:59
	← reskp left	15:59
	→ gua_ould joined	15:59
Nevik	ooooookayyyyyy	15:59
	← gua_ould left	15:59
hftf	lol	16:00
	← iwantoski left	16:00
Nevik	hftf: that does pretty much exactly what i said, only in a more refined way	16:00
	← Sendoushi left	16:00
hftf	I'm about to try it out	16:00
	← Hecter left	16:00
Nevik	if i had any svn repos i could have tested my suggestion before recommending it to you, but svn imports are usually painfully slow	16:00
	so i dont do them if i dont have to	16:00
hftf	(also it helps to have someone else's written-out commands to look at - not that your explanation wasn't helpful or anything)	16:00
	← M00sL0gB0t left	16:01
	→ Sendoushi joined	16:01
	→ M00sL0gB0t joined	16:01
	→ achadwick joined	16:01
	→ gua_ould joined	16:01
	← colli5ion left	16:01
	← roelmonnens left	16:01
	← vince_pr_ left	16:02
	→ colli5ion joined	16:02
	← psoo left	16:03
	→ Sendoush_ joined	16:03
	← Sendoushi left	16:03
	flazz → flazz_gone	16:03
	→ cads joined	16:04
	→ lavaman joined	16:04
	← diraol left	16:04
	← matheus23 left	16:04
	← Leoneof left	16:05
	← delboy1978uk1 left	16:05
hftf	just need to figure out which revision #s are correct	16:06
	→ boboc joined	16:06
	← ThomasLocke left	16:06
	← lifelike left	16:07
	→ lifelike joined	16:07
	→ Gamecubic joined	16:08
	→ m104 joined	16:08
	→ iwantoski joined	16:09
	→ eletuchy joined	16:09
	→ acharlieh joined	16:09
	→ cjwilburn joined	16:10
	← Sendoush_ left	16:10
	→ eeprom joined	16:11
	→ Sendoushi joined	16:11
	→ lolmaus joined	16:12
	← rchavik left	16:12
	→ King_Hual joined	16:12
	← ehmatthes left	16:12
	← colli5ion left	16:12
	→ maestrojed joined	16:12
	← Error404NotFound left	16:13
	→ IVplay joined	16:13
	→ Err404NotFound joined	16:13
	← Err404NotFound left	16:14
	→ martianlobster1 joined	16:14
	→ Gavrisimo joined	16:14
	← Raging_Hog left	16:14
	→ tgkokk joined	16:14
	← vtunka left	16:14
	→ Err404NotFound joined	16:14
	→ Sendoush_ joined	16:14
	← Sendoushi left	16:14
	→ veebers joined	16:14
	← mewm left	16:15
	← cbreak_ left	16:15
	← troyt left	16:15
	→ Leoneof joined	16:15
	→ poulson joined	16:15
	← tomeram left	16:16
	← kriks left	16:16
	← johnkevinmbasco left	16:16
	→ lite joined	16:17
	→ el3ctron joined	16:17
	→ joelrobichaud joined	16:17
	→ chovy_ joined	16:18
chovy_	i'm using bitbucket and i have a fork repo. The upstream has a 'release' branch, but my origin does not. How do I get this branch into my fork?	16:18
	← Gavrisimo left	16:19
	→ r0bby_ joined	16:19
	← dfanjul_ left	16:19
dawik	try git pull origin release	16:19
	if that is the name of the branch	16:19
jast	eww, no :}	16:19
chovy_	doesn't that merge the remote branch into origin/master?	16:19
	← Gizburdt left	16:20
jast	chovy_: you're saying that after 'git fetch', you have no remotes/origin/release?	16:20
	* in the output of 'git branch -a'	16:20
dawik	not if you create the branch first	16:20
	and go there	16:20
	it merges with whatever branch you are in	16:20
	iirc	16:20
	→ kermit joined	16:20
	← lite left	16:20
	→ lite_ joined	16:20
chovy_	$ git pull origin release	16:20
	fatal: Couldn't find remote ref release	16:20
	git fetch fails	16:21
jast	ohh	16:21
	I didn't parse your question correctly	16:21
	← lifelike left	16:21
	← iwantoski left	16:21
jast	basically you'll have to grab the branch from the upstream and then push it to your fork	16:21
ewet	I don't even ... http://www.reddit.com/r/git/comments/1xre1e/making_submodules_better_with_an_alias/	16:21
chovy_	remotes/upstream/release	16:21
	chovy_ → chovy	16:22
jast	you have that already?	16:22
chovy	i do not have remotes/origin/release	16:22
	which i was expecting	16:22
	← o9 left	16:22
jast	right, because your fork doesn't automatically grab new branches from the original repo	16:22
chovy	so how do i get fork to sync with upstream branches?	16:22
	← makubi left	16:22
jast	unless bitbucket has a magic button for that, you'll have to do it manually	16:23
	you do have remotes/upstream/release in your local clone, right?	16:23
	→ lifelike joined	16:23
chovy	jast yeah	16:23
	it looks like it	16:23
	→ lite joined	16:23
jast	so, one thing you can do is: git push origin upstream/release:release	16:24
ewet	jast: how about parking gitinfo in #bitbucket as well? would that be a good idea?	16:24
chovy	what will that do?	16:24
	seems backwards	16:24
jast	ewet: depends on what the guys who run #bitbucket think	16:24
	← lite_ left	16:24
jast	chovy: it pushes your upstream/release to origin as 'release'	16:25
	→ Exancill_ joined	16:25
	→ thiago joined	16:25
	← nilg left	16:25
jast	ewet: the scary part about your link is that there's an /r/git in the first place ;)	16:25
chovy	ok	16:25
ewet	jast: hehe	16:25
	← alvesjnr left	16:26
	→ sluther joined	16:27
ewet	!help	16:27
gitinfo	What do you need help with? Something with git? Tell us what's going on, and please be specific. For information on how to abuse me (I'm a bot!), see http://jk.gs/git/bot . Please be gentle.	16:27
	← Exancillatus left	16:27
	→ makubi joined	16:27
chovy	$ git push origin upstream/release:release	16:27
	error: unable to push to unqualified destination: release	16:27
	→ diraol joined	16:27
jast	okay, I was half expecting that	16:27
	try this: git push origin upstream/release:refs/heads/release	16:27
	slightly more verbose, but more fire-proof	16:27
	FWIW, an easier way to do it: create a local branch from upstream release and then push that	16:28
	← kaze left	16:28
jast	*from upstream/release	16:28
	jeez	16:28
	← cagedwisdom left	16:29
	← LBV_User left	16:31
	→ johntitor2036 joined	16:31
	← arvind_khadri left	16:32
	→ Dudi joined	16:32
	← hypera1r left	16:32
	← armyriad left	16:33
	→ starkhalo joined	16:33
	→ iwantoski joined	16:33
	→ armyriad joined	16:34
	→ nilg joined	16:34
	← diraol left	16:35
	← HelperW left	16:36
	← tummy_ left	16:36
	← jceb left	16:36
	→ kriks joined	16:37
	← gua_ould left	16:37
amoe	what git release introduced the -c option?	16:38
	→ tummy joined	16:38
	→ nicedice joined	16:38
	← m0ltar left	16:39
	← freimatz left	16:39
	→ v0n joined	16:39
	→ ferreum joined	16:40
	→ tgkokk_ joined	16:40
	← _5kg left	16:40
	← tgkokk left	16:40
	← Sly1986_ left	16:40
	→ d2dchat joined	16:41
	tgkokk_ → tgkokk	16:41
	→ Gavrisimo joined	16:41
	← tummy left	16:42
	→ Sonderblade joined	16:42
	← Sonderblade left	16:42
	→ dangerousdave joined	16:42
	← dangerousdave left	16:42
	→ Sonderblade joined	16:42
	← jatt left	16:43
	→ Noldorin joined	16:43
	← Kayra left	16:44
	→ koell joined	16:45
	→ Kayra joined	16:45
	← Gamecubic left	16:45
	← andr3a left	16:46
	← Gavrisimo left	16:46
	→ colli5ion joined	16:46
	→ troyt joined	16:46
jast	amoe: to what command? :)	16:47
	← osse left	16:47
	→ osse joined	16:47
	← LeMike left	16:47
	← iwantoski left	16:48
	← dexen left	16:48
	→ hyperair joined	16:48
	→ dik_dak joined	16:48
chovy	jast: i'm a little hesitant to run these commands. i'm not sure how to undo them if they bork my repo	16:48
	← boboc left	16:48
ashooby	make a copy of your repo	16:48
	→ Gavrisimo joined	16:48
osse	amoe: 1.7.10	16:49
	→ webtroll joined	16:49
chovy	ashooby: that is too easy :)	16:49
jast	osse: what are we even talking about? 'git -c ...' has been around for longer than that	16:49
	← Kayra left	16:49
jast	chovy: all 'git push' does is send objects from A to B	16:49
osse	jast: oh? 8b1fa778	16:49
	jast: but I suspect he's taking about the -C option	16:50
jast	with the command I suggested, nothing can get destroyed, only new stuff added	16:50
	osse: I'll bet that you got deceived by the sort order of tags in the output	16:51
	→ bbloom joined	16:52
osse	jast: you're imagining things. I wrote 1.7.2	16:52
	:P	16:52
	← rath left	16:53
osse	In unrelated news: I fully support the new suggestion of adding --sort=version to git-tag	16:53
	← ghostlines left	16:53
	→ bjornbjorn joined	16:55
	← bwreilly left	16:55
	→ vvetter joined	16:55
	← martianlobster1 left	16:55
	← angelsl left	16:55
	← hike left	16:56
	→ RichardJ joined	16:57
	mikecmpb_ → mikecmpbll	16:58
	← DoniRS left	16:58
	← koell left	16:58
	← cads left	16:58
	← SorenHolm left	16:58
	← Leoneof left	16:59
	→ SorenHolm joined	16:59
	→ koell joined	16:59
	← solker left	16:59
	→ lite_ joined	17:00
	← arand left	17:00
	← lite left	17:01
	→ Gamecubic joined	17:01
	← Gonzo89 left	17:01
	← SorenHolm left	17:02
	← r0bby_ left	17:03
	→ SorenHolm joined	17:04
	→ ngladitz joined	17:04
	→ psyl0n joined	17:04
	← pduin left	17:04
	→ vince_prignano joined	17:05
	← shingshang left	17:05
	← albel727 left	17:05
	→ nZac joined	17:06
	→ albel727 joined	17:07
	← fr33 left	17:07
	→ r0bby_ joined	17:07
	← jerius left	17:07
	← tgkokk left	17:08
	→ jerius joined	17:08
	→ hwrdprkns joined	17:08
	← michael_lee left	17:09
	→ pheaver joined	17:10
	← jargon left	17:11
	← Sendoush_ left	17:11
	→ Sendoushi joined	17:12
	← hwrdprkns left	17:12
	← SorenHolm left	17:13
	← jerius left	17:13
	→ fr33 joined	17:13
	← ngw left	17:14
	→ User458764 joined	17:14
	→ SorenHolm joined	17:15
	← regreddit left	17:15
	→ bwreilly joined	17:15
	→ Kayra joined	17:15
	← Err404NotFound left	17:16
	← Sendoushi left	17:16
	→ hwrdprkns joined	17:17
	→ watermel0n joined	17:18
	← Luke-Jr left	17:18
	→ SamB joined	17:18
	→ joelm joined	17:19
	→ goTAN joined	17:19
	→ Luke-Jr joined	17:19
	→ jerius joined	17:19
	← coderdad_ left	17:20
	← Dudi left	17:20
	→ akiva joined	17:20
	→ krizzii joined	17:20
	← hwrdprkns left	17:20
	← Kayra left	17:20
	→ hwrdprkns joined	17:21
	← r0bby_ left	17:21
	→ robbyoconnor joined	17:21
	← SWakey left	17:23
	← specious left	17:23
	→ Sendoushi joined	17:24
	→ _5kg joined	17:24
	→ specious joined	17:24
	→ Leoneof joined	17:24
	→ neophreak joined	17:25
	→ johnflux joined	17:25
	← johnflux left	17:25
	→ johnflux joined	17:25
	← johnflux__ left	17:25
hbf	Should Author/Committer contain @some-dummy-domain when all I have is a username (from cvs/svn) and there is no natural domain/e-mail address to use? Git itself works fine without, but maybe some tools don't.	17:26
	← dreiss left	17:27
grawity	I usually see tools put @localhost or SVN-repo-UUID as the domain	17:27
hbf	Yes, I've seen that. Just wondering if there is some point to it. less text is more readable after all.	17:27
	← bartman`` left	17:28
	→ zorbash joined	17:28
	← JSharpe_ left	17:28
	→ h0bbit_ joined	17:28
	← krizzii left	17:31
	→ chiromante_ joined	17:31
	← ChrisAnn left	17:31
	← robbyoconnor left	17:31
hbf	eh, if anyone said something just now i lost it from irc:-(	17:32
	← chiromante left	17:32
	← intellix left	17:32
	→ halu joined	17:32
	← User458764 left	17:33
	← luxgeek left	17:33
	← eaj left	17:33
	← canton7-mac left	17:34
	← P4_Denis left	17:34
	← lavong left	17:34
	→ Kayra joined	17:34
	← chiromante_ left	17:35
	→ chiromante_ joined	17:35
	← Kayra left	17:35
	→ Kayra joined	17:36
	← chiromante_ left	17:36
	← mikecmpbll left	17:36
	→ luxgeek joined	17:36
	← Zaknefain left	17:36
	→ chiromante joined	17:37
	← pheaver left	17:37
	← hwrdprkns left	17:38
	← GodEater left	17:38
	← Exancill_ left	17:38
	→ Exancillatus joined	17:38
	→ hwrdprkns joined	17:39
	→ glaksmono joined	17:39
	← reskp_ left	17:39
	← shruggar left	17:39
	→ User458764 joined	17:39
	→ treehouse joined	17:40
	← glaksmono left	17:40
	← Exancillatus left	17:40
	← cllamas left	17:40
	→ JSharpe joined	17:40
	← Kayra left	17:40
	→ gordian joined	17:41
goTAN	so is there a difference between /folder/ and folder/ in .gitignore	17:42
	→ Exancillatus joined	17:42
goTAN	?	17:42
	→ tyreld joined	17:42
	→ glaksmono joined	17:43
osse	goTAN: a leading slash makes the pattern match from the root dir	17:43
	→ mimoo joined	17:43
	← RizKhan left	17:43
goTAN	from the root or only the folder in the root?	17:43
	so no subfolders with the same name are ignored?	17:43
osse	correct	17:44
goTAN	ah	17:44
	→ koltroll joined	17:44
osse	A leading slash matches the beginning of the pathname. For example, "/*.c" matches "cat-file.c" but not "mozilla-sha1/sha1.c".	17:44
	← kermit left	17:44
goTAN	yea I have a bit of trouble with ignoring files.	17:45
	← mlechner left	17:46
	← Gamecubic left	17:46
	← marcjs left	17:46
	← tawane left	17:46
	→ Gamecubic joined	17:46
goTAN	I wanted to add a file to .gitignore which was already in the history so I added it to .gitignore and did git rm --cached filename	17:46
	→ P4_Denis joined	17:46
	← Noldorin left	17:47
osse	so far so good	17:47
goTAN	and then I commited which worked fine for me but the other developer had problems merging it	17:47
	→ Noldorin joined	17:47
	→ ArcTanSusan joined	17:47
	→ tomengland joined	17:47
	→ joelroa joined	17:47
goTAN	even if they did not had local changes	17:47
	→ Partiallogic joined	17:48
	← Partiallogic left	17:48
goTAN	I solved this by just deleting those file and then merging it	17:48
	but I was wondering what I did wrong	17:48
hbf	"/foo" in .gitignore is relative to the directory which contains the .gitignore. 'echo /foo > bar/.gitignore' means bar/foo gets ignored.	17:49
	← Agen_Terminator left	17:49
	← psyl0n left	17:50
	← a1bl left	17:50
	→ mens joined	17:50
	← DrNick left	17:50
	n8chur_ → n8chur	17:51
mens	hi, does anyone have any experience with git, https and proxy?	17:51
	→ boombatower joined	17:51
goTAN	so what I actually wanted to do is, adding a file as discribed to .gitignore so that every developer ignores that file	17:51
mens	I had it working fine with 1.7.1 but 1.7.12 no longer works	17:51
	to github that is	17:51
	← tomengland left	17:52
skorgon	mens, as client or server? on linux you just need to set the environment variables http_proxy and https_proxy according to your proxy and access via http(s) should work.	17:53
mens	skorgon: that's what I did	17:53
	← achadwick left	17:53
mens	I see a connection attempt going through my proxy, but then it stops	17:54
	← arif-ali left	17:54
skorgon	then it should work :P do other tools work through the proxy?	17:54
mens	it was working with git 1.7.1	17:54
	I upgraded to 1.7.12 and it doesn't work anymore	17:54
	← m104 left	17:54
	→ axl_ joined	17:55
skorgon	well, you can try whether downgrading or upgrading git helps	17:55
	← Balliad left	17:55
	→ m104 joined	17:55
	← m104 left	17:55
	← ArcTanSusan left	17:55
mens	skorgon, it does, but I need git > 1.7.10 to install gitlab	17:55
	← joelroa left	17:55
hbf	goTAN: re-reading your posts... committed/tracked files do not get ignored. .gitignore says which untracked files to ignore. So it has no effect on files that are in history.	17:56
	→ m104 joined	17:56
skorgon	well, then why not use a recent git. current stable is 1.9	17:56
	← lifelike left	17:56
	← m104 left	17:56
goTAN	hbf: so this is why I do git rm --cached file right?	17:56
	→ lifelike joined	17:56
	→ m104 joined	17:57
	← koltroll left	17:57
hbf	yes, but you said it's "already in the history". I.e. in a previous commit, wile --cached controls what you're going to commit	17:57
	← budrose left	17:58
	→ jcs222 joined	17:58
	← Segfault_ left	17:58
	→ Sami1 joined	17:58
	← luxgeek left	17:58
	→ coderdad joined	17:58
osse	mens: have you tried the very latest?	17:58
	← specious left	17:58
goTAN	hbf: hm so how do I ignore files which are already in previous commits then?	17:59
osse	goTAN: you commited after doing git rm --cached right=	17:59
	?	17:59
goTAN	yes	17:59
	→ johnflux_ joined	17:59
	← johnflux_ left	17:59
	→ johnflux_ joined	17:59
	← Sami1 left	17:59
	→ joelroa joined	17:59
osse	then afaik you did nothing wrong	17:59
	← xlinkz0_ left	17:59
osse	but the file might be deleted from the others' repos when they pull	17:59
goTAN	ok but then I pushed it to the remote repository, and another developer was not able to pull	18:00
mens	osse, no, not yet, wanted to check if it was a known issue - I was upgrading and it broke, didn't try upgrading even more yet	18:00
	← johnflux left	18:00
hbf	goTAN: You don't ignore previously committed files. You can make another commmit which deletesthem	18:00
goTAN	hbf: well I dont want them to be deleted I want them to be ignored isnt that a difference	18:00
	→ dmnd joined	18:00
goTAN	?	18:00
	→ bwreilly_ joined	18:00
hbf	tough	18:01
osse	hbf: he already made such a commit	18:01
	→ able16 joined	18:01
	← ArSn left	18:01
Vampire0	goTAN, that wont work. You can only ignore untracked files. As soon as a file is tracked (either because it was not ignored before or -f is used) it will never be ignored because it is a tracked file	18:02
	← deuti left	18:02
Vampire0	The only way to ignore the file is to delete it from the repository	18:02
	→ DrNick joined	18:02
goTAN	ok now I am really confused	18:02
Vampire0	Why?	18:02
	← coderdad left	18:03
hbf	What do you mean by ignoring them anyway? Which commands do you expect to ignore them?	18:03
	← aberrant left	18:03
goTAN	because I added the file to .gitignore and did git rm --cache file	18:03
	and no it is been ignored	18:03
thiago	goTAN: now commit	18:03
goTAN	adding it to .gitignore	18:03
	← tieTYT2 left	18:03
goTAN	thiago: I did	18:03
thiago	goTAN: git whatchanged -- file	18:04
	← bwreilly left	18:04
thiago	goTAN: is the top change a "D" change?	18:04
	← jcs222 left	18:04
	→ jhulten joined	18:04
	→ specious joined	18:05
goTAN	what do you mean by "D" chane?	18:05
	*change	18:05
	← colli5ion left	18:05
hbf	eh, tired. going home.	18:06
	→ GodEater joined	18:06
	← GodEater left	18:06
	→ GodEater joined	18:06
Eugene	jast - would any sort of perl version info help maybe?	18:07
	It's definitely not working here. :-\|	18:07
goTAN	thiago: yea there is a D change but its not the top one	18:07
	← okaido left	18:07
	→ Segfault_ joined	18:08
	← joelroa left	18:08
osse	goTAN: are you sure the conflict arose from that specific file?	18:08
	and are you sure the had no changes to it?	18:08
	*they had	18:08
thiago	looks like the conflict was fixed by restoring the file	18:08
	delete it again	18:08
goTAN	osse: I am not 100% sure but I did a git checkout . on that developers machine before I did git pull	18:09
	I mean after deleting that file it worked	18:09
	and everything is fine now (I hope) I was just wondering if I did something wrong ;/	18:09
	← mimoo left	18:09
thiago	if the top change is not D, then it's not fine	18:09
	delete the file again	18:10
	← sethwklein left	18:10
	← GodEater left	18:10
	→ infynyxx joined	18:10
Vampire0	goTAN if you show us the output of "git status -s --ignored" and "git whatchanged -- file" the situation might be clearer	18:10
	→ GodEater joined	18:10
	← GodEater left	18:10
	→ GodEater joined	18:10
	→ retnuh joined	18:10
	← hwrdprkns left	18:11
	→ danman joined	18:12
goTAN	Vampire0: http://hastebin.com/yewifanujo.erlang_repl	18:12
	← Sendoushi left	18:12
	→ luxgeek joined	18:13
	→ Zaknefain joined	18:13
	→ Sendoushi joined	18:13
	→ rath joined	18:13
goTAN	oh now the top commit is a D change	18:13
	weird	18:13
	← matteo left	18:14
	← IVplay left	18:14
	→ Dudi joined	18:14
goTAN	so am I save now?	18:15
	→ dreiss joined	18:15
	→ mikecmpbll joined	18:15
	→ phuh joined	18:16
	← lopezt left	18:16
	← poulson left	18:16
	← taijeen left	18:17
	→ koltroll joined	18:17
	→ sethwklein joined	18:17
	← Zaknefain left	18:17
	→ taijeen joined	18:18
	← Sendoushi left	18:18
	→ kcj joined	18:18
	← bwreilly_ left	18:18
	← taijeen left	18:18
	→ taijeen joined	18:18
	← taijeen left	18:19
	← daedeloth_ left	18:19
	← tvw left	18:19
	→ bwreilly joined	18:20
	→ taijeen joined	18:20
	→ tvw joined	18:20
	← taijeen left	18:20
	→ taijeen joined	18:21
	→ hahuang65 joined	18:21
	← jnavila left	18:21
	← taijeen left	18:21
	→ taijeen joined	18:22
	← taijeen left	18:22
	→ taijeen joined	18:23
	← taijeen left	18:23
	← thiago left	18:24
	→ taijeen joined	18:24
	→ jatt joined	18:24
	← bwreilly left	18:24
	→ hwrdprkns joined	18:24
	← taijeen left	18:24
	← chrisw_ left	18:25
	→ taijeen joined	18:25
	← taijeen left	18:25
	→ taijeen joined	18:26
	← Sonderblade left	18:26
	← taijeen left	18:26
	→ taijeen joined	18:27
	← taijeen left	18:27
	→ coderdad joined	18:27
	→ taijeen joined	18:28
	→ bwreilly joined	18:28
	← taijeen left	18:28
	→ joki joined	18:29
	→ taijeen joined	18:29
	← taijeen left	18:30
	→ taijeen joined	18:30
	← taijeen left	18:31
	← asakura0 left	18:31
	→ hwrd\|work joined	18:31
	→ taijeen joined	18:31
	← chris2 left	18:32
	← taijeen left	18:32
	→ chris2 joined	18:32
	→ taijeen joined	18:32
	→ alexlindenlevy joined	18:32
	← Renex`afk left	18:33
	← taijeen left	18:33
	→ taijeen joined	18:33
	→ asakura0 joined	18:33
	→ crystal77 joined	18:34
	← taijeen left	18:34
	← hwrdprkns left	18:34
crystal77	If I delete a file, run a 'git status', and see that it was removed, how can I see the timestamp of when it was deleted?	18:34
	→ coderdad_ joined	18:34
	→ taijeen joined	18:34
	← deciph3r left	18:35
	← coderdad left	18:35
	← jatt left	18:35
	← taijeen left	18:35
	→ taijeen joined	18:35
	← taijeen left	18:36
	→ BoyanYordanov joined	18:36
	→ taijeen joined	18:36
	→ Kayra joined	18:36
	← taijeen left	18:37
	→ taijeen joined	18:37
	← dreiss left	18:37
	← taijeen left	18:38
	← bwreilly left	18:38
	← treehouse left	18:38
	→ taijeen joined	18:38
grawity	You can't.	18:38
	← mellernoia left	18:39
	→ pheaver joined	18:39
grawity	The timestamps are recorded only the moment you do `git commit`	18:39
	← goTAN left	18:39
	← taijeen left	18:39
grawity	for the commit as a whole	18:39
	→ lindenle joined	18:39
	→ taijeen joined	18:39
	→ rq60 joined	18:39
	→ vkrest joined	18:40
ixon	In fact, storing filestamps themselves would be detrimental: git checkout HEAD^ && make --- right now, that works, but would not if you restored old timestamps.	18:40
	← taijeen left	18:40
	→ deciph3r joined	18:40
ixon	(oh nevermind...)	18:40
	→ taijeen joined	18:40
	← deciph3r left	18:40
	→ deciph3r joined	18:40
	← lindenle left	18:40
	→ jluc joined	18:41
	← Kayra left	18:41
	← taijeen left	18:41
grawity	right, it wouldn't, if you kept returning to older & newer commits during a bisect	18:41
	→ taijeen joined	18:42
	← taijeen left	18:42
	→ taijeen joined	18:42
	← hftf left	18:42
	← Noldorin left	18:42
	→ arif-ali joined	18:43
	→ treehouse joined	18:43
	← taijeen left	18:43
	← CKyle left	18:43
	→ taijeen joined	18:43
	→ mellernoia joined	18:44
	← taijeen left	18:44
	→ oracal joined	18:44
	→ taijeen joined	18:44
	→ Kayra joined	18:45
	← taijeen left	18:45
	← alexlindenlevy left	18:45
	→ kermit joined	18:45
	→ taijeen joined	18:45
	→ alexlindenlevy joined	18:46
	← taijeen left	18:46
	jmpp greets!	18:46
jmpp	yesterday I was shown a link explaining alternatives to storting binary files in a git repo	18:47
	but I failed to save them :(	18:47
	→ taijeen joined	18:47
	→ goTAN joined	18:47
jmpp	anyone have at hand any form of main source of info on the subject?	18:47
	← taijeen left	18:47
	→ hftf joined	18:47
	→ taijeen joined	18:48
	← taijeen left	18:48
	→ taijeen joined	18:49
	← taijeen left	18:49
Jasper	How do I find the branch (or list of branches) a commit is on?	18:49
	→ taijeen joined	18:50
	← koltroll left	18:50
Jasper	Aha, git branch --contains	18:50
	← alexlindenlevy left	18:50
	→ CKyle joined	18:50
	← taijeen left	18:50
	← lite_ left	18:50
	→ taijeen joined	18:51
	→ aantix joined	18:51
	→ lite joined	18:51
	→ jizanthapus joined	18:51
	← taijeen left	18:51
	→ taijeen joined	18:52
	← taijeen left	18:52
	← vkrest left	18:52
	→ taijeen joined	18:53
	← Luke-Jr left	18:53
	→ Luke-Jr joined	18:53
	← taijeen left	18:53
	→ taijeen joined	18:54
	→ kukks joined	18:54
	← kukks left	18:54
	→ kukks joined	18:54
	← nZac left	18:54
	← taijeen left	18:54
mens	ok, proxy works fine with 1.9.0	18:55
	thx	18:55
	← treehouse left	18:55
	→ LBV_User joined	18:55
	← crystal77 left	18:55
	→ taijeen joined	18:55
Eugene	jnewt - !annex	18:55
gitinfo	jnewt: git-annex and git-media are two solutions to the !binary problem. They work by keeping the blobs outside of the repo, storing a reference to the blob in the repo instead. See http://git-annex.branchable.com/ and https://github.com/schacon/git-media	18:55
	→ sq-one joined	18:55
Eugene	ixon - `git archive` run against a tree(not a commit) will give a tar with the mtime set to the last commit-time of each file	18:55
	← lite left	18:55
	← taijeen left	18:55
	→ taijeen joined	18:56
Eugene	Eh wait no	18:56
	→ jatt joined	18:56
Eugene	It's the current time, I have my man pages mixed	18:56
	← taijeen left	18:56
Eugene	If you want the latter it involves some git log & touch hacking	18:57
	← mellernoia left	18:57
	→ taijeen joined	18:57
	→ bwreilly joined	18:57
	← retnuh left	18:57
	← taijeen left	18:57
	→ taijeen joined	18:58
	→ doener joined	18:58
	← taijeen left	18:58
	← specious left	18:59
	→ taijeen joined	18:59
	→ Pullphinger joined	18:59
	→ specious joined	18:59
	← taijeen left	19:00
	→ Renex joined	19:00
	→ dreiss joined	19:00
	→ lindenle joined	19:00
	→ taijeen joined	19:00
	→ joelroa joined	19:00
	← taijeen left	19:01
	→ taijeen joined	19:01
	← bwreilly left	19:01
	← Pullphinger left	19:01
	← taijeen left	19:02
	→ bwreilly joined	19:02
	→ Pullphinger joined	19:02
	→ taijeen joined	19:02
	← bgerber left	19:02
	← taijeen left	19:03
	→ taijeen joined	19:03
	→ mellernoia joined	19:04
	← taijeen left	19:04
	← Dudi left	19:04
	→ taijeen joined	19:04
	← Pullphinger left	19:04
	→ thiago joined	19:04
	→ Pullphinger joined	19:04
	→ maroloccio joined	19:04
	→ SWakey joined	19:04
	← taijeen left	19:05
	→ taijeen joined	19:05
	← joelroa left	19:05
	← AaronMT left	19:05
	→ bgerber joined	19:06
	→ AaronMT joined	19:06
	← taijeen left	19:06
Vampire0	goTAN, depends on your definition of save. At least those 6 listed files are ignored by Git	19:06
	→ vijay13 joined	19:06
	→ taijeen joined	19:06
	→ Sendoushi joined	19:07
	← taijeen left	19:07
	→ Zaknefain joined	19:07
	→ taijeen joined	19:07
	← gdmfsob left	19:07
	← taijeen left	19:08
	← goTAN left	19:08
	→ taijeen joined	19:08
	← taijeen left	19:09
	← sanmarcos left	19:09
	→ sanmarcos joined	19:09
	→ taijeen joined	19:09
	→ shruggar joined	19:10
	← taijeen left	19:10
	→ taijeen joined	19:10
	← taijeen left	19:11
	→ taijeen joined	19:11
	→ retnuh joined	19:12
	← Zaknefain left	19:12
	← taijeen left	19:12
	← AaronMT left	19:12
	→ jaf2k joined	19:12
	→ taijeen joined	19:12
	→ AaronMT joined	19:12
	→ freestyl3r joined	19:12
	← taijeen left	19:13
	← clarkfischer left	19:13
	→ valgrind joined	19:13
	→ taijeen joined	19:13
	→ clarkfischer joined	19:14
	→ Hecter joined	19:14
	← taijeen left	19:14
	→ taijeen joined	19:15
	← taijeen left	19:15
	← oracal left	19:15
	→ taijeen joined	19:15
	← kcj left	19:16
	← taijeen left	19:16
	→ pantsman- joined	19:16
	→ taijeen joined	19:16
	← maroloccio left	19:17
	← taijeen left	19:17
	→ oracal joined	19:17
	→ taijeen joined	19:17
	→ beben_ joined	19:18
beben_	hi	19:18
gitinfo	beben_: 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.	19:18
	← taijeen left	19:18
	← SHyx0rmZ left	19:18
	← ShooterM_ left	19:18
	→ taijeen joined	19:19
	→ juanrgar joined	19:19
beben_	please how can i fork a branch ? The only git URL i can find is the master but i'd like to participate to a branch	19:19
	thank you	19:19
	← taijeen left	19:19
osse	beben_: run 'git branch -a'; what do you see?	19:19
	← SorenHolm left	19:19
	→ taijeen joined	19:20
	← taijeen left	19:20
beben_	osse: origin/master	19:20
	→ taijeen joined	19:21
offby1	.oO("Run 'Lookout of the Yard'." "Why? What shall I see?")	19:21
osse	beben_: then there are no other branches. You're free to create a new one	19:21
beben_	ah ok, i have to switch	19:21
	→ felipewm joined	19:21
	← asakura0 left	19:21
	← felipewm left	19:21
	← taijeen left	19:21
	→ taijeen joined	19:22
	→ goTAN joined	19:22
	← cjwilburn left	19:22
	→ SorenHolm joined	19:22
	→ Not_Whatever joined	19:22
	← taijeen left	19:22
	→ SHyx0rmZ joined	19:23
	→ taijeen joined	19:23
	← rath left	19:23
	← taijeen left	19:23
	← chiromante left	19:24
	→ taijeen joined	19:24
beben_	osse: i'm on origin/master but i see the branch i'd like to modify	19:24
	← Internet13 left	19:24
	← taijeen left	19:24
	→ taijeen joined	19:25
	→ pbrobst joined	19:25
	→ asakura0 joined	19:25
	← taijeen left	19:25
	→ taijeen joined	19:26
	← taijeen left	19:26
	→ regreddit joined	19:27
	→ robbyoconnor joined	19:27
	→ taijeen joined	19:27
	→ vkrest joined	19:27
	← h0bbit_ left	19:27
	← taijeen left	19:27
	→ taijeen joined	19:28
	← taijeen left	19:28
	← becks__ left	19:29
	→ taijeen joined	19:29
	← coderdad_ left	19:29
	← Sendoushi left	19:29
	→ draftqin joined	19:29
	→ Sendoushi joined	19:29
	← hyperair left	19:29
	← Exancillatus left	19:29
	→ mribeirodantas joined	19:29
	← taijeen left	19:30
	→ taijeen joined	19:30
	← phantomtiger left	19:31
	← taijeen left	19:31
	→ stockholm joined	19:31
	→ taijeen joined	19:31
	→ hyperair joined	19:31
	gitinfo set mode: +v	19:31
stockholm	i get: error: Your local changes to the following files would be overwritten by merge:	19:31
	← taijeen left	19:32
stockholm	and i DO want to overwrite them	19:32
	how do i do that?	19:32
	→ taijeen joined	19:32
stockholm	can i just rm my local files?	19:32
	← bwreilly left	19:32
	← robbyoconnor left	19:32
	← taijeen left	19:33
	→ taijeen joined	19:33
	← goTAN left	19:33
	→ Internet13 joined	19:33
	← taijeen left	19:34
	← Renex left	19:34
	→ taijeen joined	19:34
	← taijeen left	19:35
	→ taijeen joined	19:35
cbreak	stockholm: no.	19:35
	stockholm: you can do a git checkout -- filename	19:35
	stockholm: if you rm the local file, you'll get a modify-remove conflict	19:36
	← axl_ left	19:36
	← taijeen left	19:36
	→ taijeen joined	19:36
	← SorenHolm left	19:37
	← taijeen left	19:37
stockholm	ah	19:37
	thanks	19:37
	→ taijeen joined	19:37
	← taijeen left	19:38
	→ taijeen joined	19:38
	← doev left	19:38
	→ SorenHolm joined	19:39
	← taijeen left	19:39
	← guyz left	19:39
	→ taijeen joined	19:39
	← infynyxx left	19:39
	→ digifiv5e joined	19:40
	digifiv5e → Guest13084	19:40
	← taijeen left	19:40
	→ infynyxx joined	19:40
	← PLejeck left	19:40
	→ taijeen joined	19:40
	→ nZac joined	19:41
	← taijeen left	19:41
	← Guest13084 left	19:41
	→ Guest13084 joined	19:41
	→ robbyoconnor joined	19:41
	Guest13084 → guyz	19:41
	→ taijeen joined	19:41
	← robbyoconnor left	19:42
	← aspiers left	19:42
	← m104 left	19:42
	← ldiamond left	19:43
	→ bwreilly joined	19:44
	→ mishok13 joined	19:45
	← lifelike left	19:45
	→ lifelike joined	19:46
	← taijeen left	19:46
	← NBhostin_ left	19:47
	→ PLejeck joined	19:47
	→ NBhosting joined	19:47
	→ vurma joined	19:48
	← bwreilly left	19:48
	→ felipewm joined	19:48
	← felipewm left	19:48
	← SorenHolm left	19:50
	→ bwreilly joined	19:50
	← jaf2k left	19:50
	→ coderdad joined	19:51
	→ Mitchbones joined	19:51
	→ axl_ joined	19:52
	← takamich_ left	19:52
	← Exio4 left	19:53
	← hwrd\|work left	19:53
	← retnuh left	19:53
	← danman left	19:53
	→ primitive joined	19:53
	→ danman joined	19:53
	→ Exio4 joined	19:53
	→ mdhopkins joined	19:54
	← Kayra left	19:54
	← tarkus left	19:54
	← danman left	19:54
	→ Kayra joined	19:55
	→ Exancillatus joined	19:56
	→ ShooterMG joined	19:56
	→ jnavila joined	19:57
	← mikecmpbll left	19:57
	← chrisshattuck left	19:57
	← CKyle left	19:57
	→ chrisshattuck joined	19:57
	→ PanSteffek joined	19:58
	← Kayra left	19:59
	← watermel0n left	19:59
	→ martianlobster joined	20:00
	→ felipewm joined	20:01
	← msafi left	20:01
	→ Zaknefain joined	20:01
	→ koltroll joined	20:02
	→ CKyle joined	20:02
	→ aartist joined	20:02
	← PanSteffek left	20:02
	← kukks left	20:02
	← felipewm left	20:03
	→ PanSteffek joined	20:03
	← zapb left	20:03
	← koltroll left	20:04
aartist	How do I know what changed in a particular file 1. Working	20:04
	directory to last commit. 2. Last commit to the one before ?	20:04
	← nZac left	20:04
cbreak	aartist: git checkout lastcommit -- file && git reset beforecommit -- file	20:05
	→ Mark_ joined	20:05
cbreak	then git commit --amend to change the last commit	20:05
arand__	aartist: git diff HEAD -- file, git diff HEAD~1..HEAD -- file	20:05
	← draftqin left	20:05
	← Zaknefain left	20:06
	→ SorenHolm joined	20:06
	← rubatdub left	20:07
	→ kevin-brown joined	20:07
arand__	cbreak: wat?	20:07
cbreak	git diff isn't going to help you change the history	20:07
	← vijay13 left	20:07
masak	cbreak: not sure that's what aartist wants...	20:07
cbreak	hmm... maybe not.	20:07
aartist	arand__: Cool. That works great. I didn't wantd to 'checkout' that cbreak suggestd.	20:07
cbreak	it did seem like a strange request :)	20:07
	→ outreach joined	20:08
	← SWakey left	20:08
kevin-brown	I'm currently running into an issue where when I try to commit an update to a submodule, the commit is created by the submodule update is not included (silently unstages itself)	20:08
	← Sendoushi left	20:08
	← martianlobster left	20:08
cbreak	submodule update does not create commits	20:08
	it just checks them out	20:09
	(in normal mode)	20:09
	→ mikecmpbll joined	20:09
	→ Sendoushi joined	20:09
	→ hwrdprkns joined	20:09
	← kermit left	20:09
kevin-brown	Yeah, I should have rephrased that better. In a superproject I'm trying to update the reference to a submodule. Everything appears to be going fine (git picks up the new index, shows it in the diff as expected), but commiting is failing silently	20:09
	→ alvaro_o joined	20:10
	← outreach left	20:10
	→ vijay13 joined	20:11
	→ foobrew joined	20:11
	→ fatalhalt joined	20:11
	← hahuang65 left	20:12
	→ dfarler joined	20:12
	→ nanashiRei joined	20:13
	← Sendoushi left	20:13
	→ MattStratton joined	20:13
	→ unknownhero joined	20:14
	→ imachuchu joined	20:15
	← BoyanYordanov left	20:15
	← SorenHolm left	20:16
	← dougsland left	20:16
	→ alaird joined	20:16
	→ Gizburdt joined	20:16
	→ zapb joined	20:17
	← mellernoia left	20:17
cbreak	git add submodule	20:17
	then it should show up as staged in git status	20:17
	→ SorenHolm joined	20:17
	→ MattMaker joined	20:18
	← vijay13 left	20:19
	→ DrShoggoth joined	20:19
	→ goTAN joined	20:19
kevin-brown	It does :)	20:20
alaird	hye, maybe this is a silly question..... i'm trying to take two commits and visually (osx) see the changes between files and see the logs of all the changes.	20:20
	or hey	20:20
	← hwrdprkns left	20:20
kevin-brown	And then I do `git commit`, fill out the message, and everything appears to go through... except when I then run `git status`, the change for the submodule is back, and it doesn't appear in the newest commit	20:20
	→ ZaeDrake joined	20:21
alaird	i've messed with sourcetree and diffmerge but i have not figured out how to take a project and really dive into it	20:21
arand__	kevin-brown: Are you trying to commit the pointer to a dirty-state submodule rather than one that actually has new commits?	20:22
kevin-brown	arand__: I'm not sure what you mean?	20:22
	← lazers left	20:23
	→ hwrdprkns joined	20:24
	← goTAN left	20:25
	← mdhopkins left	20:25
	→ blackmesa joined	20:26
	→ bliker joined	20:26
	← githogori left	20:26
	← bliker left	20:27
	jsilver_ → jsilver	20:27
	→ martianlobster joined	20:27
	← freeed left	20:28
	← ewet left	20:29
arand__	kevin-brown: Does status say (modified contents) rather than (new commits) for the submodule?	20:29
guyz	anyone use github know how to turn OFF notifications of issues for starred projects? (i only want to recieve notifications for what I've commented on, not new issues that other people create after/before and talk about)	20:30
	← nafg__ left	20:30
kevin-brown	arand__: It says (new commits	20:30
	→ nafg_ joined	20:30
arand__	kevin-brown: Ok, then I don't understand either.	20:30
	← BiggFREE left	20:31
	← MattStratton left	20:31
	← vkrest left	20:31
guyz	ahh forget it, i'll just set gmail to auto flag them as spam	20:31
kevin-brown	guyz: That usually only happens for projects you are watching, not starred	20:31
	→ vkrest joined	20:31
guyz	kevin-brown, hmm, let me check that then	20:31
	← vkrest left	20:32
	← dsantiago left	20:32
	→ vkrest joined	20:32
guyz	ahh, yup that was it. haha	20:32
	→ githogori joined	20:32
	← tvw left	20:34
	← xsbeats left	20:35
	← pheaver left	20:35
	← teran left	20:36
	→ phantomtiger joined	20:36
	→ M-ou-se joined	20:37
	← coderdad left	20:38
	← jhulten left	20:38
	→ budrose joined	20:39
	→ simesy joined	20:40
	→ jhulten joined	20:40
	← User458764 left	20:40
	← muuh left	20:41
	→ retnuh joined	20:41
	→ lazers joined	20:43
	→ aberrant joined	20:43
	→ tmcmahon joined	20:43
alaird	it seems like there must be a better way to do this. 'git difftool branch...branch' invokes difftool for each file	20:43
	→ tarkus joined	20:43
kevin-brown	arand__: I managed to update it by creating a patch that did it, and then applying it. I'm still not sure why it was failing before though	20:44
rawtaz	plain diff?	20:44
	→ coderdad joined	20:45
	← dc5ala_ left	20:45
	← jeek left	20:45
	← glaksmono left	20:47
	→ vijay13 joined	20:48
	← lolmaus left	20:49
	→ tomengland joined	20:49
	→ lolmaus joined	20:49
	← lifelike left	20:50
	← simesy left	20:50
	→ glaksmono joined	20:50
	→ ghostlines joined	20:50
	← ghostlines left	20:50
	→ lifelike joined	20:50
moritz	plaintiff?	20:51
	→ kermit joined	20:51
	→ ghostlines joined	20:51
	← scorphus` left	20:51
	→ scorphus` joined	20:51
	→ muuh joined	20:51
	→ azathoth_ joined	20:51
	← pbrobst left	20:54
	← tomengland left	20:54
	→ pbrobst joined	20:54
	→ Zaknefain joined	20:55
	→ tmart joined	20:55
	← infynyxx left	20:56
	← Zaknefain left	20:56
	← blackmesa left	20:56
	→ dmnd_ joined	20:57
	→ pantsman joined	20:57
	← pantsman left	20:57
	→ pantsman joined	20:57
	← tmcmahon left	20:57
	→ johnflux__ joined	20:58
	← johnflux__ left	20:58
	→ johnflux__ joined	20:58
	→ lolmaus_ joined	20:58
	→ mdpatrick joined	20:58
	→ glaksmono_ joined	20:59
	← fr33 left	20:59
	→ nnyk_ joined	21:00
	→ Exancill_ joined	21:00
	→ styx_ joined	21:00
	→ leptonix joined	21:00
	→ harv_ joined	21:00
	scorphus` → scorphus	21:00
	→ bhek_ joined	21:00
	→ specious_ joined	21:00
	→ \toothrot joined	21:01
	→ Guest35248 joined	21:01
	→ kballou joined	21:01
	→ ThomasKaufmann_ joined	21:03
	→ qsusxs joined	21:03
	→ b4rbz joined	21:04
	→ GodEater` joined	21:04
	→ cephalostrum_ joined	21:04
	← hbf left	21:04
	← Olipro left	21:04
	← tusbar left	21:04
	← livingstn left	21:04
	← Arokh left	21:04
	← biertie left	21:04
	← Nothing4You left	21:04
	← jakob left	21:04
	← uu1101 left	21:04
	← chuckharmston_ left	21:04
	← twisted` left	21:04
	← Asenar left	21:04
	← raccoon_ left	21:04
	← tfnico left	21:04
	← knownasilya left	21:04
	← jmcantrell left	21:04
	← JStoker left	21:04
	← supermat left	21:04
	← Bombe left	21:04
	← averell left	21:04
	← tgummerer left	21:04
	← ramlev left	21:04
	← evanc left	21:04
	← Seveas left	21:04
	← Mapley left	21:04
	← ohcibi left	21:04
	← Ywa left	21:04
	← breiti left	21:04
	← midnightmagic left	21:04
	← harleypig left	21:04
	← dr_lepper left	21:04
	← Fuxx left	21:04
	← Zimsky left	21:04
	← potatoe left	21:04
	← Alenah left	21:04
	← Derega left	21:04
	← swpd left	21:04
	→ joelroa joined	21:04
	→ RichardBronosky_ joined	21:04
	→ atoponce joined	21:04
	← kermit left	21:04
	→ Nothing4You joined	21:04
	→ mattcen_ joined	21:04
	← glaksmono left	21:05
	← lolmaus left	21:05
	← martianlobster left	21:05
	← hwrdprkns left	21:05
	← MattMaker left	21:05
	← Exancillatus left	21:05
	← axl_ left	21:05
	← pantsman- left	21:05
	← specious left	21:05
	← sethwklein left	21:05
	← GodEater left	21:05
	← dmnd left	21:05
	← johnflux_ left	21:05
	← tyreld left	21:05
	← bjornbjorn left	21:05
	← MrRoot left	21:05
	← ehynds left	21:05
	← Exdaix left	21:05
	← mattcen left	21:05
	← hoschi_ left	21:05
	← styx__ left	21:05
	← harv left	21:05
	← bhek left	21:05
	← Guest80050 left	21:05
	← sente left	21:05
	← leptonix_ left	21:05
	← toothr left	21:05
	← CodeShar_ left	21:05
	← mdpatrick_ left	21:05
	← tmart_ left	21:05
	← frobware left	21:05
	← Stravy left	21:05
	← camt left	21:05
	← hays_ left	21:05
	← IrishPrime left	21:05
	← fission6 left	21:05
	← Hunner left	21:05
	← qsuscs left	21:05
	← stellarhopper left	21:05
	← xSmurf left	21:05
	← jgoss left	21:05
	← ThomasKaufmann left	21:05
	← drbean left	21:05
	← lahwran left	21:05
	← silverfox_ left	21:05
	← jayne left	21:05
	← brainproxy left	21:05
	← tarkus left	21:05
	← jhulten left	21:05
	← unknownhero left	21:05
	← alvaro_o left	21:05
	← mikecmpbll left	21:05
	← ShooterMG left	21:05
	← PLejeck left	21:05
	← mishok13 left	21:05
	← mribeirodantas left	21:05
	← clarkfischer left	21:05
	← aantix left	21:05
	← deciph3r left	21:05
	← luxgeek left	21:05
	← ngladitz left	21:05
	← vvetter left	21:05
	← osse left	21:05
	← johntitor2036 left	21:05
	← joelrobichaud left	21:05
	← leeN left	21:05
	← rylinaux left	21:05
	← KK4MGV left	21:05
	← njsg left	21:05
	← w0ng left	21:05
	← scottyob left	21:05
	← wendellM left	21:05
	← joehh left	21:05
	← webguynow left	21:05
	← Tabmow left	21:05
	← zz_karupanerura left	21:05
	← aucecil left	21:05
	← bhldev left	21:05
	← ariscop left	21:05
	← SegFaultAX left	21:05
	← RoryHughes left	21:05
	← Neozonz_ left	21:05
	← gwb3 left	21:05
	← scalability-junk left	21:05
	← karstensrage left	21:05
	← illbyte left	21:05
	← quackgyver left	21:05
	← ggherdov left	21:05
	← arnihr left	21:05
	← NimeshNeema left	21:05
	← frogonwheels left	21:05
	← ryanakca left	21:05
	← mtlatif_ left	21:05
	← arcanis left	21:05
	← Werring left	21:05
	← AAA_awright left	21:05
	← chriswk_ left	21:05
	← locojay left	21:05
	← retard left	21:05
	← xrq``` left	21:05
	← mattp__ left	21:05
	← kent\n left	21:05
	← Ghjnut left	21:05
	← aboudreault left	21:05
	← theForce_ left	21:05
	← ineb left	21:05
	← kloeri left	21:05
	← Favoretti left	21:05
	← gtmanfred left	21:05
	← ppr left	21:05
	← d1b left	21:05
	← joschi left	21:05
	← hakril_ left	21:05
	← Shadiku left	21:05
	← webster left	21:05
	← Ziber left	21:05
	← SleePy left	21:05
	← mnemoc left	21:05
	← shihan left	21:05
	← konr left	21:05
	← shennyg left	21:05
	← Myrth left	21:05
	← PierrickB left	21:05
	← vespaper left	21:05
	← Su7 left	21:05
	← Parnic left	21:05
	← JakePee left	21:05
	← so left	21:05
	← loolwut left	21:05
	← phy1729 left	21:05
	← deryni left	21:05
	← kanzure left	21:05
	← GameGamer43 left	21:05
	← JrCs left	21:05
	← phanimahesh left	21:05
	← lewellyn left	21:05
	← Nugget left	21:05
	← quadz left	21:05
	← pasky left	21:05
	← cxreg left	21:05
	← Mogget left	21:05
	← Imdsm left	21:05
	← cuppscakes left	21:05
	← vkrest left	21:05
	← dfarler left	21:05
	← dreiss left	21:05
	← boombatower left	21:05
	← gordian left	21:05
	← kapowaz left	21:05
	← Mez_ left	21:05
	← kini left	21:05
	← flazz_gone left	21:05
	← mehdi left	21:05
	← ManneW left	21:05
	← mnml left	21:05
	← ORiON-- left	21:05
	← steverandy left	21:05
	← h34d3r left	21:05
	← madduck left	21:05
	← Evanlec left	21:05
	← MikeJ92 left	21:05
	← cyphase left	21:05
	← rndbit left	21:05
	← tm512 left	21:05
	← Mindfart left	21:05
	← mackanfkp left	21:05
	← ghoti left	21:05
	← ping-pong left	21:05
	← pigeon_ left	21:05
	← tazle_ left	21:05
	← monokrome left	21:05
	← place_ left	21:05
	← mitsuhiko left	21:05
	← qdii left	21:05
	← blast_hardcheese left	21:05
	← SJr left	21:05
	← aisbaa left	21:05
	← leprechau left	21:05
	← SebastianFlyte left	21:05
	← Kabaka left	21:05
	← ScottE left	21:05
	← cschneid left	21:05
	← gitinfo left	21:05
	← Norrin left	21:05
	← nephyrin left	21:05
	← adambrenecki left	21:05
	← ceari left	21:05
	← up_the_irons left	21:05
	← jds left	21:05
	← mino left	21:05
	← abackstrom left	21:05
	← rastus_vernon left	21:05
	← dsop left	21:05
	← MacGyver left	21:05
	← uhu01 left	21:05
	← sakkemo left	21:05
	← diget left	21:05
	← soren left	21:05
	← Moult left	21:05
	← mh` left	21:05
	← MetaCosm left	21:05
	← Tacker left	21:05
	← kaictl left	21:05
	← ashka left	21:05
	← xender left	21:05
	← Diziet left	21:05
	← mattp left	21:05
	← grumbel_ left	21:05
	← foo left	21:05
	← c0ded left	21:05
	← runnyspot left	21:05
	← ozymandias_ left	21:05
	← ivan` left	21:05
	← twobitsprite left	21:05
	← Takumo left	21:05
	← lamont left	21:05
	← Devels left	21:05
	← neophreak left	21:05
	← troyt left	21:05
	← tbmiller left	21:05
	← wcpan left	21:05
	← Novacha left	21:05
	← bedouin left	21:05
	← felixjet left	21:05
	← tommcdo left	21:05
	← rom1504 left	21:05
	← Tobarja left	21:05
	← yaru22 left	21:05
	← henrikhodne left	21:05
	← catsup left	21:05
	← offbyone left	21:05
	← cwillu_at_work left	21:05
	← kadoban left	21:05
	← dionyziz left	21:05
	← jdav_gone left	21:05
	← RogerWS left	21:05
	← Goles left	21:05
	← JPT left	21:05
	← JPohlmann left	21:05
	← Spamoi left	21:05
	← kennon left	21:05
	← mz` left	21:05
	← Silex left	21:05
	← MindfulMonk left	21:05
	← dharrigan left	21:05
	← damagna_ left	21:05
	← lacrosse left	21:05
	← jab416171_ left	21:05
	← BaconOverflow_ left	21:05
	← atrus left	21:05
	← claudiu______ left	21:05
	← CJD14 left	21:05
	← jgornick left	21:05
	← Okaria left	21:05
	← Bigcheese left	21:05
	← Edgan left	21:05
	← ConstantineXVI left	21:05
	← gnarf left	21:05
	← simpleminds left	21:05
	← weltall left	21:05
	← Mark_ left	21:05
	← neal__ left	21:05
	← Forkk left	21:05
	← rportugal left	21:05
	← Kyle left	21:05
	← Kamilion left	21:05
	← mjulian left	21:05
	← zack6849 left	21:05
	← bluesm left	21:05
	← guest12214 left	21:05
	← Jasper left	21:05
	← dan64 left	21:05
	← crane left	21:05
	← tapout_ left	21:05
	← liri__ left	21:05
	← Naeblis left	21:05
	← mmattice left	21:05
	← legumbre left	21:05
	← knittl left	21:05
	← brisbin left	21:05
	← igalic left	21:05
	← totte left	21:05
	← antoks left	21:05
	← jtoy_ left	21:05
	← telmich left	21:05
	← brandonw left	21:05
	← spyroboy left	21:05
	ThomasKaufmann_ → ThomasKaufmann	21:05
	mattcen_ → mattcen	21:05
	harv_ → harv	21:05
	→ ammar2 joined	21:05
	RichardBronosky_ → RichardBronosky	21:05
	dmnd_ → dmnd	21:05
	→ ToothlessGear joined	21:05
	← sq-one left	21:05
	→ luxgeek joined	21:06
	← salamanderrake left	21:06
	→ Mark_ joined	21:06
	→ neophreak joined	21:06
	→ troyt joined	21:06
	→ tbmiller joined	21:06
	→ wcpan joined	21:06
	→ yaru22 joined	21:06
	→ Novacha joined	21:06
	→ felixjet joined	21:06
	→ tommcdo joined	21:06
	→ telmich joined	21:06
	→ rom1504 joined	21:06
	→ Tobarja joined	21:06
	→ henrikhodne joined	21:06
	→ offbyone joined	21:06
	→ cwillu_at_work joined	21:06
	→ kadoban joined	21:06
	→ dionyziz joined	21:06
	→ jdav_gone joined	21:06
	→ RogerWS joined	21:06
	→ Goles joined	21:06
	→ JPohlmann joined	21:06
	→ Spamoi joined	21:06
	→ kennon joined	21:06
	→ mz` joined	21:06
	→ Silex joined	21:06
	→ dharrigan joined	21:06
	→ damagna_ joined	21:06
	→ lacrosse joined	21:06
	→ atrus joined	21:06
	→ claudiu______ joined	21:06
	→ CJD14 joined	21:06
	→ jgornick joined	21:06
	→ Okaria joined	21:06
	→ Edgan joined	21:06
	→ ConstantineXVI joined	21:06
	→ guest12214 joined	21:06
	→ gnarf joined	21:06
	→ simpleminds joined	21:06
	→ weltall joined	21:06
	→ Naeblis joined	21:06
	→ Forkk joined	21:06
	→ zack6849 joined	21:06
	→ crane joined	21:06
	→ liri__ joined	21:06
	→ totte joined	21:06
	→ mmattice joined	21:06
	→ legumbre joined	21:06
	→ knittl joined	21:06
	→ brisbin joined	21:06
	→ igalic joined	21:06
	→ antoks joined	21:06
	→ jtoy_ joined	21:06
	→ brandonw joined	21:06
	→ spyroboy joined	21:06
	→ pdtpatr1ck joined	21:06
	→ docwhat joined	21:06
	→ mjulian joined	21:06
	→ Kyle joined	21:06
	→ dan64 joined	21:06
	→ rportugal joined	21:06
	← ToothlessGear left	21:06
	→ ToothlessGear joined	21:06
	→ salamanderrake joined	21:06
	← valgrind left	21:06
	→ silverf0x joined	21:06
	→ CodeShark joined	21:06
	→ bwreilly_ joined	21:06
	→ sente_ joined	21:06
	→ psoo joined	21:06
	→ bjornbjorn1 joined	21:06
	→ Sendoushi joined	21:06
	→ tarkus joined	21:06
	→ jhulten joined	21:06
	→ unknownhero joined	21:06
	→ alvaro_o joined	21:06
	→ mikecmpbll joined	21:06
	→ ShooterMG joined	21:06
	→ PLejeck joined	21:06
	→ mishok13 joined	21:06
	→ mribeirodantas joined	21:06
	→ clarkfischer joined	21:06
	→ aantix joined	21:06
	→ deciph3r joined	21:06
	→ PAAH4AJ joined	21:06
	→ ngladitz joined	21:06
	→ vvetter joined	21:06
	→ osse joined	21:06
	→ johntitor2036 joined	21:06
	→ joelrobichaud joined	21:06
	→ leeN joined	21:06
	→ rylinaux joined	21:06
	→ njsg joined	21:06
	→ webtroll_ joined	21:06
	→ bhldev joined	21:06
	→ ariscop joined	21:06
	→ SegFaultAX joined	21:06
	→ RoryHughes joined	21:06
	→ Neozonz_ joined	21:06
	→ gwb3 joined	21:06
	→ phanimahesh joined	21:06
	→ scalability-junk joined	21:06
	→ karstensrage joined	21:06
	→ quackgyver joined	21:06
	→ illbyte joined	21:06
	→ ggherdov joined	21:06
	→ arnihr joined	21:06
	→ NimeshNeema joined	21:06
	→ frogonwheels joined	21:06
	→ ryanakca joined	21:06
	→ mtlatif_ joined	21:06
	→ arcanis joined	21:06
	→ Werring joined	21:06
	→ AAA_awright joined	21:06
	→ ineb joined	21:06
	→ chriswk_ joined	21:06
	→ locojay joined	21:06
	→ retard joined	21:06
	→ xrq``` joined	21:06
	→ mattp__ joined	21:06
	→ kent\n joined	21:06
	→ aboudreault joined	21:06
	→ Ghjnut joined	21:06
	→ theForce_ joined	21:06
	→ kloeri joined	21:06
	→ Favoretti joined	21:06
	→ gtmanfred joined	21:06
	→ ppr joined	21:06
	→ d1b joined	21:06
	→ joschi joined	21:06
	→ hakril_ joined	21:06
	→ Shadiku joined	21:06
	→ Myrth joined	21:06
	→ webster joined	21:06
	→ Ziber joined	21:06
	→ SleePy joined	21:06
	→ mnemoc joined	21:06
	→ shihan joined	21:06
	→ konr joined	21:06
	→ shennyg joined	21:06
	→ PierrickB joined	21:06
	hobana.freenode.net set mode: +v	21:06
	→ vespaper joined	21:06
	→ Su7 joined	21:06
	→ Parnic joined	21:06
	→ JakePee joined	21:06
	→ so joined	21:06
	→ loolwut joined	21:06
	→ phy1729 joined	21:06
	→ deryni joined	21:06
	→ kanzure joined	21:06
	→ GameGamer43 joined	21:06
	→ JrCs joined	21:06
	→ lewellyn joined	21:06
	→ Nugget joined	21:06
	→ quadz joined	21:06
	→ pasky joined	21:06
	→ cxreg joined	21:06
	→ Mogget joined	21:06
	→ Imdsm joined	21:06
	→ cuppscakes joined	21:06
	→ MAAAAA7 joined	21:06
	→ ghoti joined	21:06
	→ KK4MGV joined	21:06
	→ drbean joined	21:06
	→ edude03 joined	21:06
	→ BaconOverflow_ joined	21:06
	← webtroll left	21:06
	→ ivan` joined	21:06
	→ Exdaix joined	21:06
	← MissionCritical left	21:06
	← jackneill left	21:06
	← yacks left	21:06
	→ joelroa_ joined	21:06
	→ LeMike joined	21:06
	→ TheJHNZ joined	21:07
	→ bedouin joined	21:07
TheJHNZ	what do these symbols mean? http://joshua.geek.nz/s/JHNZ02-21-10-07-04.png	21:07
	← mz` left	21:07
	→ jab416171_ joined	21:07
	→ Kamilion joined	21:07
	→ Bigcheese joined	21:07
	→ MindfulMonk joined	21:07
	← bwreilly left	21:07
	→ tapout joined	21:07
	→ blackmesa joined	21:07
	→ monokrome joined	21:07
	→ simesy joined	21:07
	→ catsup joined	21:07
	→ neal__ joined	21:07
offby1	TheJHNZ: I'm guessing it's an extremely condensed summary of the output of "git status"	21:08
	→ vkrest joined	21:08
	→ dfarler joined	21:08
	→ dreiss joined	21:08
	→ boombatower joined	21:08
	→ kapowaz joined	21:08
	→ Mez_ joined	21:08
	→ kini joined	21:08
	→ flazz_gone joined	21:08
	→ mehdi joined	21:08
	→ ManneW joined	21:08
	→ xender joined	21:08
	→ mnml joined	21:08
	→ ORiON-- joined	21:08
	→ mh` joined	21:08
	→ steverandy joined	21:08
	→ h34d3r joined	21:08
	→ grumbel_ joined	21:08
	→ madduck joined	21:08
	→ Evanlec joined	21:08
	→ cyphase joined	21:08
	→ MikeJ92 joined	21:08
	→ rndbit joined	21:08
	→ tm512 joined	21:08
	→ Mindfart joined	21:08
	→ mackanfkp joined	21:08
	→ ping-pong joined	21:08
	→ blast_hardcheese joined	21:08
	→ pigeon_ joined	21:08
	→ tazle_ joined	21:08
	→ mitsuhiko joined	21:08
	→ place_ joined	21:08
	→ qdii joined	21:08
	→ SJr joined	21:08
	→ aisbaa joined	21:08
	→ leprechau joined	21:08
	→ SebastianFlyte joined	21:08
	→ ScottE joined	21:08
	→ cschneid joined	21:08
	→ gitinfo joined	21:08
	→ Norrin joined	21:08
	→ uhu01 joined	21:08
	→ nephyrin joined	21:08
	→ adambrenecki joined	21:08
	→ ceari joined	21:08
	→ up_the_irons joined	21:08
	→ jds joined	21:08
	→ mino joined	21:08
	hobana.freenode.net set mode: +o	21:08
	→ abackstrom joined	21:08
	→ rastus_vernon joined	21:08
	→ dsop joined	21:08
	→ Tacker joined	21:08
	→ Takumo joined	21:08
	→ twobitsprite joined	21:08
	→ c0ded joined	21:08
	→ MacGyver joined	21:08
	→ mattp joined	21:08
	→ sakkemo joined	21:08
	→ diget joined	21:08
	→ soren joined	21:08
	→ Moult joined	21:08
	→ MetaCosm joined	21:08
	→ Devels joined	21:08
	→ kaictl joined	21:08
	→ ashka joined	21:08
	→ Diziet joined	21:08
	→ h12o joined	21:08
	→ Lulzon joined	21:08
	→ heavystorm joined	21:08
	→ foo joined	21:08
	→ johnkpaul joined	21:08
	→ runnyspot joined	21:08
	→ iAsterisk joined	21:08
	→ jamiebikies_ joined	21:08
	→ ozymandias_ joined	21:08
	→ dserodio joined	21:08
	→ Fissure joined	21:08
	→ Zariel joined	21:08
	→ lamont joined	21:08
	→ lahwran joined	21:08
	← joelroa left	21:08
	← vkrest left	21:08
	← h34d3r left	21:08
	← blast_hardcheese left	21:08
	← halu left	21:08
	→ durianshredder joined	21:08
offby1	how did your prompt get set that way?	21:08
	← durianshredder left	21:08
	← ariscop left	21:08
	→ pfg joined	21:08
	→ xSmurf joined	21:08
	→ brainproxy joined	21:08
	→ durianshredder joined	21:09
	qsusxs → qsuscs	21:09
	← durianshredder left	21:09
	← tarkus left	21:09
	→ kukks joined	21:09
	→ valgrind joined	21:09
	→ jayne joined	21:09
	→ vkrest joined	21:09
	← felixjet left	21:09
offby1	I'm guessing that's Github For Windows' PowerShell console	21:09
	→ tpollard joined	21:09
	→ Kabaka joined	21:10
TheJHNZ	yeah lol was trying to squash and it happened o.o	21:10
offby1	TheJHNZ: https://github.com/dahlbyk/posh-git#the-prompt	21:10
	pretty sure you could have figured that out as easily as I did	21:10
	→ cjwilburn joined	21:10
	→ W0rmDr1nk joined	21:10
W0rmDr1nk	hi	21:11
gitinfo	W0rmDr1nk: 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.	21:11
TheJHNZ	didnt know what to look for lol	21:11
W0rmDr1nk	hi	21:11
offby1	TheJHNZ: neither did I, and yet somehow I managed to find it :-\|	21:11
	→ felixjet joined	21:11
	→ mz` joined	21:11
	← mz` left	21:11
	→ mz` joined	21:11
W0rmDr1nk	if I have a git folder on my computer, how do I share it with someone else ?	21:11
	← ghoti left	21:11
alaird	rawtaz: well, diff branch...branch and diff --name-status branch...branch is how i've been doing it.	21:11
offby1	W0rmDr1nk: either with SSH, HTTP, or the git-web server	21:12
	→ ghoti joined	21:12
alaird	trying to figure out how to improve that so i can see log, file, and diff	21:12
W0rmDr1nk	offby1, ok so I have to give them ssh access to the folder git is checked out it for example ?	21:12
	→ halu joined	21:12
offby1	W0rmDr1nk: yep. See http://git-scm.com/book/en/Git-on-the-Server	21:12
	← catsup left	21:12
kadoban	W0rmDr1nk: that's one way. you can get much fancier though	21:13
	→ dangerousdave joined	21:13
	→ fission6 joined	21:13
W0rmDr1nk	offby1, hmm, actually I think we are talking about two different things	21:13
	→ johnbenz joined	21:13
	→ axl_ joined	21:13
	→ catsup joined	21:13
	← juanrgar left	21:13
W0rmDr1nk	offby1, I know how to host git with git-daemon - and I know ssh access can be used to share it to other users	21:13
offby1	W0rmDr1nk: maybe ...	21:13
	→ JPT joined	21:13
	→ polyzen joined	21:13
	← joelroa_ left	21:13
W0rmDr1nk	offby1, but say I checkout git repo on my computer, like say from github	21:13
offby1	W0rmDr1nk: ok, then, I don't know what you're asking because those sound like the right answers :)	21:13
	ok, you've cloned from github.	21:14
	→ sethwklein joined	21:14
	→ teran joined	21:14
	← netcarver left	21:14
W0rmDr1nk	offby1, can I just share that git repo by opening ssh access to someone so they can see the clone folder ?	21:14
	→ MattMaker joined	21:14
offby1	sure. That's just what I was talking about abve.	21:14
johnbenz	Hi somebody can tell me if using gitlab-shell to create a repo will create it in the gitlab I have installed in my server?	21:14
offby1	a b o v e	21:14
	→ Arokh joined	21:15
	→ livingstn joined	21:15
	→ h34d3r joined	21:15
	→ bluesm joined	21:15
	→ biertie joined	21:15
	→ jakob joined	21:15
	→ uu1101 joined	21:15
	→ chuckharmston_ joined	21:15
	→ twisted` joined	21:15
	→ evanc joined	21:15
	→ Asenar joined	21:15
	→ raccoon_ joined	21:15
	→ tfnico joined	21:15
	→ knownasilya joined	21:15
	→ Mapley joined	21:15
	→ jmcantrell joined	21:15
	→ JStoker joined	21:15
	→ supermat joined	21:15
	→ Bombe joined	21:15
	→ averell joined	21:15
	→ tgummerer joined	21:15
	→ ramlev joined	21:15
	→ Seveas joined	21:15
	→ ohcibi joined	21:15
	→ Ywa joined	21:15
	→ breiti joined	21:15
	→ midnightmagic joined	21:15
	→ harleypig joined	21:15
	→ dr_lepper joined	21:15
	→ Fuxx joined	21:15
	→ Zimsky joined	21:15
	→ potatoe joined	21:15
	→ Alenah joined	21:15
	→ Derega joined	21:15
	→ swpd joined	21:15
	hobana.freenode.net set mode: +vv	21:15
	→ Nizumzen joined	21:15
offby1	johnbenz: no idea.	21:15
johnbenz	offby1: ok thanks anyway	21:15
	→ MissionCritical joined	21:15
offby1	gitlab != git, and as far as I know isn't terribly popular	21:15
W0rmDr1nk	offby1, ok sorry	21:15
johnbenz	Yes I know but I'm in the server and I need to create a new repo, I only have access to the server and not the admin in gitlab	21:15
offby1	W0rmDr1nk: why not Try It And See™?	21:15
	← kadoban left	21:16
	→ hbf joined	21:16
	→ tusbar joined	21:16
	← lewellyn left	21:17
	→ JTABAGCX joined	21:17
	→ WAA5I37 joined	21:17
	→ mh`` joined	21:17
	→ martianlobster joined	21:17
	← MissionCritical left	21:17
	← ghoti left	21:17
	→ ausjke joined	21:18
	← simesy left	21:18
	→ Olipro joined	21:18
	← quackgyver left	21:18
	→ ghoti joined	21:18
	← marthinal left	21:18
	← able16 left	21:18
	← ggherdov left	21:19
	← Imdsm left	21:19
	← Hecter left	21:19
	← travisstaton left	21:19
	← jluc left	21:19
	→ mikecmpb_ joined	21:19
ausjke	after 'git clone --mirror linux', how can I add some remote kernel(from a different git repo) within the same standard linux kernel mirrored git? so my git repo on my server can track all the upstream code in only place?	21:19
	→ kadoban joined	21:19
	→ blast_hardcheese joined	21:20
ausjke	git clone --mirror linux; cd linux.git; git remote add origin1 http://another.linux.git; git remote update; will this do?	21:20
	→ jhulten_ joined	21:20
	→ njsg_ joined	21:20
skorgon	ausjke, git remote add <name> <URL>	21:20
	← eletuchy left	21:20
skorgon	git fetch <remote>	21:20
	← elijah left	21:20
	→ Imdsm joined	21:21
	→ deciph3r_ joined	21:21
	→ eletuchy joined	21:21
	← sohail__ left	21:21
	→ goTAN joined	21:21
	← hbf left	21:21
ausjke	skorgon: do i have to 'git fetch remote_' or 'git remote update' will do/	21:21
	→ aantix_ joined	21:21
	← kriks left	21:21
skorgon	i think both work. !try	21:22
ausjke	ok, thanks!	21:22
	← axl_ left	21:22
	← jnavila left	21:22
	← mikecmpbll left	21:23
	← dangerousdave left	21:23
	→ jrobichaud joined	21:23
	← chriswk_ left	21:23
	← Mogget left	21:23
	← NimeshNeema left	21:23
	→ a_ joined	21:23
	→ Mogget joined	21:23
	← konr left	21:23
	→ ncd\|leeN joined	21:23
	→ MattMake_ joined	21:23
	a_ → Guest95727	21:23
	← ghoti left	21:23
	→ ITDev2 joined	21:24
	← azathoth_ left	21:24
	→ chriswk_ joined	21:24
	→ ghoti joined	21:24
skorgon	!ping	21:24
	← goTAN left	21:24
	→ psoo_ joined	21:24
	→ gdmfsob joined	21:24
	← kadoban left	21:24
	→ bouga joined	21:25
	→ xrq```` joined	21:25
	→ konr joined	21:25
	→ Nugget_ joined	21:25
	→ hakril joined	21:25
	→ Mission-Critical joined	21:26
	← eletuchy left	21:26
	→ pasky_ joined	21:26
	← beben_ left	21:26
	→ CodeShar_ joined	21:26
	← njsg left	21:26
	→ kermit joined	21:26
	→ deuti joined	21:26
	← unknownhero left	21:26
	← leeN left	21:26
	→ quackgyver joined	21:27
	→ heavystorm_ joined	21:27
	→ jayallen joined	21:28
	→ ShooterM_ joined	21:28
	→ TakumoKatekari joined	21:28
	← TakumoKatekari left	21:28
	→ TakumoKatekari joined	21:28
	→ kadoban_ joined	21:28
skorgon	the bot died	21:28
	→ Ghjnut_ joined	21:28
	→ cereffusion joined	21:28
	→ cxreg2 joined	21:28
	← robustus left	21:29
	→ Vovko joined	21:29
	→ peper joined	21:29
	← peper left	21:29
	→ peper joined	21:29
	← nanashiRei left	21:29
	→ gtmanfre- joined	21:29
	→ deryni_ joined	21:29
	← ghoti left	21:29
	← Mapley left	21:29
	← supermat left	21:29
	→ d1b_ joined	21:29
	← ZaeDrake left	21:29
	→ PLejeck- joined	21:30
	→ osse_ joined	21:30
	← W0rmDr1nk left	21:30
	→ retard_ joined	21:30
	→ mribeiro1antas joined	21:30
	→ kent\n_ joined	21:30
	→ twandy joined	21:30
	→ cyphase_ joined	21:31
	→ [1]cereffusion joined	21:31
	← ghostlines left	21:31
	→ ryanakca_ joined	21:31
	← ryanakca_ left	21:31
	→ ryanakca_ joined	21:31
	→ JeremyD joined	21:31
	← user258467 left	21:31
	← emac_user left	21:31
	← cereffusion left	21:31
	[1]cereffusion → cereffusion	21:31
	← JeremyD left	21:31
	→ JeremyD joined	21:31
	→ Balliad joined	21:31
	← freestyl3r left	21:31
	← wagle left	21:31
	→ NimeshNeema joined	21:31
	→ ggherdov joined	21:31
	→ kanzure_ joined	21:31
	Mission-Critical → MissionCritical	21:31
	→ ghoti joined	21:31
	→ An_Ony_M1ose joined	21:31
	← jayallen left	21:31
	→ nanashiRei joined	21:31
	← ErKa left	21:32
	→ mimoo joined	21:32
	→ SegFaultAX_ joined	21:32
	→ godgodgodgo joined	21:32
	← Hounddog left	21:32
	→ JrCs_ joined	21:32
	← SegFaultAX_ left	21:32
	→ SegFaultAX_ joined	21:32
	← nanashiRei left	21:32
	→ nanashiRei joined	21:32
	→ ineb_ joined	21:32
	→ Nevik joined	21:32
	→ jayallen joined	21:32
	← ferreum left	21:32
	→ jan1337z joined	21:32
	← Nugget left	21:32
	← scalability-junk left	21:32
	← pasky left	21:32
	→ mika joined	21:32
	← mika left	21:32
	→ mika joined	21:32
	→ RichiH_ joined	21:32
	← NimeshNeema left	21:32
	→ NimeshNeema joined	21:32
	← drodger left	21:32
	→ DrZaius_ joined	21:32
	← cods left	21:32
	→ max_weller joined	21:33
	→ cods joined	21:33
	→ wagle joined	21:33
	→ phy1729_ joined	21:33
	→ AAA_awright_ joined	21:33
	→ joschi_ joined	21:33
	→ freestyl3r joined	21:33
	→ scalability-junk joined	21:33
	→ cschneid_ joined	21:33
	→ siprbaum joined	21:33
	← c0ded left	21:33
	→ c0d3d joined	21:33
	→ phanimahesh_ joined	21:33
	→ tvw joined	21:33
	← phanimahesh_ left	21:33
	→ phanimahesh_ joined	21:33
	← johnbenz left	21:33
	→ emac_user joined	21:33
	← alaird left	21:33
	→ drodger joined	21:33
	→ user258467 joined	21:34
	← retnuh left	21:34
	→ kloeri_ joined	21:35
	→ clarkf joined	21:35
	← ghoti left	21:35
	→ bwreilly joined	21:35
	→ ghoti joined	21:36
	← jayallen left	21:36
	← twandy left	21:36
	→ retnuh joined	21:36
	← mtlatif_ left	21:36
	← hakril_ left	21:36
	← deryni left	21:36
	← paulweb515 left	21:36
	→ infynyxx joined	21:36
	← cods left	21:36
	→ cods joined	21:36
	→ ngladitz_ joined	21:36
	← ngladitz_ left	21:36
	→ ngladitz_ joined	21:36
	← silverf0x left	21:36
	← rylinaux left	21:36
	→ twandy_ joined	21:37
	← catsup left	21:37
	← mishok13 left	21:37
	← deciph3r left	21:37
	← vvetter left	21:37
	← MattMaker left	21:37
	← jhulten left	21:37
	← joelrobichaud left	21:37
	→ mtlatif_ joined	21:37
	← kballou left	21:37
ezakimak_work2	is there any difference between merging a into b vs b into a other than the order of the parents?	21:37
	→ Favorett1 joined	21:38
	→ hwrdprkns joined	21:38
osse_	ezakimak_work2: yes. the branch you merge in is untouched and the branch you merge into is modified	21:38
	→ tyreld joined	21:38
	→ aboudreault_ joined	21:38
	← retnuh left	21:38
osse_	ezakimak_work2: if you merge a into b then a is left alone and b is advanced, and vice versa	21:39
	→ jluc joined	21:39
	← PanSteffek left	21:39
	← aantix left	21:39
	← ngladitz left	21:39
	← monokrome left	21:39
	← alvaro_o left	21:39
	← PLejeck left	21:39
	← clarkfischer left	21:39
	← johntitor2036 left	21:39
	← polyzen left	21:39
	← psoo left	21:39
	← osse left	21:39
	← dfarler left	21:39
	← dreiss left	21:39
	← boombatower left	21:39
	← kapowaz left	21:39
	← Mez_ left	21:39
	← kini left	21:39
	← flazz_gone left	21:39
	← mehdi left	21:39
	← ManneW left	21:39
	← mnml left	21:39
	← ORiON-- left	21:39
	← steverandy left	21:39
	← madduck left	21:39
	← Evanlec left	21:39
	← MikeJ92 left	21:39
	← cyphase left	21:40
	← rndbit left	21:40
	← tm512 left	21:40
	← Mindfart left	21:40
	← mackanfkp left	21:40
	← ping-pong left	21:40
	← pigeon_ left	21:40
	← tazle_ left	21:40
	← place_ left	21:40
	← mitsuhiko left	21:40
	← qdii left	21:40
	← SJr left	21:40
	← aisbaa left	21:40
	← leprechau left	21:40
	← SebastianFlyte left	21:40
	← ScottE left	21:40
	← cschneid left	21:40
	← gitinfo left	21:40
	← Norrin left	21:40
	← nephyrin left	21:40
	← adambrenecki left	21:40
	← ceari left	21:40
	← up_the_irons left	21:40
	← jds left	21:40
	← mino left	21:40
	← abackstrom left	21:40
	← rastus_vernon left	21:40
	← dsop left	21:40
	← MacGyver left	21:40
	← uhu01 left	21:40
	← sakkemo left	21:40
	← diget left	21:40
	← soren left	21:40
	← Moult left	21:40
	← mh` left	21:40
	← MetaCosm left	21:40
	← Tacker left	21:40
	← kaictl left	21:40
	← ashka left	21:40
	← xender left	21:40
	← Diziet left	21:40
	← mattp left	21:40
	← h12o left	21:40
	← Lulzon left	21:40
	← grumbel_ left	21:40
	← heavystorm left	21:40
	← foo left	21:40
	← runnyspot left	21:40
	← johnkpaul left	21:40
	← iAsterisk left	21:40
	← jamiebikies_ left	21:40
	← ozymandias_ left	21:40
	← dserodio left	21:40
	← Fissure left	21:40
	← twobitsprite left	21:40
	← Zariel left	21:40
	← Takumo left	21:40
	← lamont left	21:40
	← Devels left	21:40
	← CodeShark left	21:40
	← ShooterMG left	21:40
	← mribeirodantas left	21:40
	← sente_ left	21:40
	Favorett1 → 6JTABAHBY	21:40
	→ Favorett1 joined	21:40
	→ rylinaux joined	21:40
	← rylinaux left	21:40
	→ alvaro_o joined	21:40
	→ rylinaux joined	21:40
	← bwreilly_ left	21:40
	← KK4MGV left	21:40
	← alvaro_o left	21:40
	← rylinaux left	21:40
	← Favorett1 left	21:40
	mh`` → mh`	21:40
	→ alvaro_o joined	21:40
	→ KK4MGV joined	21:40
	→ polyzen joined	21:40
	← DolphinDream left	21:40
ezakimak_work2	"a into b" meaning HEAD is b, and you do "git merge a" ?	21:40
	← edude03 left	21:40
	← bhldev left	21:40
	← SegFaultAX left	21:40
	← RoryHughes left	21:40
	← Neozonz_ left	21:40
	← gwb3 left	21:40
	← karstensrage left	21:40
	← illbyte left	21:40
	← arnihr left	21:40
	← frogonwheels left	21:40
	← ryanakca left	21:40
	← arcanis left	21:40
	← Werring left	21:40
	← AAA_awright left	21:40
	← locojay left	21:40
	← retard left	21:40
	← xrq``` left	21:40
	← mattp__ left	21:40
	← kent\n left	21:40
	← Ghjnut left	21:40
	← aboudreault left	21:40
	← theForce_ left	21:40
	← ineb left	21:40
	← kloeri left	21:40
	← Favoretti left	21:40
	← gtmanfred left	21:40
	← ppr left	21:40
	← d1b left	21:40
	← joschi left	21:40
	← Shadiku left	21:40
	← webster left	21:40
	← Ziber left	21:40
	← SleePy left	21:40
	← mnemoc left	21:40
	← shihan left	21:40
	← shennyg left	21:40
	← Myrth left	21:40
	← PierrickB left	21:40
	← vespaper left	21:40
	← Su7 left	21:40
	← Parnic left	21:40
	← JakePee left	21:40
	← so left	21:40
	← loolwut left	21:40
	← phy1729 left	21:40
	← kanzure left	21:40
	← GameGamer43 left	21:40
	← JrCs left	21:40
	← phanimahesh left	21:40
	← quadz left	21:40
	← cxreg left	21:40
	← cuppscakes left	21:40
	JeremyD → SleePy	21:40
	gtmanfre- → gtmanfred	21:40
	SegFaultAX_ → SegFaultAX	21:40
	JrCs_ → JrCs	21:40
	→ quadz joined	21:40
osse_	ezakimak_work2: that's what I mean, yes. Didn't you? You wrote it first :P	21:40
	kloeri_ → kloeri	21:40
	osse_ → osse	21:41
	→ silverf0x joined	21:41
	→ Myrth joined	21:41
	← ghoti left	21:41
	phanimahesh_ → phanimahesh	21:41
	← Myrth left	21:42
	→ Myrth joined	21:42
	→ Celm_ joined	21:42
	← coderdad left	21:42
	→ theForce joined	21:42
	→ SebastianFlyte joined	21:42
	→ edude03 joined	21:42
	→ JakePee joined	21:43
	→ looolwut joined	21:43
	→ mehdi joined	21:43
	→ karstensrage joined	21:43
	→ Kayra joined	21:43
	karstensrage → Guest63922	21:44
	← Olipro left	21:44
	→ illbyte joined	21:44
	← dmnd left	21:44
	→ Neozonz_ joined	21:44
	← mjulian left	21:44
	→ mjulian joined	21:44
	→ jgoss joined	21:45
	← AaronMT left	21:45
	← polyzen left	21:46
	← looolwut left	21:46
	← jayne left	21:46
Nevik	!gitinfo	21:46
	→ ghoti joined	21:46
Nevik	jast: hai	21:46
	→ looolwut joined	21:47
Nevik	jast: gitinfo is dead	21:47
	→ oojacoboo joined	21:47
meatmanek	once upon a time, I came in here and asked about git-based deployment systems; I got the standard chastising for trying to use git as a deployment system, and then someone liked me to a really useful article about the various techniques that people try, and their pitfalls. Anybody know what article I'm talking about?	21:47
	KK4MGV → Guest57569	21:47
	→ dmnd joined	21:47
	→ Ziber joined	21:47
	→ coderdad joined	21:47
	→ moppersmurf joined	21:48
	→ jayne joined	21:48
	← tureba left	21:48
OMGOMG	!deploy	21:48
	→ Olipro joined	21:48
Nevik	OMGOMG: bot is ded	21:48
OMGOMG	:x	21:48
	Nevik: thanks	21:48
cbreak	meatmanek: gitinfo knows	21:48
	chriswk_ → chriswk__	21:49
Nevik	meatmanek: http://jk.gs/git/bot/trigger.php look for the !deploy trigger	21:49
	→ travisstaton joined	21:49
	→ ilogger2 joined	22:02
	→ memoryleak joined	22:02
	→ akitada joined	22:02
	→ nfroidure joined	22:02
	→ stfn joined	22:03
	→ brainproxy joined	22:03
	→ harish_ joined	22:03
	→ D4v33 joined	22:03
	→ HeN joined	22:03
	→ ngladitz_ joined	22:03
	→ _rgn joined	22:03
	→ anarchih joined	22:03
	→ dermoth\|home joined	22:03
	→ sohum joined	22:03
	→ Tobbi joined	22:03
	→ Tectu joined	22:03
	→ mizu_no_oto joined	22:03
	→ Devastator joined	22:03
	→ idoru joined	22:03
	← anarchih left	22:03
	→ anarchih joined	22:03
	→ myme joined	22:03
	← Tobbi left	22:03
	→ eqyiel joined	22:04
	→ Tobbi joined	22:04
	sohum → Guest84402	22:04
	→ coopsh joined	22:04
	→ GameGamer43 joined	22:05
	→ johnmilton joined	22:05
	→ durianshredder joined	22:06
	→ bedouin joined	22:06
	→ Console joined	22:06
	→ SleePy joined	22:06
	→ roflin joined	22:06
	→ ixian joined	22:06
	→ kenyon joined	22:06
	→ adam___ joined	22:06
	→ dytrivedi joined	22:06
	→ dreiss joined	22:06
	→ srcerer joined	22:06
	→ jfield joined	22:06
	→ stellarhopper joined	22:06
	→ Hunner joined	22:06
	→ Stravy joined	22:06
	→ w0ng joined	22:06
	→ scottyob joined	22:06
	→ wendellM joined	22:06
	→ joehh joined	22:06
	→ webguynow joined	22:06
	→ Tabmow joined	22:06
	→ zz_karupanerura joined	22:06
	→ aucecil joined	22:06
	→ camt joined	22:06
	→ hays joined	22:06
	→ frobware joined	22:06
	→ bhldev joined	22:06
	→ MAAD7HK joined	22:06
	→ Werring joined	22:06
	→ webster joined	22:06
	→ PierrickB joined	22:06
	→ cuppscakes joined	22:06
	→ RoryHughes joined	22:06
	→ arcanis joined	22:06
	→ Shadiku joined	22:06
	→ vespaper joined	22:06
	→ frogonwheels_ joined	22:06
	→ Su7 joined	22:06
	→ shihan joined	22:06
	→ robustus\|Off joined	22:06
	→ sente joined	22:06
	→ gwb3 joined	22:06
	→ locojay joined	22:06
	→ mnemoc joined	22:06
	→ Parnic joined	22:06
	→ arnihr_ joined	22:06
	→ shennyg joined	22:06
	→ Watabou joined	22:06
	→ dfarler joined	22:06
	→ boombatower joined	22:06
	→ kapowaz joined	22:06
	→ Mez_ joined	22:06
	→ kini joined	22:06
	→ flazz_gone joined	22:06
	→ ManneW joined	22:06
	→ xender joined	22:06
	→ mnml joined	22:06
	→ ORiON-- joined	22:06
	→ steverandy joined	22:06
	→ grumbel_ joined	22:06
	→ madduck joined	22:06
	→ Evanlec joined	22:06
	→ MikeJ92 joined	22:06
	→ rndbit joined	22:06
	→ tm512 joined	22:06
	→ Mindfart joined	22:06
	→ mackanfkp joined	22:06
	→ ping-pong joined	22:06
	→ pigeon_ joined	22:06
	→ tazle_ joined	22:06
	→ mitsuhiko joined	22:06
	→ place_ joined	22:06
	→ qdii joined	22:06
	→ SJr joined	22:06
	→ aisbaa joined	22:06
	→ leprechau joined	22:06
	→ ScottE joined	22:06
	→ gitinfo joined	22:06
	→ Norrin joined	22:06
	→ uhu01 joined	22:06
	→ nephyrin joined	22:06
	→ adambrenecki joined	22:06
	→ ceari joined	22:06
	→ up_the_irons joined	22:06
	→ jds joined	22:06
	→ mino joined	22:06
	→ abackstrom joined	22:06
	→ rastus_vernon joined	22:06
	→ dsop joined	22:06
	→ Tacker joined	22:06
	→ twobitsprite joined	22:06
	→ MacGyver joined	22:06
	→ mattp joined	22:06
	→ sakkemo joined	22:06
	→ diget joined	22:06
	hitchcock.freenode.net set mode: +o	22:06
	→ soren joined	22:06
	→ Moult joined	22:06
	→ MetaCosm joined	22:06
	→ Devels joined	22:06
	→ kaictl joined	22:06
	→ ashka joined	22:06
	→ Diziet joined	22:06
	→ h12o joined	22:06
	→ Lulzon joined	22:06
	→ foo joined	22:06
	→ johnkpaul joined	22:06
	→ runnyspot joined	22:06
	→ iAsterisk joined	22:06
	→ jamiebikies_ joined	22:06
	→ ozymandias_ joined	22:06
	→ dserodio joined	22:06
	→ Fissure joined	22:06
	→ Zariel joined	22:06
	→ lamont joined	22:06
	→ quackgyver joined	22:06
	→ paulweb515 joined	22:07
	→ elijah joined	22:07
	kenyon → Guest58769	22:07
	← frobware left	22:07
	→ frobware joined	22:07
	← cuppscakes left	22:07
	← bhldev left	22:07
	← arcanis left	22:07
	← SleePy left	22:07
	→ SleePy joined	22:07
	→ Olipro joined	22:07
	→ aboudreault joined	22:07
	→ cuppscakes joined	22:07
	→ arcanis joined	22:07
	→ bhldev joined	22:07
	gwb3 → Guest36224	22:08
	→ so joined	22:08
	→ jaeckel joined	22:08
	→ eletuchy joined	22:09
	→ retnuh joined	22:09
	← retnuh left	22:09
	→ BaconOverflow_ joined	22:10
	→ vijay13 joined	22:10
	→ bwreilly joined	22:10
	← srcerer left	22:10
	← GameGamer43 left	22:11
	→ ErKa joined	22:11
	→ GameGamer43 joined	22:11
	← mizu_no_oto left	22:12
	→ joelroa joined	22:12
	→ DarkMantis joined	22:13
	→ dangerousdave joined	22:13
	→ tier joined	22:13
	→ vijay13_ joined	22:13
	→ chrisss404 joined	22:13
	→ lithiumjake joined	22:13
	← vijay13 left	22:15
	← dreiss left	22:15
	→ Dykotomee joined	22:15
	← joelroa left	22:15
	gitinfo set mode: +v	22:16
	→ Ademan joined	22:17
Dykotomee	Hey guys, I'm using gitflow and I'm trying to branch off of my develop branch, but I'm getting this error message:	22:17
	→ breakfast joined	22:17
	→ vijay13 joined	22:17
Dykotomee	warning: refname 'develop' is ambiguous. fatal: Ambiguous object name: 'develop'.	22:17
Ademan	is there any way to make git bail if prompted for authentication?	22:18
Dykotomee	I migrated an SVN repo to Git, and the two are now sitting in the same directory. So far this has been nbd.	22:18
	@Ademan: Ctrl+C?	22:18
	@Ademan: You mean automatically?	22:18
Ademan	Dykotomee: yep	22:18
	← vijay13_ left	22:19
	→ martianlobster1 joined	22:19
Dykotomee	@Ademan: Good question.	22:19
	← tier left	22:20
	→ lifelike joined	22:20
	→ oojacoboo joined	22:20
	→ CheckDavid_ joined	22:20
	→ teran_ joined	22:20
	→ ZaeDrake joined	22:20
	← ZaeDrake left	22:21
	→ tier joined	22:21
	→ vijay13_ joined	22:21
	→ JerryT joined	22:21
Ademan	https://gist.github.com/anonymous/9124517 -- my use case. the repos which have already been DMCA'd prompt for authentication (it may very well be all of them, but I'm not trying them all individually).	22:22
	→ hellopat joined	22:22
	→ marshmn joined	22:23
	← vijay13 left	22:23
	→ jizanthapus joined	22:23
ausjke	on the serveri after 'git clone --mirror; git add remote test git://new; git remote update', i then 'git clone' from client PC, however the 'remote test' was not cloned, how?	22:23
	→ twandy___ joined	22:23
	→ teran joined	22:24
marshmn	hi all; when you've worked on a new feature in a branch, and you're merging it back into your main develop branch - you wouldn't normally squash your commits right?	22:24
	→ bwreilly_ joined	22:24
	→ axl_ joined	22:25
	→ vijay13 joined	22:25
	→ Zaknefain joined	22:25
	→ ianmcorvidae\|alt joined	22:25
	→ sjmikem joined	22:26
	← vijay13_ left	22:26
	→ syst3mw0rm joined	22:26
	← frobware left	22:27
	← hays left	22:27
	← camt left	22:27
	← Stravy left	22:27
	← Hunner left	22:27
	← stellarhopper left	22:27
	← jfield left	22:27
	← BaconOverflow_ left	22:27
	← so left	22:27
	← bhldev left	22:27
	← arcanis left	22:27
	← cuppscakes left	22:27
	← Console left	22:27
	← SleePy left	22:27
	← ixian left	22:27
	← dytrivedi left	22:27
	← webster left	22:27
	← Werring left	22:27
	← PierrickB left	22:27
	← Shadiku left	22:27
	← RoryHughes left	22:27
	← vespaper left	22:27
	← frogonwheels_ left	22:27
	← Su7 left	22:27
	← robustus\|Off left	22:27
	← sente left	22:27
	← shihan left	22:27
	← Guest36224 left	22:27
	← locojay left	22:27
	← mnemoc left	22:27
	← Parnic left	22:27
	← w0ng left	22:27
	← scottyob left	22:27
	← wendellM left	22:27
	← joehh left	22:27
	← webguynow left	22:27
	← Tabmow left	22:27
	← zz_karupanerura left	22:27
	← aucecil left	22:27
	ianmcorvidae\|alt → ianmcorvidae	22:27
	→ kadoban_ joined	22:27
	← ianmcorvidae left	22:27
	→ ianmcorvidae joined	22:27
	→ aspiers joined	22:27
	→ LucaS05 joined	22:27
	→ becks__ joined	22:27
	← hellopat left	22:27
	→ Exancillatus joined	22:27
	→ retnuh joined	22:27
	→ saurik joined	22:28
LucaS05	hi. i've just created a branch and i'm working on it. how can i switch back and revert all changes to my first branch?	22:28
	→ identity joined	22:28
	← identity left	22:28
	→ identity joined	22:28
	→ Slush- joined	22:28
	→ hhuuggoo_ joined	22:29
	→ pierre1_ joined	22:29
bufferloss	LucaS05: not sure if I understand correctly but if so, probably something like: git reset --hard && git clean -d -f	22:29
	← vijay13 left	22:30
	← JerryT left	22:30
LucaS05	maybe i can push to github, so you can see. can't you?	22:30
	→ eletuchy_ joined	22:30
osse	marshmn: it all depends. I don't	22:30
	→ oriba joined	22:31
	→ ELLIOTTCABLE joined	22:31
	→ qsusxs joined	22:31
	→ chamunks- joined	22:32
	→ mellernoia joined	22:32
marshmn	osse: OK, thanks	22:32
	← tier left	22:33
	← teran_ left	22:33
	← breakfast left	22:33
	← dangerousdave left	22:33
	← bwreilly left	22:33
	← harish_ left	22:33
	← DarkMantis left	22:33
	← bedouin left	22:33
	← roflin left	22:33
	← Guest58769 left	22:33
	← adam___ left	22:33
	← arnihr_ left	22:33
	← shennyg left	22:33
	← Watabou left	22:33
	← dfarler left	22:33
	← boombatower left	22:33
	← kapowaz left	22:33
	← Mez_ left	22:33
	← kini left	22:33
	← flazz_gone left	22:33
	← ManneW left	22:33
	← mnml left	22:33
	← ORiON-- left	22:33
	← steverandy left	22:33
	← madduck left	22:33
	← Evanlec left	22:33
	← MikeJ92 left	22:33
	← rndbit left	22:33
	← tm512 left	22:33
	← Mindfart left	22:33
	← mackanfkp left	22:33
	← ping-pong left	22:33
	← pigeon_ left	22:33
	← tazle_ left	22:33
	← place_ left	22:33
	← mitsuhiko left	22:33
	← qdii left	22:33
	← SJr left	22:33
	← aisbaa left	22:33
	← leprechau left	22:33
	← ScottE left	22:33
	← gitinfo left	22:33
	← Norrin left	22:33
	← nephyrin left	22:33
	← adambrenecki left	22:33
	← ceari left	22:33
	← up_the_irons left	22:33
	← jds left	22:33
	← mino left	22:33
	← abackstrom left	22:33
	← rastus_vernon left	22:33
	← dsop left	22:33
	← MacGyver left	22:33
	← uhu01 left	22:33
	← sakkemo left	22:33
	← diget left	22:33
	← soren left	22:33
	← Moult left	22:33
	← MetaCosm left	22:33
	← Tacker left	22:33
	← kaictl left	22:33
	← ashka left	22:33
	← xender left	22:33
	← Diziet left	22:33
	← mattp left	22:33
	← h12o left	22:33
	← Lulzon left	22:33
	← grumbel_ left	22:33
	← foo left	22:33
	← runnyspot left	22:33
	← johnkpaul left	22:33
	← iAsterisk left	22:33
	← jamiebikies_ left	22:33
	← ozymandias_ left	22:33
	← dserodio left	22:33
	← Fissure left	22:33
	← twobitsprite left	22:33
	← Zariel left	22:33
	← lamont left	22:33
	← Devels left	22:33
	→ Guest00000 joined	22:33
	← lithiumjake left	22:33
osse	marshmn: but I usually tweak the set of commits though	22:33
	Most of it I do as I go	22:33
	← eletuchy left	22:34
	→ sanmarcos joined	22:34
	→ JerryT joined	22:34
	→ kuatsure joined	22:34
	← Zaknefain left	22:35
	→ kevinfagan joined	22:35
	← Olipro left	22:35
	→ Zaknefain joined	22:35
marshmn	osse: what do you mean by 'tweak'?	22:35
osse	marshmn: fix typos in commit messages, squash some (but not all) commits, etc.	22:36
marshmn	I see	22:36
	→ silverf0x joined	22:36
	→ dreiss joined	22:36
	→ DarkMantis joined	22:36
	→ BaconOverflow_ joined	22:36
	→ so joined	22:36
	→ bhldev joined	22:36
	→ arcanis joined	22:36
	→ cuppscakes joined	22:36
	→ bedouin joined	22:36
	→ Console joined	22:36
	→ SleePy joined	22:36
	→ roflin joined	22:36
	→ ixian joined	22:36
	→ Guest58769 joined	22:36
	→ adam___ joined	22:36
	→ dytrivedi joined	22:36
	→ lamont joined	22:36
	→ Zariel joined	22:36
	→ Fissure joined	22:36
	→ dserodio joined	22:36
	→ ozymandias_ joined	22:36
	→ jamiebikies_ joined	22:36
	→ iAsterisk joined	22:36
	→ runnyspot joined	22:36
	→ johnkpaul joined	22:36
	→ foo joined	22:36
	→ Lulzon joined	22:36
	→ h12o joined	22:36
	→ Diziet joined	22:36
	→ ashka joined	22:36
	→ kaictl joined	22:36
	→ Devels joined	22:36
	→ MetaCosm joined	22:36
	→ Moult joined	22:36
	→ soren joined	22:36
	→ diget joined	22:36
	→ sakkemo joined	22:36
	→ mattp joined	22:36
	→ MacGyver joined	22:36
	→ twobitsprite joined	22:36
	→ Tacker joined	22:36
	→ dsop joined	22:36
	→ rastus_vernon joined	22:36
	→ abackstrom joined	22:36
	→ mino joined	22:36
	→ jds joined	22:36
	→ up_the_irons joined	22:36
	→ ceari joined	22:36
	→ adambrenecki joined	22:36
	→ nephyrin joined	22:36
	→ uhu01 joined	22:36
	→ Norrin joined	22:36
	→ gitinfo joined	22:36
	→ ScottE joined	22:36
	→ leprechau joined	22:36
	→ aisbaa joined	22:36
	→ SJr joined	22:36
	→ qdii joined	22:36
	→ place_ joined	22:36
	→ mitsuhiko joined	22:36
	→ tazle_ joined	22:36
	→ pigeon_ joined	22:36
	→ ping-pong joined	22:36
	→ mackanfkp joined	22:36
	→ Mindfart joined	22:36
	→ tm512 joined	22:36
	→ rndbit joined	22:36
	→ MikeJ92 joined	22:36
	→ Evanlec joined	22:36
	→ madduck joined	22:36
	→ grumbel_ joined	22:36
	→ steverandy joined	22:36
	→ ORiON-- joined	22:36
	→ mnml joined	22:36
	→ xender joined	22:36
	→ ManneW joined	22:36
	→ flazz joined	22:36
	→ kini joined	22:36
	→ Mez_ joined	22:36
	→ kapowaz joined	22:36
	→ boombatower joined	22:36
	→ dfarler joined	22:36
	→ Watabou joined	22:36
	→ shennyg joined	22:36
	→ arnihr_ joined	22:36
	→ jfield joined	22:36
	→ stellarhopper joined	22:36
	→ Hunner joined	22:36
	→ Stravy joined	22:36
	→ w0ng joined	22:36
	→ scottyob joined	22:36
	→ wendellM joined	22:36
	→ joehh joined	22:36
	→ webguynow joined	22:36
	hitchcock.freenode.net set mode: +o	22:36
	→ Tabmow joined	22:36
	→ zz_karupanerura joined	22:36
	→ aucecil joined	22:36
	→ camt joined	22:36
	→ hays joined	22:36
	→ frobware joined	22:36
	→ MAAD7HK joined	22:36
	→ Werring joined	22:36
	→ webster joined	22:36
	→ PierrickB joined	22:36
	→ RoryHughes joined	22:36
	→ Shadiku joined	22:36
	→ vespaper joined	22:36
	→ frogonwheels_ joined	22:36
	→ Su7 joined	22:36
	→ shihan joined	22:36
	→ robustus\|Off joined	22:36
	→ sente joined	22:36
	→ Guest36224 joined	22:36
	→ locojay joined	22:36
	→ mnemoc joined	22:36
	→ Parnic joined	22:36
osse	Typically I squash fixes to stuff that was introduced in the same branch	22:36
	← twandy___ left	22:37
	→ dagnachew joined	22:37
	→ wongon_ joined	22:37
	→ twandy___ joined	22:38
	← becks__ left	22:38
	→ mizu_no_oto joined	22:38
	→ Olipro joined	22:38
	→ jeek joined	22:39
	→ harish_ joined	22:39
LucaS05	bufferloss, still there?	22:39
	→ alvaro_o joined	22:40
	Guest00000 → kulp	22:40
	→ titusjose____ joined	22:40
	← axl_ left	22:41
	← Zaknefain left	22:41
	→ Vampire0_ joined	22:41
	→ rjhunter joined	22:42
	← durianshredder left	22:42
	→ Sabbath joined	22:42
	→ valgrind joined	22:43
	← webster left	22:45
	← myme left	22:45
	← Guest84402 left	22:45
	← ManneW left	22:45
	→ chrisw_ joined	22:45
	← valgrind left	22:45
	← silverf0x left	22:46
	← frobware left	22:46
	← hays left	22:46
	← camt left	22:46
	← Stravy left	22:46
	← Hunner left	22:46
	← stellarhopper left	22:46
	← jfield left	22:46
	← dreiss left	22:46
	← DarkMantis left	22:46
	← bedouin left	22:46
	← roflin left	22:46
	← Guest58769 left	22:46
	← adam___ left	22:46
	← arnihr_ left	22:46
	← shennyg left	22:46
	← Watabou left	22:46
	← dfarler left	22:46
	← boombatower left	22:46
	← kapowaz left	22:46
	← Mez_ left	22:46
	← kini left	22:46
	← flazz left	22:46
	← mnml left	22:46
	← ORiON-- left	22:46
	← steverandy left	22:46
	← madduck left	22:46
	← Evanlec left	22:46
	← MikeJ92 left	22:46
	← rndbit left	22:46
	← tm512 left	22:46
	← Mindfart left	22:46
	← mackanfkp left	22:46
	← ping-pong left	22:46
	← pigeon_ left	22:46
	← tazle_ left	22:46
	← place_ left	22:46
	← mitsuhiko left	22:46
	← qdii left	22:46
	← SJr left	22:46
	← aisbaa left	22:46
	← leprechau left	22:46
	← ScottE left	22:46
	← gitinfo left	22:46
	← Norrin left	22:46
	← nephyrin left	22:46
	← adambrenecki left	22:46
	← ceari left	22:46
	← up_the_irons left	22:46
	← jds left	22:46
	← mino left	22:46
	← abackstrom left	22:46
	← rastus_vernon left	22:46
	← dsop left	22:46
	← MacGyver left	22:46
	← uhu01 left	22:46
	← sakkemo left	22:46
	← diget left	22:46
	← soren left	22:46
	← Moult left	22:46
	← MetaCosm left	22:46
	← Tacker left	22:46
	← kaictl left	22:46
	← ashka left	22:46
	← xender left	22:46
	← Diziet left	22:46
	← mattp left	22:46
	← h12o left	22:46
	← Lulzon left	22:46
	← grumbel_ left	22:46
	← foo left	22:46
	← runnyspot left	22:46
	← johnkpaul left	22:46
	← iAsterisk left	22:46
	← jamiebikies_ left	22:46
	← ozymandias_ left	22:46
	← dserodio left	22:46
	← Fissure left	22:46
	← twobitsprite left	22:46
	← Zariel left	22:46
	← lamont left	22:46
	← Devels left	22:46
	← w0ng left	22:46
	← scottyob left	22:46
	← wendellM left	22:46
	← joehh left	22:46
	← webguynow left	22:46
	← Tabmow left	22:46
	← zz_karupanerura left	22:46
	← aucecil left	22:46
	→ silverf0x joined	22:47
	→ dreiss joined	22:47
	→ DarkMantis joined	22:47
	→ bedouin joined	22:47
	→ roflin joined	22:47
	→ Guest58769 joined	22:47
	→ adam___ joined	22:47
	→ lamont joined	22:47
	→ Zariel joined	22:47
	→ Fissure joined	22:47
	→ dserodio joined	22:47
	→ ozymandias_ joined	22:47
	→ jamiebikies_ joined	22:47
	→ iAsterisk joined	22:47
	→ runnyspot joined	22:47
	→ johnkpaul joined	22:47
	→ foo joined	22:47
	→ Lulzon joined	22:47
	→ h12o joined	22:47
	→ Diziet joined	22:47
	→ ashka joined	22:47
	→ kaictl joined	22:47
	→ Devels joined	22:47
	→ MetaCosm joined	22:47
	→ Moult joined	22:47
	→ soren joined	22:47
	→ diget joined	22:47
	→ sakkemo joined	22:47
	→ mattp joined	22:47
	→ MacGyver joined	22:47
	→ twobitsprite joined	22:47
	→ Tacker joined	22:47
	→ dsop joined	22:47
	→ rastus_vernon joined	22:47
	→ abackstrom joined	22:47
	→ mino joined	22:47
	→ jds joined	22:47
	→ up_the_irons joined	22:47
	→ ceari joined	22:47
	→ adambrenecki joined	22:47
	→ nephyrin joined	22:47
	→ uhu01 joined	22:47
	→ Norrin joined	22:47
	→ gitinfo joined	22:47
	→ ScottE joined	22:47
	→ leprechau joined	22:47
	→ aisbaa joined	22:47
	hitchcock.freenode.net set mode: +o	22:47
	→ SJr joined	22:47
	→ qdii joined	22:47
	→ place_ joined	22:47
	→ mitsuhiko joined	22:47
	→ tazle_ joined	22:47
	→ pigeon_ joined	22:47
	→ ping-pong joined	22:47
	→ mackanfkp joined	22:47
	→ Mindfart joined	22:47
	→ tm512 joined	22:47
	→ rndbit joined	22:47
	→ MikeJ92 joined	22:47
	→ Evanlec joined	22:47
	→ madduck joined	22:47
	→ grumbel_ joined	22:47
	→ steverandy joined	22:47
	→ ORiON-- joined	22:47
	→ mnml joined	22:47
	→ xender joined	22:47
	→ flazz joined	22:47
	→ kini joined	22:47
	→ Mez_ joined	22:47
	→ kapowaz joined	22:47
	→ boombatower joined	22:47
	→ dfarler joined	22:47
	→ Watabou joined	22:47
	→ shennyg joined	22:47
	→ arnihr_ joined	22:47
	→ frobware joined	22:47
	→ hays joined	22:47
	→ camt joined	22:47
	→ aucecil joined	22:47
	→ zz_karupanerura joined	22:47
	→ Tabmow joined	22:47
	→ webguynow joined	22:47
	→ joehh joined	22:47
	→ wendellM joined	22:47
	→ scottyob joined	22:47
	→ w0ng joined	22:47
	→ Stravy joined	22:47
	→ Hunner joined	22:47
	→ stellarhopper joined	22:47
	→ jfield joined	22:47
	→ biertie joined	22:47
	→ Drakevr joined	22:47
	← Drakevr left	22:47
	→ Drakevr joined	22:47
	← Sabbath left	22:47
	→ da5id joined	22:47
	← retnuh left	22:47
	→ Pieter joined	22:47
	→ webster joined	22:47
	→ JStoker joined	22:47
	→ myme joined	22:48
	→ Takumo joined	22:48
	→ ramlev joined	22:48
	← ngladitz_ left	22:48
	→ CKyle joined	22:48
	→ majoh joined	22:48
	→ grawity joined	22:48
	→ dsdeiz joined	22:48
	← HeN left	22:48
	flazz → flazz_gone	22:49
	→ glaksmono_ joined	22:49
	→ tgummerer joined	22:49
	→ o9 joined	22:50
	← JStoker left	22:50
	→ carbon1 joined	22:50
	← carbon1 left	22:50
	→ EToS joined	22:50
	→ ManneW joined	22:50
	→ HeN joined	22:50
	→ Celm joined	22:50
	← Olipro left	22:51
	→ psoo joined	22:51
	← rjhunter left	22:51
	→ Olipro joined	22:51
	→ Mogget joined	22:51
	→ durianshredder joined	22:51
	→ scalability-junk joined	22:52
	→ jayne joined	22:52
	→ sunny256 joined	22:52
	→ amoe joined	22:52
	→ rportugal joined	22:53
	→ JStoker joined	22:53
	← JerryT left	22:53
	→ pwnz0r joined	22:53
	→ mdhopkins joined	22:55
	← psoo left	22:55
	→ wethu joined	22:55
	→ rjhunter joined	22:56
	→ satiricon joined	22:56
	→ valgrind joined	22:56
	→ Leoneof joined	22:56
	→ hwrdprkns joined	22:58
	← mizu_no_oto left	22:58
YourBestFriend	guys	22:58
	→ lithiumjake joined	22:59
YourBestFriend	when you start a new project, when do you create your first commit?	22:59
	← valgrind left	22:59
	→ Mousse_ joined	23:00
ToxicFrog	YourBestFriend: these days I usually create it on github, which means the first commit contains a blank README automatically	23:00
	If I'm not, I generally create a README with a short summary of the project + language-appropriate gitignore and commit that	23:01
	(if I'm working in clojure, the first commit is the skeleton created by `lein new`)	23:01
	→ valgrind joined	23:01
	← Exancillatus left	23:01
	→ ariscop joined	23:02
	→ hahuang65 joined	23:03
	→ ntio joined	23:04
	→ Vampire0 joined	23:04
	→ pr0ton joined	23:04
	→ bufferloss joined	23:05
	→ Zifre joined	23:06
	→ ultraflash3 joined	23:06
	← bufferloss left	23:06
	← CKyle left	23:06
	→ bufferloss joined	23:06
bufferloss	LucaS05: yes I'm here	23:06
	← Vampire0_ left	23:07
	→ rq601 joined	23:08
cbreak	YourBestFriend: usually after I create the project skeleton	23:08
	→ lazers joined	23:08
	→ LBV_User joined	23:10
bufferloss	how might I go about counting the number of commits within a branch	23:10
	seems like it should be simple but I can't find a reliable way	23:10
LBV_User	bufferloss: git log --oneline parentBranch..HEAD \| wc -l	23:11
cbreak	bufferloss: man git-rev-list	23:12
gitinfo	bufferloss: the git-rev-list manpage is available at http://jk.gs/git-rev-list.html	23:12
cbreak	bufferloss: look for --count	23:12
	→ breakfast joined	23:13
	← martianlobster1 left	23:14
	→ retnuh joined	23:15
	→ maroloccio joined	23:15
	← valgrind left	23:15
	→ johnflux joined	23:15
	← pr0ton left	23:16
	→ pr0ton joined	23:16
	← pr0ton left	23:17
	→ path[l] joined	23:17
bufferloss	LBV_User: the problem is that using online or rev list requires knowing the parent	23:17
	→ [1]cereffusion joined	23:17
bufferloss	but if the parent has diverged, it reports an incorrect number of commits	23:17
	→ pr0ton joined	23:17
	← pr0ton left	23:18
path[l]	hi, I need help with a git-bisect. During a git	23:18
	err	23:18
	During a git-bisect, is there a way to skip completely broken revisions	23:18
bufferloss	e.g. if I branch off of develop, then someone commits hot fixes to master, then others commit feature branches to develop, then the project manager rebases develop onto the master with hot fixes and I then subsequently fetch/merge my copy of develop	23:18
	if I compare my branch to develop it will report an incorrect number of commits	23:18
	e.g. I know there are 6 commits in this one branch, but rev list and online are reporting 30 commits	23:18
	→ valgrind joined	23:19
	← [1]cereffusion left	23:19
bufferloss	LBV_User, cbreak ^	23:19
cbreak	bufferloss: you need to know the parent either way	23:19
LucaS05	i've resolved ;)	23:19
cbreak	and no, the number will be correct	23:19
	→ Gavrisimo joined	23:19
bufferloss	why should I need to know the parent though	23:19
	← chrisw_ left	23:19
bufferloss	cbreak: and no, the number is not correct	23:19
cbreak	of course it's correct	23:19
LBV_User	bufferloss: wouldn't be better to you to branch develop before comiting your changes?	23:20
cbreak	it gives you the number of commits in your branch, but not in the other	23:20
bufferloss	I know the number i need, I need 6, which is how many commits I actually made	23:20
	but I'm getting 30	23:20
	← valgrind left	23:20
bufferloss	yes that's fine, but it's not the number I need	23:20
	be it "correct" or not	23:20
cbreak	bufferloss: you need to know the parent to exclude those commits	23:20
bufferloss	why should I need to exclude commits	23:20
cbreak	because you said you wanted to	23:20
	→ andrewrk joined	23:20
bufferloss	this means that it's impossible to programmatically get the number of commits if the parent branch is different than it used to be	23:20
	which is common	23:20
cbreak	sure it is	23:20
bufferloss	no I said I need to know how many commits I made to a given branch	23:20
	you're just talking about one way to arrive at that number	23:21
cbreak	bufferloss: git does not store in which branch a commit is made	23:21
	→ Zaknefain joined	23:21
bufferloss	and that way arrives at a number that is not useful nor correct for what I need and want	23:21
cbreak	bufferloss: if you make a branch off of master, then ALL commits in master are also in that branch	23:21
andrewrk	hello. at one point in time I clobbered a commit which I remember deleted a line containing the string "Typical value". It's probably in reflog somewhere but not on any branches. How can I find the commit?	23:21
cbreak	bufferloss: that's why you want to exclude those that are in master	23:21
	if you exclude those that are in master, then you only get the number of commits that are not in master.	23:21
bufferloss	i have a hard time believing that git really doesn't track which commits were committed to a given branch by name	23:21
cbreak	bufferloss: easy.	23:22
	bufferloss: then you're an idiot	23:22
bufferloss	cbreak: yes I understand the mechanics of how to get the number	23:22
	but the number is still not correct	23:22
	cbreak: wow, you're suffering from support fatigue	23:22
cbreak	bufferloss: why do you think it's not correct?	23:22
bufferloss	please ignore me and go away	23:22
	← pwnz0r left	23:22
bufferloss	you are obviously wrong, I'm sure there's a way to do this	23:22
cbreak	bufferloss: nope.	23:22
Eugene	!refund	23:22
gitinfo	If you are not satisfied with git, or the support provided by the volunteers in #git, you are entitled to a full refund of the purchase price, and are invited to use another VCS. Elsewhere.	23:22
	→ matthiaskrgr joined	23:22
cbreak	bufferloss: you're obviously an idiot	23:22
	bufferloss: if you don't know how git works, don't claim you do	23:22
	gitinfo set mode: +v	23:22
	→ Nizumzen joined	23:22
Eugene	Arguing with free support is a recipe for a quick kick, fwiw.	23:23
matthiaskrgr	is there a way to make git log only show file additions and deletions but not modifications?	23:23
bufferloss	meh, i'll just virtual ignore him	23:23
	there's gotta be a way to get this number programmatically	23:23
	→ russ_ joined	23:23
Eugene	In any case, it sounds like git-describe isn't doing what you want?	23:23
cbreak	bufferloss: I told you how	23:23
	→ morenoh149 joined	23:23
Eugene	Or you can continue to be a dick, that works.	23:23
bufferloss	cbreak: your way doesn't give me the correct number sorry	23:23
morenoh149	how would I check the last commit to a heroku git repo?	23:23
	ChanServ set mode: +o	23:23
cbreak	bufferloss: of course it does	23:23
	Eugene kicked bufferloss (END OF FILE)	23:23
morenoh149	I know that my local repo is ahead, but I don't know by how much	23:23
cbreak	morenoh149: git fetch from it	23:24
andrewrk	morenoh149, git log master..origin/master	23:24
cbreak	morenoh149: then you can use git log for example to list the commits	23:24
	Eugene changed the topic to: Welcome to #git, the place for git help and ice cream novelties \| Current stable version: 1.9.0 \| Start here: http://jk.gs/git \| Seeing "Cannot send to channel" or unable to change nick? /msg gitinfo .voice \| git-hg: Don't you know that's poison?	23:24
Dykotomee	exit	23:24
	(oops)	23:24
	← Dykotomee left	23:24
Eugene	matthiaskrgr - you mean in the diffstat? git doesn't really differentiate between them, no.	23:24
matthiaskrgr	Eugene: just found out --diff-filter also works for log :)	23:25
	I was searching for something like --log-filter :D	23:25
	→ mattp__ joined	23:25
LBV_User	if he rebased the branch he was using, he couldn't get the number he wanted?	23:25
cbreak	LBV_User: nope.	23:25
Eugene	andrewrk - man git-log; -G and -g are what you want	23:25
gitinfo	andrewrk: the git-log manpage is available at http://jk.gs/git-log.html	23:25
	→ p8952 joined	23:26
	← Zaknefain left	23:26
cbreak	LBV_User: he'd have to know the base, and then he'd get the same number still (unless commits have become redundant)	23:26
LBV_User	cbreak: thanks, it seems I don't understand yet what rebase does... time to read the manual :P	23:26
andrewrk	thanks Eugene	23:26
morenoh149	wait, so I have my heroku remote named 'heroku' so I do 'git log heroku'?	23:26
cbreak	LBV_User: !cs has some pictures	23:26
gitinfo	LBV_User: "Git for Computer Scientists" is a quick introduction to git internals for people who are not scared by phrases like Directed Acyclic Graph. http://eagain.net/articles/git-for-computer-scientists/ See also !concepts !bottomup	23:26
cbreak	morenoh149: no, git log ..heoku/branchname	23:26
Eugene	morenoh149 - no; `git log heroku/somebranch`, or an alias like !lol which is all-encompassing	23:27
gitinfo	morenoh149: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	23:27
pasky_	the way i understand it, bufferloss really does seem to have more of a problem with dealing with other people's rebases rather than knowing parents	23:27
cbreak	pasky_: nah, he's just a braindead moron.	23:27
	← kuatsure left	23:27
pasky_	(I mean, obviously he dislikes that he needs to know parents but if he is getting "30" in the second case,that seems to indicate a messed up rebase situation)	23:28
path[l]	During a git-bisect, is there a way to skip completely broken revisions, a linear search would take too long	23:28
cbreak	pasky_: he claims that he gets the wrong result despite it being perfectly valid. And he flatly refuses to show why he thinks it's wrong.	23:28
pasky_	hmm i guess i'd have to read backlog in more detail which i have no desire to ;)	23:28
	path[l]: git bisect --skip not doing what you need?	23:29
cbreak	pasky_: and then he calls me clueless because I told him that git doesn't store the branch commits are made in in a commit	23:29
Eugene	That sounds like mercurial training talking	23:30
	And see /topic :v	23:30
	→ nathancahill joined	23:30
cbreak	pasky_: I more think he just used a dot too many and got the symetric difference	23:30
	but who knows. He lacked the basic brain power to even explain his problem properly	23:31
path[l]	pasky_: aha I kept searching for the word "skip" and couldnt find it. I guess looking at the man pages has started to become the last thing I do, but in this case that was the best place to look :x. I'm mortified, thank you	23:31
	→ MattStratton joined	23:32
	← nathancahill left	23:32
	→ monokrome joined	23:32
	→ johntitor2036 joined	23:33
pasky_	path[l]: no problem :) git manpages tend to be quite helpful	23:33
	← wethu left	23:33
pasky_	(in my humble opinion, anyway)	23:33
	→ nathancahill joined	23:34
path[l]	haha	23:34
	← ntio left	23:34
	→ regreddit joined	23:35
	← regreddit left	23:35
	→ regreddit joined	23:35
	→ coderdad joined	23:35
	→ cads joined	23:36
LBV_User	the more I use git and try it's tools, the more I like it	23:38
	is it too dangerous to use rebase as a default pull action?	23:39
	MikeJ92 → zz_MikeJ92	23:39
	→ grep0r joined	23:40
	← ixian left	23:41
path[l]	no, I know several people who do that especially when working with a specific remote branch treated as "trunk"	23:41
	→ ixian joined	23:42
	→ AaronMT joined	23:42
arand__	LBV_User: It's not dangerous f you know how to recover...	23:42
	← Celm left	23:42
LBV_User	path[l]: if I have branch per feature and rebase with a common dev branch	23:44
path[l]	yeah, thats exactly the mode in which I've worked on several codebases, some quite large	23:44
LBV_User	path[l]: let's say, I rebase my feature branch, then merge it into dev	23:44
	arand__: btw, for me a "too dangerous" is some action not reversible at all	23:45
path[l]	yeah. As long as when shit hits the fan you know how to use the base commands, you're ok.	23:45
	→ chrisw_ joined	23:46
	→ JanC joined	23:46
LBV_User	what would be a bad situation for rebase? (or how can I reproduce it)?	23:47
	← morenoh149 left	23:47
	→ john2x joined	23:48
path[l]	well one example would be when you're trying to collaborate with other people on a feature. You now either need a new remote branch, or you need to pull and push from each other. If you have multiple remote branches, then you want to be careful about rewriting history on one branch and seeing a different history on a different branch	23:49
	← matthiaskrgr left	23:50
LBV_User	but assuming I'll not push the features branch to the remote repo, then shouldn't be any problems, right?	23:50
	→ hftf joined	23:50
	← hftf left	23:50
	→ hftf joined	23:50
	→ kermit joined	23:50
LucaS05	with branches, i've just found that git is the best think in the world!	23:50
skorgon	LBV_User, try following a branch using 'git pull' when the remote is rebased.	23:51
LBV_User	skorgon: that's one of the 'shit on the fan' path[l] mentioned above?	23:53
	→ agronholm joined	23:53
LBV_User	moments*	23:54
arand__	LBV_User: If you've made merges, rebasing those would make them disappear, for another example.	23:54
	← john2x left	23:54
	→ john2x joined	23:54
agronholm	I just did (@master) git rebase --onto <commit> <branch> and the end result was that most of my commits in the master branch were deleted and nothing was added to that branch	23:54
	zz_MikeJ92 → MikeJ92	23:55
LBV_User	so I would lose the features merge into the dev branch?	23:55
agronholm	but the commits that were supposed to go into that branch remain in the master branch	23:55
	can someone explain to me why this happened?	23:55
	→ kukks joined	23:55
	→ Exancillatus joined	23:55
	← kukks left	23:55
	→ kukks joined	23:55
	← LucaS05 left	23:55
	← Watabou left	23:56
	→ Watabou joined	23:56
path[l]	LBV_User: my personal rule is that I only use rebases for branches that have not been pushed remotely and are only on my machine. So I might go to master and rebase all my changes from another branch on to it and push. But if I then make FURTHER changes on the feature branch, I cannot re-rebase them (I could rebase the new commits though)	23:57
	← Leoneof left	23:58
	→ wethu joined	23:58
	→ axl_ joined	23:58
	→ CKyle joined	23:58
arand__	LBV_User: No, but you'd loose existing merge structure (unless you tell rebase to try to re-create it). E.g. all your merged feature branches get smushed into a line in the rebase.	23:59
skorgon	path[l], no, you don't rebase master, you rebase your feature branches on top of master	23:59
	← mdhopkins left	23:59
	→ Leoneof joined	23:59
skorgon	arand__, you can always use --no-ff to force a merge commit	23:59

Logs Search ←Prev date Next date→

Channels Documentation