IRCloggy #git 2015-02-14

Provider of IRC logs since 2005.

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

	2015-02-14
	→ monbro joined	00:00
	← zumba_addict left	00:00
	← fooforge left	00:00
bnb	Okay, that command went through with no problem.	00:00
	← Gama11 left	00:00
	← joki left	00:00
kadoban	rayman22201: Just your favorite paste site should be fine https://gist.github.com/ I guess if nothing else? (I forget if you need an account for that to work, but I don't think so)	00:01
_ikke_	bnb: Yeah, it's not doing very much	00:01
	← UKn0Me left	00:01
_ikke_	bnb: It's just adds a config	00:01
bnb	_ikke_: Okay, great. What do I do next?	00:02
_ikke_	git fetch <name>	00:02
	where <name> is the name you just gave	00:02
	← monbro left	00:02
bnb	Okay, it worked. Should I have the repo exactly how it is on GitHub now?	00:03
_ikke_	no\	00:03
	Now you need for example to merge one of the branches in you just fetched	00:03
	if you are on master, you could for example do: git merge upstream/master (assuming the name of the remote is upstream)	00:04
bnb	I want to use the branch `build/content-update`. Should I do that one?	00:04
_ikke_	did you call the remote build?	00:04
bnb	No.	00:04
	I called it foosh	00:04
_ikke_	are you currently on branch content-update?	00:05
bnb	Yes.	00:05
rayman22201	kadoban: I meant should I share the diff or the git log. What should I share that would be most helpful?	00:05
_ikke_	then you could do: git merge foosh/content-update	00:05
bnb	merge: foosh/content-update - not something we can merge	00:05
	→ joki joined	00:06
kadoban	rayman22201: Oh, I don't think I can tell much of anything at all except from the terminal history of whoever did the merge. That's the thing, you can't tell from the history if the merge happened automatically, or if there were conflicts that someone "resolved" in a nonsense way.	00:06
_ikke_	Does the repository you forked from have a branch called content-update?	00:06
bnb	I think there are a few commits in my branch that aren't in the upstream branch	00:06
	Yes.	00:06
	Wait	00:06
	No	00:06
	It's called build/content-update	00:06
_ikke_	oh ok	00:06
kadoban	rayman22201: You could…recreate the branches that were merged, merge them manually again and see if what happens on a well-done merge matches the original result, but that's kind of hairy.	00:06
_ikke_	then: git merge foosh/build/content-update	00:06
	← HoMM left	00:06
bnb	Already up to date ;-;	00:07
	→ yang joined	00:07
_ikke_	ok, that means it doesn't have any commits you don't have already	00:08
kadoban	rayman22201: Most of the time when I've seen merges go…badly, it tends to be someone who doesn't really quite understand the merge process, or doesn't care enough to do it correctly. Quite a few people seem to think it doesn't really matter or something and they just guess at commands until git stops complaining, which is…really bad.	00:09
bnb	That's not true.	00:10
	← FabTG_ left	00:10
bnb	I have to this commit: Merge pull request #143 from silverwind/update-others-link … at https://github.com/iojs/website/commits/master	00:10
	← Quevin_ left	00:10
bnb	Then there are like three of my commits.	00:10
rayman22201	kadoban: lol. I wouldn’t let anyone just bash away until it stops complaining. I would promptly yell profanities at them. But there may be some other misunderstanding going on.	00:11
	→ FabTG joined	00:11
	→ ojacobson joined	00:11
_ikke_	bnb: that branch you refered to is 53 commits behind master	00:12
bnb	Oh...	00:12
	One sec	00:12
	Um	00:12
	Okay	00:12
	So I can just run that command on Master and it will update?	00:12
_ikke_	That pull request has been merged in 4 days ago	00:12
bnb	Yeah	00:12
_ikke_	you could checkout master, and then merge in foosh/master	00:13
bnb	I thought you were supposed to commit to that, but I guess not.	00:13
	How do I do that?	00:13
_ikke_	commit to what?	00:13
	← thedodd left	00:14
bnb	That build/content-update branch	00:14
	← c74d left	00:14
	→ mvensky joined	00:14
	→ thedodd joined	00:14
_ikke_	Do you want to merge master into build/content-update?	00:14
	← pandeiro left	00:14
	← Mixologic left	00:14
bnb	I don't know.	00:14
	If I should.	00:15
	→ Mixologic joined	00:15
_ikke_	me neither, but it looks like it's outdated currently	00:15
bnb	Okay, I'm going to ask. I'll probably be back in a bit.	00:15
_ikke_	right	00:15
	→ kcm1700_ joined	00:15
	→ c74d joined	00:16
	← gargola left	00:16
	→ Quevin_ joined	00:17
	→ dm7freek joined	00:18
	← thedodd left	00:19
	← cbonobo left	00:19
	→ tjm_jimmy joined	00:20
	← CustosLimen left	00:20
	→ Samual_ joined	00:20
	← Samual_ left	00:20
	→ Samual_ joined	00:20
	→ cbonobo joined	00:20
	← michaelrice left	00:20
	← zacts left	00:21
	← stephen_ left	00:21
	← Samual left	00:21
	→ multi_io joined	00:22
	→ mizu_no_oto joined	00:22
	← dm7freek left	00:22
	← adamben left	00:23
	← baweaver left	00:23
	← Dougie187 left	00:23
	→ das_beard joined	00:24
	← zumba_ad_ left	00:24
	→ ottanta joined	00:25
	← multi_io_ left	00:25
	← harish left	00:26
ottanta	is there a way to have a unix directory simlink to a specific git branch, like git checkout -b <branch> --depth 1 <repodir> <destdir>	00:26
_ikke_	ottanta: Not sure if it's what you need, but there is a new-work-tree script in contrib	00:27
	→ str joined	00:28
_ikke_	git-new-workdir&	00:28
	← madtalentz left	00:28
ottanta	maybe, what I'd like is to be able to use build scripts with several branches of the same git repo, without having multiple clones of that repo to manage	00:29
	so, ideally, I'd have one git repository folder for master, one for our develop branch, etc	00:30
	→ pzl joined	00:30
	→ CustosLimen joined	00:30
ottanta	hey cool _ikke_ this looks like I could use it for what I need	00:30
	← bulletmark left	00:31
	← mostlybadfly left	00:32
	→ baweaver joined	00:32
	← PeterBooker left	00:34
ottanta	but yeah it seems like what I want is to have a directory that simply points at a different index of one git repository somewhere else on the same machine	00:34
	→ intransi_ joined	00:34
_ikke_	there is only one index in a repository	00:35
	→ mostlybadfly joined	00:35
_ikke_	and also one HEAD	00:35
	← th3fallen left	00:35
_ikke_	what this does is create a new repo, with the same refs, objects and config, but different index and HEAD	00:35
	→ thiago joined	00:35
	→ otter768 joined	00:36
	← im8bit left	00:36
	→ Sasazuka joined	00:37
	← intransit left	00:37
	→ mroach joined	00:38
ottanta	oh yeah	00:38
	cause I would need two staging areas	00:38
	cool, cool, ty	00:38
	← Literphor left	00:39
	← CustosL1men left	00:39
	← pbrobst left	00:39
	→ tristanp joined	00:39
	← ErKa left	00:39
ottanta	_ikke_ couldn't I just run two different clones then?	00:40
	→ th3fallen joined	00:40
	← otter768 left	00:40
	→ jonalmeida joined	00:41
_ikke_	sure, if you do a local file clone, all object would be shared anyway	00:41
	→ linuxmint joined	00:41
_ikke_	But this shares allmost everything that doesn't contains state for the work tree	00:41
	So if you fethch into one repo, you can use that in the other one	00:42
	← th3fallen left	00:43
	→ jalmeida joined	00:43
	← tristanp left	00:44
	← rayman22201 left	00:44
	→ pbrobst joined	00:44
	← liamkeily left	00:44
	→ liamkeily joined	00:46
	← litespeed left	00:46
	← liamkeily left	00:46
	← jonalmeida left	00:47
	← sgen left	00:47
	← anli left	00:48
	→ joeyDB_ joined	00:49
	← Ragnar left	00:50
	← Quevin_ left	00:51
	ColdKeybo[a]rd → ColdKeyboard	00:51
	← ojacobson left	00:52
	← kpease left	00:52
	← u1106 left	00:54
	→ u1106 joined	00:54
	← joeyDB_ left	00:54
	← tohuw left	00:55
	→ Motoko joined	00:56
	→ livingstn joined	00:56
	→ th3fallen joined	00:57
	→ tohuw joined	00:57
	← dan_w left	00:57
	← auuf left	00:58
	→ hexagoxel_ joined	00:59
	← th3fallen left	00:59
	← a_le left	00:59
	← cbonobo left	00:59
	→ rwio joined	00:59
	→ a_le joined	01:00
	← fstd left	01:00
	→ fstd joined	01:00
	← hexagoxel left	01:02
	← Vile left	01:03
	← sbogg left	01:04
	← githogori left	01:05
	← nfk left	01:05
	→ githogori joined	01:06
	→ ojacobson joined	01:06
	← u1106 left	01:06
	→ u1106 joined	01:07
	→ Dragooon joined	01:08
	← mvensky left	01:08
bnb	_ikke_ I found out that the branch I need to commit to is the main branch.	01:09
	← baweaver left	01:09
	← Etheco left	01:09
bnb	master*	01:09
	← Takle left	01:11
	→ Takle joined	01:11
	← EminenceHC left	01:12
	→ Entomo joined	01:12
	← arez left	01:12
	→ zumba_addict joined	01:13
	← tjm_jimmy left	01:16
bnb	_ikke_: I tried git merge foosh/master, and I got this: https://gist.github.com/bnb/2cdd5a2b809a8460f15b	01:17
	→ Etheco joined	01:17
	→ tjm_jimmy joined	01:18
	← d10n-work left	01:19
	→ ErKa joined	01:19
	← SFLimey left	01:19
	← jmpp left	01:19
	→ jmpp joined	01:20
	→ _Atom_ joined	01:20
J1G\|Anon126	bnb: !eek	01:21
gitinfo	bnb: [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, don't panic. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II	01:21
	← pzl left	01:21
	→ teran joined	01:22
	← Takle left	01:22
	← mezod left	01:23
	← nour left	01:23
bnb	Thanks J1G	01:23
	← Sasazuka left	01:23
	← akiva left	01:23
J1G\|Anon126	no problem	01:23
	← a_le left	01:24
	← teran_ left	01:24
	→ a_le joined	01:25
	→ gooda joined	01:25
	← a_le left	01:25
	← tjm_jimmy left	01:25
	→ a_le joined	01:26
	← hebz0rl left	01:26
	← a_le left	01:26
	← u1106 left	01:26
	→ u1106 joined	01:27
	→ a_le joined	01:27
	← gooda left	01:27
	← booboy left	01:28
	← jontmorehouse left	01:28
bnb	J1G: Is the part on the top of the conflict the part I got from upstream or my part? The wording on that page isn't clear to me.	01:28
	→ gooda joined	01:28
	→ studmuf joined	01:30
	→ Lyqyd joined	01:31
	→ hackvana joined	01:31
	← hackvana left	01:31
	← mmoretti left	01:31
	→ hackvana joined	01:31
	→ a_le_ joined	01:31
	← a_le left	01:32
	→ duderonomy joined	01:33
	← recycle_ left	01:33
	→ jadne joined	01:34
	→ devoldmx joined	01:36
	← King_Hual left	01:36
	→ a_le joined	01:36
	→ madtalentz joined	01:37
	← a_le_ left	01:37
	← ojacobson left	01:38
	← rns2 left	01:39
	→ kukks joined	01:40
	← kukks left	01:40
	→ kukks joined	01:40
	→ kaiten02 joined	01:40
	→ SirRetnuh joined	01:41
	→ rns2 joined	01:41
	← _Atom_ left	01:41
	→ cagedwisdom joined	01:41
	← madtalentz left	01:42
	→ madtalentz joined	01:42
	← mmitchell left	01:42
	← hackvana left	01:43
	→ mmitchell joined	01:44
	→ doct0rfoo joined	01:44
	→ harish joined	01:45
	← doct0rfoo left	01:46
	← leeN left	01:46
	← drfoo left	01:47
	← teran left	01:47
	→ ojacobson joined	01:48
	→ Ragnar joined	01:48
	→ jontmorehouse joined	01:48
	→ teran joined	01:49
	← pbrobst left	01:50
	→ joeyDB_ joined	01:50
	← ajustrun left	01:50
	← dougsland left	01:51
	→ kaiten02_ joined	01:51
	← kaiten02 left	01:51
J1G\|Anon126	bnb: oops, sorry I didn't see your message. the top part is the part from upstream	01:51
bnb	No problem, I got it solved.	01:51
	← dreiss left	01:52
	→ beckyconning_ joined	01:52
	← Dragooon left	01:53
	← lieber left	01:53
	← joeyDB_ left	01:55
	→ gwho_ joined	01:56
gwho_	how do you push an older commit to productihn without modifying any files?	01:56
	http://stackoverflow.com/questions/28511534/how-to-git-push-older-commit-to-production	01:56
	→ CKyle joined	01:57
	→ _Atom_ joined	01:57
	→ teran_ joined	01:57
	← teran left	01:58
J1G\|Anon126	gwho_: one answer mentions git bisect. you can read about that at http://git-scm.com/book/en/v2/Git-Tools-Debugging-with-Git#Binary-Search	01:59
	← robustus left	01:59
	← jontmorehouse left	01:59
	← m0ltar left	01:59
	← rns2 left	02:00
	→ robustus joined	02:00
	← rwio left	02:01
	← imachuchu left	02:02
	← jagob left	02:02
gwho_	I reverted it but the head is detached	02:02
	why is there "detached head branching" within an actual branch	02:02
	when has that "feature" ever helped anyone?	02:03
phy1729	git push origin <commit id>:branch	02:03
	→ rns2 joined	02:04
gwho_	and i don't need to switch to a different commit first?	02:04
	hexagoxel_ → hexagoxel	02:04
phy1729	nope	02:04
gwho_	I can just push an arbitrary commit with that command phy1729?	02:04
	thank you	02:05
	← devol left	02:05
phy1729	welcome	02:06
	FreezingAlt → FreezingCold	02:06
	→ dm7freek joined	02:07
gwho_	cannot be resolved because tip is behind its remote counterpart.	02:07
	→ EminenceHC joined	02:07
gwho_	man	02:08
	i git pull and it says it's ok	02:09
	but when i push it says it's not	02:09
	fuckgin	02:09
	← AAoK_ left	02:09
gwho_	moving between commits is so basic. why can't there just be one simple cmomand or click button	02:09
	if you do it wrong, u have to learn some other complicated thing just to go back	02:10
	imagine if browser forward and back buttons were like that	02:10
	→ tier joined	02:10
ojacobson	gwho_: to fully answer that requires a fair bit of theory	02:10
	and your attitude suggests you'd just curse at me	02:10
	so: "because" :)	02:10
gwho_	incorrect	02:11
	← livingstn left	02:11
gwho_	dont mistake frsutraon at the thign with insulting someone feeding you	02:11
	who woudl feed me	02:11
	← Zentdayn left	02:11
	phy1729 sits for theory lecture from ojacobson	02:11
gwho_	not allowed to express frsutration. if you do, people take it the wrong way	02:11
	such is life	02:11
	and people	02:11
ojacobson	well, alright. how's your graph theory? if I say "digraph", do you follow, or should I use a different vocabulary	02:11
	← dm7freek left	02:12
	← andi4 left	02:12
gwho_	im not very familiar	02:12
	← EminenceHC left	02:12
ojacobson	Okay.	02:12
gwho_	my complaint is mainly UX	02:12
ojacobson	Oh, Git's UX is terribad in lots of ways.	02:12
gwho_	of how to operate git	02:12
ojacobson	The thing you're trying to do is also a bad idea, but the UI doesn't make it clear why, or why you should care.	02:12
gwho_	i see	02:12
	reverting is better then	02:13
	and just push teh reverted one	02:13
ojacobson	The short version is that as long as you only ever add new commits to a branch, no additional information is needed for other users to integrate those changes into their own repositories	02:13
	but if you remove or replace commits, some additional information would be needed; git doesn't (because of reasons) store or transmit that additional data	02:13
	(in part, it'd be very hard to define well)	02:13
gwho_	i see	02:13
	kind of like migrations	02:13
ojacobson	Somewhat.	02:13
	→ m0viefreak joined	02:13
	→ chemist69_ joined	02:14
ojacobson	anyways, you can definitely create a new commit identical to a prior commit	02:14
	→ Literphor joined	02:15
ojacobson	there's a UI-awful but very reliable and terse way to do it, and a less UI-awful but verbose and awkward way to do it	02:15
	→ curiousmansi joined	02:15
ojacobson	finish whatever commit you're working on first, either way	02:15
	→ livingstn joined	02:15
gwho_	my day for 5 hours was figuring out how to do everything but actually produce code	02:17
	fml	02:17
	← chemist69 left	02:17
gwho_	tahts why i hate tesing too	02:17
Rylee	i love git because it has a small enough learning curve to get started and then from then on, you can just go deeper and deeper into the rabbit hole	02:17
	← Consuela left	02:18
	← devoldmx left	02:18
	→ Consuela joined	02:18
	← gooda left	02:18
	← mikeric left	02:19
	← Consuela left	02:19
	← Literphor left	02:19
	→ Consuela joined	02:19
	→ ajustrun joined	02:19
gwho_	I do git revert commit	02:20
	← CEnnis91 left	02:20
gwho_	but it takes me to a prompt.	02:20
	i dont know what it wants	02:20
	→ devoldmx joined	02:20
	→ s8321414 joined	02:20
gwho_	now it didn't give me the prompt.... inconsisteny fml	02:21
	← mizu_no_oto left	02:22
gwho_	sorry i wont trash teh chat anymjore.	02:22
	thanks you	02:22
	← pks left	02:22
	← _Atom_ left	02:22
	← ajustrun left	02:22
ojacobson	gwho_: 'git revert' takes a commit*, turns it into a diff, reverses that diff, applies it to HEAD, and uses the result to create a new commit	02:23
	→ ajustrun joined	02:23
ojacobson	it effectively reverses a single commit and creates a new commit out of that, even if the commit being reversed is far back in history	02:23
	→ pks joined	02:23
ojacobson	it's _probably_ not what you want	02:23
	→ watabou joined	02:24
	← curiousmansi left	02:24
	← hexagoxel left	02:24
ojacobson	you said you want to return to a prior state, effectively reversing _all_ changes since that state?	02:24
	(and keep your working tree intact; that's the easy part)	02:25
	← ktchup left	02:27
	→ enitiz joined	02:28
	→ sc0n joined	02:28
	→ Guest86565 joined	02:32
	→ _Atom_ joined	02:33
	→ shampine joined	02:33
	→ lieber joined	02:36
	← duderonomy left	02:36
	← enitiz left	02:36
	→ ktchup joined	02:36
	→ otter768 joined	02:37
	← shinnya left	02:37
	→ cbonobo_ joined	02:37
	→ lys joined	02:37
	← ErKa left	02:38
	→ trn450 joined	02:38
	→ Vampire0 joined	02:38
	← gwho_ left	02:39
	← livingstn left	02:40
	→ dreiss joined	02:41
	← Vampire0_ left	02:41
	→ CEnnis91 joined	02:41
	← otter768 left	02:41
	← haptiK left	02:42
	→ gfixler joined	02:42
	← _Atom_ left	02:42
	→ livingstn joined	02:42
	→ runev joined	02:43
	→ tbsaunde joined	02:44
	→ jonalmeida joined	02:45
	→ _Atom_ joined	02:45
	→ hackvana joined	02:46
	← hackvana left	02:46
	→ hackvana joined	02:46
	← CKyle left	02:46
	← jalmeida left	02:46
	→ duderonomy joined	02:46
	→ willharrison joined	02:46
	← hackvana left	02:47
	→ mikeric joined	02:47
	→ jalmeida joined	02:47
	← rns2 left	02:48
	← jonalmeida left	02:50
	→ joeyDB_ joined	02:51
	→ mkaesz joined	02:54
	← sc0n left	02:54
	← AciD` left	02:55
	← dreiss left	02:55
	← robert__ left	02:55
	← joeyDB_ left	02:56
	→ dreiss joined	02:56
	← u1106 left	02:56
	← a_le left	02:57
	→ u1106 joined	02:57
	← skinkitten left	02:57
	→ robert__ joined	02:58
	← runev left	02:58
	← mkaesz left	02:58
	← robert__ left	03:00
	← tieTYT2 left	03:00
	→ Redmega joined	03:03
Redmega	Hello! Does anyone have any experience with hosting a website using github?	03:04
	← beastd left	03:04
	← Sample left	03:04
phy1729	Redmega: I'd ask #github	03:04
Redmega	Oh, whoops! Thanks	03:06
	← Redmega left	03:06
	→ eletuchy_ joined	03:07
	→ Goplat joined	03:08
	→ dsdeiz joined	03:09
	← SirRetnuh left	03:09
	← eletuchy left	03:09
	← kukks left	03:09
	→ Literphor joined	03:10
	← livingstn left	03:10
	→ saint_ joined	03:11
	← u1106 left	03:12
	→ EminenceHC joined	03:12
	→ u1106 joined	03:12
	← dannymichel left	03:13
	→ a_le joined	03:16
	← a_le left	03:16
	← EminenceHC left	03:17
	→ a_le joined	03:17
	← eletuchy_ left	03:18
	→ frivol joined	03:18
	→ zhangyh26258 joined	03:18
	← zhangyh26258 left	03:19
	→ zhangyh26258 joined	03:19
	← xaa left	03:20
	→ sandr8 joined	03:20
	← Literphor left	03:20
	→ eletuchy joined	03:21
	← u1106 left	03:21
	→ SirRetnuh joined	03:21
	← SirRetnuh left	03:21
	→ u1106 joined	03:21
	→ SirRetnuh joined	03:22
	← SirRetnuh left	03:22
	→ joeyDB_ joined	03:22
	→ SirRetnuh joined	03:22
	← soreau left	03:24
	→ soreau joined	03:24
	→ drfoo joined	03:24
	← mikeric left	03:25
	← Guest48461 left	03:25
	→ enitiz joined	03:26
	→ hackvana joined	03:26
	← hackvana left	03:26
	ajustrun → ajustrun\|away	03:26
	→ hackvana joined	03:27
	← hackvana left	03:27
	← joeyDB_ left	03:27
	→ eletuchy_ joined	03:29
	← duderonomy left	03:29
	← oojacoboo left	03:29
	→ zacts joined	03:30
	→ smccarthy joined	03:30
	← eletuchy left	03:31
	← darkbasic left	03:34
	→ duderonomy joined	03:35
	→ darkbasic joined	03:35
	← jadne left	03:36
	← ktchup left	03:40
	← trn450 left	03:40
	← harish left	03:43
	→ bb010g joined	03:43
	← bnb left	03:43
	← dsdeiz left	03:45
	→ s8321414_ joined	03:46
	← s8321414 left	03:46
	→ Literphor joined	03:47
	← u1106 left	03:48
	→ CKyle joined	03:48
	→ u1106 joined	03:48
	← _Atom_ left	03:49
	→ dannymichel joined	03:50
	← u1106 left	03:52
	→ u1106 joined	03:52
	← Acidnerd left	03:54
	← jstimm left	03:55
	→ luriv_ joined	03:55
	← specious left	03:55
	→ dm7freek joined	03:56
	→ geomyidae_ joined	03:57
	← Literphor left	03:58
	← luriv left	03:58
	← dm7freek left	04:00
	→ Literphor joined	04:03
	← duderonomy left	04:03
	← s8321414_ left	04:04
	← Consuela left	04:07
	→ duderonomy joined	04:10
	← saint_ left	04:12
	← tgummerer left	04:12
	→ smw_ joined	04:12
	→ Dragooon joined	04:15
	← devoldmx left	04:16
	→ EminenceHC joined	04:16
	← u1106 left	04:17
	→ u1106 joined	04:17
	← intransi_ left	04:18
	← kadoban left	04:19
	→ bnb joined	04:19
	← Dragooon left	04:21
	← EminenceHC left	04:21
	→ joeyDB_ joined	04:23
	→ SFLimey joined	04:25
	← frivol left	04:27
	← joeyDB_ left	04:28
	← str left	04:30
	← Noldorin left	04:30
	→ dsdeiz joined	04:31
	← duderonomy left	04:32
	→ duderonomy joined	04:33
	→ diegoaguilar joined	04:34
	→ tgummerer joined	04:37
	→ otter768 joined	04:37
	← blahdodo left	04:38
	→ skorgon joined	04:40
	← skorgon left	04:40
	→ skorgon joined	04:40
	← SFLimey left	04:40
	← enitiz left	04:41
	← otter768 left	04:42
	← dreiss left	04:43
	← smw_ left	04:45
	← lindenle left	04:46
	← mmitchell left	04:47
	→ Sample joined	04:47
	← studmuf left	04:50
	→ jonalmei_ joined	04:51
	← jalmeida left	04:51
	← lys left	04:51
	← CKyle left	04:51
	→ Dragooon joined	04:52
	← SirRetnuh left	04:53
	← tier left	04:54
	← drfoo left	04:56
	→ UKn0Me joined	04:56
	← duderonomy left	04:56
	→ yohos joined	04:56
yohos	im new to git and ive been reading docs but i seriously dont know what ive just done	04:57
	i did a git status and it said i was like 2 commits behind main line	04:57
	so i did a git pull and now its done some merge commit	04:57
	→ VioletVivirand joined	04:57
yohos	but when i do a git diff theres no diff and git log doesnt show any commits beyond what i had	04:57
	wt is going on?	04:57
	← Dragooon left	04:58
	← VioletVivirand left	04:58
	← MattMaker left	04:58
	← dik_dak left	04:59
	→ Dragooon joined	04:59
	← bnb left	04:59
	← Dragooon left	05:00
	→ Dragooon joined	05:01
	→ duderonomy joined	05:01
deltab	yohos: git diff with no arguments?	05:02
yohos	yeah	05:02
deltab	that'll compare the work tree to the index	05:03
	after a merge they'll be the same	05:03
yohos	hrm	05:03
deltab	because the merged revision is checked out	05:04
	← hcc23 left	05:04
yohos	im worried some radom merging stuff is going to show up in origin now	05:04
	like i want to undo everything	05:04
	ive just done	05:04
	i have no pending/local/staged commits	05:04
skorgon	!fixup	05:04
gitinfo	So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!	05:04
deltab	but you should see the two extra commits	05:04
yohos	see them?	05:05
	in git log?	05:05
deltab	yes, I think so	05:06
yohos	ah yes i do	05:06
	i see the 2 commits i guess i was missing	05:06
	and a 3rd which is the resulting "merge" of my git pull	05:06
	thats what i want to undo	05:06
	deltab nods	05:06
	→ jstimm joined	05:06
yohos	i just dont want that merge to showup in origin when i do a push	05:07
	like i was just trying to "update" to latest	05:07
	im from svn world still :x	05:07
	→ shinnya joined	05:07
	→ Tommy[D]_ joined	05:07
deltab	you could, if you want, rebase your change	05:07
	→ Fakeboost joined	05:08
	→ alekks joined	05:09
deltab	that is, turn your changes into patches and apply them to the current state of origin/master instead of where you branched off earlier	05:09
	← Sample left	05:09
yohos	ah so origin doesnt have my change	05:09
deltab	that way there's no merge commit	05:09
yohos	thats the reason this is such a clusterfuck	05:09
deltab	yes, your changes are local until you push them elsewhere, or they pull	05:10
	← duderonomy left	05:10
	→ pacon joined	05:10
	← Tommy[D] left	05:10
	← madewokherd left	05:11
yohos	fuck so i shoulda rebased	05:11
	i wa really just trying to see what had changed	05:11
	→ Consuela joined	05:11
deltab	you have your very own repo	05:11
	→ MattMaker joined	05:11
yohos	if i leave that merge and then later push/pull	05:12
	will they see it in the origin timeline?	05:12
deltab	if you don't want to merge remote changes into your branch, use git fetch -v instead of pull	05:12
	yes	05:12
	← ghormoon left	05:12
yohos	hrm whats the fetch do?	05:12
deltab	connects to the remote and gets the objects yours doesn't have	05:13
	← Fakeboost left	05:13
deltab	as well as updating your remote-tracking branchs	05:13
	← alekks left	05:13
deltab	git branch -av will show the branches you have, local and remote	05:13
	← willharrison left	05:14
yohos	yeah i just wanted to see the commits i didnt have	05:14
	because i guess git log is just my local repos	05:14
deltab	pull is basically fetch then merge	05:14
yohos	hrm	05:14
	so pull would just bring the files down?	05:14
	er fetch	05:14
deltab	yes, without changing your local branches	05:15
yohos	hrm but doesnt it update my files with the changes from origin?	05:15
deltab	then you can use git diff origin etc.	05:15
yohos	hthat link you posted	05:17
	itll let me back out this merge ?	05:17
	and pull?	05:17
deltab	hmm, do you mean the objects in the object store, or the work tree files, or something else	05:17
	that was skorgon	05:17
yohos	hrm i wish i knew	05:18
deltab	sure, you can back out the merge	05:18
yohos	like ive got through gitscm and the codeschool git course	05:18
	stillf ucking lost	05:18
	i dont know how people can say git is esay	05:18
	its a mindfuck	05:18
	→ GT4066 joined	05:18
deltab	people say that?	05:18
ojacobson	git's simple	05:18
	by which I mean	05:18
yohos	that was the feeling i got	05:18
	like "learn it over lunch"	05:18
	← u1106 left	05:18
yohos	mentality	05:18
ojacobson	git exports a lot of complexity to the user, so that the _implementation_ is simple	05:19
deltab	simple in that there are few concepts	05:19
yohos	like you can google git undo and reset and theres like no clear answers	05:19
ojacobson	yeah	05:19
	git's UI is implementation-focussed (and not very good in other ways), not task-focussed	05:19
	→ u1106 joined	05:19
	← MattMaker left	05:19
	→ madewokherd joined	05:20
ojacobson	can you describe your problem in terms of "I did X a few Ys ago, and I wish I hadn't. I wish I'd done Z, instead"?	05:20
	We can probably approximate it for you	05:20
	← dannymichel left	05:21
deltab	aiui, yohos pulled from origin but only intended to see what was different	05:21
yohos	i was doing git status on my local repos and it said i was 2 out of sync with origin/mainline..so i thought oh neat i wanna see what the changes are so i did a git pul	05:21
	and now i have a merge commit locally	05:21
	that i dont want to push up into origin ever	05:21
ojacobson	'git pull' is shorthand	05:21
yohos	i had a git commit in local thats not in mainline yet	05:21
	awaiting CR	05:21
ojacobson	'git pull' is shorthand for 'git fetch' followed by 'git merge @{upstream}'	05:22
	(@{upstream} is a revision notation for the current branch's configured upstream branch)	05:22
	← muricula left	05:23
ojacobson	so, in one sense, you (unwittingly, and with the best of intentions) asked for a merge	05:23
	the real question is, what did you _mean_ to do?	05:23
	You have diverging local changes in your repo	05:23
	← beckyconning_ left	05:23
	→ joeyDB_ joined	05:23
yohos	yeah i guess i wanted to see what the commits were that i was missing	05:24
ojacobson	You might find the visualization in !lol interesting, then	05:24
gitinfo	A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	05:24
yohos	i wanted to really see who/commit-mesages	05:24
ojacobson	if you can read line diagrams in text, anyways :)	05:24
yohos	heh	05:24
ojacobson	'git fetch' would have downloaded the commits without merging them	05:24
yohos	so now i have no idea how to undo the result of my git pull	05:24
ojacobson	Incidentally, can you pastebin/gist the output of that command?	05:24
yohos	so i can go back and do something beyond git pull	05:25
	negative	05:25
ojacobson	And, in the diagram, can you point out which commit your branch should have been on, had you not merged?	05:25
yohos	like look at that command statement	05:25
	its ridicououls	05:25
	are those like common use cases	05:25
ojacobson	_assuming your work tree is clean_ and 'git status' shows no committed or uncommitted changes you care about, some variation on 'git reset' will get you back to where you want	05:25
	ugh do not get me started	05:25
	→ Fakeboost joined	05:25
ojacobson	my advice on 'git pull' is actually just "don't" :)	05:26
yohos	yeah lesson learned	05:26
	your speaking to a svn update long time vet	05:26
ojacobson	when you have enough experience with git to argue with me, you'll also have enough experience with git to make it do the right thing	05:26
yohos	so stuck in my ways for now :p	05:26
deltab	git fetch -v instead	05:26
ojacobson	(the problem is that "the right thing" is heavily workflow-dependent, and git has no workflow support as such)	05:26
yohos	oh -v ofc	05:26
Motoko	git pull isn't bad if you know exactly what you're doing.	05:26
ojacobson	Motoko: I believe that's what I said, yes :)	05:27
Motoko	And what it will be doing.	05:27
deltab	for verbose, so it tells you more	05:27
yohos	yeah i guess its just easy to see that many from svn land are going to look for an svn update equivalent	05:27
ojacobson	yeah	05:27
Motoko	Indeed.	05:27
ojacobson	'svn update' is a silent merge	05:27
	← kaiten02_ left	05:27
yohos	fair enough	05:27
Motoko	Subversion has a very different concept of flows.	05:28
yohos	so im still not clear on git fetch -v	05:28
ojacobson	_for most workflows_ 'git pull --rebase' _can_ be similar, but don't do that, either: do the underlying pieces, instead	05:28
	('git fetch' and 'git rebase' :)	05:28
	→ harish joined	05:28
ojacobson	and, well, rebase is complex enough that you should probably not just blindly use it, either	05:28
	(sorry!)	05:28
	← joeyDB_ left	05:28
yohos	hah i have heard of rebease	05:28
	→ dannymichel joined	05:28
yohos	but yeah git definitely has this deer in headlights effect when you run a cmd	05:28
	for newbs	05:28
	like i hae no idea what state im in	05:29
	now	05:29
ojacobson	'svn update' ... mostly ... converts your uncommitted changes to a diff and discards them, snaps your work tree to the newest commit on your branch, and then reapplies the diff, yes?	05:29
yohos	yeah	05:29
ojacobson	(so effectively your changes are preserved, but against a new baseline)	05:29
yohos	if no merge issues your golden	05:29
ojacobson	there's not a lot of ways to do that in git	05:29
	commit your changes _before_ integrating upstream work.	05:29
Motoko	rebase?	05:29
ojacobson	'git rebase' will do a similar thing _to commits_, but not to uncommitted changes (and it'll just quit without doing anything if you have uncommitted changes)	05:29
Motoko	Ideally, you should work on a different branch from the upstream name so you can rebase on top of it often.	05:29
	ojacobson, I usually use stash for holding uncommitted work.	05:30
yohos	yeah it seems no mattter how small your change is you should just throw it on a branch	05:30
	to avoid this shit	05:30
ojacobson	yep	05:30
	branch early, often, and aggressively	05:30
	git provides a lot of branch-manipulation tools	05:30
Motoko	Branches are cheap in git, so use them.	05:30
ojacobson	a branch-ful of bullshit commits with 'derp!' messages can still be turned into something nicer before you send it on to others	05:30
	← mikecmpbll left	05:31
Motoko	Yeah. I'll rebase a lot, even to merge commits together.	05:31
yohos	ok so seeing ive committted some changes, did a pull, did a silent merge	05:31
Motoko	Before I push.	05:31
yohos	withoutt a branch	05:31
	can i get to that golden path?	05:31
ojacobson	yep	05:31
	does 'git reflog <your branch name>' print the commit message for the commit you _should_ be on next to any of the lines? In particular, is it next to <your branch name>@{1} ?	05:32
yohos	im not on a branch	05:32
	im on mainline	05:32
	or is that ok?	05:32
ojacobson	the only time you're "not on a branch" is when 'git status' says something about "detached HEAD".	05:32
	'master' is a branch.	05:33
	← gitinfo left	05:33
yohos	yeahs wasnt sure if you thought i was on a branch branch	05:33
	:p	05:33
ojacobson	:)	05:33
deltab	git branch -v	05:33
	← jast left	05:33
ojacobson	I know what you meant, but it'll help you make sense of git's UI, I hope	05:33
yohos	i have no idea what that output is telling me	05:33
deltab	it's listing the branches you have	05:34
	the current one has * next to it	05:34
yohos	yeah all i hae is 1	05:34
	→ gitinfo joined	05:34
	ChanServ set mode: +o	05:34
yohos	because i never knew that not creating branches	05:34
	resulted in such a shitstorm	05:34
ojacobson	heh	05:35
	it gets better	05:35
	← madewokherd left	05:35
ojacobson	_your_ 'master' and _origin's_ 'master' are actually independent branches, as far as git's concerned	05:35
	any relationship between them, no matter how important, is in your mind... except for upstream relationships. Go figure. :)	05:35
yohos	like all i have is a 5 revion local repos	05:35
deltab	git remote -av	05:35
yohos	i cloned	05:36
ojacobson	anyways, enough theory	05:36
yohos	then i did a git pull i guess some days ago not realizing it would show up	05:36
ojacobson	does 'git reflog <your branch name>' print the commit message for the commit you _should_ be on next to any of the lines? In particular, is it next to <your branch name>@{1} ?	05:36
deltab	with -a, it includes the remote-tracking branches too	05:36
ojacobson	oh it was days ago, great, good times :)	05:36
yohos	hha	05:36
	nono	05:36
	it was another git pull i think	05:36
ojacobson	this gon' be fun to fix up, especially since you refuse to show anyone any output :)	05:36
yohos	it says pull: Fast-forward	05:36
	i dont know what that pull was	05:36
	probably me even more naively issuing a git pull	05:36
ojacobson	ugh you have encountered yet more modal behaviour in git's UI, sorry	05:36
yohos	then is my real commit	05:37
	← zacts left	05:37
yohos	then theres a blank line	05:37
	no idea	05:37
	and then head@{0} pull: Merge made by the recursive strategy	05:37
	which resulted from me issuing that git pull	05:37
ojacobson	'head'?	05:37
yohos	head@{2} is my commit	05:37
	er sorry	05:37
	mainline@{2{	05:37
	like i gues is all i want when i eventually do a git push is my clear misunderstanding of git going to show up in origin	05:38
	as a result of this mess in my local repos	05:38
	for what should have been a singular commit	05:38
	→ Sample joined	05:39
ojacobson	mm	05:39
yohos	thats all i want to fix	05:39
ojacobson	what's mainline@{1} ?	05:39
yohos	its a blank line	05:39
	:x	05:39
ojacobson	neat	05:39
	is mainline currently checked out?	05:39
yohos	git reflog mainline	05:39
	that sthe cmd right?	05:39
ojacobson	Yep.	05:39
yohos	is mainline currently checked out	05:40
	will i cloned from it	05:40
	is that a yes/	05:40
	mainline@{4} is the clone	05:40
deltab	what does git branch show the * next to?	05:40
ojacobson	If you type 'git branch', is mainline the one marked with a star? :)	05:40
yohos	mainline	05:40
	yes	05:40
ojacobson	Yes, then :)	05:40
	ok.	05:40
yohos	its the onlly one listed	05:40
	ive never branched :D	05:40
ojacobson	I'm going to do this the less-destructive way	05:40
yohos	remember	05:40
	thats why were in this ess :p	05:40
ojacobson	there is a shorter way, but I want to make sure I don't fuck up your repo for you :)	05:40
yohos	yeah thats how i feel	05:40
ojacobson	'git checkout -b mainline-before-pull mainline@{1}'	05:41
yohos	like i gtet shit fucked and i feel like im walking on eggshells	05:41
ojacobson	to decompose that: checkout (and create) the branch "mainline-before-pull", using mainline@{1} (from git-reflog, it'll parse that for you) to figure out where to start the branch	05:41
	the _only_ thing that'll do is create a new branch at an existing commit	05:41
	(and check it out)	05:41
	if that turns out to be the wrong commit, we can delete the branch and try again pretty easily.	05:42
yohos	yeah i have no idea what that change is	05:42
	can i see the diff of that ?	05:42
ojacobson	'git show mainline-before-pull' will give you commit message and patch	05:42
	→ madewokherd joined	05:42
ojacobson	'git log mainline-before-pull' will give you history	05:42
yohos	yeah i mean before i do the checkout	05:42
ojacobson	So do I	05:42
	oh	05:42
	replace 'mainline-before-pull' with 'mainline@{1}' above, then	05:42
yohos	k	05:43
ojacobson	(to git, all revision expressions are more or less interchangeable.)	05:43
yohos	its my commit	05:43
ojacobson	(branch names? fine. reflog expressions? same thing. bare commit hashes? okeydoke.)	05:43
	neat.	05:43
yohos	but so is mainline@{2}	05:43
ojacobson	That can happen.	05:43
yohos	so i have no idea wht athat change is	05:43
	btu its just a log	05:43
ojacobson	The reflog sometimes over-records things	05:43
yohos	is ther ea diff of files?	05:43
ojacobson	yep	05:44
yohos	sweet	05:44
ojacobson	'git diff mainline@{1} mainline@{2}'	05:44
	unsurprisingly :)	05:44
	the reflog is a local history (more like an undo buffer, really, in a lot of ways) of how each _local_ branch has evolved over time	05:44
yohos	blank	05:44
ojacobson	it tracks things like rebases, merges, resets etc. that would otherwise destroy data	05:44
yohos	maybe our review tool made it	05:44
ojacobson	'git log' is what most people think of as the history of a branch: it's the list of commits on that branch _right now).	05:44
	← mroach left	05:45
	→ dm7freek joined	05:45
ojacobson	maybe they're the same commit	05:45
	if you 'git show' the two commits, do they have the same hash at the top?	05:45
	→ hackvana joined	05:45
	← hackvana left	05:45
	→ hackvana joined	05:45
yohos	n	05:46
	o	05:46
	:o	05:46
	→ lindenle joined	05:46
ojacobson	neat	05:47
yohos	is that normal	05:47
ojacobson	well, there are a few ways to get commits with identical contents in git	05:47
	git-rebase is spectacularly good at creating them; git-merge does it sometimes, too	05:47
	in both cases it's normal	05:47
	if you don't have a good reason to prefer one over the other, 'mainline@{1}' will be the state of mainline _immediately_ before the merge 'git pull' created.	05:48
	← bb010g left	05:48
	← u1106 left	05:48
	← spyroboy left	05:48
ojacobson	A "good reason" would be subjective, but if you have one, it'll stand out in 'git show'	05:48
	→ kaiten02 joined	05:48
	→ u1106 joined	05:48
yohos	ill keep the empty mainline@{2}	05:48
	→ Vadimus joined	05:49
	← dm7freek left	05:49
ojacobson	Having said I'd do it the safer, wordier way, I'm actually inclined to show you the faster, slightly more destructive way	05:50
	since you've done all the investigation you'd have to do the safer way, already :)	05:50
	you're still on mainline, correct?	05:50
	→ michaelrice joined	05:50
ojacobson	(I say "destructive"; what I mean is "if you screw up and don't notice quickly enough, you can lose commits. If you screw up, you can _irreversibly_ lose uncommited changes.")	05:51
	← lindenle left	05:51
yohos	yeah i get how serous it is	05:51
	thats why im here	05:51
	deer in headlights et al	05:51
	:p	05:51
	yeah	05:51
	← jonalmei_ left	05:52
	→ zumba_ad_ joined	05:52
ojacobson	So, _given_ that you know you want mainline@{2} back as mainline, and _given_ that 'git status' says you have no committed changes	05:52
	← Err404NotFound left	05:52
ojacobson	'git reset --hard mainline{2}' should get you what you want.	05:53
	er	05:53
	'git reset --hard mainline@{2}' should get you what you want.	05:53
	(note that this will add a new reflog entry, so it'll only work once. After that you'll have to look at the reflog again to see how the numbering changes. :)	05:53
	← Vadimus left	05:53
hmsimha	go	05:53
	oops	05:54
yohos	hrm	05:54
	nice :D	05:54
	← Sample left	05:54
yohos	nice i see - so reflog knows the madness that happened	05:55
ojacobson	yeah	05:55
yohos	and i imagine i could go forward if i wanted too?	05:55
	← adamellsworth left	05:55
ojacobson	no, only backwards	05:55
	but "going backwards" adds new entries, rather than deleting existing ones	05:55
yohos	yeah s always ar=olling forward	05:55
ojacobson	if you iteratively run 'git reset --hard mainline@{1}', git will happily switch back and forth between two commits	05:55
deltab	yohos: you mean re-instating the merge?	05:55
	← zumba_addict left	05:56
	→ TheNet joined	05:56
ojacobson	the reflog is a _purely local_ tool, it's not part of git's idea of a branch's history	05:56
	but it is useful for backing out whoopsies of various sorts	05:56
yohos	yeah i guess deltab	05:56
ojacobson	it's also purged after a few weeks so	05:56
yohos	yeah	05:56
	what really	05:56
	auto?	05:56
ojacobson	Reflog entries fall off the end, yeah	05:56
	it's not a versioning tool. 'git log' is that.	05:57
yohos	oh sure ok so it has a max entries	05:57
ojacobson	the reflog is mostly meant for manipulating local, unpublished changes, not for project history	05:57
yohos	i thought i twas litereally time based	05:57
deltab	reflog is like the history in a browser	05:57
ojacobson	no, literally time-based	05:57
yohos	hah wow	05:57
	even if i make no more commits	05:57
	or do anything	05:57
ojacobson	even if	05:57
	if you run _no_ git commands obviously nothing happens to the reflog	05:58
	but anything that might trigger gc (which is a lot of things) will do it, as will anything that writes reflog entries	05:58
yohos	will thats what i mean	05:58
	ah	05:58
	← Dragooon left	05:58
yohos	sorry whats the best way to check where im at aagain	05:58
	i want to doucblecheck this	05:58
	→ adamellsworth joined	05:58
ojacobson	!lol	05:58
gitinfo	A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	05:58
	← cagedwisdom left	05:59
	→ Dragooon joined	05:59
yohos	it lists mine as backup/mainline	05:59
	is that because im on local repos?	05:59
	→ cagedwisdom joined	06:00
deltab	you have a remote called backup?	06:01
	→ zacts joined	06:01
	← dsdeiz left	06:01
	← zhangyh26258 left	06:01
yohos	yep	06:02
	maybe thats where iour review tool posts	06:02
ojacobson	'git log --decorate' annotates commits with _every_ label it can find for them	06:02
	if two branches are set to the same commit, 'git log' will include both names	06:02
yohos	like hwat is the best way to read about git	06:02
	→ MattMaker joined	06:03
yohos	like i read the cmds and everything makes sense	06:03
ojacobson	(commits, as far as git is concerned, don't have any single "true" branch: they're "on' every branch pointing to them or pointing to anything after them)	06:03
	I've found !concepts to be pretty good	06:03
gitinfo	"Git Concepts Simplified" explains the basic structures used by git, which is very helpful for understanding its concepts. http://gitolite.com/gcs.html	06:03
ojacobson	it's kind of an implementation-upwards expanation but it's thorough without being too detailed	06:03
	→ zhangyh26258 joined	06:03
yohos	its all the mysery in how they are supposed to be combined to produced a meaningful workflow	06:03
	tnx	06:03
ojacobson	heh	06:04
	well	06:04
	that won't help that, then	06:04
	there's a crap ton of workflow documents out there for git, covering everything from purely local practices (I make terrible, terrible branches, for example, and clean them up after) to whole-project conventions	06:05
	!sausage !workflow	06:05
gitinfo	[!sausage_making] Some developers like to "hide the sausage making", transforming their commits before presenting them to the outside world. See http://sethrobertson.github.com/GitBestPractices/#sausage and !perfect	06:05
	Finding the right workflow for you is critical for the success of any SCM project. Git is very flexible with respect to workflow. See http://sethrobertson.github.com/GitBestPractices/#workflow for a list of references about choosing branching and distributed workflows.	06:05
ojacobson	that covers a bunch of it	06:05
yohos	hhah	06:05
	cool thanks	06:05
ojacobson	git-flow and github-flow are relatively widespread; keep in mind they're _conventions_, not rules, though	06:05
	(personally I find git-flow a bit finnicky around develop/master/production, and use fewer branches)	06:06
	→ blahdodo joined	06:08
yohos	ha	06:08
ojacobson	(I also don't have nvie's specific set of needs, so:)	06:08
	anyways, read sitaram's concepts guide, it'll give you a handle on what various commands are _doing_ in a way that will at least let you diagnose your own mistakes :)	06:09
	← Fakeboost left	06:09
	← blahdodo left	06:10
	← michaelrice left	06:12
	→ beautifulmind joined	06:12
	← D-Boy left	06:12
	← yohos left	06:14
	→ dsdeiz joined	06:18
	→ EminenceHC joined	06:19
	→ chiemseesurfer joined	06:20
	← hackvana left	06:20
	→ duderonomy joined	06:20
	← _W_ left	06:21
	→ mroach joined	06:23
	← Polyatomic left	06:23
	← EminenceHC left	06:24
	← pheaver left	06:24
	→ joeyDB_ joined	06:24
	← dsdeiz left	06:25
	← johtso left	06:26
	→ bramgg joined	06:27
	← u1106 left	06:27
	→ u1106 joined	06:28
	← elbeardmorez left	06:28
	← mroach left	06:28
	→ mroach joined	06:29
	← joeyDB_ left	06:29
	→ myyst joined	06:30
	→ jceb_ joined	06:30
	← bramgg left	06:30
	→ D-Boy joined	06:31
	← u1106 left	06:32
	→ u1106 joined	06:32
	← myst left	06:33
	→ a_le_ joined	06:33
	→ Sample joined	06:34
	← chiemseesurfer left	06:34
	← myyst left	06:34
	→ Error404NotFound joined	06:35
	→ snearch joined	06:35
	→ myyst joined	06:35
	← a_le left	06:36
	→ bramgg joined	06:37
	← cagedwisdom left	06:37
	← snearch left	06:37
	← texasmynsted left	06:38
	→ snearch joined	06:38
bramgg	Ugh, I want to add all files possible that aren't staged for commit, but because one of the files is ignored by my .gitignore file (on purpose) I get a fatal error, and no files are added. How can I do "git add *" and just let it ignore the files it's supposed to ignore while adding the others?	06:38
	→ otter768 joined	06:38
bramgg	Basically I added said file to my .gitignore because I thought I could then conveniently run "git add *" without having to specifically remove it after	06:39
	→ kadoban joined	06:40
	← otter768 left	06:43
	← hvxgr left	06:44
	← u1106 left	06:45
	→ u1106 joined	06:46
	← cbonobo_ left	06:46
comps	bramgg: hmm, does "git add ." work?	06:47
bramgg	comps: yup! Are you a wizard -_-	06:49
comps	yes	06:50
	:)	06:50
bramgg	:p	06:51
	comps: really though, just to improve on my terrible git knowledge, what's the difference between "*" and "."?	06:51
	Or is it just that..	06:52
	← snearch left	06:52
	← CustosLimen left	06:52
comps	IIRC gitignore works for most ways of staging changes, except when adding the files directly by name	06:52
	"git add ." is the standard way of wildcarding "add everything"	06:52
	→ CustosLimen joined	06:52
comps	when you type "git add *" though, the asterisk gets expanded by bash, calling git-add with the file names explicitly	06:53
	hence ignoring gitignore	06:53
bramgg	ah, cool. thanks!	06:53
	← Error404NotFound left	06:53
	← Lyqyd left	06:54
	→ Polyatomic joined	06:54
kadoban	comps: I don't think that's quite right, but the result is the same. If you directly specify (or use shell globs, which to git looks the same), it will fail with a message if some of those are ignored, unless you -f I believe. Which means you still don't want to do that, but it'll error out at least, not just silently discard your .gitignore	06:55
	→ cagedwisdom joined	06:56
comps	kadoban: that may be true, I haven't touched that functionality since v1.5 or so :)	06:56
	→ Error404NotFound joined	06:56
comps	and git has gotten much more "user friendly" since then	06:56
	→ michaelrice joined	06:57
kadoban	Ah, yeah it's quite possible it's changed in between	06:57
	→ Sadeukko joined	06:58
	← Sadeukko left	06:58
	← jceb_ left	07:00
	→ jceb joined	07:01
	→ EminenceHC joined	07:03
	← Motoko left	07:03
	→ _W_ joined	07:03
	→ pacon2 joined	07:04
	← ToAruShiroiNeko left	07:04
	← DSH105 left	07:04
	→ bb010g joined	07:04
	← shampine left	07:05
	← tohuw left	07:06
	← pacon left	07:06
	← michaelrice left	07:06
	→ tohuw joined	07:06
	← beautifulmind left	07:07
	← Sample left	07:07
	→ shampine joined	07:07
	→ DSH105 joined	07:07
	← minerale_ left	07:07
	← shampine left	07:07
	← EminenceHC left	07:07
	← ajustrun\|away left	07:07
	← jceb left	07:07
	← adamellsworth left	07:07
	← dansmith_ left	07:08
	← Entomo left	07:08
	→ trig-ger joined	07:08
	→ shampine joined	07:08
	← shampine left	07:08
	→ Sadeukko joined	07:08
	→ minerale joined	07:08
	→ Entomo joined	07:08
	→ dansmith_btc joined	07:09
	→ shampine joined	07:09
	← shampine left	07:09
	→ ToAruShiroiNeko joined	07:09
	← ToAruShiroiNeko left	07:09
	→ shampine joined	07:09
	← shampine left	07:09
	→ ToAruShiroiNeko joined	07:10
	→ ajustrun joined	07:10
	← ToAruShiroiNeko left	07:10
	→ epifanio joined	07:10
	→ shampine joined	07:10
	← shampine left	07:10
	→ ToAruShiroiNeko joined	07:10
	← ToAruShiroiNeko left	07:11
	→ shampine joined	07:11
	← shampine left	07:11
	← das_beard left	07:11
	→ shampine joined	07:12
	← shampine left	07:12
	→ irqq joined	07:12
	→ shampine joined	07:12
	→ The_Phoenix joined	07:12
	← shampine left	07:12
	→ shampine joined	07:13
	← shampine left	07:13
	→ shampine joined	07:14
	← shampine left	07:14
	→ ToAruShiroiNeko joined	07:14
	→ shampine joined	07:15
	← duderonomy left	07:15
	← shampine left	07:15
	← bhldev__ left	07:15
	→ bhldev joined	07:15
	→ shampine joined	07:15
	← shampine left	07:15
	→ Maniqui joined	07:16
	→ shampine joined	07:16
	← shampine left	07:16
	← ajustrun left	07:16
	→ shampine joined	07:17
	← shampine left	07:17
	→ shampine joined	07:18
	← shampine left	07:18
	→ netj_ joined	07:18
	→ FabTG_ joined	07:18
	→ javawizard joined	07:18
	→ shampine joined	07:18
	← shampine left	07:18
	→ snearch joined	07:19
	→ Dreamer3__ joined	07:19
	→ shampine joined	07:19
	← shampine left	07:19
	→ himikov joined	07:20
	→ shampine joined	07:20
	← shampine left	07:20
	→ OMGOMG_ joined	07:20
	→ Corey_ joined	07:20
	→ aboccia_ joined	07:21
	→ _W joined	07:21
	← Dreamer3 left	07:21
	→ David_____ joined	07:21
	← David left	07:21
	David_____ → David	07:21
	← jongravois left	07:22
	← snearch left	07:22
	→ Pieter__ joined	07:22
	→ jongravois joined	07:22
	→ hvxgr joined	07:23
	→ _Atom_ joined	07:25
	→ JPT_ joined	07:25
	← diegoaguilar left	07:25
	→ joeyDB_ joined	07:25
	← vlovgr left	07:25
	→ sokoll- joined	07:26
	← netj left	07:26
	← Mannequin left	07:26
	→ kyledr_ joined	07:26
	→ nikio__ joined	07:26
	← jongravois left	07:27
	← Gamecubic left	07:27
	→ sgen_ joined	07:27
	→ gagan662_ joined	07:27
	← _W_ left	07:28
	← kaiten02 left	07:28
	← chemist69_ left	07:28
	← FabTG left	07:28
	← joki left	07:28
	← toothrot left	07:28
	← ColdKeyboard left	07:28
	← Arsonide left	07:28
	← ItSANgo_ left	07:28
	← himikof left	07:28
	← drodger left	07:28
	← salamanderrake left	07:28
	← bipolar_ left	07:28
	← kyledr left	07:28
	← JPT left	07:28
	← ValicekB left	07:28
	← gagan662 left	07:28
	← srcerer left	07:28
	← Generator_ left	07:28
	← jcp left	07:28
	← jab416171 left	07:28
	← aboccia left	07:28
	← r00tWearsRedHats left	07:28
	← Corey left	07:28
	← sokoll left	07:28
	← Pieter left	07:28
	← OMGOMG left	07:28
	← doobi-sham-95717 left	07:28
	← osfe left	07:28
	← j416 left	07:28
	← timoxley left	07:28
	→ ValicekB_ joined	07:28
	← sgen_ left	07:28
	→ doobi-sham-95717 joined	07:28
	← Vgr left	07:29
	← joeyDB_ left	07:30
	← lid_ left	07:30
	← whoami left	07:30
	→ drodger joined	07:30
	← doobi-sham left	07:31
	← doobi-sham-95717 left	07:31
	→ JohnBat26 joined	07:31
	← JohnBat26 left	07:31
	→ ColdKeyboard joined	07:31
	← cagedwisdom left	07:32
	→ Vgr joined	07:32
	→ srcerer joined	07:32
	ValicekB_ → ValicekB	07:33
	→ salamanderrake joined	07:33
	→ whoami joined	07:33
	→ sgen_ joined	07:33
	← whoami left	07:33
	→ whoami joined	07:33
	→ dm7freek joined	07:33
	← u1106 left	07:34
	→ u1106 joined	07:34
	← Ragnar left	07:34
	→ bipolar joined	07:35
	→ doobi-sham-95717 joined	07:35
	→ jab416171 joined	07:35
	→ timoxley joined	07:35
	→ kaiten02 joined	07:35
	→ joki joined	07:35
	→ ItSANgo_ joined	07:35
	→ Generator_ joined	07:35
	→ r00tWearsRedHats joined	07:35
	→ osfe joined	07:35
	← doobi-sham-95717 left	07:36
	← kaiten02 left	07:36
	← jab416171 left	07:36
	→ pantsman- joined	07:36
	→ Arsonide joined	07:36
	→ j416 joined	07:36
	→ jab416171 joined	07:36
	→ kaiten02 joined	07:37
	→ anbz joined	07:37
	← geomyidae_ left	07:38
	← dm7freek left	07:38
	← _Atom_ left	07:38
	← u1106 left	07:39
	→ u1106 joined	07:39
	← pacon2 left	07:43
	→ cagedwisdom joined	07:45
	← Vgr left	07:46
	← TheNet left	07:46
	→ dreiss joined	07:47
	→ mmitchell joined	07:48
	← madewokherd left	07:48
	→ txzf joined	07:48
	→ Vgr joined	07:48
	← Vgr left	07:48
	→ Vgr joined	07:48
	← dreiss left	07:48
	← linuxmint left	07:48
	← txzf left	07:48
	→ dreiss joined	07:49
	→ netcarver joined	07:49
	→ chemist69_ joined	07:49
	→ Bwpl joined	07:49
	← Bwpl left	07:50
	→ reai joined	07:51
	← reai left	07:51
	← mmitchell left	07:52
	→ zyak joined	07:52
	← zyak left	07:52
	→ aeoo joined	07:54
	← ValicekB left	07:56
	→ leolrrj joined	07:58
	← Vgr left	08:00
	← cagedwisdom left	08:00
	← Goplat left	08:01
	→ Vgr joined	08:01
	→ d4ryus_ joined	08:01
	→ Takle joined	08:02
	→ nikio___ joined	08:02
	← GT4066 left	08:03
	← leolrrj left	08:03
	→ ValicekB joined	08:03
	← d4ryus left	08:04
	← netcarver left	08:06
	← Takle left	08:07
	← zhangyh26258 left	08:08
	← apurcell left	08:08
	← Vgr left	08:11
	→ Sample joined	08:12
	→ Vgr joined	08:12
	← Vgr left	08:12
	→ Vgr joined	08:12
	← tohuw left	08:12
	→ petersr joined	08:14
	→ leolrrj joined	08:15
	→ Takle joined	08:15
	← kaiten02 left	08:15
	→ blahdodo joined	08:17
	→ settermjd joined	08:17
	← blahdodo left	08:19
	← faheem_ left	08:20
	← leolrrj left	08:22
	← polyzen left	08:23
	→ blahdodo joined	08:24
	→ EminenceHC joined	08:24
	← settermjd left	08:24
	→ zhangyh26258 joined	08:25
	← dreiss left	08:26
	← blahdodo left	08:26
	→ joeyDB_ joined	08:26
	← EminenceHC left	08:28
	→ blahdodo joined	08:29
	← joeyDB_ left	08:30
	→ darkbasic_ joined	08:31
	→ mezod joined	08:31
	← darkbasic left	08:32
	← jstimm left	08:33
	→ lindenle joined	08:36
	← blahdodo left	08:38
	→ polyzen joined	08:38
	→ otter768 joined	08:39
	← lindenle left	08:40
	→ blahdodo joined	08:41
	→ nnyk_ joined	08:43
	← thiago left	08:43
	← otter768 left	08:44
	← mezod left	08:45
	→ dm7freek joined	08:49
	→ Vile joined	08:50
	→ liamkeily joined	08:51
	← blahdodo left	08:53
	→ jagob joined	08:53
	→ PeterBooker joined	08:54
	→ blahdodo joined	08:56
flavi0	hey there. i asked yesterday already but wasn't quite able to finish/test it. so i have those two local commits to master. there is my own origin github repo and the upstream github repo. the changes have not yet been pushed to origin. in upstream there was a commit in between. i would like to skip the merge commit in either direction and use rebasing instead. now how would i exactly go about this?	08:57
	→ ev_ joined	08:58
	→ Kicer86 joined	08:59
	→ kyc0816 joined	08:59
kyc0816	hh	09:00
flavi0	osse yesterday proposed to do git rebase origin/master, but i don't really get how this would work. will this, like push-rebase my local commits onto origin/master?	09:01
	→ JohnBat26 joined	09:02
	→ hellolittle joined	09:02
	→ luriv joined	09:05
	→ haptiK joined	09:07
	→ lamont joined	09:07
	← Zarthus left	09:07
	→ autochthon joined	09:07
kyc0816	I'm doing the tutorial on gitimmersion.com (on lab15), and does staging change the location of the HEAD? (+ does HEAD point to all my works that are not committed/staged)?	09:08
	← haptiK left	09:08
	→ jongravois joined	09:10
	← Literphor left	09:10
	→ runev joined	09:11
	← liamkeily left	09:11
	← luriv_ left	09:11
	← hellolittle left	09:12
kadoban	kyc0816: No, staging doesn't change HEAD. HEAD points to an actual commit	09:14
	← jongravois left	09:15
	← Sample left	09:17
	→ rendar joined	09:18
	← Sleepy63 left	09:19
	← JohnBat26 left	09:22
kyc0816	@kadoban Thanks that helped me get by : )	09:23
kadoban	:)	09:23
	← skylite left	09:23
	→ joeyDB_ joined	09:27
	→ anli joined	09:28
	→ Zarthus joined	09:30
	← joeyDB_ left	09:32
	→ Sleepy63 joined	09:32
	→ skylite joined	09:32
	→ ZujkisNx joined	09:32
	→ EminenceHC joined	09:32
	→ PragCypher joined	09:33
	→ liamkeily joined	09:34
flavi0	ok reading man git-rebase helped..	09:34
gitinfo	the git-rebase manpage is available at http://jk.gs/git-rebase.html	09:34
	← MechtiIde left	09:34
	← runev left	09:35
	← EminenceHC left	09:37
	→ CustosL1men joined	09:38
	← nnyk_ left	09:38
	→ Zoddo joined	09:40
	← aeoo left	09:42
	→ IIT joined	09:42
	→ elbeardmorez joined	09:42
	← IIT left	09:43
	→ Kauh joined	09:44
	← Kauh left	09:45
	→ fidn joined	09:45
	→ cdown joined	09:46
	→ govg joined	09:47
	← fidn left	09:47
	→ Err404NotFound joined	09:48
	← Err404NotFound left	09:48
	→ Err404NotFound joined	09:48
	← Error404NotFound left	09:48
	→ gerea joined	09:48
	← gerea left	09:49
	← cdown left	09:49
	→ Xoea joined	09:49
flavi0	if i do not use topic branches but commit to master always, will a github upstream be able to selectively merge my commits? or is that cumbersome and he would have to cherrypick or something, so rather use isolated topic branches?	09:51
	← Xoea left	09:52
	→ Eloz joined	09:53
	← Eloz left	09:53
	→ Aivm joined	09:54
	→ HelloShitty joined	09:54
	← Aivm left	09:54
Seveas	flavi0: if you use pull requests, you should use one branch per request	09:55
	→ oozs joined	09:55
	→ m8 joined	09:55
	→ cagedwisdom joined	09:56
flavi0	Seveas: ok that's what i thought, really got to get used to actually doing so. thanks!	09:56
	→ jatt joined	09:59
	← jatt left	09:59
	→ jatt joined	09:59
	← jatt left	10:00
	→ skylite_ joined	10:00
	→ jatt joined	10:00
	← jatt left	10:00
	→ jatt joined	10:00
	← kyc0816 left	10:01
osse	flavi0: this is what I meant https://github.com/Osse/git-stuff/blob/master/origin-master.txt#L26-L29	10:01
	← Takle left	10:01
	← skylite left	10:02
	← bramgg left	10:03
flavi0	osse: ahh yep, got it now, hopefully :)	10:03
	← epifanio left	10:05
	→ stick-shift joined	10:07
	← MLM left	10:07
	← PragCypher left	10:08
	→ PragCypher joined	10:08
	→ Takle joined	10:08
	→ tanuck joined	10:09
	← PragCypher left	10:09
	→ PragCypher joined	10:10
	→ AAoK joined	10:11
	→ WaReZ joined	10:11
flavi0	hmm ok.. if upstream is supposed to easily merge my topic branches, they may only depend on commits which are actually in upstream. so i should not branch off my local master (which has all my changes let's say, even when upstream rejected them), but rather checkout upstream/master and branch off that for each topic branch, then issue pull request and merge into my local master? would that be the clean way to go about this?	10:14
Seveas	flavi0: correct	10:15
	→ svteoi joined	10:15
	← AAoK left	10:15
flavi0	Seveas: sweet. exploring the powers of git just now :)	10:15
Seveas	also, if two branches depend on each other, don't file a pull request for the second until the first has been merged, otherwise it gets confusing :)	10:16
	← oozs left	10:16
flavi0	Seveas: yeah that's kinda how i came thinking about this. because wanted to start using a topic branch now but that already depends on my current master of course.. i could fix that by checking out the commit already in upstream and branch from that right?	10:17
	← PragCypher left	10:17
Seveas	yes	10:17
flavi0	just great, really... but still takes me to wrap my head around.	10:18
	→ ayg joined	10:18
	→ lahwran joined	10:19
	→ theme2 joined	10:19
	← CEnnis91 left	10:20
	→ duper joined	10:20
	← zhangyh26258 left	10:21
	→ AAoK joined	10:21
	← nikio__ left	10:25
	← nikio___ left	10:25
	→ lindenle joined	10:25
	← jatt left	10:26
	→ okanck joined	10:26
	← catsup left	10:27
	→ catsup joined	10:27
	← MattMaker left	10:27
	→ joeyDB_ joined	10:27
	← catsup left	10:28
	→ fooforge joined	10:29
	→ catsup joined	10:29
	← lindenle left	10:29
	→ freestyl3r joined	10:31
	→ zhangyh26258 joined	10:32
	← joeyDB_ left	10:32
	→ hardenedapple joined	10:32
	← catsup left	10:34
	← fooforge left	10:34
	→ michelangelo joined	10:35
	→ heroux joined	10:35
	→ catsup joined	10:35
	→ EminenceHC joined	10:36
	← stick-shift left	10:36
	→ Sound joined	10:37
	← donmichelangelo left	10:38
	← u1106 left	10:38
	→ drfoo joined	10:39
	→ u1106 joined	10:39
	← catsup left	10:40
	→ otter768 joined	10:40
	→ Amandil joined	10:40
	→ catsup joined	10:40
	← EminenceHC left	10:41
	→ jceb joined	10:41
	→ PragCypher joined	10:41
	→ Gizburdt joined	10:43
	→ basiclaser joined	10:44
	→ randiman joined	10:45
	← otter768 left	10:45
	← catsup left	10:46
	→ catsup joined	10:46
	→ faheem_ joined	10:48
	→ xaa joined	10:48
	← catsup left	10:51
	← ZujkisNx left	10:51
	→ catsup joined	10:52
	→ stick-shift joined	10:54
	→ jatt joined	10:55
	← jatt left	10:55
	→ jatt joined	10:55
	→ Gama11 joined	10:56
	→ IIT joined	10:56
	← catsup left	10:57
	→ catsup joined	10:57
	→ twoface88 joined	10:58
	← twoface88 left	10:58
	→ jongravois joined	10:59
	→ andi4 joined	11:00
	← catsup left	11:02
	→ HoMM joined	11:02
	→ catsup joined	11:03
	← jongravois left	11:04
	← tanuck left	11:04
	← theme2 left	11:05
	→ wicope joined	11:07
	← NBhosting left	11:07
	← catsup left	11:08
	→ catsup joined	11:08
	→ pandeiro joined	11:10
	← jceb left	11:10
	← skorgon left	11:12
	← catsup left	11:13
	→ catsup joined	11:14
	→ jongravois joined	11:15
	← pantsman- left	11:16
	← Dragooon left	11:17
	← randiman left	11:17
	→ Dragooon joined	11:18
	→ cdown joined	11:18
	→ giusef joined	11:19
	← catsup left	11:19
	← Dragooon left	11:19
	→ catsup joined	11:19
	→ King_Hual joined	11:20
	← stick-shift left	11:20
	→ dsirijus joined	11:20
	← dsirijus left	11:21
	← cagedwisdom left	11:21
	← catsup left	11:25
	← Polyatomic left	11:25
	→ catsup joined	11:25
	→ nfk joined	11:25
	→ rap joined	11:25
	→ tens0r joined	11:26
	→ Dragooon joined	11:27
	→ stick-shift joined	11:27
	→ RaceCondition joined	11:27
	→ joeyDB_ joined	11:28
	← andi4 left	11:30
	← Terens left	11:30
	← catsup left	11:30
	→ catsup joined	11:30
	← drfoo left	11:31
	← stick-shift left	11:32
	← joeyDB_ left	11:33
	← cdown left	11:33
	→ jiku joined	11:33
	← kcj left	11:34
	← Guest56020 left	11:34
	← catsup left	11:35
	→ catsup joined	11:36
	→ gv joined	11:36
	gv → Guest43744	11:36
	→ EminenceHC joined	11:38
	← HelloShitty left	11:38
	→ Nizumzen joined	11:38
	← nfk left	11:39
	→ cagedwisdom joined	11:40
	→ nnyk_ joined	11:41
	→ Dexter245 joined	11:41
	→ arez joined	11:42
	← EminenceHC left	11:43
	← Dexter24 left	11:43
	← tens0r left	11:46
	← RaceCondition left	11:47
	→ gagalicious joined	11:48
	← warthog9 left	11:49
	← CustosL1men left	11:49
	← eletuchy_ left	11:49
	← mroach left	11:49
gagalicious	how can i checkout everything regardless of overwriting current files and without deleting a single file?	11:50
	i did "git init; git add .; git commit -m 'everything'"; now would like to "restore everything and overwrite the directory and not delete a single file?"	11:51
	i would also like to make sure it doesnt throw errors... i mean i would like to force it	11:52
	← tgummerer left	11:53
	→ tgummerer joined	11:53
	← PragCypher left	11:54
bremner	gagalicious: what exactly do you want to restore? you have one commit, so the logical answer is go back to pre-init stat?	11:54
	← svteoi left	11:55
gagalicious	oh i figured out... but the problem is... how do i checkout the directories with the right user permission and user group?	11:55
bremner	gagalicious: git obeys umask, but otherwise only cares about the executable bit.	11:55
gagalicious	when i checkout, it checkouted as root coz i logined as roog	11:56
	root	11:56
kadoban	gagalicious: …so don't do that then	11:56
gagalicious	...	11:56
	← Vile left	11:57
	← jason237 left	11:58
	→ jost joined	11:58
bremner	what is your goal in logging in as root to perform git operations?	11:58
	or is that just a mistake that needs to be fixed?	11:59
	→ dougsland joined	11:59
gagalicious	a mistake	11:59
	fixed ... i re did chowned everything and ... oh well... that does it	12:00
	← anli left	12:01
	→ HelloShitty joined	12:02
	← watabou left	12:02
	→ eletuchy joined	12:03
	← jatt left	12:03
	→ gdhaworth joined	12:04
	→ Terens joined	12:05
	← Terens left	12:05
	→ Terens joined	12:05
	→ Domhack joined	12:05
	← robbyoconnor left	12:06
	← nnyk_ left	12:07
	→ nnyk_ joined	12:08
	← liamkeily left	12:09
	← Arsonide left	12:09
	← tgummerer left	12:11
	← zhangyh26258 left	12:11
	← cagedwisdom left	12:11
	← ap0c left	12:11
	→ tens0r joined	12:13
	← gdhaworth left	12:14
	← polyzen left	12:16
	→ zhangyh26258 joined	12:16
	← kadoban left	12:19
	← u1106 left	12:19
	→ u1106 joined	12:19
	← tens0r left	12:20
	→ tens0r joined	12:20
	← zhangyh26258 left	12:21
	← gfixler left	12:23
	→ cagedwisdom joined	12:24
	→ [gmi] joined	12:24
	← ayg left	12:28
	← Dragooon left	12:29
	→ ahf joined	12:29
	→ joeyDB_ joined	12:29
	→ endiruna joined	12:29
ahf	Heya. I'd like to make "git show" run "git show --foo". I tried adding an alias in my ~/.gitconfig for "show = show --foo", but that doesn't seem to do the track. Any hints?	12:29
	← tens0r left	12:31
	← cagedwisdom left	12:32
	→ mkhkz joined	12:32
	← u1106 left	12:32
	→ u1106 joined	12:32
	← mkhkz left	12:33
	→ CustosL1men joined	12:33
	→ nzef joined	12:33
	← joeyDB_ left	12:34
	← ToAruShiroiNeko left	12:34
	→ zhangyh26258 joined	12:34
bremner	you can't alias build in commands	12:34
	if you _must_ you can make a wrapper script.	12:34
	→ jadne joined	12:34
	← nnyk_ left	12:35
	← anbz left	12:36
	← zhangyh26258 left	12:36
	→ zhangyh26258 joined	12:36
	→ JargonNode joined	12:37
	→ s8321414 joined	12:39
	→ ToAruShiroiNeko joined	12:40
	← ToAruShiroiNeko left	12:40
	→ ToAruShiroiNeko joined	12:40
	→ warthog9 joined	12:40
	← ToAruShiroiNeko left	12:41
	→ ToAruShiroiNeko joined	12:41
	→ otter768 joined	12:41
	← u1106 left	12:44
	→ u1106 joined	12:44
	→ haptiK joined	12:44
	← warthog9 left	12:45
deltab	ahf: is the option something that can be set in git-config?	12:45
	← CustosLimen left	12:46
	→ JagaJaga joined	12:46
	← otter768 left	12:46
ahf	deltab: couldn't find it. i wanted --show-signatures to show and log	12:46
	← haptiK left	12:46
	→ anbz joined	12:46
	→ CustosLimen joined	12:49
	→ warthog9 joined	12:50
	→ nnyk_ joined	12:50
	← HelloShitty left	12:51
	→ zadock joined	12:51
	← jadne left	12:52
	← anbz left	12:52
	→ doev joined	12:53
	← IIT left	12:53
	→ shuaib joined	12:56
	→ KaitoDaumoto joined	12:56
	→ jstimm joined	12:58
	← Gizburdt left	12:58
	→ daedeloth joined	12:59
	← fstd left	13:00
	→ GT4066 joined	13:00
	→ fstd joined	13:00
	← giusef left	13:01
	← nzef left	13:02
	← Nizumzen left	13:02
	→ npzv joined	13:03
	→ Nizumzen joined	13:05
	→ e^0 joined	13:06
	e^0 → Guest62239	13:06
	← Guest62239 left	13:07
	→ ktchup joined	13:09
	← btree left	13:09
	→ e^0_ joined	13:09
	→ Akagi201 joined	13:10
	→ joel_falcou joined	13:10
	→ lys joined	13:10
	← Takle left	13:10
	→ jatt joined	13:12
	← jatt left	13:12
	→ jatt joined	13:12
	→ anli joined	13:14
	← wicope left	13:16
	→ tritone joined	13:20
	← e^0_ left	13:21
	← ToAruShiroiNeko left	13:22
	→ ToAruShiroiNeko joined	13:23
	→ dprophit joined	13:23
	← ToAruShiroiNeko left	13:24
	→ ToAruShiroiNeko joined	13:24
	→ stick-shift joined	13:25
dprophit	If I create a bare repository that mirrors from elsewhere and the bare repo is the production site and production is a CMS or cart, do I have to add a gitignore file to ignore locations that continue to add say images, etc?	13:25
	→ tgummerer joined	13:27
	→ leeN joined	13:29
	← jatt left	13:30
	→ joeyDB_ joined	13:30
	← u1106 left	13:33
	→ jatt joined	13:33
	→ u1106 joined	13:33
	← jatt left	13:33
	→ jatt joined	13:33
	→ ZujkisNx joined	13:35
	← joeyDB_ left	13:35
	← shift8 left	13:36
	← jiku left	13:36
	→ jatt` joined	13:36
moritz	dprophit: how can a bare repo be the production site?	13:37
	← jatt` left	13:37
	← jatt left	13:37
moritz	dprophit: doesn't the web server need the actual files?	13:37
	→ jatt joined	13:37
	← jatt left	13:37
	→ jatt joined	13:37
	→ EminenceHC joined	13:41
	→ lindenle joined	13:45
	→ shift8 joined	13:45
	← EminenceHC left	13:46
	← stick-shift left	13:47
	→ Shusshu joined	13:47
	← Shusshu left	13:48
	→ rns2 joined	13:49
	← lindenle left	13:49
	myyst → myst	13:50
	→ gooda joined	13:51
	→ Acidnerd joined	13:51
	← u1106 left	13:53
	← Sound left	13:53
	→ u1106 joined	13:53
	← jatt left	13:53
	← npzv left	13:58
	→ jatt joined	13:58
	← jatt left	13:58
	→ jatt joined	13:58
	→ jele joined	13:59
	← jele left	13:59
	→ HelloShitty joined	14:00
	→ Qke joined	14:02
	→ Joel_ joined	14:02
	→ jadne joined	14:02
	Joel_ → Guest74204	14:02
	← Qke left	14:03
	← ToAruShiroiNeko left	14:03
	→ MrRoot joined	14:03
	← MrRoot left	14:03
	← Guest74204 left	14:03
	→ MrRoot joined	14:04
	← ktchup left	14:04
	→ Ozuu joined	14:04
	→ Joel__ joined	14:04
	→ skasturi joined	14:05
	← shuaib left	14:05
	← joel_falcou left	14:05
	Joel__ → joel_falcou	14:06
	← u1106 left	14:07
	← Dexter245 left	14:07
	→ u1106 joined	14:07
	← netameta left	14:08
	→ ktchup joined	14:09
	← s8321414 left	14:09
	← Ozuu left	14:10
	← jatt left	14:11
	→ Xreq joined	14:11
	→ Takle joined	14:11
	← Xreq left	14:11
	→ Deit joined	14:13
	→ hexagoxel joined	14:13
	← ktchup left	14:13
	← u1106 left	14:14
	← ev_ left	14:14
	→ PCatinean joined	14:14
	→ u1106 joined	14:14
	→ netcarver joined	14:16
Vgr	is there a way to show the history from a certain point up until now? I know I can do it with dates but I don't know how to do it with commit hashes	14:16
	← Takle left	14:16
flavi0	Vgr: git log <hash>..	14:17
	→ mkaesz joined	14:17
Vgr	oh, wasn't aware you could do that. thanks!	14:17
flavi0	yw	14:18
Vgr	oh, this isn't what I want	14:18
	← mkaesz left	14:18
Vgr	this shows me history from and before that point; I want it from and after that point	14:18
	← skasturi left	14:22
flavi0	Vgr: the .. was to be taken literally	14:22
	→ skasturi joined	14:22
flavi0	Vgr: actually that includes not the commit itself, so you might do git log <hash>^.. instead	14:23
	Vgr: ^ meaning the parent of that commit	14:23
	→ Vile joined	14:24
	← Akagi201 left	14:24
	→ Vadimus joined	14:25
	→ devll joined	14:25
flavi0	Vgr: or, if you're on master git log <hash>^..master or for the current branch git log <hash>^..HEAD	14:25
	or rather, current state of head, should also work for 'detached head', not corresponding to a branch	14:26
	→ Gizburdt joined	14:26
	→ sword``` joined	14:27
	→ enitiz joined	14:27
	→ mizu_no_oto joined	14:28
	→ CEnnis91 joined	14:28
	→ jatt joined	14:29
	← sword`` left	14:29
	← jatt left	14:29
	→ jatt joined	14:29
	→ pierre1_ joined	14:29
	→ xk_id joined	14:30
	← xk_id left	14:31
	→ joeyDB_ joined	14:31
moritz	newer git versions seem to print "Checking connectivity... done." at the end of a 'git clone'	14:31
	what's that about?	14:31
	→ litespeed joined	14:32
	→ zivester joined	14:33
	→ iamjarvo joined	14:33
	→ epifanio joined	14:33
	← staafl left	14:34
	← joeyDB_ left	14:35
	→ sburgess joined	14:35
	← sburgess left	14:36
	→ two-gun joined	14:37
	→ staafl joined	14:37
	← doev left	14:38
	← iamjarvo left	14:40
two-gun	afternoon all. i'm very new to git (so probs doing it wrong) i'm testing a very simple local mamp setup. i make a change in my code on a branch but when i toggle between the branches and refresh my webpage the change is not picked up. i can see the change in the code and i've tried deleting my cache but no change. btw i am not pushing the code anywhere it is not connected to a repos. i'm just committing it? does	14:40
	anyone know what i'm doing wrong? thanks	14:40
osse	two-gun: Does your web server serve the location of your repo directly?	14:41
	← freestyl3r left	14:42
two-gun	i think so...	14:42
	→ otter768 joined	14:42
two-gun	my site is ~/sites/website/	14:42
	← netcarver left	14:42
two-gun	and i have git @ ~/sites/website/.git	14:43
	← HoMM left	14:43
two-gun	but maybe i dont have a repo? i have not pushed this anywhere, it's not on github or anything. do i have to push it somewhere (say my raspberry pi NAS) for it to work?	14:44
	← lieber left	14:44
osse	What is the change in the code? You use git checkout to switch branches right? What does git status say?	14:44
Vgr	flavi0: thanks, will do! sorry for late reply, had to go afk	14:44
	→ EminenceHC joined	14:44
osse	No. No need to push anything anywhere if your web server is local also	14:44
two-gun	yes it picks up the change fine. i'm changing the name fontsize in css from 16px to 30px	14:44
	sorry it picks it up fine in the code but the change is not served to my web browser	14:45
	→ smw_ joined	14:45
	→ netcarver joined	14:46
	← otter768 left	14:46
	→ HoMM joined	14:47
	← HoMM left	14:47
	→ HoMM joined	14:47
	← HoMM left	14:47
	→ metastableB joined	14:47
	→ HoMM joined	14:47
	← HoMM left	14:47
	→ HoMM joined	14:47
	← HoMM left	14:47
	← okanck left	14:47
	→ HoMM joined	14:48
	← HoMM left	14:48
two-gun	so currently i am on master branch with name size of 16px but the browser shows me a name font size of 30px which is from my branch edit	14:48
	→ HoMM joined	14:48
	← pierre1_ left	14:48
	← HoMM left	14:48
	→ HoMM joined	14:48
	Guest32888 → mricon	14:48
two-gun	i figured if i checkout a different branch that would be the edit that my mamp server serves?	14:48
Vgr	two-gun: did you commit your changes before checking out? just making sure	14:49
	← EminenceHC left	14:49
two-gun	Vgr: ok, 1 sec...	14:49
	→ CheckDavid joined	14:49
Vgr	uncommited changes carry over between checkouts	14:50
	only commits are connected to a branch. file changes are not	14:50
	→ phos1 joined	14:50
	→ Guest5041 joined	14:50
	→ lsiv568 joined	14:51
	← JEEB left	14:51
	← HoMM left	14:52
	→ ejb joined	14:52
	← mricon left	14:53
two-gun	Vgr: i just triple checked this. it is not the problem. i'm now currently in my master branch but when i refresh my browser i can only see the edits from my 'branch-test' branch.	14:53
	if i switch branches. i still have the same results in the browser	14:54
Vgr	you did not answer my question	14:54
	did you commit your changes?	14:54
	← anli left	14:55
ejb	Hi, I want to take over a github issue/PR gone stale: https://github.com/twbs/ratchet/pull/558. It's stated that the PR needs to be rebased and squashed. Should I clone the patch author's repo first then merge in the official repo? Or start with the official repo and merge in the patch repo?	14:55
	→ snearch joined	14:55
_ikke_	Doesn't really matter	14:56
	← jatt left	14:56
two-gun	Vgr: i did commit my changes. but now my moment of BLUSH i was in the wrong bloddy directory. sorry to waste your time. thanks for you help!	14:57
Vgr	no prob	14:57
	← flavi0 left	14:57
	→ jatt joined	14:57
Vgr	glad you figured it out	14:57
	:)	14:57
two-gun	osse: seems i was in the wrong directory! mega blush thanks for your help	14:57
	← jatt left	14:57
	→ jatt joined	14:57
	← zhangyh26258 left	14:58
	→ Akagi201 joined	14:58
	→ APerson_ joined	14:58
	← troyt left	15:00
	gitinfo set mode: +v	15:00
	→ JEEB joined	15:01
	→ garfixas joined	15:01
	← garfixas left	15:01
	→ irqq_ joined	15:02
	← irqq left	15:03
	irqq_ → irqq	15:03
	→ troyt joined	15:03
	→ ktchup joined	15:03
	→ MLM joined	15:05
	← GT4066 left	15:07
	→ DaisyTheCow joined	15:08
	← DaisyTheCow left	15:08
	← King_Hual left	15:08
	← JEEB left	15:09
	← lsiv568 left	15:11
	← Deit left	15:11
	← Gizburdt left	15:12
	← Nizumzen left	15:12
	→ Yttc joined	15:13
ejb	_ikke_: Do I add the patch repo as another remote to pull it in? ( assuming I clone the official repo first )	15:14
	← Yttc left	15:14
	← shinnya left	15:14
	← endiruna left	15:14
	→ dfa joined	15:15
	→ endiruna joined	15:15
_ikke_	yes	15:16
	→ _Atom_ joined	15:16
qsuscs	you could also download the patch and am it, if you want	15:16
	→ Takle joined	15:16
	→ BuenGenio joined	15:16
	→ adamben joined	15:17
	← adamben left	15:17
	→ adamben joined	15:17
	← litespeed left	15:18
	← snearch left	15:18
	→ dsdeiz joined	15:20
	← phos1 left	15:20
	→ Dougie187 joined	15:20
	→ Ratler joined	15:20
	← Takle left	15:21
	→ Sam-T joined	15:21
	← Sam-T left	15:21
	→ Sam-T joined	15:21
	→ netameta joined	15:22
	→ epifanio_ joined	15:22
	← epifanio left	15:22
	epifanio_ → epifanio	15:22
	← vmiklos left	15:23
ejb	qsuscs: am it?	15:25
	→ vmiklos joined	15:25
qsuscs	ejb: nvm, just fetch the repo. i meant man git am	15:25
gitinfo	ejb: the git-am manpage is available at http://jk.gs/git-am.html	15:25
_ikke_	stands for apply mailbox	15:26
ejb	qsuscs: ok, that's what I've done. Added as remote, fetch, branch, checkout. So not I need to rebase? And how can I test the patch using their travis ci setup? Never used that	15:26
_ikke_	iirc	15:26
qsuscs	yes ikke	15:27
_ikke_	ejb: You need to send a pull request, it will automatically trigger a test build	15:27
ejb	_ikke_: Ok, but first I can rebase and make sure that it plays nice with the latest code from the official repo?	15:27
_ikke_	right	15:30
	← zadock left	15:30
	→ Jackneill joined	15:31
	← adamben left	15:31
	→ joeyDB_ joined	15:31
ejb	Shoot. Just tried to do an interactive rebase but none of the commits were listed... tried to quit but it says that it rebased. Can I undo that?	15:32
	← metastableB left	15:32
_ikke_	Did it actually rebase something/	15:32
	(and yes, it can be undone)	15:32
ejb	_ikke_: unknown. I did git reset --hard ORIG_HEAD	15:33
	→ adamben joined	15:33
	← dfa left	15:33
_ikke_	I guess that should work (I've never used ORIG_HEAD)	15:33
	→ jottr joined	15:33
ejb	Here's how I'm trying to rebase: 1) git merge-base file_protocol_push_js patch 2) git rebase --interactive HASH	15:34
_ikke_	why are you manually calculating the merge-base?	15:34
	← ZujkisNx left	15:34
ejb	_ikke_: oh maybe this is called squashing? I'm folling a guide. How do you do it?	15:34
_ikke_	rebasing on merge base is a noop if I understand it correctly	15:34
ejb	_ikke_: it said noop in there, yeah	15:35
	→ Aagat joined	15:35
	→ incredible joined	15:35
_ikke_	git rebase <branch-to-rebase-on> <branch-to-rebase>	15:35
	Do you need it to be interactive?	15:35
ejb	so probably git rebase origin/master patch/the_patch ?	15:36
	no	15:36
	← joeyDB_ left	15:36
_ikke_	right. And the last argument is optional if you are already on that branch	15:36
	← Aagat left	15:36
ejb	_ikke_: ok	15:36
	→ Lancien joined	15:37
ejb	_ikke_: ok, up to date. How about squashing the patch?	15:37
	→ Gamecubic joined	15:37
	→ tfwe joined	15:37
	→ Gamecubic_ joined	15:37
_ikke_	Why do you want / need to squash it?	15:37
	→ Solid1 joined	15:37
	← tfwe left	15:38
ejb	_ikke_: it was requested by the maintainers	15:38
_ikke_	Ok	15:38
	← enitiz left	15:38
_ikke_	Then you do need the interactive rebase, indeed	15:38
	→ Ofw joined	15:38
	→ jgardella joined	15:40
ejb	_ikke_: So I undid the rebase and tried with -i for interactive but there aren't any commits listed?	15:40
_ikke_	You probably used the wrong branches to calculate the merge base	15:41
	→ Noldorin joined	15:41
ejb	I just did git rebase -i origin/master	15:41
_ikke_	and on what branch are you currently?	15:41
ejb	the_patch	15:42
	← Solid1 left	15:42
	→ petersr_ joined	15:42
	→ enitiz joined	15:42
_ikke_	what does git log --oneline origin/master.. \| wc -l return?	15:43
	← petersr_ left	15:43
	← jstimm left	15:43
	→ doev joined	15:43
	← Jackneill left	15:44
ejb	_ikke_: just a sec. I don't see the changes from the_patch in my files.	15:45
	_ikke_: I did git fetch patch	15:46
	_ikke_: git checkout the_patch	15:46
_ikke_	ejb: git fetch takes a remote, not a branch	15:46
	(git fetch <remote> <refspec>)	15:46
ejb	_ikke_: then looked for the changes in the files and they aren't there	15:46
	_ikke_: yeah, sorry that is a remote	15:46
	poor naming	15:46
_ikke_	ok then	15:46
	did the branch the_patch already exist in the repo before you checked it out?	15:47
	→ FabTG joined	15:47
	→ jstimm joined	15:47
ejb	not in my local repo	15:47
	I'll start over.	15:47
	← jottr left	15:48
	← chemist69_ left	15:48
_ikke_	No need to	15:48
	Would be educational to find out why you don't see what you expect	15:48
	→ cbonobo joined	15:49
	→ jottr joined	15:49
	→ nnyk joined	15:50
	← _Atom_ left	15:50
	← nnyk_ left	15:50
ejb	_ikke_: hm, well I started over and now I see the changes. I think the difference was: git fetch patch, git checkout the_patch, git fetch	15:51
	the second fetch	15:51
	← mizu_no_oto left	15:51
	← HelloShitty left	15:51
	← cbonobo left	15:52
_ikke_	That doesn't even make sense	15:52
	→ mizu_no_oto joined	15:52
	→ barduck joined	15:52
_ikke_	(I recall stumbling upon similar things when I started to use git)	15:53
	← mizu_no_oto left	15:53
	→ nnyk_ joined	15:53
	← rap left	15:53
	→ ErKa joined	15:53
ejb	_ikke_: hah, well, I'm back to the rebase / squash.	15:53
	_ikke_: I see the commits now in interactive mode. I changed all but the first to squash	15:53
	→ metastableB joined	15:54
_ikke_	Do you need the commit messages from all of the commits?	15:54
	→ iamjarvo joined	15:54
_ikke_	otherwise, use fixup	15:54
ejb	nah	15:54
	← nnyk left	15:54
	← barduck left	15:55
	← Ofw left	15:55
ejb	noted. But I used squash and then got an error that the first commit could not be applied	15:55
	→ barduck joined	15:56
	→ lkgf joined	15:56
ejb	_ikke_: so is this where I need to actually resolve the code issue?	15:56
	← gooda left	15:57
	← Lancien left	15:57
	← barduck left	15:58
	← hesco left	15:58
	→ barduck joined	15:58
_ikke_	Did you rebase onto origin/master?	16:00
	Then, yes, you should fix the conflicts	16:01
	← barduck left	16:01
	→ barduck joined	16:01
	← JagaJaga left	16:02
	→ hcc23 joined	16:02
	← barduck left	16:03
	→ ev_ joined	16:04
ejb	_ikke_: oy. more problems. I fixed the conflict. git add js/push.js. git rebase --continue. All good. But somehow my conflict resolution didn't stay? The two conflicting code blocks are still in js/push.js	16:04
	← jottr left	16:04
	→ barduck joined	16:04
ejb	_ikke_: git status doesn't show any outstanding changes in js/push.js	16:05
_ikke_	ejb: I think in this case, it's easier to first do the squash, and then rebase it onto origin/master	16:05
	← Err404NotFound left	16:05
ejb	_ikke_: isn't it one step?	16:05
	← iamjarvo left	16:06
_ikke_	You can do it in one step, or two	16:06
	basically, squashing multiple commits into one is one step, moving that commit onto another branch is another step	16:07
	← barduck left	16:07
	← u1106 left	16:07
ejb	_ikke_: Ok, so does git rebase -i origin/master patch/the_patch do that?	16:07
	→ Zifre joined	16:07
	→ u1106 joined	16:07
	→ barduck joined	16:08
	← rns2 left	16:08
	→ Nizumzen joined	16:08
_ikke_	ejb: git rebase -i $(git merge-base origin/master patch/the_patch)	16:08
	← dannymichel left	16:09
ejb	While on the_patch branch?	16:09
	← barduck left	16:10
	→ chemist69 joined	16:10
_ikke_	yes	16:10
	→ barduck joined	16:10
ejb	_ikke_: Ok, success.	16:11
	→ gooda joined	16:11
	← cbreak left	16:11
ejb	_ikke_: Now it needs to be merged into origin/mater?	16:11
	→ anli joined	16:12
	→ hesco joined	16:12
_ikke_	No, you should rebase it on master, upstream will do the merge through a pull request	16:13
	→ cavallari joined	16:13
_ikke_	(the rebase is, like you said, to be sure the patch applies onto the newest code)	16:13
	→ Zifre_ joined	16:13
	→ Takle joined	16:14
	← jost left	16:14
	← Gitzilla left	16:14
	← enitiz left	16:14
ejb	_ikke_: understood. Why, with that last method of rebasing, did I not have to resolve the same conflict as before? The patch's version of the code was automatically used.	16:15
_ikke_	ejb: did you rebase it onto origin/master yet?	16:15
ejb	_ikke_: oh that's a second rebase?	16:16
_ikke_	yes	16:16
	That's why I said it was two stepts	16:16
	steps*	16:16
	← metastableB left	16:16
	← Zifre left	16:16
	→ toothrot joined	16:17
	→ _Atom_ joined	16:17
	→ enitiz joined	16:17
	→ Gitzilla joined	16:17
	→ ghormoon joined	16:17
	Guest5041 → xxSnip3rsl4yerxx	16:18
ejb	_ikke_: Ok, I rebased to origin/master and resolved the conflict. Now I probably need to push the patch to my own remote branch?	16:18
	← Consuela left	16:18
_ikke_	ejb: push -f	16:18
daynaskully	{Q} anyone have any recommendations to a deploy script of some sort? I thought of just doing a cron job to do a git update on my webserver.. but i dunno..	16:20
	→ CKyle joined	16:20
	→ freestyl3r joined	16:22
_ikke_	I either use capistrano, or a self-made bash script that uses git-archive and symlinks	16:22
	← [cust] left	16:22
	→ specious joined	16:23
	→ cbreak joined	16:24
	→ lindenle joined	16:25
ejb	_ikke_: push -f -> permission denied because the remote branch belongs to the original patch author	16:26
	_ikke_: can I just change the remote	16:26
_ikke_	sure	16:26
	→ demifuror joined	16:26
ejb	_ikke_: is there another way too?	16:27
	← lindenle left	16:27
	→ snearch joined	16:27
pekster	daynaskully: there's some info for you at !deploy	16:27
gitinfo	daynaskully: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html	16:27
	← incredible left	16:27
_ikke_	No, you need to push it somewhere you have access to	16:27
cbreak	I read git 2.3 now has a "deploy" mode built in...	16:27
	← APerson_ left	16:27
cbreak	but of course, it is just as risky as some of the more the primitive methods described on that gitolite link	16:28
_ikke_	right	16:28
osse	two-gun: np yw ttyl bbq	16:28
ejb	_ikke_: if I just remove the patch remote will the_patch branch remain locally? Then I can just do push -f?	16:28
_ikke_	ejb: Yes, and no -f necessary if you push it to another repo	16:28
demifuror	hey guys. is it possible to have placeholder tags in my source files, and then, when i commit changes, have the commit sha placed into one of the placeholders, before the file is committed?	16:29
	← Vadimus left	16:29
_ikke_	demifuror: the sha is not determined until the commit has happened	16:29
	so, no	16:29
	→ Guin joined	16:29
	← ghormoon left	16:29
	← snearch left	16:30
	→ metastableB joined	16:31
	← Nikhil_D left	16:31
BuenGenio	how do you guys manage the persistent differences you need to keep in files between master/development branches - e.g. different paths in files, debug/testing flags all around the code etc... which you want to keep different in production and dev branch	16:31
	?	16:31
	→ Nikhil_D joined	16:32
_ikke_	BuenGenio: Arranging things so that those changes don't need to be made in files that are actually tracked	16:32
	→ joeyDB_ joined	16:32
	→ cdown joined	16:32
	→ rns2 joined	16:32
	← awkwardusername left	16:33
pekster	One basic example might be build-time code that knows if you've checked out a development or production branch (based on the branch name, for example, or whatever else you'd like) and defines something. Then you can #ifdef DEBUG # or whatever	16:33
	But there are many variations on that theme	16:33
ejb	_ikke_: Thanks a ton. I got it pushed to my repo. I think I'm ready to do a PR. Do I have to open a new PR to get the test results? The original issue was closed... is it common practice to request them to reopen the issue or start a new one?	16:33
	→ King_Hual joined	16:33
_ikke_	ejb: well, because it's a different branch from a different user, you have to create a new PR, but you should link to the original	16:34
	→ madewokherd joined	16:34
	→ jottr joined	16:34
BuenGenio	_ikke_, well, they need to be change in the actually tracked files - for example, I only want to send email notification generated by my app when TESTING flag is set (and I want to keep it always in TESTING on the devel branch, also my app root paths differ between production/staging server - as such I want to keep path separate in the files responsible for running the Cronjobs, which are still tracked for other changes....	16:35
	← joeyDB_ left	16:37
_ikke_	git doesn't support keeping changes only in certain branches	16:37
BuenGenio	well, many people will still find themselves facing similar requirements... just wondering which approaches everyone else is using..	16:38
qsuscs	well, you _can_ do an evil merge	16:38
	but it’s called evil for a reason	16:38
BuenGenio	what's an evil merge? :)	16:38
_ikke_	merge that also introduces changes	16:38
BuenGenio	excited	16:38
qsuscs	don’t even think about it.	16:38
	it will burn all your kittens	16:38
BuenGenio	oohs, c'mon, now that you said it :))))	16:38
	my kitten actually deserves to be burnt	16:38
_ikke_	It's called evil because no-one expects a merge to introduce new changes, and it can easily confuse people to where a change came from	16:38
BuenGenio	I've been putting it off for too long..	16:39
	→ ams__ joined	16:39
_ikke_	BuenGenio: git merge -n, change somehting. git commit	16:39
BuenGenio	No one expects the Spanish inquisition!	16:39
	← jottr left	16:39
	← lys left	16:39
_ikke_	But you'd have to do that for each merge you do into the other branches	16:40
BuenGenio	for reference currently I am the sole developer/tester/maintainer so the only person bound to be confused is myself	16:40
	← doev left	16:40
	← ktchup left	16:41
_ikke_	BuenGenio: I'd still try to change your setup so that changing configs belong to untracked files. Then you could use post-commit hooks to change to the correct config	16:41
	→ doev joined	16:41
BuenGenio	ok, noted	16:41
_ikke_	My position in this is that config doesn't belong with the source (at most, a template for the config)	16:42
BuenGenio	perhaps that /is/ the solution	16:42
	→ liamkeily joined	16:42
	← cdown left	16:42
qsuscs	!config	16:42
gitinfo	[!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas	16:42
BuenGenio	_ikke_, but what about cron scripts? basically I guess I'm just lazy to add a few conditions to my bash scripts to check whether i'm in staging or production, and use appropriate paths...	16:42
	→ zumba_addict joined	16:42
	→ cdown joined	16:43
BuenGenio	from what you're saying....	16:43
	← felixjet_ left	16:43
_ikke_	BuenGenio: can cron scripts source files?	16:43
	→ otter768 joined	16:43
BuenGenio	what do you mean?	16:43
	← liamkeily left	16:43
_ikke_	are those bash scripts?	16:43
BuenGenio	yes	16:43
	← anli left	16:43
	→ felixjet_ joined	16:43
ejb	_ikke_: Thanks again. PR submitted, build passed. Winning.	16:43
_ikke_	ejb: yw	16:43
BuenGenio	basically staging/production uses different paths	16:43
qsuscs	_ikke_: cron can run whatever you want, even a java program if you want	16:43
	← cdown left	16:43
_ikke_	qsuscs: I know	16:44
	→ anli joined	16:44
	← specious left	16:44
BuenGenio	also database creds are different	16:44
	→ willharrison joined	16:44
_ikke_	BuenGenio: Also don't belong in your repo	16:44
BuenGenio	but I still need to checkout the config file	16:44
_ikke_	BuenGenio: If you published the repo to somewhere non-private, your database credentials would be public	16:45
BuenGenio	ok - so the actual question is like this - how do I keep track of the files I need for the app to function (config/cron/bash scripts, etc...) when I check it out on a new production env?	16:45
	_ikke_, yes - that's why I have a paid Github account ;)	16:45
	← zumba_ad_ left	16:45
_ikke_	My approach is this:	16:46
	I never store actual config values (like db credentials) in git	16:46
	and also, not the files themselfs (I track config.template.foo, not config.foo)	16:46
BuenGenio	ah	16:47
	nice one	16:47
	← u1106 left	16:47
	← warthog9 left	16:47
BuenGenio	i think that should do nicely	16:47
_ikke_	the configuration files for each production env, are stored somewhere seperate from the deployed code	16:47
	→ u1106 joined	16:47
	← otter768 left	16:47
_ikke_	I then symlink them into the deployed code	16:47
	→ liamkeily joined	16:48
	→ cdown joined	16:48
	→ ktchup joined	16:48
_ikke_	Each release is also put into a timestamped dir	16:48
	← Yatekii left	16:48
_ikke_	And then put in place also through a symlink	16:49
	← chemist69 left	16:49
	→ warthog9 joined	16:50
	← metastableB left	16:52
	→ JEEB joined	16:52
	→ stick-shift joined	16:52
	→ EminenceHC joined	16:52
	→ snearch joined	16:53
	→ Yatekii joined	16:53
	← soreau left	16:54
	→ pheaver joined	16:57
	← EminenceHC left	16:57
	← snearch left	16:58
	_W → _W_	16:58
	← barduck left	16:58
	← stick-shift left	17:00
	← Dougie187 left	17:01
	→ stick-shift joined	17:02
	← demifuror left	17:02
	← lkgf left	17:03
	→ masclic joined	17:04
	→ melmouss joined	17:04
	← cdown left	17:05
	← two-gun left	17:05
	→ fioei joined	17:05
	→ [cust] joined	17:05
	→ FroMaster joined	17:06
	← Zarthus left	17:06
	← u1106 left	17:07
	→ u1106 joined	17:08
	→ Solid1 joined	17:08
	→ Zarthus joined	17:08
	→ soreau joined	17:08
	← a_le_ left	17:09
	→ mtakkman joined	17:10
	→ cdown joined	17:10
	→ a_le joined	17:11
	→ alekks joined	17:11
	← a_le left	17:11
	→ a_le joined	17:12
	← a_le left	17:12
	← shift8 left	17:13
	→ a_le joined	17:13
	← rns2 left	17:14
	← stick-shift left	17:14
	→ shinnya joined	17:14
	← _Vi left	17:14
	← a_le left	17:14
	→ a_le joined	17:15
	← alekks left	17:15
	→ _Vi joined	17:15
	← a_le left	17:15
	→ metastableB joined	17:16
	→ a_le joined	17:16
	← ojacobson left	17:16
	→ snearch joined	17:16
	← a_le left	17:16
	← u1106 left	17:16
	→ u1106 joined	17:17
	→ a_le joined	17:17
	← anli left	17:19
	← CEnnis91 left	17:20
	→ Dragooon joined	17:21
	→ dreiss joined	17:22
	→ stamina joined	17:24
	→ NinjaStyle joined	17:24
	→ lindenle joined	17:27
	← a_le left	17:27
	→ a_le joined	17:28
	→ giusef joined	17:28
	← CheckDavid left	17:28
	← cavallari left	17:30
	← ejb left	17:31
	← endiruna left	17:31
	← lindenle left	17:32
	← doev left	17:32
	← a_le left	17:32
	→ joeyDB_ joined	17:33
	← snearch left	17:33
	→ a_le joined	17:33
	← cdown left	17:34
	← zumba_addict left	17:34
	→ snearch joined	17:34
	→ zumba_addict joined	17:34
	← u1106 left	17:35
	→ u1106 joined	17:35
	← Zarthus left	17:35
	← mtakkman left	17:37
	← joeyDB_ left	17:38
	← enitiz left	17:38
	→ Zarthus joined	17:38
	← CKyle left	17:41
	→ mikecmpbll joined	17:42
	→ m0ltar joined	17:42
	→ checkit joined	17:43
	← vmiklos left	17:43
	→ ojacobson joined	17:43
	← jatt left	17:43
	→ jatt joined	17:44
	← jatt left	17:44
	→ jatt joined	17:44
	→ enitiz joined	17:44
	→ vmiklos joined	17:45
	→ Sample joined	17:45
	← ojacobson left	17:48
	← checkit left	17:49
	→ Ragnar joined	17:49
	→ Goplat joined	17:50
	→ chemist69 joined	17:51
	← smccarthy left	17:51
	→ endiruna joined	17:52
	← masclic left	17:53
	→ checkit joined	17:54
Ragnar	Hey guys, every time I start a new terminal session I have to eval "$(ssh-agent -s)" & ssh-add ~/.ssh/mykey in order to use github. Is there some way to make sure the key is always added? The key requires a password.	17:54
offby1	Ragnar: what operating system are you using?	17:54
Ragnar	offby1: I'm on Mac OSX	17:54
offby1	Ragnar: it's supposed to work automagically on OS X. It does for me ... but I can't explain how :-\|	17:55
Ragnar	offby1: It's not the default name id_rsa, which I think is why	17:55
offby1	Ragnar: perhaps you've got something in your shell's init file (~/.bashrc , ~/.bash_profile, something like that) that is accidentally clobbering the SSH_AUTH_SOCK environment variable	17:55
	→ Joel_ joined	17:56
	Joel_ → Guest11511	17:56
offby1	Ragnar: you could sidestep it by putting an entry in ~/.ssh/config that says, in effect, "yo ssh -- wheneever I connect to github, use ~/.ssh/mykey instead of ~/.ssh/whatever"	17:56
Ragnar	doesn't appear to be haha	17:56
	→ EminenceHC joined	17:57
offby1	Ragnar: here's an example that does more or less that (for a different reason): https://gist.github.com/99871b7e81d6d560aa40	17:57
	← enitiz left	17:57
	→ Reskp joined	17:57
offby1	anyway, there should only be one ssh-agent process on your Mac, and you should be able to add a key to it in one window, and then later access that key from another window. If that's not working, something is terribly wrong	17:58
	← joel_falcou left	17:58
	→ nour joined	17:59
offby1	see also https://gist.github.com/offby1/248e47cd59f9a83e765c -- that strongly suggests that every new terminal session that I create will be able to access my ssh-agent, which OS X started for me when I logged in	17:59
Ragnar	thanks, I'll take a look	18:00
	← endiruna left	18:00
	← m0viefreak left	18:01
	→ CEnnis91 joined	18:01
	→ endiruna joined	18:01
	→ HoMM joined	18:01
	← HoMM left	18:01
	→ HoMM joined	18:01
	← HoMM left	18:01
	← EminenceHC left	18:01
	→ HoMM joined	18:01
	← HoMM left	18:01
	→ HoMM_ joined	18:01
	← HoMM_ left	18:01
	→ Guest69863 joined	18:02
	← Gamecubic left	18:02
	← liamkeily left	18:02
	← Guest11511 left	18:03
	→ AssassinsMod joined	18:03
Ragnar	offby1: I have a similar output for that command	18:04
	← xxSnip3rsl4yerxx left	18:04
offby1	that's good, I guess	18:04
	← u1106 left	18:04
AssassinsMod	Hi, is there anybody who tried to set up a git server over smart http?	18:04
	→ u1106 joined	18:04
offby1	maybe stop doing eval "$(ssh-agent -s)" ?	18:04
	Ragnar: yes, I think your problem is that you're starting a new ssh agent, and using _it_, rather than the one that OS X kindly created for you ... and presumably when that terminal goes away, so does the ssh agent that you started.	18:06
	So just do ssh-add ~/.ssh/mykey once, and I predict that key will be available to all your terminals from then until you log out	18:06
	(which nobody ever does, amirite?)	18:06
	→ sakujo joined	18:07
Ragnar	offby1: yep I think that did it	18:07
offby1	ssh is awfully tricky	18:07
Ragnar	thanks for your help	18:07
	← snearch left	18:07
sakujo	hey, i like my code in /usr/local/src and i like to avoid using root. So currently I always mkdir /usr/local/src/MYDIR and then chown MYUSER /usr/local/src/MYDIR into git clone ...	18:08
offby1	man, I used to help people with exactly this kind of ssh question in #subversion, years ago when that was a thing -- it was tricky then, and it's tricky now	18:08
sakujo	is there a way this could be done simpler?	18:08
	→ rns2 joined	18:08
offby1	sakujo: probably not, unless "just give up and be root" is an option	18:08
	→ btree joined	18:09
sakujo	hmm	18:09
	is there a reason not to be root?	18:09
offby1	sakujo: I used to do that too, but now all my git stuff is under ~/git-repositories, and that works nicely	18:09
sakujo	you always read in the guides only do the make install as root	18:09
offby1	sakujo: in theory, if you're root, you might make a mistake that deletes lots of important data. In practice, you are just as likely to hose that same data when logged in as yourself, so ... not really	18:09
sakujo	i suppose if the src is fake it could also do harm right?	18:10
	after all ./configure can have anything in it right?	18:10
offby1	sakujo: running "make" is, in effect, running a program that you haven't studied, given to you by someone you don't know. So if you aren't comfortable running random programs downloaded from the internet as root, then you shouldn't be running "make" as root, either.	18:10
sakujo	yeah ill stick to my long way i suppose	18:10
_ikke_	On the other hand, there is lots of code you don't know running as root	18:11
offby1	correct, ./configure is a program that is (potentially) exactly as dangerous as the Makefile, or any other program	18:11
_ikke_	sakujo: You know the install command?	18:11
sakujo	the install command?	18:11
	no i don't	18:11
_ikke_	install -D -o $UID /usr/local/src/PROJECT	18:11
	Perhaps not much of an improvement, but it is one less command	18:12
	← u1106 left	18:12
sakujo	that is awesome	18:12
	→ u1106 joined	18:13
sakujo	however are you certain you did not make a typo?	18:13
_ikke_	s/-D/-d/	18:13
sakujo	either i am derping or it does not fit the synopsis	18:13
_ikke_	sakujo: No, I'm not certain	18:13
sakujo	aye ill check myself then	18:13
_ikke_	the capital D should be lower case	18:13
	install -d	18:13
offby1	Only you can prevent derping	18:13
sakujo	yeah -D would require a source is uppose	18:14
_ikke_	correct	18:14
sakujo	i am preparing for my QFT exam -.- it is like i am constantly stoned	18:14
_ikke_	QFT?	18:14
sakujo	quantum field theory	18:14
_ikke_	What I would've guessed	18:15
sakujo	if someone asks me a question right now i need literally 30-40 seconds to re-adjust my brains ;p	18:15
offby1	Qualified Fitness Trainer	18:15
_ikke_	Query File Table	18:15
sakujo	Wan-Tan Meal Theory	18:15
	← MLM left	18:17
	← metastableB left	18:17
	← Solid1 left	18:17
	→ CKyle joined	18:18
	← NinjaStyle left	18:19
	← Reskp left	18:20
	→ snearch joined	18:20
	→ thiago joined	18:21
	← CKyle left	18:22
	← checkit left	18:23
	→ wcypierreme joined	18:23
	→ Dougie187 joined	18:26
	← adamben left	18:28
	→ lindenle joined	18:28
	→ mueslo joined	18:29
	→ robbyoconnor joined	18:30
	→ liamkeily joined	18:30
	← Yatekii left	18:30
	← wcypierreme left	18:30
	→ Yatekii joined	18:30
	← dreiss left	18:31
	→ metastableB joined	18:31
	→ coppro joined	18:31
coppro	hey all	18:31
	when using filters	18:31
	→ checkit joined	18:31
	wedgie_ → wedgie	18:32
	← Nizumzen left	18:32
	← chemist69 left	18:32
	→ syndarion joined	18:32
	offby1 awaits breathlessly	18:32
offby1	hey all	18:32
	how old Cary Grant	18:33
	← lindenle left	18:33
offby1	"Old Cary Grant just fine"	18:33
	→ nemesis joined	18:33
	→ joeyDB_ joined	18:34
	← Guin left	18:34
	→ Gizburdt joined	18:34
	→ APerson_ joined	18:35
	→ jontmorehouse joined	18:35
	→ Reskp joined	18:36
	← nasso_ left	18:37
syndarion	Hi all! I’ve been using .git-prompt.sh for a while now, without any issues, but when I open a shell in emacs, I get bash: __git_ps1: command not found. This behaviour can also be reached when executing bash in a terminal window. Any ideas?	18:37
	→ nasso joined	18:37
	← Sample left	18:37
	→ FreezingAlt joined	18:38
	← UKn0Me left	18:38
	← joeyDB_ left	18:39
	← tgies left	18:39
	← gooda left	18:40
	← Yatekii left	18:41
	→ JagaJaga joined	18:41
	→ Yatekii joined	18:41
	→ tgies joined	18:41
	← Sleepy63 left	18:42
	← FreezingCold left	18:42
	→ Reskp_ joined	18:43
	← u1106 left	18:43
	← pandeiro left	18:43
	← Reskp left	18:43
	← rns2 left	18:43
	← liamkeily left	18:43
	→ otter768 joined	18:44
	→ u1106 joined	18:44
	← syndarion left	18:44
	← jontmorehouse left	18:44
	→ joel_falcou joined	18:45
	← joel_falcou left	18:45
	← Domhack left	18:46
	← melmouss left	18:47
	← stamina left	18:48
	← endiruna left	18:48
	← otter768 left	18:48
	→ Vadimus joined	18:49
	→ polyzen joined	18:49
	→ pantsman- joined	18:51
	← nemesis left	18:51
	→ rns2 joined	18:51
	← metastableB left	18:51
	→ pdurbin joined	18:51
	← robbyoconnor left	18:52
pdurbin	I'm curious what people think about this github oauth thing: http://irclog.perlgeek.de/linuxvillage/2015-02-14#i_10116104	18:53
	→ tristanp joined	18:53
	→ liamkeily joined	18:54
	← liamkeily left	18:54
	→ liamkeily joined	18:54
	← Eugene left	18:55
	→ Eugene joined	18:55
	← checkit left	18:55
	→ rvsjoen_ joined	18:55
	→ adamben joined	18:56
	← rvsjoen left	18:56
	→ robbyoconnor joined	18:57
	→ EminenceHC joined	18:59
	← nnyk_ left	18:59
	→ nour_ joined	18:59
	→ shift8 joined	19:00
	← adamben left	19:00
	→ Literphor joined	19:00
	← u1106 left	19:00
	→ u1106 joined	19:01
	→ Changa joined	19:01
	→ ZujkisNx joined	19:01
	← nour left	19:02
Changa	Hello, I am trying to push to origin from my local server to my vps but I am getting an error saying permission is denied to change "master.lock" file. I have searched a little bit and it was suggested to change the owner to the git user which does not exist on my server. What do I do?	19:02
	← Vile left	19:03
	→ Sample joined	19:03
	← EminenceHC left	19:03
	← Dragooon left	19:04
offby1	Changa: !transcript	19:04
gitinfo	Changa: Please paste (using https://gist.github.com/ or similar) a transcript ( https://gist.github.com/2415442 ) of your terminal session.	19:04
pdurbin	Changa: well, whatever user should own the files. It may not be called "git". Maybe it's your username.	19:05
	← ColdKeyboard left	19:05
	← Artpicre left	19:06
Changa	offby1, here it is https://gist.github.com/anonymous/0d401de8fb41eb711077	19:06
	pdurbin, current owner of the files is me	19:07
bremner	Changa: yes, but do you own the containing directories?	19:08
offby1	Changa: right -- first figure out who should own that git repository. I'd guess it's "ediz". Then do "sudo chown -R ediz ."	19:08
	→ Jackneill joined	19:08
offby1	bremner: yes, but Quis custodiet ipsos custodes?	19:09
	→ frain joined	19:09
	→ Dragooon joined	19:09
frain	Hi, I can't push to my repo for some reason.	19:09
	git add went ok, and git commit too	19:09
Changa	bremner, offby1 - https://gist.github.com/anonymous/eaa0aad6e0176fc00916 isn't it already mine? I'm doing chown anyway	19:09
frain	create mode 10064 for all files. Bt git push doesn't work :\	19:09
	No refs in common and none specified; doing nothing.	19:10
	Perhaps you should specify a branch such as 'master'.	19:10
	Everything up-to-date	19:10
Changa	still getting the same error.	19:10
	→ rayman22201 joined	19:12
	← u1106 left	19:12
	← Gizburdt left	19:12
	→ u1106 joined	19:12
	→ Guest86680 joined	19:13
	→ tmager joined	19:13
	← PCatinean left	19:14
	← rayman22201 left	19:15
	→ syndarion joined	19:15
	→ micechal joined	19:15
	← micechal_ left	19:17
	→ checkit joined	19:18
	← v0n left	19:18
	→ twoface88 joined	19:19
	→ ciampix joined	19:19
frain	Anyone?	19:20
	← jab416171 left	19:24
	→ jab416171 joined	19:24
bremner	p	19:25
	oops.	19:25
	← Sadeukko left	19:25
qsuscs	poops? bremner! watch your language!	19:26
	← snearch left	19:27
	→ snearch joined	19:27
	→ randiman joined	19:29
	← AssassinsMod left	19:29
	→ RaceCondition joined	19:31
	← snowpeas left	19:31
	← Steve_Jobs left	19:31
	→ Steve_Jobs joined	19:33
	← basiclaser left	19:34
	→ joeyDB_ joined	19:35
	→ johnny2600 joined	19:36
	← liamkeily left	19:37
	← snearch left	19:38
	→ frainfreeze joined	19:39
	← frainfreeze left	19:39
	→ frainfreeze joined	19:39
	← joeyDB_ left	19:39
qsuscs	Seveas: another issue with git-spindle (though it might be a problem with the API), the repo seems to be moved: http://0bin.net/paste/U0NlQZupva0kPzHf#A8RocO8kOd1LocSa94WVBvG2x4LXUboBBS0h8W3GMTh	19:40
_ikke_	frain: git doesn't know what you want to push, you have to tell it	19:41
	git push <remote> <branch>	19:42
	← frain left	19:42
_ikke_	if it's a branch you use more often, you want to add -u (--add-upstream): git push -u <remote> <branch>	19:42
	===+	19:42
	ah, just left / timed out :-/	19:43
	← syndarion left	19:43
_ikke_	frainfreeze: ^^	19:43
	← johnny2600 left	19:44
	← giusef left	19:44
	← Dougie187 left	19:44
	→ ap0c joined	19:44
frainfreeze	Ok, I ll try	19:44
	→ v0n joined	19:45
frainfreeze	_ikke_, doesn't help	19:45
	But only difference to other repos is that this one contains only .dll that need to be pushed	19:46
thiago	committing a .dll? Are you sure?	19:47
qsuscs	!binary	19:47
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	19:47
thiago	usually you don't store products of compilation. Store, instead, the source code.	19:47
qsuscs	and, thumb rule, don’t commit generated data	19:47
frainfreeze	No way I can push those dll's ?	19:48
thiago	you can	19:48
	you shouldn't	19:48
frainfreeze	Those don't change.	19:48
	Ever.	19:48
thiago	same answer	19:48
	if you really want to, add the file, commit and push	19:48
	← RaceCondition left	19:49
	→ tvw joined	19:50
frainfreeze	thiago, doesn't help :	19:50
	→ MasterPiece joined	19:50
	← checkit left	19:51
	← CLaxware_ left	19:51
	← pdurbin left	19:51
	→ Solid1 joined	19:52
	→ scientes joined	19:53
	← scientes left	19:53
	→ scientes joined	19:53
	← rns2 left	19:54
Seveas	qsuscs: yeah, git-spindle isn't good at telling you 'repo doesn't exist, go away'.	19:54
	← robbyoconnor left	19:54
qsuscs	Seveas: enter the according URL in your browser, it redirects you to the right repo—i just wonder whether API does so (can do so)	19:55
	→ liamkeily joined	19:55
	← ktchup left	19:55
	→ ajustrun joined	19:56
	← Guest86680 left	19:56
	← skylite_ left	19:56
Seveas	looks like the api doesnt	19:56
	→ Artpicre joined	19:56
_ikke_	frainfreeze: git status	19:57
	← liamkeily left	19:57
_ikke_	frainfreeze: and, you timed out earlier, not sure if you got all of my messages	19:57
qsuscs	!log	19:58
gitinfo	[!irclog] Public logs of #git are kept at: http://colabti.org/irclogger/irclogger_log/git or look at stats for the last 30 days: http://itvends.com/irc/git.html or since Jan 1, 2012: http://itvends.com/irc/git-all.html	19:58
Seveas	qsuscs: http://0bin.net/paste/CA7+qPn1j+OtVBTE#NE1rCRurL8bu9pA0UspYhu2l1oWPe3bkfqcg4gQBIyv	19:58
frainfreeze	_ikke_, if it is just a branch...	19:58
	# On branch master	19:58
	nothing to commit, working directory clean	19:58
_ikke_	and git push -u origin master?	19:59
frainfreeze	nope.	19:59
	→ haptiK joined	19:59
frainfreeze	_ikke_, great!	20:00
	Works like charm. Thanks man	20:00
_ikke_	frainfreeze: also, what does git config push.default return?	20:00
frainfreeze	nothing.	20:00
	→ checkit joined	20:00
	← checkit left	20:01
_ikke_	What version of git do you use?	20:01
	→ checkit joined	20:01
frainfreeze	1.8.4.msysgit.0	20:01
_ikke_	right	20:01
	← haptiK left	20:01
	→ lid_ joined	20:01
_ikke_	it might make sense to set it to a value	20:02
	git config --global push.default current	20:02
	← willharrison left	20:02
	← arez left	20:02
	→ EminenceHC joined	20:03
	→ trewe joined	20:03
	→ Sasazuka joined	20:03
frainfreeze	Dunno what that does but thanks mate :)	20:03
	← przemoc left	20:03
	→ mikeric joined	20:04
qsuscs	frainfreeze: git help config, search for push.default	20:04
	→ skylite joined	20:04
	← troyt left	20:04
	← Sasazuka left	20:05
frainfreeze	nice!	20:05
	→ MechtiIde joined	20:05
	_ikke_ wonders whether simple or current is a better default for push.default	20:05
_ikke_	aparently, simple has been introduced in 1.8.0.2	20:06
	1.8.2*	20:06
	→ liamkeily joined	20:06
	← Noldorin left	20:06
qsuscs	_ikke_: nothing :>	20:07
	→ nnyk_ joined	20:07
_ikke_	qsuscs: where is that an answer to?	20:07
	→ Vile joined	20:07
lewellyn	_ikke_: when you push, it answers that to some degree. ;)	20:07
qsuscs	_ikke_: default push.default	20:07
	← TinkerTyper left	20:07
	← EminenceHC left	20:07
_ikke_	it has an implicit default value	20:08
	git config -l only returns explicitly set values	20:08
	→ TinkerTyper joined	20:08
lewellyn	oh. did it stop filling the screen with info, then?	20:08
	← u1106 left	20:09
_ikke_	lewellyn: pre 2.2, it defaulted to matching	20:09
qsuscs	pre 2.0	20:09
_ikke_	qsuscs: That was the plan	20:09
	→ u1106 joined	20:09
lewellyn	_ikke_: you were saying 1.8.2	20:09
_ikke_	lewellyn: That's where simple was introduced	20:09
lewellyn	yes.	20:09
_ikke_	not made default	20:09
lewellyn	but you didn't say you were on a newer git.	20:09
_ikke_	I wasn't implying	20:10
	I just wondered what a good default for new users was	20:10
	→ Arsonide joined	20:10
_ikke_	because it's now set to simple, but I think current can be a good default too	20:10
	'current'	20:10
lewellyn	i think simple is a good default.	20:10
	it is least likely to violate the principle of least surprise.	20:11
_ikke_	lewellyn: frainfreeze was surprised	20:11
frainfreeze	yep.	20:11
	← jagob left	20:12
	→ przemoc joined	20:12
_ikke_	Tell me if I'm wrong, but I think most new users think git push will push just the current branch you are on	20:12
	→ teran joined	20:12
lewellyn	_ikke_: the only time i can think of a new user being surprised is when pushing to a new remote. (i missed whatever surprised frainfreeze )	20:12
	← lamppid left	20:12
	← BuenGenio left	20:12
lewellyn	maybe current would be better, yes. but between matching and simple, i opt for simple.	20:13
	→ tg joined	20:13
_ikke_	lewellyn: Now, for each branch, the user has to do at least once: git push -u <remote> <branch>	20:13
	lewellyn: Of course, but current was already available before simple	20:13
lewellyn	yes. and most hosted services tell you to do that.	20:13
	indeed. but it was never mentioned in the page-o-text you saw every push.	20:13
_ikke_	the advise part	20:13
	?	20:13
	→ sakujo_ joined	20:14
lewellyn	it may be slightly surprising to people to see it come back with yet another option.	20:14
	yes.	20:14
	→ stick-shift joined	20:14
_ikke_	Yeah, right now it makes no sense to change	20:14
	Just trying to find the reasoning (skimming the commit logs about it)	20:14
	→ troyt joined	20:14
lewellyn	i tried to find the reasoning way back when it was introduced. :P	20:14
	← teran_ left	20:15
_ikke_	hehe	20:15
lewellyn	i should see when current came about. that might solve my issues for "i have a shared git config and one of the git installs is too old for simple"	20:15
	caring about that has been low-priority. i can handle matching. :)	20:15
	← mikeric left	20:17
_ikke_	Hmm, aparently I'm missing what 'simple' means	20:17
	(the irony)	20:17
	← sakujo left	20:17
lewellyn	simple works like upstream, but it refuses to push if the remote doesn't have a branch of the same name.	20:17
	→ oojacoboo joined	20:18
_ikke_	lewellyn: Yeah, but I noticed a commit message that has more defaults	20:18
	details*	20:18
lewellyn	basically, it's like handing the noobs a gun with a safety so they don't screw up their remotes as easily.	20:18
_ikke_	lewellyn: 3b8d2765c794ef1f1c7b39a90f72c4e61ce26fbd	20:18
	→ mikeric joined	20:19
	lid_ → lidaaa	20:19
_ikke_	lewellyn: I get the idea behind it, but I'm more interested in the exact behaviour	20:19
	← mikeric left	20:19
qsuscs	.search 3b8d2765c794ef1f1c7b39a90f72c4e61ce26fbd	20:19
	→ lieber joined	20:19
_ikke_	https://github.com/git/git/commit/3b8d2765c794ef1f1c7b39a90f72c4e61ce26fbd	20:19
lewellyn	oh yay. github is killing my browser.	20:19
_ikke_	sorry, meant to paste the url	20:19
lewellyn	i think that means it's time to leave the house.	20:19
	← oojacoboo left	20:19
gitinfo	.search: nothing found.	20:19
qsuscs	hmm.	20:19
_ikke_	lol	20:19
qsuscs	.search facebook	20:20
gitinfo	.search: nothing found.	20:20
_ikke_	d'oh	20:20
	broken	20:20
	.search git	20:20
gitinfo	.search: nothing found.	20:20
qsuscs	jas… oh well.	20:20
_ikke_	we can go home now	20:20
	git doesn't exist anymore aparently	20:20
	→ oojacoboo joined	20:20
	← devll left	20:20
lewellyn	_ikke_: but yeah, the big difference between current and simple is whether it'll push to a new branch on the remote.	20:20
	(iirc, at least)	20:21
	← liamkeily left	20:21
_ikke_	ok	20:21
	← irqq left	20:21
	← MasterPiece left	20:21
_ikke_	But comming back to switching to simple as default	20:21
	← Sample left	20:22
	→ Noldorin joined	20:22
_ikke_	Between the writing of the code to switch to simple, and it actually being merged, another commit came in that aparently broke that switch	20:22
	→ kadoban joined	20:22
_ikke_	So effectively, simple is only the default as of v2.2	20:23
lewellyn	that doesn't surprise me at all.	20:23
	← u1106 left	20:23
	→ teran_ joined	20:23
	→ u1106 joined	20:23
_ikke_	Does the term triangular workflow refer to something that happens a lot with github, you fetch from upstream, but push to your own fork?	20:24
	← Acidnerd left	20:24
	← ciampix left	20:24
lewellyn	i'm pretty sure that's what it means: one canonical upstream, but lots of people underneath swapping changes	20:24
	→ ciampix joined	20:24
lewellyn	the github "network" model	20:25
	← teran left	20:25
	→ smccarthy joined	20:25
	→ CheckDavid joined	20:25
qsuscs	it’s not necessarily github, is it?	20:26
	doesn’t linux work similarly?	20:26
lewellyn	qsuscs: i merely identified one specific case, the one he asked about.	20:27
_ikke_	And I just used it as a well-known example	20:27
lewellyn	but yeah. linux is also a single canonical upstream with a bunch of incestuous downstreams.	20:27
	← sakujo_ left	20:27
	→ sakujo_ joined	20:28
offby1	Changa: the files you displayed in your last paste are indeed all yours, but that's almost irrelevant, because you only showed a tiny fraction of the relevant files.	20:28
	lewellyn suspects "incestuous workflow" will never catch on	20:28
qsuscs	wtf :D	20:28
offby1	Changa: show me a transcript of the command you ran to change the ownership; I suspect you did it wrong.	20:28
	← TinkerTyper left	20:28
	← Vadimus left	20:29
offby1	lewellyn: depends -- is "workflow" hot?	20:29
_ikke_	just found the post in the mailing list where the `simple` bug was discovered	20:29
lewellyn	be careful asking that. you might get a sjw attack and doxxing. ;)	20:29
_ikke_	offby1: that's a late answer :P	20:30
	→ Nizumzen joined	20:30
	→ TinkerTyper joined	20:30
offby1	_ikke_: sho' 'nuff. But I didn't see any solutions	20:30
	← stick-shift left	20:32
	← tg left	20:32
	→ tier joined	20:32
	→ ojacobson joined	20:32
	→ enitiz joined	20:32
	← m8 left	20:33
	→ graSP joined	20:35
	→ tg joined	20:35
	→ barduck joined	20:35
	→ adamellsworth joined	20:35
	→ joeyDB_ joined	20:35
	→ dreiss joined	20:35
	← adamellsworth left	20:35
	→ bramgg joined	20:35
	← kadoban left	20:36
	→ adamellsworth joined	20:37
	← barduck left	20:38
	→ barduck joined	20:38
	→ daito joined	20:39
	← joeyDB_ left	20:40
	← barduck left	20:41
	← graSP left	20:41
	→ graSP joined	20:41
	→ barduck joined	20:41
	→ frainfreeze_ joined	20:42
	← APerson_ left	20:43
	← daito left	20:43
	→ scottschecter joined	20:44
	→ Polyatomic joined	20:44
	← barduck left	20:44
	→ otter768 joined	20:45
	→ willharrison joined	20:45
	→ barduck joined	20:45
	← jatt left	20:45
	→ wachterjohannes joined	20:45
	← tg left	20:45
	← Takle left	20:45
	← frainfreeze left	20:45
daynaskully	{Q} If i'm currently on master that has a commit history; and I want to start a new branch (clean with no files, no commits) -- what do i do?	20:46
	← wachterjohannes left	20:47
	→ Etheco- joined	20:47
	→ tg joined	20:47
thiago	start a new repository	20:47
_ikke_	daynaskully: git checkout --orphan <branchname>	20:47
	← barduck left	20:48
_ikke_	then rm all files	20:48
	!orphan	20:48
gitinfo	To create an orphaned branch(unrelated to existing history): `git checkout --orphan newbranchname`. This will leave your index/worktree as-is(use `rm .git/index; git clean -dfx` to delete EVERYTHING). If you get 'error: unknown option `orphan`' see !orphan_old. For an empty/null commit see !orphan_null.	20:48
	→ barduck joined	20:48
	← Jackneill left	20:49
	→ jatt joined	20:49
	← jatt left	20:49
	→ jatt joined	20:49
daynaskully	is it possible to then merge into master (keeping existing histroy?) reason being i want to basicaly rewrite the whole thing and if its all good merge to master (but need the ability to checkout the previous "stable" if that makes sense)	20:49
	← otter768 left	20:49
	← CEnnis91 left	20:50
	→ Lyqyd joined	20:50
thiago	yes	20:50
	← ojacobson left	20:50
	← Etheco left	20:50
thiago	but you're really discussing starting a new repository	20:50
	← lieber left	20:51
	← u1106 left	20:51
	← barduck left	20:51
	→ u1106 joined	20:52
	← smithd_ left	20:52
	← Kartagis left	20:52
	→ wachterjohannes joined	20:52
	← Amandil left	20:53
	← tg left	20:53
	← checkit left	20:53
	→ Amandil joined	20:53
	→ snearch joined	20:57
	→ pacon joined	20:57
	→ Kartagis joined	20:58
	→ xolubi joined	20:58
	← graSP left	20:58
	← MechtiIde left	20:58
	← u1106 left	20:58
frainfreeze_	_ikke_, thanks again. Have a nice day mate :)	21:00
	You rock.	21:01
	← frainfreeze_ left	21:01
	_ikke_ contemplates rockness	21:01
	→ u1106 joined	21:02
	← troyt left	21:03
offby1	daynaskully: I agree with thiago: starting a new repository will be easier	21:04
daynaskully	yea but it's just a rewrite of the same project, so having 2 repos seems a bit overkill	21:04
	← tmager left	21:05
	→ robbyoconnor joined	21:05
	→ troyt joined	21:06
	← nour_ left	21:06
_ikke_	repos are cheap	21:07
	← u1106 left	21:07
	→ u1106 joined	21:08
	← Literphor left	21:08
	→ ghormoon joined	21:08
	→ tg joined	21:09
	← _Atom_ left	21:10
	→ graSP joined	21:10
	→ _Atom_ joined	21:10
	← wachterjohannes left	21:12
	→ arez joined	21:12
	← ev_ left	21:12
	← petersr left	21:14
	→ Sieigeie joined	21:14
	← u1106 left	21:15
	← _Atom_ left	21:15
	→ u1106 joined	21:15
	← tg left	21:15
	← graSP left	21:16
	→ natu joined	21:16
	→ graSP joined	21:17
	→ chemist69 joined	21:17
	← scientes left	21:19
	← tristanp left	21:19
	→ duderonomy joined	21:21
	← twoface88 left	21:22
	→ rubyonrailed joined	21:22
qsuscs	the overhead in contrast to an orphan branch will be … 1KiB?	21:22
	← graSP left	21:23
	→ pandeiro joined	21:24
	→ Guest3574 joined	21:25
	→ RDove joined	21:26
	← RDove left	21:26
	→ RDove joined	21:26
	← hardenedapple left	21:26
	→ mchvs joined	21:27
	← Nizumzen left	21:30
	← fioei left	21:31
	← ZujkisNx left	21:32
	→ Iionu joined	21:34
	→ r0bby_ joined	21:34
	← robbyoconnor left	21:35
	← Iionu left	21:35
	← JagaJaga left	21:35
	→ CEnnis91 joined	21:35
	→ ZujkisNx joined	21:36
	→ adamben joined	21:36
	← adamben left	21:36
	→ adamben joined	21:36
	← jatt left	21:36
	→ Kwoc joined	21:36
	→ joeyDB_ joined	21:36
	← ajustrun left	21:36
	→ jatt joined	21:37
	← jatt left	21:37
	→ jatt joined	21:37
	← u1106 left	21:37
	→ u1106 joined	21:38
	← Kwoc left	21:38
Seveas	new command: git orphanage -- merge all orphan branches into HEAD	21:39
	→ ocyn joined	21:39
qsuscs	i just have to think of the orphanage of turanga leela	21:39
	← RDove left	21:39
offby1	-- put photos of all orphan branches on Instagram; beg for money	21:40
Seveas	that would be git unicef	21:40
	← joeyDB_ left	21:41
	→ RDove joined	21:42
	← RDove left	21:42
	→ RDove joined	21:42
	→ Consuela joined	21:42
	← mueslo left	21:43
	← dreiss left	21:43
	← dprophit left	21:43
	→ cdown joined	21:44
	→ linuxmint joined	21:47
	← natu left	21:49
	← dsdeiz left	21:50
	← rubyonrailed left	21:53
	→ graSP joined	21:55
	→ Sample joined	21:55
	← r0bby_ left	21:56
	← cdown left	21:58
	← graSP left	21:58
	→ lqi joined	21:59
	→ psoo joined	22:00
	→ Lancien joined	22:00
	→ michaelrice joined	22:00
	→ r0bby_ joined	22:02
	→ scientes joined	22:03
	← scientes left	22:03
	→ scientes joined	22:03
	← scientes left	22:03
	→ scientes joined	22:04
	→ Quevin_ joined	22:04
	← Quevin_ left	22:04
	→ cagedwisdom joined	22:04
	← freestyl3r left	22:05
	→ tmager joined	22:05
	FreezingAlt → FreezingCold	22:06
	← tvw left	22:08
	← snearch left	22:09
	← scientes left	22:09
	→ Sadeukko joined	22:10
	← kyledr_ left	22:10
	→ rubyonrailed joined	22:11
	← jstimm left	22:11
	← u1106 left	22:11
	→ u1106 joined	22:11
	→ nfk joined	22:11
	→ EminenceHC joined	22:12
	← psoo left	22:12
	→ tg joined	22:12
	← ocyn left	22:13
	← Entomo left	22:14
	← pantsman- left	22:14
	→ Ojna joined	22:14
	→ graSP joined	22:15
	→ Niudo joined	22:16
	← EminenceHC left	22:16
	→ boblehest joined	22:17
	← toothrot left	22:17
	→ kyb3r_ joined	22:18
Arsonide	Buddy of mine merged a branch, committed, and pushed, and now has realized that it isn't compiling. Is there some way to undo that merge entirely?	22:19
	← Ojna left	22:19
	→ FreezingAlt joined	22:19
	← graSP left	22:19
Arsonide	Without the push I know it's a simple reset.	22:19
	← tmager left	22:20
_ikke_	with the merge it's also a simple reset, but it means you have to force push to propagate it, with all consequences	22:21
	← FreezingCold left	22:22
	→ dreiss joined	22:23
	← twisted` left	22:23
	→ toothrot joined	22:24
	← tfnico left	22:24
	← bret left	22:24
	← CEnnis91 left	22:24
	← tier left	22:24
	← teadrop__ left	22:24
	← rakm left	22:25
	→ Entomo joined	22:25
	← mehdi left	22:26
	← OliverJAsh left	22:26
	← mjbrender left	22:27
	← kirjs______ left	22:27
	← lqi left	22:27
	← jmfcool____ left	22:27
	← mattl left	22:28
	→ s8321414 joined	22:28
	← u1106 left	22:29
	← Reskp_ left	22:29
	→ u1106 joined	22:29
qsuscs	can you git revert a merge commit?	22:29
Bombe	What happened when you tried?	22:30
	← coppro left	22:30
_ikke_	qsuscs: You can, but you have to specify the 'mainline'	22:31
	← Niudo left	22:31
_ikke_	which in most cases is 1	22:31
	← randiman left	22:31
	← rubyonrailed left	22:31
	← jadne left	22:31
	← cagedwisdom left	22:31
	← Guest3574 left	22:32
	→ hiepb joined	22:32
	← FreezingAlt left	22:32
	← s8321414 left	22:33
	→ cagedwisdom joined	22:33
	→ graSP joined	22:33
	→ MLM joined	22:34
	← hiepb left	22:35
	→ OliverJAsh joined	22:36
	→ yqqd joined	22:36
	→ CEnnis91 joined	22:37
	→ mjbrender joined	22:37
	→ joeyDB_ joined	22:37
	→ jadne joined	22:37
	→ teadrop__ joined	22:37
	→ rubyonrailed joined	22:37
	→ jmfcool____ joined	22:38
	← Sieigeie left	22:39
	← Solid1 left	22:39
	→ twisted` joined	22:40
	← graSP left	22:40
	→ mattl joined	22:40
	← rendar left	22:40
	← yqqd left	22:40
	→ graSP joined	22:40
	→ FreezingCold joined	22:41
	→ rakm joined	22:41
	→ mehdi joined	22:41
	← joeyDB_ left	22:42
	← jadne left	22:42
	← cagedwisdom left	22:42
	← WaReZ left	22:43
	→ graSP_ joined	22:43
	→ kirjs______ joined	22:44
	→ jstimm joined	22:45
	→ otter768 joined	22:46
	→ BuenGenio joined	22:46
	→ bret joined	22:46
	← graSP left	22:47
	→ APerson_ joined	22:47
	← King_Hual left	22:48
	← brandonw left	22:49
	← rubyonrailed left	22:49
	→ tfnico joined	22:50
	← otter768 left	22:50
	← zumba_addict left	22:53
	→ zumba_ad_ joined	22:53
	→ lid_ joined	22:53
	→ mcrutchfield joined	22:53
	→ rubyonrailed joined	22:56
	← graSP_ left	22:56
	→ Takle joined	22:56
	→ TheNet joined	22:56
	← lidaaa left	22:57
	→ SirRetnuh joined	22:57
	← smccarthy left	22:57
	← adamben left	22:58
	→ m0viefreak joined	22:59
	← u1106 left	22:59
	← mcrutchfield left	22:59
	→ u1106 joined	22:59
	→ graSP joined	23:00
	← rubyonrailed left	23:00
	← willharrison left	23:01
De\|ta	Can you not just branch from master, fix it, and then merge that fix in?	23:02
	→ Dorf joined	23:02
De\|ta	or, branch from master, revert the merge commit, merge that branch back in	23:03
	→ stick-shift joined	23:03
	→ devoldmx joined	23:03
	← graSP left	23:05
	← jatt left	23:06
	→ ejb joined	23:06
ejb	_ikke_: ping	23:06
_ikke_	pong	23:07
	→ metastableB joined	23:07
	→ lindenle joined	23:07
	→ nemesis joined	23:07
	← daedeloth left	23:09
	→ daedeloth joined	23:10
	← zumba_ad_ left	23:10
ejb	_ikke_: Remember how I squashed and rebased that patch earlier?	23:10
	→ zumba_addict joined	23:10
_ikke_	yeah	23:11
	→ jatt joined	23:11
	← lindenle left	23:11
	← jatt left	23:12
	→ jatt joined	23:12
ejb	_ikke_: well, turns out that origin/master is their unstable branch. So in order to have stable code with that patch included, I need to roll back master to a release tag.	23:12
	_ikke_: But I've submitted that PR so I need to make sure that I don't screw that up in the process.	23:12
_ikke_	right	23:12
	so just rebase that patch onto the relase tag, and then force push to your branch	23:13
	← stick-shift left	23:13
ejb	I can give the branch a new name with push -f?	23:13
_ikke_	ejb: if you give it a new name, you don't need -f	23:14
	→ rns2 joined	23:14
ejb	_ikke_: Ok, because the PR should be rebased onto origin/master (like it is) but I need another version rebased to stable.	23:14
	← m0ltar left	23:15
_ikke_	ok, then create a new branch on the stable release, and cherry-pick the patch onto it	23:15
	→ linuxchiq joined	23:15
	→ watabou joined	23:16
	→ str joined	23:16
	→ thedodd joined	23:17
	→ EminenceHC joined	23:18
	← daedeloth left	23:18
	← AAoK left	23:18
	→ hebz0rl joined	23:19
	← Zoddo left	23:19
	→ bollullera joined	23:20
	← u1106 left	23:21
	→ dm7freek_ joined	23:21
	→ u1106 joined	23:21
	→ Gizburdt joined	23:22
	← EminenceHC left	23:22
	→ cagedwisdom joined	23:22
	← dm7freek left	23:24
	← Gama11 left	23:27
	← cceleri left	23:27
	← Gizburdt left	23:27
	← Sample left	23:27
	→ cceleri joined	23:27
	→ Gizburdt joined	23:28
	← Takle left	23:29
	← APerson_ left	23:29
	← Gizburdt left	23:30
	← SirRetnuh left	23:31
	← The_Phoenix left	23:32
	→ jadne joined	23:32
	→ Gizburdt joined	23:33
	← Gizburdt left	23:34
	→ robbyoconnor joined	23:35
	← r0bby_ left	23:36
	← TheNet left	23:37
	→ plumzl joined	23:37
	→ TheNet joined	23:37
	→ haptiK joined	23:37
	→ joeyDB_ joined	23:38
	← haptiK left	23:39
	Samual_ → Samual	23:39
	→ Gizburdt joined	23:40
	← sorenb left	23:41
	← cagedwisdom left	23:41
	← teran_ left	23:42
	← joeyDB_ left	23:42
	← PeterBooker left	23:42
	← ciampix left	23:44
	→ anli joined	23:45
	← zumba_addict left	23:46
	→ sorenb joined	23:46
	→ zumba_addict joined	23:46
	→ jeffmjack joined	23:48
	← Dorf left	23:48
	→ Sample joined	23:49
	← ashnur left	23:51
	→ shawndumas joined	23:51
	← robbyoconnor left	23:53
	← zacts left	23:53
	→ OnkelTem joined	23:54
	gitinfo set mode: +v	23:54
OnkelTem	Hi. How to call git format-patch to cook a patch for the previous commit?	23:55
	→ smithd joined	23:55
OnkelTem	i.e. calling with -1 makes patch from the last commit. With -2 - from two last commits. But I need the previous only :)	23:55
_ikke_	OnkelTem: git format-patch -1 HEAD^	23:56
OnkelTem	with ^?	23:56
_ikke_	yes	23:56
	or ~	23:56
	HEAD~ or HEAD~1	23:56
	→ MattMaker joined	23:57
OnkelTem	** that feeling when you see a program which utilizes pseudographics	23:57
	_ikke_: thanks!	23:57
	→ zhangyh26258 joined	23:57
	→ snearch joined	23:58
	→ robbyoconnor joined	23:58
	→ kingbeowolf joined	23:58
_ikke_	see also man gitrevisions	23:58
gitinfo	the gitrevisions manpage is available at http://jk.gs/gitrevisions.html	23:58
	→ cagedwisdom joined	23:58
_ikke_	it explains what it all means	23:58
kingbeowolf	hi I want to put any changes made to a branch into master	23:58
	should i just do git merge mybranch?	23:58
	never merged changes before	23:58
	will it screw anything up	23:59
_ikke_	kingbeowolf: Yes, just merge it	23:59
	kingbeowolf: It might give merge conflicts	23:59
	← Amandil left	23:59
kingbeowolf	what do i do if that happens?	23:59
_ikke_	kingbeowolf: But those happen, just solve them when they happen	23:59
	!eek	23:59
gitinfo	[!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, don't panic. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II	23:59

Logs Search ←Prev date Next date→

Channels Documentation