IRCloggy #git 2014-10-04

Provider of IRC logs since 2005.

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

	2014-10-04
	← fstd left	00:00
	→ Lyqyd joined	00:00
	← vocifer left	00:00
	→ fstd joined	00:00
	→ Sebtoast joined	00:00
	← oojacoboo left	00:02
	→ baweaver joined	00:02
imachuchu	ozoness: looks like you broke something! It just means that the project won't build with the changes you commited	00:03
	ozoness: so you used git/github just fine, but the code you commited had a problem	00:03
	← thumpba left	00:03
	← Sebtoast left	00:03
	← boombatower left	00:03
	→ Sebtoast joined	00:04
	→ aidalgol joined	00:04
	→ boombatower joined	00:04
ozoness	imachuchu: really? I just added a condition to an if statement, that's all ha. I wonder what's causing the problem, could I link you the PR so you can check? It's just a 20 char change...	00:04
	imachuchu: I added the changes to the development branch, could it be because of that? :S	00:05
	← robzilla left	00:06
babuloseo	what's the parent number?	00:06
	→ Miesco joined	00:07
	→ decompiled joined	00:07
Miesco	Hi, in my .csproj file, git added a bunch of stuff like "<<<<<<< Updated upstream	00:07
	"	00:07
	At the very beginning	00:07
	← baweaver left	00:07
Miesco	My partner can not open the project now in visual studio	00:07
	WHy would git add stuff to my files?	00:08
	→ baweaver joined	00:08
imachuchu	ozoness: if it wasn't 5 oclock I'd say sure, but I'm out (sorry!). It might also be failing an automated test. Try compiling it on your end and see if it's just Travis being wierd (which happens)	00:08
babuloseo	^ his partner...should I just revert to a parent and hope .csproj doesn't get touched?	00:08
ozoness	imachuchu: thanks!	00:09
	← St_Marx left	00:09
	→ madewokherd joined	00:09
	← rdbell left	00:09
	← in_deep_thought left	00:09
imachuchu	Miesco: just quick on my way out, that's not just git it's a diff issue. Most likely your merge had an error and the '<<<<<', '======', and '>>>>>>' show the difference between the heads that git is trying to merge. Look up git merge and maybe the diff program	00:09
	→ rdbell joined	00:09
	← imachuchu left	00:10
thibaultcha	Miesco: you guys ran into a !conflict	00:10
gitinfo	Miesco: [!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	00:10
ozoness	imachuchu: last one: should I remove my forks after my PR gets accepted?	00:10
babuloseo	thibaultcha, so just revert? not sure how to fix the conflict :P	00:10
ozoness	hey guys, should I remove my forks after my PR gets accepted?	00:11
CareBear\	why not	00:11
thibaultcha	babuloseo: Edit each file having conflicts and chose what part should be kept and what part should be diteched out. Watch the video from the bot's reply for a more detailed process maybe	00:12
ozoness	CareBear\: do you delete them?	00:12
CareBear\	ozoness : I never use github	00:12
ozoness	CareBear\: ahhh ok	00:12
	→ acharlieh joined	00:12
	← Miesco left	00:13
	← ozoness left	00:13
	← baweaver left	00:13
thibaultcha	babuloseo: Also the link to the git book.	00:13
	→ robzilla joined	00:13
babuloseo	haha..natural part of collaboration XD	00:13
	that bot cracks me up :P	00:13
thibaultcha	babuloseo: But don't panic, it happens, and it's not a big deal, you jsut have to choose which part of the code is valid because git cannot decide for you, since both of you (your partner and yourself) made changes to the same piece of code.	00:14
	← rdbell left	00:14
babuloseo	yeah, we are gonna use patches >.>	00:14
	it's just that he made changes to .csproj, which doesn't happen usually	00:14
	I want to revert, but it keeps telling me that it expects a numberial value	00:15
CareBear\	hbabuloseo : you made changes to .csproj too clearly, otherwise there would be no conflict	00:15
thibaultcha	^	00:16
CareBear\	babuloseo : it is of course possible that you have crappy tools which are making changes to some files without you really wanting them to	00:16
	git can not really help with that problem	00:16
babuloseo	yeah, I think that's on my partners end..who isn't using visual studio 2013 :P	00:18
	and using some next tool to build the .csproj..	00:18
	← robzilla left	00:18
	→ kukks joined	00:20
	← kukks left	00:20
	→ kukks joined	00:20
	← toothrot left	00:20
	← LLaurent left	00:20
CareBear\	please listen	00:22
	you would not have a conflict in that file if you did not have changes in it in your commits	00:22
	you REALLY need to start reviewing what you are committing	00:22
	if you want to be able to collaborate with anyone	00:22
	← SjB left	00:23
	← justinmburrous left	00:23
	→ mribeirodantas joined	00:25
babuloseo	CareBear\, will check	00:26
	← snuffeluffegus left	00:27
	← netcarver left	00:28
	→ ussher_ joined	00:30
	→ SjB joined	00:30
	← Goplat left	00:30
	→ jxpx777_ joined	00:31
	← jxpx777 left	00:31
	← Quevin left	00:31
	→ justinmburrous joined	00:31
	→ Miesco joined	00:32
	← d10n-work left	00:32
	← zanchoPa1sa left	00:32
ussher_	Im trying to merge master branch with my dev branch but hitting an issue. The error is "error: Your local changes...would be overwritten by merge:" but the file it states does not exist in either branch. I tried git stash drop but still cant get it to merge. any ideas why?	00:33
	→ zanchoPansa joined	00:33
	← ianbrandt left	00:33
	← rpg_ left	00:34
Miesco	Hi, git added this to the beginning of my file: <<<<<<< Updated upstream	00:34
	And at the end: >>>>>>> Stashed changes	00:35
ussher_	Got it sorted with reset --hard. Thanks.	00:35
Miesco	I can not find anything on google to why this happened or what to do.	00:35
	← freeman42 left	00:36
soerenb	Miesco, those are the conflict markers git adds when it can't resolve the conflict on it's own. you have to resolve it manually now	00:36
CareBear\	Miesco : did you miss what people just told you? !conflict	00:36
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	00:36
thibaultcha	Miesco: We explained to your partner 5 minutes ago, weren't you here?	00:36
	← tchan left	00:36
Miesco	CareBear\: Sorry, I was on the bus and my session got cut out	00:36
	← akiva left	00:38
	← listochkin left	00:39
	← Skapadapaduu left	00:41
	← jottr left	00:43
	→ CKyle joined	00:44
	← robustus\|Off left	00:44
	→ EminenceHC joined	00:45
osse	.	00:45
	→ habanany joined	00:46
	← maslowbeer left	00:46
	→ joeyDB joined	00:46
	→ maslowbeer joined	00:47
	→ robustus\|Off joined	00:47
	robustus\|Off → robustus	00:47
	← Miesco left	00:48
	← Sasazuka left	00:49
	← EminenceHC left	00:49
	→ snuffeluffegus joined	00:49
	→ tchan joined	00:51
	← salamanderrake left	00:53
	← AKK9 left	00:53
	← Sleepy63 left	00:53
	→ salamanderrake joined	00:53
	← kukks left	00:53
	← decompiled left	00:54
	← ajustrun left	00:54
	← oriba left	00:54
	→ Miesco joined	00:54
	← seanmerron left	00:57
	← xSmurf left	00:57
	← kballou left	00:58
	← ciampix left	00:59
	gfixler_ → gfixler	01:01
	← eto left	01:01
	← livingstn left	01:01
	← justinmburrous left	01:02
	→ eto joined	01:02
	← Segfault_ left	01:03
	← Sadeukko left	01:04
	→ thumpba joined	01:04
	→ akushner_ joined	01:04
	→ phoenixz joined	01:05
	← ra0 left	01:06
	→ m0viefreak joined	01:06
	→ Sleepy63 joined	01:06
	→ tbxyz joined	01:07
	→ justinmburrous joined	01:08
	← akushner left	01:08
	→ kukks joined	01:08
	← akushner_ left	01:09
	← mribeirodantas left	01:10
	→ kopparam joined	01:10
	← CKyle left	01:10
	← kukks left	01:12
	← chris_99 left	01:13
	← shinnya left	01:14
	→ mnavratil joined	01:15
	← acharlieh left	01:15
	← maestrojed left	01:15
	→ acharlieh joined	01:16
	← Tuna-Fish left	01:17
	← kopparam left	01:17
	← studmuf left	01:17
	→ Tuna-Fish joined	01:18
	← desposo1 left	01:18
	→ studmuf joined	01:18
	→ punchagan joined	01:18
	← hexagoxel_ left	01:19
	← Celm left	01:19
	→ Celm joined	01:20
	← mellernoia left	01:22
	→ jonr2219 joined	01:22
	← studmuf left	01:22
	→ tgunr joined	01:23
	← Celm left	01:24
	← LeMike left	01:25
	→ knownasilya joined	01:26
	→ hebz0rl_ joined	01:29
	← jonr2219 left	01:29
	← cagedwisdom left	01:32
	← hebz0rl left	01:32
	← acharlieh left	01:33
	← joelm left	01:33
	← LucasTT left	01:37
	→ acharlieh joined	01:38
	← justinmburrous left	01:38
	→ RaceCondition joined	01:41
	→ justinmburrous joined	01:42
	→ tmcmahon joined	01:43
	← davispuh left	01:46
	→ rdbell joined	01:47
	← Guest26075 left	01:47
	→ ariver joined	01:48
	ariver → Guest32135	01:49
	← acharlieh left	01:49
	← Guest32135 left	01:49
	→ ferreum_ joined	01:51
	→ EminenceHC joined	01:51
	→ jpf_ joined	01:52
	← tmcmahon left	01:52
	← dreiss left	01:52
	← ferreum left	01:54
	← jpf left	01:54
	→ mizu_no_oto joined	01:56
	← jpf_ left	01:57
	← EminenceHC left	01:57
	→ Goplat joined	01:57
	← mnavratil left	01:57
	← darkbasic_ left	01:59
	→ darkbasic joined	01:59
	→ m0ltar joined	02:01
	→ Dougie187 joined	02:01
	→ AnujSharma joined	02:02
	← bAnt left	02:03
	← AnujSharma left	02:04
	→ nettoweb joined	02:06
	← nettoweb left	02:06
	→ nettoweb joined	02:07
	← nettoweb left	02:07
	→ nettoweb joined	02:07
	← hstefan left	02:07
	← kcm1700 left	02:09
	→ kcm1700 joined	02:10
	← pbrobst_ left	02:10
	→ studmuf joined	02:10
	← m0ltar left	02:10
	← joeyDB left	02:11
	→ OneEyedWill joined	02:14
	← studmuf left	02:14
	← mueslo left	02:14
	← justinmburrous left	02:15
	← MutSbeta left	02:18
	→ Celm joined	02:20
	← RaceCondition left	02:24
	→ juvenal joined	02:24
	← Celm left	02:25
	← Obi_obi_ left	02:27
	→ Obi_obi_ joined	02:27
	→ imkmf joined	02:28
	← imkmf left	02:29
	← snuffeluffegus left	02:30
	→ inoue joined	02:32
	← nb_bez___ left	02:33
	← maslowbeer left	02:33
	→ Literphor joined	02:33
	← gmb2020 left	02:33
	→ justinmburrous joined	02:33
	← tbxyz left	02:34
	← wookienz_ left	02:35
	→ wookienz joined	02:35
	→ Celm joined	02:37
	→ ome joined	02:37
	→ surfperch joined	02:37
	← CheckDavid left	02:37
	← kaendfinger left	02:38
	← jdhines left	02:40
	→ Gamecubic_ joined	02:40
	→ reim_ joined	02:41
	← inoue left	02:43
	→ sorresse1n joined	02:43
	→ Cassiel joined	02:43
	→ Nevik_ joined	02:43
	→ bbloom joined	02:43
	→ jave_ joined	02:43
	→ rasto_ joined	02:44
	← msonntag left	02:44
	→ jwr__ joined	02:44
	→ WaReZ joined	02:44
	← nettoweb left	02:44
	→ bremner` joined	02:44
	← bremner` left	02:44
	→ bremner` joined	02:44
	→ nicetry_ joined	02:44
	← mizu_no_oto left	02:44
	→ jiyuu joined	02:45
	→ AccessGr1nted joined	02:45
	→ Orphis joined	02:45
	→ msonntag joined	02:46
	→ cite_ joined	02:46
	→ ariver joined	02:46
	→ rj11_ joined	02:46
	→ rs0 joined	02:46
	→ purpleid1a joined	02:46
	→ abrkn_ joined	02:47
	← Literphor left	02:47
	→ rotorooter joined	02:47
	← reim left	02:47
	→ maestrojed joined	02:47
	→ tpope_ joined	02:47
	← kevin-brown left	02:48
	→ kevin-brown joined	02:48
	→ Neptu_ joined	02:48
	→ a joined	02:48
	→ granden_ joined	02:48
	→ qdii joined	02:48
	a → Guest42626	02:49
	→ nettoweb joined	02:49
	← nettoweb left	02:49
	→ niax_ joined	02:49
	→ a___ joined	02:49
	→ nettoweb joined	02:49
	→ Consuela_ joined	02:49
	← nettoweb left	02:49
	→ thesquib_ joined	02:50
	→ nettoweb joined	02:50
	→ watabou joined	02:50
	→ SumDude joined	02:50
	→ Console` joined	02:51
	→ jtruckz_ joined	02:51
	← Gamecubic_ left	02:51
	→ qsusxs joined	02:52
	← SumDude left	02:52
	→ sokoll- joined	02:52
	→ Gamecubic_ joined	02:52
	→ shampine joined	02:53
	→ ojacobson joined	02:53
	→ EminenceHC joined	02:56
	→ NoNMaDDeN joined	02:56
	← Celm left	02:56
	→ linduxed_ joined	02:56
	← surfperch left	02:56
	← habanany left	02:56
	← Consuela left	02:56
	← AccessGranted left	02:56
	← Gamecubic left	02:56
	← wakd left	02:56
	← rasto left	02:56
	← bbloom_ left	02:56
	← jwmann left	02:56
	← jave left	02:56
	← synchronous left	02:56
	← StolenToast left	02:56
	← fuki left	02:56
	← a_ left	02:56
	← catsup left	02:56
	← NfNitLoop left	02:56
	← emacer left	02:56
	← berndj left	02:56
	← Orphis_ left	02:56
	← sokoll left	02:56
	← Neptu left	02:56
	← granden left	02:56
	← nicetry left	02:56
	← SJS left	02:56
	← roto left	02:56
	← pooh22 left	02:56
	← Nevik left	02:56
	← Orginator left	02:56
	← sorressean left	02:56
	← abrkn__ left	02:56
	← tpope left	02:56
	← qdii_ left	02:56
	← jwr___ left	02:56
	← niax left	02:56
	← rs0_ left	02:56
	← linduxed left	02:56
	Consuela_ → Consuela	02:56
	→ Orginator_ joined	02:56
	→ Celm joined	02:56
	→ pooh22 joined	02:58
	→ habanany joined	02:58
	→ SJS joined	02:58
	→ emacer joined	02:58
	← m0viefreak left	02:58
	→ StolenToast joined	02:58
	→ synchronous joined	02:59
	→ wakd joined	02:59
	← EminenceHC left	03:00
	→ moritzs joined	03:00
	→ NfNitLoop joined	03:00
	→ home-pc_ joined	03:01
	→ SumDude joined	03:01
	← SumDude left	03:01
	← Celm left	03:01
	→ Celm joined	03:03
	→ _Atom_ joined	03:03
	← skylite left	03:03
	← babuloseo left	03:04
	→ toothrot joined	03:05
	← Pyrogerg left	03:05
	← madduck left	03:05
	→ xSmurf joined	03:07
	→ berndj-blackout joined	03:07
	← Celm left	03:07
	→ jonmorehouse joined	03:07
	→ skylite joined	03:08
	← skylite left	03:09
	→ pcypher joined	03:10
	← hebz0rl_ left	03:10
	← Goplat left	03:11
	→ jontmorehouse joined	03:12
	← jonmorehouse left	03:13
	→ shawndumas joined	03:13
	← maestrojed left	03:13
	→ home-pc__ joined	03:15
	→ jargon joined	03:15
	→ Pyrogerg joined	03:16
	→ maestrojed joined	03:16
	→ thepreacher joined	03:16
	← home-pc_ left	03:17
	← ojacobson left	03:18
	→ ajustrun joined	03:19
	← moritzs left	03:19
	→ ojacobson joined	03:19
	← c0ded left	03:20
	← maestrojed left	03:20
	← Noldorin left	03:21
	← pcypher left	03:24
	→ skylite joined	03:25
	→ Celm joined	03:27
	→ diegoaguilar joined	03:29
	← shampine left	03:29
	← eliasr left	03:32
	← Obi_obi_ left	03:32
	← Celm left	03:32
	→ Obi_obi_ joined	03:32
	← ajustrun left	03:33
	← Obi_obi_ left	03:33
	→ Obi_obi_ joined	03:34
	← wakd left	03:34
	← Obi_obi_ left	03:36
	→ Obi_obi_ joined	03:36
	← Obi_obi_ left	03:36
	← shawndumas left	03:37
	→ Obi_obi_ joined	03:38
	← Obi_obi_ left	03:40
	→ Obi_obi_ joined	03:41
	→ joeyDB joined	03:41
	← Obi_obi_ left	03:41
	→ Obi_obi_ joined	03:41
	← Obi_obi_ left	03:42
	→ Obi_obi_ joined	03:42
	→ amjam joined	03:43
	→ evildmp joined	03:43
	→ wakd joined	03:43
	→ otter768 joined	03:44
	← Dougie187 left	03:46
	← Consuela left	03:46
	→ lowkeyliesmyth joined	03:48
	Obi_obi_ → Obi_obi	03:49
	→ Jumblemuddle joined	03:49
Jumblemuddle	I have a remote git repo setup. When I attempt to 'git push' it, I get a ssh error 'failed to add the host to the list of known hosts'. However, when I use ssh to connect directly the the user it works fine. In what way does git use ssh when pushing to a remote repo?	03:51
	← wookienz left	03:51
	← jontmorehouse left	03:51
ojacobson	'ssh (user@)hostname git upload-pack /path/to/repo'	03:51
	and likewise with git receive-pack	03:51
	(sometimes with options)	03:51
	→ wookienz joined	03:52
	← phanlord left	03:52
Jumblemuddle	Hmm, any reason it'd be different, and not allow for the fingerprint already in ssh/known_hosts? I've already connected to this user on my server, so it's in the known_hosts file.	03:53
	The fingerprints show up as the same.	03:53
ojacobson	!repro	03:54
gitinfo	Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will raise the odds of getting your problem fixed from about 30% to about 90%.	03:54
	← polyzen left	03:54
ojacobson	ideally both the git command + output and an ssh command + output	03:54
	← thepreacher left	03:54
	← a_le left	03:56
Jumblemuddle	http://sprunge.us/iPbW	03:57
	let me know if there is anything else I should show	03:57
ojacobson	do you have a services entry for a service named "~" ?	03:58
	← n-st left	03:58
	→ surfperch joined	03:58
ojacobson	SSH _urls_ use : as a port separator, like every other URL.	03:58
	surfperch → Guest74493	03:59
ojacobson	well, hostname and service separator.	03:59
	(normally the service is just a port number, most people seem to have forgotten that services can be named)	03:59
Jumblemuddle	No, I don't I was thinking it was linking to the $HOME folder.	03:59
ojacobson	Paths go after the slash after the authority.	03:59
	(protocol://authority/path)	04:00
	→ Mitchbones joined	04:00
	← NoNMaDDeN left	04:00
	← Guest74493 left	04:00
ojacobson	The alternate nfs-style syntax for SSH remotes (host:path) can't be freely combined with URL syntax; pick one or the other :)	04:00
	→ EminenceHC joined	04:00
	→ kossy joined	04:00
Jumblemuddle	So, I should `git remote add deploy ssh://user@something.com/blog.git`?	04:01
ojacobson	Is blog.git in the root directory on something.com ?	04:01
	You probably want /~/ instead of /	04:01
	(the URL-like syntax resolves from the filesystem root, because of reasons)	04:01
Jumblemuddle	Oh, gotcha! I understand now.	04:01
	→ NoNMaDDeN joined	04:02
	← home-pc__ left	04:02
Jumblemuddle	How can I change the remote deploy?	04:02
ojacobson	git remote set-url, most likely :)	04:02
	→ home-pc_ joined	04:03
Jumblemuddle	Hmm, ok. I've changed it, but I'm still having the issue of ssh failing to add the host to the list of known hosts.	04:03
	→ jontmorehouse joined	04:03
	← EminenceHC left	04:05
Jumblemuddle	I went ahead and used the full path: `git remote set-url deploy ssh://user@something.com/home/blog/blog.git`	04:05
	← madewokherd left	04:08
	← phoenixz left	04:09
Jumblemuddle	Most things online are saying ot change the permissions of the .ssh folder (~/cfg/ssh for me), but it's definitely owned by me. Also, ssh works fine. It's just when pushing with git that it fails.	04:09
	← home-pc_ left	04:09
	→ Celm joined	04:09
	→ home joined	04:09
	← home left	04:09
	→ home joined	04:09
	→ home-pc_ joined	04:11
ojacobson	Does the message literally say "Failed to add the host to the list of known hosts ($HOME/cfg/ssh/known_hosts)." with the string "$HOME" in it?	04:11
Jumblemuddle	ya, it does	04:11
ojacobson	that'd do it, then	04:11
Jumblemuddle	Maybe git doesn't parse $HOME?	04:11
	→ dsdeiz joined	04:11
Jumblemuddle	I hadn't thought of that.	04:11
ojacobson	git doesn't even look at authorized keys	04:11
	or known hosts	04:11
	git just invokes ssh	04:11
	→ lowkeyli_ joined	04:12
ojacobson	ssh, however, does _not_ do shell variable expansion in ssh_config or in ~/.ssh/config	04:12
	if you put "$HOME" there, that's exactly the path SSH will try to use :)	04:12
Jumblemuddle	That's strange that ssh on it's own doesn't have an issue though. I guess I'll take this over to an ssh channel. Thanks for your help. :) Sorry it wasn't really about git...	04:13
ojacobson	You can use strace to see how git's invoking ssh, if you're on linux	04:13
	that might help narrow down why the behaviour differs	04:13
	but I do suspect someone's out-clevered themselves and put what looks like a var in .ssh/config :)	04:13
	← home left	04:14
ojacobson	gotta go for a mo', mac is losing its wee mind	04:14
	avoid Wind Mobile cellular data sticks; the driver software is terribad	04:14
	← wakd left	04:14
	← thibaultcha left	04:15
	← Sleepy63 left	04:15
Jumblemuddle	Well, it's in /etc/ssh/ssh_config. Should I use ~ instead?	04:15
	For 'IdentityFile' and 'UserKnownHostsFile'	04:15
	→ EminenceHC joined	04:15
	← lowkeyliesmyth left	04:15
	→ msankhala joined	04:17
ojacobson	Tilde appears consistent with `man ssh_config`	04:17
	← OneEyedWill left	04:18
	← lowkeyli_ left	04:18
Jumblemuddle	... It works! :D I really wish this would be standardized... I've been trying to wrangle my .* files into some sort of scheme, but it's always hard to decide if I should use ~ or $HOME in configs.	04:18
	Anyhow, thanks so much for the help.	04:18
	→ lowkeyliesmyth joined	04:19
	← EminenceHC left	04:19
	→ thiago joined	04:20
	← ojacobson left	04:20
	← skylite left	04:20
	← alvaro_o left	04:21
	← evildmp left	04:21
	← Jumblemuddle left	04:22
	→ a_le joined	04:22
	← armyriad left	04:24
	← msankhala left	04:24
	← Celm left	04:24
	← a_le left	04:25
	→ Celm joined	04:25
	→ armyriad joined	04:25
	→ c0ded joined	04:26
	← Celm left	04:29
	← ntio left	04:32
	→ blubberbop joined	04:33
	← armyriad left	04:33
	→ armyriad joined	04:33
	→ ntio joined	04:34
	→ Sleepy63 joined	04:37
	← NoNMaDDeN left	04:39
	← kpreid_ left	04:39
	→ kpreid joined	04:40
	→ listochkin joined	04:40
	→ jdhines joined	04:41
	→ a_le joined	04:43
	← jdhines left	04:45
	← listochkin left	04:45
	← a_le left	04:46
	← jargon left	04:46
	→ Toaster` joined	04:48
	← blubberbop left	04:48
	← diegoaguilar left	04:50
	← thiago left	04:50
	← Sebtoast left	04:51
	→ thiago joined	04:52
	→ irqq joined	04:52
	→ ajustrun joined	04:52
	→ Literphor joined	04:53
	→ a_le joined	04:54
	← a_le left	04:54
	← otter768 left	04:55
	→ mustafavelioglu joined	04:57
	← mustafavelioglu left	04:57
	→ beautifulmind joined	04:58
	→ thiago_ joined	04:58
	→ cagedwisdom joined	05:00
	→ dauerschlaf joined	05:00
	← dauerschlaf left	05:01
	← thiago left	05:01
	→ dauerschlaf joined	05:02
	← xSmurf left	05:02
	← wookienz left	05:03
	→ EminenceHC joined	05:03
	← UmbraMalison left	05:04
	← unglid left	05:04
	→ sgen joined	05:04
	→ wookienz joined	05:05
	→ UmbraMalison joined	05:05
	← jontmorehouse left	05:06
	→ jontmorehouse joined	05:06
	← EminenceHC left	05:08
	→ unglid joined	05:09
	← dsdeiz left	05:10
	→ xSmurf joined	05:10
	← ecky--ptang-zoob left	05:11
	→ ecky--ptang-zoob joined	05:11
	← nettoweb left	05:11
	→ subhojit777 joined	05:14
	→ blubberbop joined	05:15
	→ eletuchy_ joined	05:20
	→ shigosei joined	05:21
	← amjam left	05:22
	← Literphor left	05:22
	→ amjam joined	05:23
	← irqq left	05:23
	← eletuchy left	05:24
	→ a_le joined	05:25
	→ madduck joined	05:25
	← toothrot left	05:25
	→ Celm joined	05:25
	→ mynameisbrian joined	05:26
	← _Atom_ left	05:27
mynameisbrian	hey guys, how do I deal with dependencies on github? should I leave them out of the repo? My code by default has an import statement which is supposed to include a file. it cannot work by default without this file, but should it still stay out of my repo?	05:27
	← amjam left	05:27
offby1	mynameisbrian: hard to answer.	05:28
	← boombatower left	05:28
offby1	mynameisbrian: if that file is part of a widely-available open-source library, it might suffice to just include a README with the installation instructions	05:28
	mynameisbrian: if your code uses a lanaguage that has a packaging system, like Python, perhaps you can create the magic that automatically installs the file, using the packaging system	05:29
	← Celm left	05:30
	← a_le left	05:30
offby1	another idea is to just copy it into the repository.	05:30
mynameisbrian	okay. it's just normalize, its a CSS reset stylesheet (kind of). but the import statement is in sass, and will fail to compile if they don't include it. but my repo is setup to work with the bower package manager, which auto installs this reset stylesheet. so it'd be weird to include it. but not everyone cares to use bower	05:30
offby1	yikes	05:30
Eugene	If it's a lightweight dependency(a file or three) that you NEED to have there, and won't change often, I say just go for it, and put it under a libraries/ directory.	05:31
offby1	I don't understand most of those technical terms :-) I myself have added jquery.min.js to a project once or twice.	05:31
Eugene	Eg, jquery or CSS things ^	05:31
offby1	^	05:31
mynameisbrian	okay Eugene. but isn't it redundant though, when I have it setup to work with a package manager? the package manager, if they use it (which a lot of people do) will then include it. so then there's two of the same file	05:32
Eugene	If it's a big project(like, standard C library headers or something) you want to use a dependency system of soem sort, possibly submodules, but more likely an entry in the README saying "yum install boost-devel; make; make install"	05:32
offby1	this man, he speaks sense	05:32
	→ sohail` joined	05:33
offby1	who is he? Where did he come from? What does he want?	05:33
	ChanServ set mode: +o	05:33
	← xSmurf left	05:33
	offby1 cringes	05:33
	Eugene changed the topic to: Welcome to #git, the place for git help and authoritarian dictatorships \| Current stable version: 2.1.2 \| Start here: http://jk.gs/git \| Getting "cannot send to channel"? /msg gitinfo .voice \| git commit crim PUT DOWN THAT GUN AND HANDS UP IN THE AIR!	05:33
	Eugene kicked offby1 (TRAITOR TO THE CROWN!)	05:33
	→ offby1 joined	05:34
offby1	sigh	05:34
	offby1 rubs the sore spot	05:34
	ajustrun → ajustrun\|away	05:34
mynameisbrian	know what... ill leave it out. ill create separate files for people who download it from my site. for someone more "advanced", if they're downloading my files on github, they won't care about the inconvienence (sp) of having to download and include it. then for bower users, it'll auto download it for them.	05:36
	→ buffal0 joined	05:37
	← jontmorehouse left	05:37
Eugene	Packaged release with all dependencies is also a valid approach, yup	05:37
mynameisbrian	I was typing: "marijuana, pizza, and coding, this is a good night." then literally 5 seconds later my cat threw up all over my new blanket and pillow	05:38
	→ FunkyAss joined	05:39
offby1	the wages of weed is cat puke	05:40
	s/is/are/ ? Discuss	05:40
mynameisbrian	is. "wages of weed" is the subject, and that's more like, a concept. "wages" is plural, but not "wages of weed"	05:41
	← buffal0 left	05:41
mynameisbrian	just a guess	05:42
	→ Fandekasp joined	05:42
Eugene	You must be sobering up	05:42
	→ shawndumas joined	05:42
mynameisbrian	no I dont think what I said made sense	05:42
Eugene	It's obviously "pot, pizza, programming"	05:42
	Geeze	05:42
offby1	"Wine, women, song"	05:42
mynameisbrian	"the wages are cat puke", maybe cat puke is the subject	05:43
offby1	if those were my wages, I'd go on strike	05:43
	Eugene changed the topic to: Welcome to #git, the place for git help and cat puke \| Current stable version: 2.1.2 \| Start here: http://jk.gs/git \| Getting "cannot send to channel"? /msg gitinfo .voice \| git rebase --onto toilet	05:43
Eugene	I've changed my mind for today's joke.	05:43
	Eugene set mode: -o	05:43
	→ xSmurf joined	05:44
	← cannonball left	05:45
	← blubberbop left	05:47
	← sgen left	05:48
	← eagles0513875 left	05:48
	→ eagles0513875 joined	05:48
	← eagles0513875 left	05:48
	→ eagles0513875 joined	05:48
	← subhojit777 left	05:49
	← rs0 left	05:49
mynameisbrian	fucking cat, pisses me off so much.	05:49
	← shawndumas left	05:49
offby1	well, it doesn't stain if you clean it up quickly	05:50
mynameisbrian	lol @ Perljam	05:50
	I dont really care about it staining, but I dont want to wash blankets at 2am	05:50
	→ subhojit777 joined	05:50
	← WaReZ left	05:52
	← sohail` left	05:53
	→ sgen_ joined	05:56
	← hplar_ left	05:57
	← wookienz left	05:59
	→ kopparam joined	06:01
	← ome left	06:02
	→ JohnBat26 joined	06:03
	← hahuang65 left	06:04
	→ wookienz joined	06:04
	← starkhalo left	06:05
	→ aswen joined	06:06
	← kopparam left	06:07
	→ jontmorehouse joined	06:09
	→ jiskiras joined	06:09
	← jiskiras left	06:09
	← gfixler left	06:09
	→ pcypher joined	06:12
	→ dreiss joined	06:12
	→ pantsman- joined	06:12
	← aswen left	06:13
	← Cassiel left	06:14
	← descala left	06:14
	← SjB left	06:20
	→ descala joined	06:20
	→ lowkeyli_ joined	06:21
	→ alanwill joined	06:22
	← xSmurf left	06:24
	← lowkeyliesmyth left	06:24
	→ Celm joined	06:26
	← wookienz left	06:27
	→ wookienz joined	06:28
	← dreiss left	06:29
	→ xSmurf joined	06:30
	← purak left	06:30
	→ irqq joined	06:30
	→ netcarver joined	06:31
	← Celm left	06:31
	← kyb3r_ left	06:31
	← pcypher left	06:31
	← punchagan left	06:31
	← Nijikokun left	06:33
	→ Nijikokun joined	06:35
	← netcarver left	06:37
	← Mitchbones left	06:38
	→ hoijui joined	06:38
	← home-pc_ left	06:39
	→ jdhines joined	06:41
	← wookienz left	06:42
	← joeyDB left	06:43
	→ Kicer86 joined	06:44
	← atomx_ left	06:45
	← atomx left	06:45
	→ sinkensabe joined	06:45
	→ atomx joined	06:46
	← jdhines left	06:46
	→ wookienz joined	06:47
	→ joeyDB joined	06:47
	→ evildmp joined	06:49
	← Gamecubic_ left	06:49
	→ Gamecubic_ joined	06:49
	← jontmorehouse left	06:52
	← irqq left	06:55
	→ DTSCode joined	06:55
	→ irqq joined	06:55
	→ a_le joined	06:56
	→ PinkSpecs joined	06:59
	← a_le left	07:00
	→ hahuang61 joined	07:02
	→ on4k joined	07:03
	← joeyDB left	07:04
	→ endiruna joined	07:04
	→ ehmatthes joined	07:04
	← hahuang61 left	07:07
	← rdbell left	07:07
	→ kriks joined	07:09
	→ arthurvr joined	07:10
	← endiruna left	07:11
	→ aswen joined	07:11
	→ EminenceHC joined	07:11
	→ Advocation joined	07:12
ELLIOTTCABLE	Hey, all. How can I enable colour for a single command? (when piping.)	07:14
	I have it enabled as a configuration option, but that's ignored when stdout isn't a tty …	07:14
	→ psoo joined	07:14
	← psoo left	07:14
	→ psoo joined	07:15
	→ punchagan joined	07:16
	← watabou left	07:17
	→ bmcorser joined	07:17
	← EminenceHC left	07:17
Kwpolska	ELLIOTTCABLE: --color=always	07:18
	← Gamecubic_ left	07:19
	← irqq left	07:19
ELLIOTTCABLE	“Unknown option: --color=always”	07:19
	but, scratch that anyway, I think I have it figured out …	07:19
	→ irqq joined	07:20
	← niax_ left	07:22
	→ niax joined	07:22
ELLIOTTCABLE	yah:	07:22
	`git -c color.status=true status`	07:22
	works!	07:22
	← blahdodo left	07:23
	→ enelar_ joined	07:23
	→ blahdodo joined	07:24
	→ LLaurent joined	07:26
	← enelar left	07:26
	→ Celm joined	07:26
	← lowkeyli_ left	07:27
	← aswen left	07:27
	← Nyoom left	07:27
	← Kulrak left	07:27
	→ Kulrak joined	07:27
mynameisbrian	hey guys,w hat are releases on github exactly? just archives? I guess I don't get when we should create a release	07:28
	*what	07:28
	← NBhosting left	07:29
	→ BuenGenio joined	07:29
	← evildmp left	07:30
	← punchagan left	07:30
	← Celm left	07:31
	→ enelar__ joined	07:33
	← eletuchy_ left	07:34
	→ eletuchy joined	07:34
	← sinkensabe left	07:34
	→ burhan joined	07:35
	← enelar_ left	07:36
arand_	mynameisbrian: There's #github for specifics, but isn't it just a tag, and some automatically generated tree archives?	07:39
	← burhan left	07:40
	→ burhan joined	07:40
	→ PEMapModder joined	07:40
	→ j416 joined	07:41
	← PEMapModder left	07:41
arand_	(And I would guess when to release is completely down to preference and what workflow you happen to be following...)	07:41
bremner`	right. IMHO "serious" projects have releases as snapshots considered relatively stable and usable for external users. But many people on github (and in general) don't care about this.	07:42
	← justinmburrous left	07:42
	← madduck left	07:45
	→ justinmburrous joined	07:48
	→ zapb_ joined	07:49
	→ Nyoom joined	07:49
	← irqq left	07:49
	→ irqq joined	07:50
	← psoo left	07:50
	→ ZoidbergWill joined	07:51
	← beautifulmind left	07:51
	← Ksg89 left	07:52
	→ Ksg89 joined	07:52
	← mynameisbrian left	07:53
	→ kopparam joined	07:55
	→ johntramp_ joined	07:55
	→ felixjet__ joined	07:56
	← felixjet_ left	07:57
	→ ColdKeyboard joined	07:58
	← kopparam left	07:59
	→ danicampa901 joined	08:03
	← ehmatthes left	08:03
	→ beautifulmind joined	08:04
	← suffice_ left	08:05
	← Advocation left	08:08
	→ efiop joined	08:08
	← burhan left	08:08
	→ suffice joined	08:09
	← suffice left	08:09
	→ suffice joined	08:11
	→ EminenceHC joined	08:15
	← habanany left	08:16
	→ mennea joined	08:16
	← Sleepy63 left	08:16
	← mennea left	08:17
	→ punchagan joined	08:17
	← LLaurent left	08:18
	→ mennea joined	08:18
	← justinmburrous left	08:19
	→ justinmburrous joined	08:19
	← EminenceHC left	08:19
	← mennea left	08:20
	← punchagan left	08:21
	Guest92566 → gfixler	08:21
	← beautifulmind left	08:23
	→ shinnya joined	08:23
	← justinmburrous left	08:23
	→ evildmp joined	08:23
	→ justinmburrous joined	08:23
	→ groolot joined	08:24
	← evildmp left	08:25
	→ BlaXpirit joined	08:26
	→ Celm joined	08:27
	→ St_Marx joined	08:27
	→ jhermann joined	08:27
	→ Error404NotFound joined	08:28
	→ mennea joined	08:28
	→ Sleepy63 joined	08:29
	← Celm left	08:32
	← antispaceman left	08:32
	→ antispaceman joined	08:33
	← tgunr left	08:34
	→ tgunr joined	08:35
	→ wrouesnel joined	08:37
	→ anddam joined	08:37
	→ NoNMaDDeN joined	08:37
	← efiop left	08:37
	→ Wiz_KeeD joined	08:37
anddam	hi, I cloned a github repo and did a change to file, I want to submit and do a pull request. Should I be committing in a difference branch of my own or should I just commit in master?	08:37
Seveas	anddam: if you expect to file more than one pull request, I'd suggest doing one branch per pull request. If you're just doing a drive-by commit, master is good enough. But beware: if you add more commits to master later, and push those, they will be added to the pull request.	08:39
	← on4k left	08:39
	← groolot left	08:40
anddam	Seveas: thanks, I'm reading that again	08:40
	drive-by meaning one time only?	08:40
	one branch per PR it is	08:41
	do branches name stay in history?	08:41
Seveas	not necessarily, branch names are ephemeral and can be deleted after merging	08:41
anddam	also about the "if you add more commits to master later, and push those, they will be added to the pull request." part, that applies until the PR is merged in, is that correct?	08:41
	ok, I asked worried of "polluting" the project history	08:42
Seveas	anddam: I believe that that is correct, but am not 100% certain	08:42
anddam	thank you	08:42
	→ jdhines joined	08:42
	→ mikecmpbll joined	08:45
anddam	so, to recap: I now clone the project in GH, I change my local copy to use my own repo as remote, I create a new branch, commit there, push, the go GH and open a pull request toward the original project	08:45
	sounds right?	08:45
	I use git so seldom that I don't keep the worflow in mind	08:45
	← suffice left	08:46
	→ suffice joined	08:46
	← mennea left	08:46
	→ on4k joined	08:46
	→ mennea joined	08:47
	on4k → Guest98135	08:47
	← jdhines left	08:47
anddam	mm maybe I don't even need to change remote, I can use an explicit path when pushing, is that correct?	08:48
Seveas	I wouldn't even clone the original repo. After hitting 'fork' in the github ui, you can clone your own copy :)	08:49
	← joki left	08:49
Seveas	other than that, your workflow is correct	08:49
	← suffice left	08:49
	→ suffice joined	08:49
anddam	Seveas: but I've alread cloned and edited locally	08:50
	also, is the "origin" remote special?	08:51
Seveas	anddam: cloning and editing works just fine too, it's just more work and I'm lazy :-)	08:51
anddam	i.e. should I create "myremote" and then set "myremote" as default or should I rename "origin" to "project_original" then create a new "origin" remote to act as default?	08:51
	Seveas: I'm using this as a learning moment	08:52
	← JosephFerano left	08:52
Seveas	'origin' is the default remote in many operations. I'd set it to whatever you push to	08:52
	e.g. for github forks, I use 'origin' for my fork and 'upstream' for the repo I forked from	08:52
anddam	ok, can the default be set or is "origin" hardcoded?	08:52
	← Guest98135 left	08:52
	→ freeman42 joined	08:52
anddam	that sounds good, I want to keep a track of the original project	08:53
	← ajustrun\|away left	08:53
Seveas	I think 'origin' is hardcoded in a few places, but have never found the desire to change it, so haven't investigated :)	08:53
	← justinmburrous left	08:53
	→ justinmburrous joined	08:54
anddam	ok, I renamed origin to upstream and created a new remote with my gh url	08:54
	fetch and push url are already correct	08:54
	nice	08:54
	does it make sense to keep the fetch url from upstream?	08:54
Seveas	yes, as you'll want to fetch from it	08:55
	!sync	08:55
gitinfo	[!fork_sync] You can read a nice guide on how to update your fork with the upstream repository here: https://help.github.com/articles/syncing-a-fork	08:55
	→ joki joined	08:55
anddam	the only issue I can see with that is if I commit to my repo and fetch from upstream before my change is merged	08:56
	→ efiop joined	08:56
anddam	this would revert my local change, wouldn't it?	08:56
	→ kopparam joined	08:56
Seveas	it would not	08:56
	fetching from a repo only updates refs/remotes/remotename/*, local branches are unaffected	08:57
	you will need to merge or rebase those	08:57
anddam	thank you so much	08:57
	→ a_le joined	08:57
	← justinmburrous left	08:58
johntramp_	hi I am trying to clone a gitolite repo over a ssh tunnel with no success - it keeps asking for the git password even though I have added the ssh pubkey. any ideas what I may be doing wrong?	08:59
Seveas	johntramp_: !repro please. Also add the output of ssh-add -l	08:59
gitinfo	johntramp_: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will raise the odds of getting your problem fixed from about 30% to about 90%.	08:59
	→ justinmburrous joined	08:59
	← arthurvr left	08:59
	→ arthurvr joined	09:00
	← kopparam left	09:01
anddam	Seveas: mm I created branch A with first change, committed and pushed it, then created branch B, checked it out and did a different change	09:01
	commited this but the diff shows even the first	09:02
	I should have used A as base for B isntead	09:02
johntramp_	!repro	09:02
gitinfo	Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will raise the odds of getting your problem fixed from about 30% to about 90%.	09:02
	← a_le left	09:02
anddam	https://github.com/anddam/cdto/compare/jbtule:master...anddam:fix_developer_name?expand=1	09:02
	I see the issue is that upstream master is still the same	09:02
	Seveas: should I get rid of the changes in plugins/iterm/CD2ITerm.m 14÷17 by checking out master and then reapplying?	09:03
	is it worth redoing a change?	09:03
Seveas	anddam: when createing branch B, you created it on top of A instead of upstream/master	09:04
anddam	yes, so now I'm going to checkout master while in B	09:04
	→ govg_ joined	09:04
anddam	commit	09:04
Seveas	that doesn't help	09:04
anddam	then reapply the change	09:04
	oh how so?	09:04
	I'm used to svn	09:04
Seveas	to create B on top of master: git checkout -b B upstream/master	09:04
	or checkout master first and then checkout -b B	09:04
anddam	(well not even used to, I just happen to use it often for my basic tasks)	09:05
	what about the commit in B I already did?	09:05
	I'll just checkout upstream/master and commit	09:05
Seveas	remember the sha1, then delete the branch	09:05
anddam	s/commit/write over it	09:05
Seveas	after recreating the branch, cherry-pick the sha1	09:05
anddam	how do I list the checksums?	09:05
	log ?	09:06
Seveas	git log	09:06
anddam	k	09:06
	← govg left	09:06
	govg_ → govg	09:06
	← mutley89 left	09:06
anddam	out of curiosity what happens to github repo after I delete the branch?	09:06
	I already pushed	09:06
	← randallsquared left	09:06
Seveas	you'll need to push the delete (git push origin --delete B)	09:06
	or after recreating, you can push -f to overwrite it	09:07
	→ hebz0rl joined	09:07
	← eletuchy left	09:07
anddam	> git branch -d origin/fix_developer_name	09:07
	error: branch 'origin/fix_developer_name' not found.	09:07
Seveas	no origin/	09:07
anddam	how so?	09:07
	→ martinklepsch joined	09:07
Seveas	origin/fix_developer_name is the name of the remote branch. The local one is fix_developer_name	09:07
anddam	-d (lower case) should accept a remote branch name	09:08
Seveas	push copies fix_developer_name to the origin remote and then updates the origin/fix_developer_name ref	09:08
anddam	push origin --delete B did it	09:08
Seveas	I'm fairly sure branch -d only works on local branches (refs/heads/*)	09:08
anddam	I didn't delete anything locally, should I delete local branch and recreate it or can I checkout upstream/master and do it from there?	09:09
	oh the sha1 thing you said	09:09
Seveas	You'll need to delete the local branch before recreating it	09:09
	If you forgot to copy the sha1's, 'git reflog' is a nice backup to get them from :)	09:10
	→ randallsquared joined	09:11
anddam	I did it differently	09:11
Seveas	anyway, I need to run. Good luck!	09:11
anddam	git diff A B	09:11
	to ahve a patch of the diff I need	09:11
	thank you again	09:11
	→ Amandil joined	09:14
	→ psoo joined	09:14
	← mennea left	09:16
	→ mennea joined	09:17
	← linduxed_ left	09:18
	← Dynetrekk left	09:18
	→ linduxed joined	09:18
	→ eletuchy joined	09:19
	→ stamina joined	09:20
	→ vire joined	09:21
	→ sinkensabe joined	09:22
	← aidalgol left	09:22
	→ amjam joined	09:23
	→ punchagan joined	09:24
	← martinklepsch left	09:24
	← ussher_ left	09:25
	← amjam left	09:27
	← PinkSpecs left	09:30
	← justinmburrous left	09:30
	→ PinkSpecs joined	09:30
	→ justinmburrous joined	09:31
	→ TheFuzzball joined	09:31
	← sinkensabe left	09:33
	→ Guest94948 joined	09:34
	← Guest94948 left	09:35
	← markelite left	09:35
	← justinmburrous left	09:35
	→ Guest94948 joined	09:36
	← Guest94948 left	09:37
	→ aidalgol` joined	09:38
	← alanwill left	09:38
	← aidalgol` left	09:39
	→ aidalgol` joined	09:39
	aidalgol` → aidalgol	09:39
	→ mustafavelioglu joined	09:39
	→ m8 joined	09:40
	← JohnBat26 left	09:41
	→ petersr joined	09:42
	→ xjiujiu joined	09:43
	→ mihaicris joined	09:44
	← mennea left	09:46
	→ mennea joined	09:47
	→ martinklepsch joined	09:50
	← mikecmpbll left	09:50
	← psoo left	09:51
	← wookienz left	09:51
	→ justinmburrous joined	09:52
	→ hahuang61 joined	09:54
	→ mwoodson joined	09:54
	→ wookienz joined	09:56
	← cite_ left	09:57
	→ cite joined	09:57
	→ WaReZ joined	09:58
	← hahuang61 left	09:59
	← martinklepsch left	10:02
	← mustafavelioglu left	10:02
	→ habanany joined	10:03
	→ listochkin joined	10:03
	← antispaceman left	10:03
	→ marklite joined	10:04
	← punchagan left	10:04
	← stfn left	10:05
	← vire left	10:05
	→ stfn joined	10:05
	→ antispaceman joined	10:06
	→ punchagan joined	10:08
	→ mustafavelioglu joined	10:08
	→ ncd\|leeN joined	10:09
	→ vire joined	10:09
	→ [diablo] joined	10:09
	→ kopparam joined	10:10
	→ mikecmpbll joined	10:12
	→ seanmerron joined	10:14
	← irqq left	10:14
	← israelpattison left	10:14
	→ israelpattison joined	10:15
	→ AKK9 joined	10:15
	→ irqq joined	10:15
	← xjiujiu left	10:15
	→ CheckDavid joined	10:16
	→ kristofferR joined	10:18
	→ Segfault_ joined	10:18
	← kristofferR left	10:18
	← Lyqyd left	10:19
	→ kristofferR joined	10:20
	→ Jackneill joined	10:20
	→ madduck joined	10:21
	→ chux joined	10:21
	→ EminenceHC joined	10:23
	← justinmburrous left	10:23
	→ justinmburrous joined	10:27
	← EminenceHC left	10:27
	← mennea left	10:27
	→ Celm joined	10:28
	→ mennea joined	10:28
	→ mueslo joined	10:31
	→ [gmi] joined	10:31
	← Celm left	10:32
	→ King_Hual joined	10:32
	← King_Hual left	10:34
	← aidalgol left	10:34
	→ King_Hual joined	10:35
	→ ciampix joined	10:36
	← punchagan left	10:40
	← habanany left	10:43
	→ _Vi joined	10:43
	→ jdhines joined	10:43
	← listochkin left	10:43
	→ jargon joined	10:44
	← arthurvr left	10:46
	← efiop left	10:46
	→ efiop joined	10:46
	→ ToBeFree joined	10:48
	← jdhines left	10:48
	← vire left	10:49
	→ wakd joined	10:49
	← mikecmpbll left	10:51
	→ kiran joined	10:51
	← chux left	10:52
	← xSmurf left	10:53
	→ heftig joined	10:53
	← mihaicris left	10:53
	← kopparam left	10:54
heftig	git diff A...B will get me the diff from (the common parent of A and B) to B, right?	10:54
	→ beaky joined	10:55
beaky	hello	10:55
	how do i convince my mates to use git	10:55
	rather than emailing me random compressed archives of their work	10:56
	→ arthurvr joined	10:57
	← justinmburrous left	10:58
	→ m0viefreak joined	10:58
	→ justinmburrous joined	10:58
	← justinmburrous left	11:03
	→ justinmburrous joined	11:04
	← atomx left	11:07
	→ atomx joined	11:07
	← efiop left	11:07
	→ it0a joined	11:08
	→ xSmurf joined	11:09
	← mustafavelioglu left	11:09
	← kristofferR left	11:10
	→ efiop joined	11:11
	← FreezingCold left	11:12
cbreak	heftig: "git diff A...B" is equivalent to "git diff $(git-merge-base A B) B"	11:14
	beaky: call them names?	11:15
	beaky: ask them what they changed?	11:15
	→ MutSbeta joined	11:15
	→ mikecmpbll joined	11:18
	← danicampa901 left	11:18
	→ autochthon joined	11:19
	→ johtso joined	11:20
Jupelius	Is it possible to prevent my local git repository to work on master branch?	11:21
	← efiop left	11:21
	→ Skapadapaduu joined	11:22
	← c74d left	11:24
	→ skylite joined	11:26
	robustus → robustus\|Off	11:26
	→ c74d joined	11:26
	← skylite left	11:27
	← wookienz left	11:28
	→ EminenceHC joined	11:28
	→ wookienz joined	11:29
	→ Tabmow joined	11:32
heftig	Jupelius: delete the master branch?	11:33
	← [diablo] left	11:33
	← EminenceHC left	11:33
	→ ockham joined	11:34
	← justinmburrous left	11:35
	→ hyperair joined	11:36
	→ msankhala joined	11:37
	← Tabmow left	11:37
	→ Tabmow joined	11:38
	← mennea left	11:39
	→ mennea joined	11:39
beaky	is there a way to distribute changesets as standalone files	11:39
	which can be integrated to other repos	11:40
	← mennea left	11:40
	→ mustafavelioglu joined	11:40
	→ mennea joined	11:40
	← PinkSpecs left	11:41
	→ on4k joined	11:42
	← mustafavelioglu left	11:42
	→ mustafavelioglu joined	11:42
	← kcj left	11:43
	→ skylite joined	11:44
	← mustafavelioglu left	11:46
cbreak	beaky: yes	11:47
	beaky: git format-patch or git bundle	11:47
	→ paul424 joined	11:47
beaky	ah thanks	11:48
	→ Nizumzen joined	11:53
	← jargon left	11:54
	← irqq left	11:55
	→ irqq joined	11:55
	→ mindlessdemon joined	11:55
	← mindlessdemon left	11:56
	→ mindlessdemon joined	11:56
	← mindlessdemon left	11:56
	→ mindlessdemon joined	11:57
	→ justinmburrous joined	11:57
	→ mezod joined	11:57
	← mezod left	11:57
	← mindlessdemon left	11:57
	→ netcarver joined	11:58
	← mikecmpbll left	11:58
	→ mezod joined	11:58
	← FilipNortic left	11:59
	← fstd left	12:00
	→ xtrm joined	12:00
xtrm	hi	12:00
gitinfo	xtrm: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	12:00
	→ fstd joined	12:01
xtrm	I would like to know if its possible to track a javascript in a server using git, and automatically make a commit of new changes made to that script	12:01
	→ kristofferR joined	12:01
xtrm	something like rsync + git	12:02
	← qsusxs left	12:02
	→ qsuscs joined	12:03
	→ jdhines joined	12:04
cYmen	I can't access ssh from work. What would you guys recommend to make repos on my server accessible via http?	12:04
cbreak	xtrm: automatically committing sounds like a terrible idea	12:04
	xtrm: your commit messages will suck	12:05
	xtrm: just do it yourself	12:05
xtrm	yes I dont midn about it, its a javascript made in an external server by one of our providers	12:05
	which nevers notifies us when it changes, and I need to track it	12:05
	just need to see the changes	12:06
	→ PinkSpecs joined	12:06
cbreak	can't you just nuke the changes?	12:07
	if they aren't worth to be notified about, they are probably pointless	12:07
	← govg left	12:07
	→ efiop joined	12:07
cbreak	xtrm: you can of course commit in a cronjob, but as I said, it'd suck	12:07
xtrm	cbreak unnafortunnately we cant, its a product we dont have control over and its totally necessary for us to be up to date with it	12:08
	→ govg joined	12:08
	← mennea left	12:09
xtrm	what about making a symlink to the file url, will git be able to see the changes?	12:09
	← sgen_ left	12:09
	→ mennea joined	12:09
	→ moritzs joined	12:11
	← King_Hual left	12:11
	→ King_Hual joined	12:12
	→ FilipNortic joined	12:12
cbreak	xtrm: git will track symlinks directly	12:13
	it won't follow them	12:13
	xtrm: you can git init the directory with the files, it'll become a git repository	12:13
	→ shruggar joined	12:14
	← shruggar left	12:14
	→ devoldmx joined	12:14
	← msankhala left	12:14
	← paul424 left	12:16
	→ evildmp joined	12:16
	← CheckDavid left	12:17
	→ nfk joined	12:17
	← wrouesnel left	12:18
	← kristofferR left	12:18
	← moritzs left	12:18
	gitinfo set mode: +v	12:19
	→ Goplat joined	12:20
	→ kristofferR joined	12:21
	← on4k left	12:21
	→ cherwin joined	12:22
	← arthurvr left	12:24
	← gccostabr left	12:26
	← juvenal left	12:26
	← stamina left	12:27
	→ m0ltar joined	12:27
masak	how do I filter a git log for every author except a given one?	12:27
	← justinmburrous left	12:28
	← devoldmx left	12:28
	→ justinmburrous joined	12:28
	← antispaceman left	12:29
	→ Celm joined	12:29
	→ stiffi joined	12:29
	← justinmburrous left	12:29
	→ justinmburrous joined	12:29
	← wookienz left	12:30
	→ psoo joined	12:30
	← javster left	12:30
	→ wookienz joined	12:30
	→ jrdavid joined	12:31
	← cherwin left	12:33
	→ fr33domlover joined	12:33
	→ EminenceHC joined	12:33
	← Celm left	12:34
cbreak	masak: --author=pattern	12:34
	→ dort joined	12:34
cbreak	masak: that'll filter out all but the given one	12:34
	→ Juzzika joined	12:34
	→ silence-simple joined	12:35
	← silence-simple left	12:36
	→ devoldmx joined	12:36
	→ cherwin joined	12:37
	→ Noldorin joined	12:37
	← zapb_ left	12:37
masak	cbreak: ok, let's say the author is "Bryan Cranston". what should the pattern be?	12:39
	← EminenceHC left	12:39
	← mennea left	12:39
cbreak	that will do as pattern	12:39
	→ mennea joined	12:39
masak	ah. let me rephrase the question, then.	12:39
	how do I filter out that particular author?	12:39
	← mennea left	12:39
	→ moritzs joined	12:40
	← dauerschlaf left	12:40
masak	i.e. show all other authors.	12:40
cbreak	hmm... :/	12:40
	→ mhi^ joined	12:40
cbreak	no idea, sorry	12:40
masak	I used --oneline and wc -l to find out how many such commits there are.	12:40
	but I know of no good way to use git alone to list the commits.	12:41
	→ mennea joined	12:44
masak	hm, `git rev-list --help` lists --author as a valid option, but the command itself doesn't accept it :/	12:44
	← kristofferR left	12:45
	→ javster joined	12:45
	← javster left	12:46
	← moritzs left	12:48
	→ CheckDavid joined	12:50
	→ sleepee joined	12:52
cYmen	I can't access ssh from work. What would you guys recommend to make repos on my server accessible via http? <- anybody?	12:54
	← psoo left	12:55
jast	man git-http-backend :)	12:55
gitinfo	the git-http-backend manpage is available at http://jk.gs/git-http-backend.html	12:55
	→ kristofferR joined	12:56
qsuscs	cYmen: a) talk to your admin b) … i guess this means read-write?	12:56
cYmen	qsuscs: Yes, writing would be necessary.	12:56
qsuscs	cYmen: i hope you enjoy pain. i’d really first try option a	12:57
canton7	you can set up a read-write http server without too much hassle	12:57
	← wookienz left	12:57
	← cherwin left	12:58
qsuscs	canton7: using git-http-backend or something else?	12:59
	(i neither managed to find out how to setup grack)	12:59
canton7	err let me find a doc	12:59
	yeah, git-http-backend	12:59
	the man page has a bunch of config	12:59
	→ cherwin joined	12:59
	→ msankhala joined	13:00
	← justinmburrous left	13:00
	→ Tobbi joined	13:02
	← m0ltar left	13:02
Tobbi	How can I get the .git file in a git instaweb installation? My mantis plugin requires the path to the .git project file.	13:02
	→ wookienz joined	13:03
cYmen	canton7: thanks	13:05
	← evildmp left	13:06
	→ bAnt joined	13:08
	← WaReZ left	13:08
cbreak	Tobbi: search for it	13:09
	Tobbi: it should be a directory	13:09
	find / -name ".git" -print	13:09
	or something like that	13:09
	Tobbi: but really, you should remember where you put your repositories :D	13:09
	← teran left	13:10
cbreak	(if you have a bare repo, this won't find it, you'll have to use some other strategy, like searching for HEAD)	13:10
Tobbi	cbreak: Uhm, I know my repository URL and it shows it using port 80, but I have problems configuring this: http://www.nullpointer.at/wp-content/uploads/2011/10/mantisbt-sourceintegration-detail.png	13:11
	(this is Mantis by the way). My gitweb installation is at localhost:1000	13:11
	→ os2538 joined	13:12
	← kerrick left	13:12
cbreak	Tobbi: the URL is irrelevant	13:12
	Tobbi: .git is a directory in the filesystem	13:12
	gitweb is just a web interface	13:12
	(for looking at history and so on)	13:12
Tobbi	cbreak: Will Mantis find it if I put a regular filesystem URL there that's not accessible on port 80?	13:12
	→ Mitchbones joined	13:12
cbreak	I have no idea what mantis is	13:13
	so I don't know what it wants or does with git	13:13
Tobbi	cbreak: It's a bug tracker. And I just installed a git integration plugin.	13:13
	So, mantis runs on port 80, gitweb on port 1000	13:13
	*port 100	13:14
	← kristofferR left	13:14
	→ mindlessdemon joined	13:14
	← msankhala left	13:14
	→ kristofferR joined	13:15
	← kristofferR left	13:15
	→ sohail` joined	13:15
	← cherwin left	13:16
	→ justinmburrous joined	13:16
	→ danicampa901 joined	13:17
	→ mikecmpbll joined	13:18
	→ hexagoxel joined	13:19
	→ Advocation joined	13:20
	← mennea left	13:20
	→ mennea joined	13:21
	← os2538 left	13:21
	→ os2538 joined	13:21
	← os2538 left	13:21
	→ josef_roy joined	13:22
	← fr33domlover left	13:24
	← mhi^ left	13:26
	← PinkSpecs left	13:29
	← josef_roy left	13:29
	→ mhi^ joined	13:29
	→ gccostabr joined	13:29
	← devoldmx left	13:36
	→ devoldmx joined	13:37
	← wookienz left	13:38
	→ toothrot joined	13:38
	← Advocation left	13:38
	→ martinklepsch joined	13:42
	→ wookienz joined	13:43
	← ifmw_ left	13:44
	← sleepee left	13:45
	→ RaceCondition joined	13:47
	← justinmburrous left	13:47
	→ moritzs joined	13:47
	→ juvenal joined	13:47
	→ jagob joined	13:48
	→ mechanicalduck joined	13:49
	← mennea left	13:50
	→ justinmburrous joined	13:51
	← justinmburrous left	13:51
	→ Sijdesign joined	13:51
	→ mennea joined	13:51
	→ frankdogg joined	13:51
	← frankdogg left	13:51
	→ justinmburrous joined	13:51
	← efiop left	13:52
	→ Manny joined	13:59
	← it0a left	14:00
	→ a_le joined	14:01
	→ smccarthy joined	14:02
	→ zivester joined	14:03
	mostlybadfly → ina_garten	14:05
	← bandroidx left	14:05
	← a_le left	14:06
	→ W0rmDr1nk joined	14:06
	→ atlantan joined	14:10
	→ n-st joined	14:13
	← irqq left	14:14
	← anddam left	14:14
	→ irqq joined	14:15
	→ ehmatthes joined	14:16
	→ dccc joined	14:17
	← Sijdesign left	14:19
	← Manny left	14:19
	→ Manny joined	14:19
	← juvenal left	14:20
	← mennea left	14:20
	← Toaster` left	14:21
	→ Sebtoast joined	14:21
	← justinmburrous left	14:22
	→ purak joined	14:23
	→ mennea joined	14:24
	← jdhines left	14:25
	→ ideea joined	14:25
	← hoijui left	14:25
	→ justinmb_ joined	14:25
	→ jdmf joined	14:26
	→ intellix joined	14:26
	← ideea left	14:29
	→ home-pc_ joined	14:29
	→ Celm joined	14:30
	→ bandroidx joined	14:30
subhojit777	I checked git hooks, there were no pre-merge or pre-checkout hooks. Is there any way to create a custom hook. Basically, I want to add a shell warning when user tries to checkout or merge master (stable) branch with a development branch	14:31
	→ AKK9_ joined	14:32
	← knownasilya left	14:33
	← pandeiro left	14:33
	← Celm left	14:34
	← AKK9 left	14:35
	→ IsNoSpoon joined	14:35
	← mechanicalduck left	14:37
	← Pyrogerg left	14:38
	← moritzs left	14:38
	→ AKK9__ joined	14:38
	← irqq left	14:40
	→ tiansial joined	14:40
	← tiansial left	14:40
	← AKK9_ left	14:40
	→ irqq joined	14:40
	→ tiansial joined	14:41
	← Baluse left	14:42
	→ Malsasa joined	14:43
	→ Brivelt joined	14:43
	→ listochkin joined	14:44
	→ EminenceHC joined	14:44
	→ bsdevil joined	14:45
_ikke_	subhojit777: The only way is to wrap git	14:45
	→ jprs joined	14:45
subhojit777	what do you mean	14:45
	← bsdevil left	14:46
	→ saidelike joined	14:46
	← mikecmpbll left	14:46
_ikke_	You can't create custom hooks, there is no way to tell git when to execute them. So what you do is you create a wrapper around git, which gets executed instead of git, and the wrapper does the checks, and then calls git	14:46
	ina_garten → mostlybadfly	14:47
	← devoldmx left	14:47
	→ tuxy64 joined	14:47
	→ devoldmx joined	14:47
	→ amjam joined	14:48
	← listochkin left	14:48
	← EminenceHC left	14:49
	← mennea left	14:50
	→ mutley89 joined	14:50
	← Brivelt left	14:50
subhojit777	_ikke_, so when I will do "git checkout master" or "git merge <develop into master>" then i will run some custom bash script. it does the checking, if something is wrong it will show an alert, otherwise will do the checkout or merge	14:50
	→ mennea joined	14:51
subhojit777	is that what you mean	14:51
	← zumba_addict left	14:52
	→ zumba_addict joined	14:53
	← atlantan left	14:53
_ikke_	yes	14:53
	The wrapper shadows the real git	14:54
	→ Oebele joined	14:54
	← FrozenFire left	14:54
	→ hplar joined	14:54
	← justinmb_ left	14:55
Oebele	if I merge a branch into master, then push to github, is the upstream stuff also merged properly?	14:55
	robustus\|Off → robustus	14:55
	← jprs left	14:55
	→ jprs joined	14:55
_ikke_	Oebele: upstream stuff?	14:56
bremner`	Oebele: pushing doesn't merge	14:56
	→ AKK9_ joined	14:56
	→ dreiss joined	14:56
	→ justinmburrous joined	14:57
	← justinmburrous left	14:57
	→ starkhalo joined	14:57
	→ justinmburrous joined	14:57
Oebele	okay, let me rephrase my question: I have merged a branch into master locally. What happens when I push? Do I have to do something with the upstream branches manually?	14:59
	← Nizumzen left	14:59
	→ mikecmpbll joined	14:59
	← AKK9__ left	15:00
_ikke_	Oebele: You mean the remote tracking branches?	15:00
	← BuenGenio left	15:00
Oebele	_ikke_: yes, I think so - I just don't understand what tracking means precisely	15:01
_ikke_	Oebele: It's how the branches are called that are prefixed with the remote name (origin/master)	15:01
	It's used to keep track of the commits you have fetched from a remote	15:02
Oebele	okay	15:02
_ikke_	But to answer your question, pushing updates those branches	15:02
	← bAnt left	15:04
	→ Brivelt joined	15:06
	→ WaReZ joined	15:06
	→ vire joined	15:07
	→ _ikke__ joined	15:08
	← Brivelt left	15:09
	→ polyzen joined	15:09
	← _ikke_ left	15:10
	← jdmf left	15:10
	← vire left	15:11
jprs	Does anyone have a good guide for getting a pretty git aware bash prompt? My google skills are not turning up anything good.	15:11
osse	jprs: https://github.com/git/git/blob/master/contrib/completion/git-prompt.sh#L6-L26	15:11
	→ Nizumzen joined	15:12
jprs	yeah, I got that far	15:12
	→ Gabriel_ joined	15:12
_ikke__	but?	15:12
	robustus → robustus\|Off	15:13
jprs	I found some great guide a while ago for setting PS1 and it could do tons of cool stuff	15:13
	but I forgot that .bashrc when I changed jobs	15:13
	meh	15:13
	← _ikke__ left	15:13
	→ _ikke_ joined	15:14
	← Gabriel_ left	15:14
jprs	Maybe I just need to fiddle around with it, PS1's make my eyes bleed, I'd rather just copy someone else's	15:14
osse	what I gave you will address the git-related aspect of it, but that's about it	15:15
jprs	ok, maybe I'll go ask in the bash channel	15:15
	thanks BTW	15:15
	I'm just a little frustrated because I found it before and now I can't	15:15
	→ quetz joined	15:16
	→ punchagan joined	15:16
	→ jargon joined	15:16
	→ acharlieh joined	15:16
	← [gmi] left	15:17
	← saidelike left	15:17
	← jimmyy left	15:18
	marklite → markelite	15:20
osse	jprs: two tips: 1) for colors, use red=$(tput setaf 1) and then PS1='foo \[$red\] bar'. That makes it slighly less of an eye sore. 2) You can do PS1=foo; PS1+=bar to "build up" your PS1 in chucks. hopefully that'll make it a little more readable.	15:20
	→ jenni_naiaretti joined	15:20
osse	*chunks	15:20
jprs	ok, thanks. That is a help, especially the chunking thing.	15:21
	← danicampa901 left	15:21
	_ikke_ just uses zsh + oh-my-zsh with a theme :P	15:21
osse	oh-my-zsh is far from "just"	15:22
	:p	15:22
jprs	hmm, one of the guys I work with uses zsh	15:22
	→ PinkSpecs joined	15:22
jprs	I've never played with it, but I'll check that out too	15:22
_ikke_	osse: For the end user, it's very easy to use	15:23
osse	it will change your life	15:23
jprs	wow, is that all	15:23
Oebele	thanks _ikke_	15:23
_ikke_	Oebele: yw	15:23
	→ kopparam joined	15:23
osse	_ikke_: that might be the case. but it introduces a lot of bugs	15:24
	→ nettoweb joined	15:24
	→ rath joined	15:24
	← subhojit777 left	15:24
	→ jpf joined	15:25
	← UmbraMalison left	15:25
_ikke_	osse: What kind of bugs?	15:26
	I barely run into bugs with zsh, and I update frequently	15:26
	← devoldmx left	15:27
	→ devoldmx joined	15:27
	← kopparam left	15:28
	← justinmburrous left	15:28
	← armyriad left	15:29
	→ UmbraMalison joined	15:29
	← smccarthy left	15:29
	← mikecmpbll left	15:29
	← jprs left	15:29
	→ armyriad joined	15:29
	→ Celm joined	15:30
	→ evildmp joined	15:30
	← markelite left	15:31
	← nettoweb left	15:31
	← dreiss left	15:32
Oebele	I did "git checkout master" and then "git merge my_branch" and now I just have a flat history - does this make sense? I expected to see the merge creating a new commit and 'my_branch' to reconnect to the master branch there	15:32
	← skylite left	15:33
	← darkbasic left	15:33
	→ Takumo joined	15:33
_ikke_	!ff	15:33
gitinfo	A fast-forward merge occurs when you merge a commit which is a descendant of !HEAD. No new commit is created, instead the branch is simply moved forward. See http://sandofsky.com/images/fast_forward.pdf	15:33
	← PinkSpecs left	15:33
	→ majoh joined	15:34
	→ darkbasic joined	15:34
	← Celm left	15:35
	→ justinmburrous joined	15:35
	→ Gamecubic joined	15:37
	← amjam left	15:38
	→ mikecmpbll joined	15:38
	→ saidelike joined	15:38
	→ amjam joined	15:38
	→ JosephFerano joined	15:41
	→ marklite joined	15:42
	← amjam left	15:43
	→ stamina joined	15:43
	← scarcry left	15:43
Oebele	_ikke_: ah okay. non-fast forwarding makes more sense to me, because then I can keep the master history more readable by summarizing the work in the branch in the commit message and keeping the details in the branch - but are there any downsides to doing that?	15:44
	→ jottr joined	15:44
	← Goplat left	15:44
	→ studmuf joined	15:45
	← studmuf left	15:45
	→ APerson_ joined	15:45
	→ studmuf joined	15:46
	← JosephFerano left	15:46
	→ EminenceHC joined	15:46
	→ Toaster` joined	15:47
	→ dccc_ joined	15:48
	← APerson_ left	15:48
	← tiansial left	15:49
	← Sebtoast left	15:50
	← EminenceHC left	15:51
	← dccc left	15:51
	→ madewokherd joined	15:52
	← Segfault_ left	15:53
	← darkbasic left	15:53
	← martinklepsch left	15:53
	→ Segfault_ joined	15:53
	← majoh left	15:54
	bremner` → bremner	15:54
	← michaelmcmillan left	15:55
	→ papna joined	15:55
papna	How would I do the equivalent of `git pull --rebase -s recursive -X ours` on 1.6.6?	15:55
	← seanmerron left	15:56
	← Mitchbones left	15:58
papna	I guess -s ours is close enough	15:58
	→ majoh joined	15:59
	→ myme joined	15:59
	→ scarcry joined	16:00
	← tuxy64 left	16:00
	← AKK9_ left	16:00
	→ tuxy64 joined	16:00
	→ eliasr joined	16:00
	→ tsr joined	16:00
	← eliasr left	16:00
	→ eliasr joined	16:00
osse	papna: definitely not. read the description of -s ours	16:01
	← tuxy64 left	16:01
osse	_ikke_: certain keys not working, errors in functions, etc. not bugs with zsh itself	16:01
	← mennea left	16:01
	→ dreiss joined	16:01
	→ mennea joined	16:02
	← shinnya left	16:05
	→ joeyDB joined	16:05
	← justinmburrous left	16:06
	→ Cheaterman1 joined	16:07
	← tsr left	16:07
	← dreiss left	16:07
	→ justinmburrous joined	16:07
	→ smccarthy joined	16:07
	→ tsr joined	16:07
	→ tuxy64 joined	16:08
	→ Literphor joined	16:09
	→ JohnBat26 joined	16:09
	→ skylite joined	16:10
	← jenni_naiaretti left	16:11
	← justinmburrous left	16:11
Jackneill	it might sound stupid, but can i use git like a http transport service? like the repo would contain files across my whole fs, and the upstream repo would mimick it, (but i dont want to create a repo at /)	16:11
	→ sinkensabe joined	16:12
	← mikecmpbll left	16:12
	← sinkensabe left	16:13
	← skylite left	16:13
osse	Jackneill: the repo itself (ie .git) can be located anywhere. Use the GIT_DIR environment variable or --git-dir	16:13
Jackneill	osse, thanks	16:14
	← Malsasa left	16:15
	← tsr left	16:16
	← eletuchy left	16:16
	→ tsr joined	16:16
	← tsr left	16:17
	→ thedodd joined	16:17
osse	Jackneill: hmm you need to set --work-tree=/ too then	16:17
Jackneill	i see	16:18
	→ jenni_naiaretti joined	16:19
	← Manny left	16:19
	→ Manny_ joined	16:19
	→ tsr_dev joined	16:21
	← stamina left	16:22
	← axl_ left	16:24
	← Ornacia left	16:24
	← zhangxaochen left	16:25
	← sohail` left	16:25
	→ justinmburrous joined	16:26
	→ zhangxaochen joined	16:26
	← tuxy64 left	16:27
	← tsr_dev left	16:28
	← joeyDB left	16:28
	→ pheaver joined	16:29
	← jenni_naiaretti left	16:29
	→ hahuang61 joined	16:29
	→ jenni_naiaretti joined	16:30
	→ mikecmpbll joined	16:30
	← ncd\|leeN left	16:31
	← mennea left	16:31
	→ mennea joined	16:32
	→ CraigyDavi`` joined	16:32
	← mennea left	16:32
	→ Danglo joined	16:33
	→ mennea joined	16:33
	→ it0a joined	16:33
	← jargon left	16:33
	← Danglo left	16:33
	→ kopparam joined	16:34
	← revolve left	16:34
	← CraigyDavi` left	16:35
	→ leeN joined	16:36
	→ DanMAbraham joined	16:36
	→ Sonderblade joined	16:37
	← ehmatthes left	16:37
	→ PinkSpecs joined	16:38
	→ listochkin joined	16:38
	← kopparam left	16:38
	← rvsjoen left	16:38
	→ rvsjoen joined	16:38
	← rvsjoen left	16:38
	→ rvsjoen joined	16:38
	→ bosCage joined	16:39
	← bosCage left	16:39
	→ jontmorehouse joined	16:39
	→ nnyk_ joined	16:40
	thiago_ → thiago	16:40
	→ Ornacia joined	16:40
	← marvinpinto left	16:41
	→ marvinpinto joined	16:41
	← Literphor left	16:43
	→ SjB joined	16:43
	→ revolve joined	16:44
	← IsNoSpoon left	16:44
	← jontmorehouse left	16:45
	→ joeyDB joined	16:45
	← DanMAbraham left	16:46
	→ xrogaan joined	16:46
	robustus\|Off → robustus	16:46
	→ Literphor joined	16:49
	→ cannonball joined	16:50
	→ EminenceHC joined	16:50
	→ iamjarvo joined	16:50
	← pheaver left	16:52
papna	osse: Oh, thanks	16:52
	osse: I found that out the hard way already. :)	16:52
	→ pcypher joined	16:52
papna	osse: But I appreciate the response. :)	16:53
	→ rshetty joined	16:53
	← EminenceHC left	16:55
	← justinmburrous left	16:56
	→ justinmburrous joined	16:57
	← CheckDavid left	16:57
	→ Advocation joined	16:58
	→ LucasTT joined	16:58
	→ thabersack joined	16:59
thabersack	Hello everyone!	16:59
gitinfo	thabersack: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	16:59
	← PinkSpecs left	16:59
	← Literphor left	16:59
	← cannonball left	17:00
	→ PinkSpecs joined	17:00
	→ JosephFerano joined	17:00
	← thedodd left	17:00
	← pcypher left	17:01
	→ Gizburdt joined	17:01
	→ ncd\|leeN joined	17:01
	← justinmburrous left	17:01
	→ jargon joined	17:01
	← mennea left	17:01
thabersack	Question: I have an open source repo and I need to make my custom self-hosted version of it; will basically mean editing a few index files to have different verbage. I've been trying to think of a flow that would work for this (separate branches, separate repos) but I can't come up with a solution that wouldn't overwrite me edited index files when merging from the updated raw OS repo. How have other people handled this	17:01
	situation?	17:01
	← JosephFerano left	17:02
	← MutSbeta left	17:02
	→ justinmburrous joined	17:02
	← stiffi left	17:02
	← leeN left	17:02
	← studmuf left	17:03
	→ mennea_ joined	17:03
	→ jgardella joined	17:03
	→ hauron_ joined	17:03
	→ studmuf joined	17:03
	→ mechanicalduck joined	17:04
	← mechanicalduck left	17:05
	← purak left	17:05
	→ mechanicalduck joined	17:05
	robustus → robustus\|Off	17:05
	← variable left	17:05
	← mechanicalduck left	17:06
	← King_Hual left	17:06
	→ FreezingCold joined	17:06
	← hahuang61 left	17:06
	→ mechanicalduck joined	17:06
	← mechanicalduck left	17:06
	→ MutSbeta joined	17:07
	← studmuf left	17:08
	gitinfo set mode: +v	17:08
	← Gizburdt left	17:08
	← Kulrak left	17:08
	→ Gizburdt joined	17:08
bremner	thabersack: maybe !config has some hints	17:08
gitinfo	thabersack: [!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	17:08
	→ Zupoman joined	17:09
	← Zupoman left	17:09
	→ Zupoman joined	17:09
	→ Peuc2 joined	17:09
thabersack	bremner: Many thanks I will check that out	17:09
	← Peuc left	17:09
	Peuc2 → Peuc	17:09
	← Caius left	17:09
	← jenni_naiaretti left	17:09
	→ Caius joined	17:10
	← mikecmpbll left	17:11
	→ ojacobson joined	17:11
	→ variable joined	17:12
	→ thedodd joined	17:12
	marklite → markelite	17:12
	→ a_le joined	17:13
	→ Goplat joined	17:14
	← mennea_ left	17:14
	→ jceb joined	17:14
	→ King_Hual joined	17:16
	→ blaman joined	17:17
blaman	a	17:17
	← saidelike left	17:18
	→ hoijui joined	17:18
	← a_le left	17:18
	← DTSCode left	17:18
	← joeyDB left	17:18
	→ saidelike joined	17:20
	← Amandil left	17:20
	→ Kulrak joined	17:21
	← home-pc_ left	17:22
	→ AKK9_ joined	17:22
	← jpf left	17:22
	← jceb left	17:23
blaman	hi there, I have a bit of a special situation here...	17:25
	← iamjarvo left	17:25
	← Error404NotFound left	17:25
	→ DTSCode joined	17:25
	→ mennea joined	17:26
Aikar	!backup	17:26
gitinfo	Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups	17:26
Aikar	oh, I was expecting something magical	17:26
	→ codeman joined	17:26
blaman	Aikar: I would change the message to say "tar the directory first or waste the next hour copying small files around."	17:28
	← JohnBat26 left	17:28
	← dccc_ left	17:29
	→ jceb joined	17:31
	← thedodd left	17:31
	→ Literphor joined	17:31
	→ joeyDB joined	17:32
	← Advocation left	17:32
	→ pcypher joined	17:33
	← justinmburrous left	17:34
	← mindlessdemon left	17:34
	← nanga left	17:35
	← AKK9_ left	17:35
blaman	so, er, say I want Git to keep track of stuff in the writable branch of a unionfs filesystem on an embedded device, /root.dev/w.	17:35
	→ AKK9 joined	17:36
	← Yomi left	17:36
	← jottr left	17:36
blaman	I could put the git repo there, but unionfs likes to create .wh__dir_opaque files inside directories for its own purposes, and presumably things will break if they are not there.	17:37
	so I can't really do checkouts and merges and pulls and stuff from /root.dev/w directly.	17:37
	→ justinmburrous joined	17:38
	← pcypher left	17:38
blaman	now, /root.dev/w is where writes to / go, so I could keep track of /, and directories would get created properly on pulls.	17:38
	but this is an embedded device, and there's 10x times more files in / than in /root.dev/w, so any git operations are extremely slow if I track /.	17:39
	is there any way to trick/tell git to track /root.dev/w but do things from / ?	17:40
	← it0a left	17:41
	← Literphor left	17:41
	← shigosei left	17:42
	← ciampix left	17:42
	→ sdrfnord1 joined	17:42
	← kpreid left	17:44
	→ daito joined	17:44
	→ pheaver joined	17:44
	→ pcypher joined	17:44
	→ kpreid joined	17:44
	→ nanga joined	17:44
	← pcypher left	17:45
	→ NBhosting joined	17:45
	← rshetty left	17:45
	CraigyDavi`` → CraigyDavi	17:45
	→ Yomi joined	17:46
	← pheaver left	17:49
osse	blaman: try with git --work-tree=foo --git-dir=bar cmd	17:50
	→ jerius joined	17:51
	← jerius left	17:51
	→ CheckDavid joined	17:52
	← daito left	17:52
	← mennea left	17:54
	→ pcypher joined	17:54
	→ EminenceHC joined	17:54
	→ mennea joined	17:54
	→ stamina joined	17:57
	← stamina left	17:57
	← EminenceHC left	17:58
	← Mixologic left	18:00
	→ jottr joined	18:03
	← listochkin left	18:06
	→ listochkin joined	18:07
	← pcypher left	18:07
	← bmcorser left	18:09
	→ dionisis_ joined	18:09
	← jottr left	18:09
	← Nizumzen left	18:10
	← listochkin left	18:11
	← jdav_gone left	18:13
	← cagedwisdom left	18:16
	→ listochkin joined	18:17
	→ zquad joined	18:18
	← acharlieh left	18:18
	→ a_le joined	18:19
	→ acharlieh joined	18:19
	← Manny_ left	18:19
	→ Manny joined	18:19
	← Gizburdt left	18:20
	← Orginator_ left	18:20
	→ Orginator joined	18:20
	← ojacobson left	18:21
	← a_le left	18:23
	→ knownasilya joined	18:24
	← mennea left	18:24
	→ mennea joined	18:24
	→ DolphinDream joined	18:25
	→ pcypher joined	18:27
	→ LeMike joined	18:27
	→ Juxtapositional joined	18:29
	← joeyDB left	18:29
	→ jdav_gone joined	18:30
	← eburcat left	18:30
Celelibi	Can I give a name to a stash once it have been created?	18:30
	← angelsl left	18:30
_ikke_	Celelibi: no	18:30
Celelibi	ok	18:30
	← evildmp left	18:31
Celelibi	So I should checkout the commit this stash is based on, pop it and restash it with a name?	18:31
	← intellix left	18:31
	← ribasushi left	18:32
	→ cannonball joined	18:33
	→ evildmp joined	18:33
	→ Advocation joined	18:34
heftig	Celelibi: try checking out the stash@{num} commit and amending it	18:34
	→ shinnya joined	18:34
	← evildmp left	18:34
	← acharlieh left	18:34
Celelibi	I'll try this later.	18:35
heftig	You'll need to alter the stash file to contain the new commit ID as well	18:35
	→ dsdeiz joined	18:35
	→ ribasushi joined	18:36
	← Juxtapositional left	18:38
	← jdav_gone left	18:38
	→ joeyDB joined	18:39
	← pcypher left	18:39
	→ darkbasic joined	18:39
	→ _Atom_ joined	18:41
	→ EminenceHC joined	18:43
	mostlybadfly → ina_garten	18:43
	← Oebele left	18:43
	ina_garten → mostlybadfly	18:44
	← zquad left	18:45
	→ jottr joined	18:47
	→ pcypher joined	18:48
	→ m0ltar joined	18:48
	← EminenceHC left	18:48
	→ mnavratil joined	18:52
	→ beastd joined	18:53
	← _Atom_ left	18:54
	← mennea left	18:54
	→ mennea joined	18:54
	← mennea left	18:55
	→ mennea joined	18:55
	→ StanAccy joined	18:55
	← StanAccy left	18:55
	→ StanAccy joined	18:55
StanAccy	Ive got two separate repos of the same code base. One is forked from a parent repo. The other is a simple source copy. Can I reconfigure the second repo, to start tracking the first (which in turn tracks the parent) ?	18:56
	← shinnya left	18:57
	→ studmuf joined	18:58
thiago	yes	18:58
	do they share the Git history?	18:58
	→ tener joined	18:59
	→ jpf joined	18:59
	← gfixler left	19:00
StanAccy	thiago: Yes, to a point	19:00
	← Advocation left	19:00
StanAccy	and by "a point" I mean about 2 days worth of changes, so nothing significant	19:00
	→ ehmatthes joined	19:00
StanAccy	we want to be able to pull changes made to Repo A (which tracks the parent) in to Repo B	19:00
	← pcypher left	19:00
thiago	ok	19:01
	→ jxpx777 joined	19:01
	← Transfusion left	19:02
	→ jontmorehouse joined	19:02
	← zanchoPansa left	19:03
	← Kabaka left	19:03
	← graphitemaster left	19:03
	← jxpx777_ left	19:03
	← toothrot left	19:03
	→ \toothrot joined	19:04
	← dionisis_ left	19:04
	← smccarthy left	19:04
	→ zanchoPansa joined	19:04
	← robinsmidsrod left	19:04
	→ graphitemaster joined	19:04
	→ aidalgol joined	19:04
	→ mizu_no_oto joined	19:04
	→ robinsmidsrod joined	19:04
	→ Brando753 joined	19:05
	→ hidekin joined	19:05
	→ devoldmx3 joined	19:05
	→ Advocation joined	19:05
	← devoldmx left	19:07
	← jiyuu left	19:07
	→ Transfusion joined	19:07
	→ lowkeyliesmyth joined	19:08
	→ kayloos joined	19:09
	← DolphinDream left	19:11
	→ pwnz0r joined	19:12
	→ eburcat joined	19:13
	← studmuf left	19:13
	→ studmuf joined	19:14
	→ watabou joined	19:15
	→ DolphinDream joined	19:15
	← devoldmx3 left	19:16
	→ punchagan1 joined	19:18
	← punchagan left	19:18
	→ mechanicalduck joined	19:18
	← hauron_ left	19:18
	← studmuf left	19:18
	→ Kabaka joined	19:18
	← Kitt3n left	19:20
	← doener left	19:20
	← hidekin left	19:21
	← UmbraMalison left	19:23
	← ethan1341 left	19:23
	← armyriad left	19:24
	→ LLaurent joined	19:25
	← thiago left	19:25
	→ UmbraMalison joined	19:26
	← mechanicalduck left	19:27
	→ mechanicalduck joined	19:27
	← RaceCondition left	19:28
	← mechanicalduck left	19:28
	→ xolubi joined	19:29
	→ mechanicalduck joined	19:29
	→ teran joined	19:29
	→ thiago joined	19:29
	← irqq left	19:29
	← Advocation left	19:29
	→ lws joined	19:30
	→ jdav_gone joined	19:30
	→ irqq joined	19:30
	← cannonball left	19:31
	← mizu_no_oto left	19:31
	→ hidekin joined	19:32
	← Goplat left	19:32
	→ dreiss joined	19:32
	→ Celm joined	19:32
lws	git seems to be stripping the newline on the last line of my file I'm trying to submit a PR for. Any idea how to prevent that?	19:33
	← xolubi left	19:34
osse	how can you tell?	19:35
	→ pcypher joined	19:35
lws	it's missing from the diff?	19:35
	← pcypher left	19:36
thiago	how did you generate the diff?	19:36
	← quetz left	19:37
	← Celm left	19:37
osse	lws: note that different editors and webpages and so on have different ways of shiwing the last newline	19:37
	→ aswen joined	19:37
osse	if you cat fil.py, is there an empty line before the next prompt?	19:38
	← hidekin left	19:38
	→ cherwin joined	19:38
	← mennea left	19:38
	→ amjam joined	19:38
	→ ruukasu joined	19:40
	→ Neozonz joined	19:40
	→ kyb3r_ joined	19:40
	← watabou left	19:41
	← amjam left	19:43
	→ kerrick joined	19:44
Celelibi	Where are all my stash in my git log --all?	19:44
	→ pcypher joined	19:45
osse	nowhere. that'' only only show the newest stash	19:45
	→ sohail` joined	19:46
	→ Cassiel joined	19:47
heftig	lws: terminating newline is the default case	19:49
lws	Okay. Hmm, maybe it has one then	19:49
	github might not be showing it	19:49
heftig	lws: if the diff adds or removes it or the context touches the file end of such a file, you'd see a line containing "\ No newline at end of file"	19:50
lws	Ahah	19:50
	→ mizu_no_oto joined	19:50
heftig	Try it and see what happens	19:50
	← nnyk_ left	19:51
	← netameta left	19:51
	→ fatalhalt joined	19:52
	→ mikecmpbll joined	19:52
	→ Cer3bus joined	19:53
	→ mennea joined	19:54
	← MutSbeta left	19:54
	← UmbraMalison left	19:54
	→ UmbraMalison joined	19:56
	← justinmburrous left	19:57
	→ justinmburrous joined	19:57
	← xtrm left	19:58
	→ EminenceHC joined	19:59
	→ kcj joined	19:59
lws	You guys are correct	20:00
	→ hidekin joined	20:00
	→ skylite joined	20:01
	→ studmuf joined	20:01
	← justinmburrous left	20:02
	→ jiskiras joined	20:02
	← jiskiras left	20:03
	← pcypher left	20:03
	→ paul424 joined	20:04
	← mizu_no_oto left	20:04
	← JanC left	20:04
	→ justinmburrous joined	20:04
	← ruukasu left	20:04
	← EminenceHC left	20:05
	→ jiskiras joined	20:06
	← kiran left	20:06
	← cherwin left	20:06
	→ mattstratton joined	20:07
	→ cherwin joined	20:08
	→ pcypher joined	20:08
	→ ruukasu joined	20:08
	← pcypher left	20:08
	← UmbraMalison left	20:10
	→ Goplat joined	20:10
	← fatalhalt left	20:11
	← jontmorehouse left	20:12
	→ UmbraMalison joined	20:13
	→ Mobutils joined	20:14
	← jceb left	20:14
	→ oriba joined	20:14
	→ jontmorehouse joined	20:15
	→ moritzs joined	20:16
	← mechanicalduck left	20:16
	← FreezingCold left	20:16
	← pwnz0r left	20:16
	← tener left	20:16
	→ mechanicalduck joined	20:16
	← Manny left	20:17
	← petersr left	20:17
	← justinmburrous left	20:17
	← mechanicalduck left	20:17
	← jiskiras left	20:17
	→ mechanicalduck joined	20:17
	→ justinmburrous joined	20:17
	→ babilen joined	20:18
	→ Manny joined	20:18
	→ JanC joined	20:18
	← Manny left	20:19
	→ jiskiras joined	20:19
	← jiskiras left	20:19
	← Neozonz left	20:19
	→ Manny joined	20:19
	← listochkin left	20:19
	→ listochkin joined	20:20
	→ pcypher joined	20:20
	← lws left	20:22
	← dsdeiz left	20:23
	← hidekin left	20:23
	← mennea left	20:23
	→ dsdeiz joined	20:24
	→ mennea joined	20:24
	← PinkSpecs left	20:24
	← listochkin left	20:24
	→ listochkin joined	20:25
	→ ruukasuu joined	20:25
qsuscs	!botsnack	20:25
gitinfo	Om nom nom	20:25
	← jontmorehouse left	20:25
	→ ojacobson joined	20:25
	← pcypher left	20:25
	← punchagan1 left	20:26
	← ehmatthes left	20:26
	← ruukasu left	20:27
	→ PinkSpecs joined	20:27
	← ruukasuu left	20:27
	← Jackneill left	20:28
	← dsdeiz left	20:28
	→ ruukasu joined	20:28
	→ dsdeiz joined	20:29
	← eburcat left	20:29
	→ mulinux joined	20:30
	← WaReZ left	20:31
	← mulinux left	20:31
	→ mulinux joined	20:31
	→ FreezingCold joined	20:31
	→ jon-mac joined	20:32
	← D-Boy left	20:32
	→ netameta joined	20:32
	→ Celm joined	20:32
	← mechanicalduck left	20:32
	→ wereHams1er joined	20:33
	← wereHams1er left	20:34
	→ wereHams1er joined	20:34
	← legend1029 left	20:34
	← bipolar left	20:34
	→ pcypher joined	20:34
	→ legend1029 joined	20:34
	→ evil-twin joined	20:34
	← mulinux left	20:34
	← pcypher left	20:35
	wereHams1er → wereSheep	20:35
	wereSheep → wereHam	20:35
	← mattstratton left	20:35
	← dsdeiz left	20:36
	← Celm left	20:37
	→ jiskiras joined	20:37
	← jiskiras left	20:37
	wereHam → wereHamster	20:39
	← CEnnis91 left	20:39
	→ _Atom_ joined	20:40
	← _Atom_ left	20:40
	← StanAccy left	20:40
	→ ruukasuu joined	20:41
	← dreiss left	20:42
	→ thibaultcha joined	20:42
	→ govg_ joined	20:42
	→ kaendfinger joined	20:42
	← govg left	20:43
	govg_ → govg	20:43
	← ruukasu left	20:43
	← kaendfinger left	20:44
	← ruukasuu left	20:44
	→ ruukasu joined	20:44
	→ metts joined	20:44
	→ fedeisas joined	20:46
	→ kaendfinger joined	20:47
	← thabersack left	20:47
	→ lowkeyli_ joined	20:49
	→ dsdeiz joined	20:49
	→ danemacmillan joined	20:49
	← lowkeyli_ left	20:50
	→ bipolar joined	20:50
	→ mattstratton joined	20:51
	→ skylite_ joined	20:51
	← aswen left	20:52
	← lowkeyliesmyth left	20:52
	← cherwin left	20:53
	← aidalgol left	20:53
	← skylite left	20:54
	→ jiskiras joined	20:55
	→ D-Boy joined	20:56
	← dsdeiz left	20:56
	→ dsdeiz joined	20:56
	→ dccc_ joined	20:57
	→ dreiss joined	20:57
fedeisas	Hi guys. I just did a push --force on the company's main repo. Instead of overwriting my branch (doing a rebase), it overwrote a bunch of my coleagues commits on master.	20:58
	is there any way to undo a git push --force?	20:58
	I'm getting fired if not	20:58
	thanks :-(	20:58
	→ alanwill joined	20:59
	→ cmosguy joined	20:59
qsuscs	fedeisas: man git reflog on the server	21:00
gitinfo	fedeisas: the git-reflog manpage is available at http://jk.gs/git-reflog.html	21:00
	← hoijui left	21:00
	← phantombeta left	21:00
	← skylite_ left	21:00
wereHamster	fedeisas: or find out who pushed last before you and ask them to push --force	21:01
ojacobson	"I just did a push --force on the company's main repo. " You're that guy	21:01
	you're actually that guy	21:01
	anyways, server-side reflog is the best way to fix it	21:01
	→ phantombeta joined	21:02
qsuscs	tbh if you push --force on you company’s repo, maybe you deserve to be fired	21:02
ojacobson	failing that, if you have a local reflog for refs/remotes/origin/master ('git reflog <ref>' will tell you) you can use that, too	21:02
qsuscs	or the admin for not implementing access controll	21:02
cmosguy	hey all, so i just want to make sure about something, i have a bunch of files checked out and and am editing adding new ones. can i do a branch create while they are all edit so that I can just check into the new branch?	21:02
fedeisas	ojacobson yeah, I'm not proud. I was on my branch. I thought git push only made changes on MY branch, right?	21:02
ojacobson	no	21:02
	not by default, until git 2.x	21:02
	(upgrade, or set push.default to simple if you're in 1.8.x)	21:02
	by default, unqualified 'git push' in 1.x does something kind of complicated	21:03
	1. it identifies the remote upstream of the checked-out branch (so if your branch tracks origin/master, then the remote is "origin")	21:03
	2. it matches up local branches with branches on that remote _by name_	21:03
	3. it pushes the local branch of any match.	21:03
	to the matching remote branch.	21:03
	namewise matching is dumb, and pushing lots of branches by default is dumb, so in 2.x the default behaviour ('simple') is much easier to grok	21:04
	← rath left	21:04
wereHamster	how's my favourite channel on freenode doing? Anybody around who can still remember me?	21:04
ojacobson	'git push' with no args will push the checked out branch to its upstream remote if and only if the upstream branch name is the same as the local branch name	21:04
milki	wereHamster: i remember you	21:05
	wereHamster: does does !stats	21:05
gitinfo	wereHamster: [!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	21:05
	→ pcypher joined	21:05
	← pcypher left	21:06
	→ devoldmx joined	21:06
	← jpf left	21:06
fedeisas	ojacobson so I can set git push.default to current branch only to prevent this from happening again?	21:06
	← ruukasu left	21:06
	← souther left	21:06
qsuscs	fedeisas: do not push --force.	21:07
	← irqq left	21:07
	→ jpf joined	21:07
qsuscs	fedeisas: and maybe propose the admin to implement some sort of access control, e.g. !gitolite	21:07
gitinfo	fedeisas: Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/	21:07
fedeisas	qsucs and how do you push a rebase if not with force?	21:07
ojacobson	fedeisas: I would recommend setting push.default to 'simple'	21:07
	not 'current' (still uses the name-matching behaviour) or 'upstream' (not sufficiently paranoid)	21:07
	and spell most pushes out in full	21:07
	← pantsman- left	21:07
ojacobson	(I have aliases for the common cases: 'git publish' for me is 'git push --force owen HEAD	21:08
fedeisas	git config --get push.default: tracking	21:08
ojacobson	and I always have a remote 'owen' for publishing to that's not the "main" repo. Forks are good.)	21:08
	← kaendfinger left	21:08
	→ ruukasu joined	21:09
	← listochkin left	21:09
	← jiskiras left	21:10
	→ listochkin joined	21:10
	← jpf left	21:11
	← mikecmpbll left	21:11
	→ listochk_ joined	21:12
	← listochkin left	21:12
fedeisas	ojacobson I just configured push.default to current	21:13
	← Wiz_KeeD left	21:14
	← ncd\|leeN left	21:14
	→ souther joined	21:15
	← Goplat left	21:15
	← ruukasu left	21:16
	→ jontmorehouse joined	21:18
	→ Gizburdt joined	21:21
	← justinmburrous left	21:22
	← knownasilya left	21:23
	← mennea left	21:23
	← DTSCode left	21:24
	→ mennea joined	21:24
	← babilen left	21:25
	← Gamecubic left	21:25
	← Gizburdt left	21:25
	→ babilen joined	21:25
	← madewokherd left	21:25
	→ Gamecubic joined	21:25
	→ nkouevda joined	21:25
	→ shampine joined	21:27
	← mennea left	21:27
	← listochk_ left	21:27
	→ aswen joined	21:27
	→ xender joined	21:27
	→ mikecmpbll joined	21:33
	→ Celm joined	21:33
	← zumba_addict left	21:33
	→ zumba_addict joined	21:34
	← johtso left	21:35
	← Cer3bus left	21:37
	→ stiffi joined	21:37
	← Kabaka left	21:37
	→ ruukasu joined	21:38
	← Celm left	21:38
	→ listochkin joined	21:38
	← dsdeiz left	21:38
	→ dsdeiz joined	21:38
	→ hahuang61 joined	21:39
	← King_Hual left	21:39
	→ Kabaka joined	21:40
	← ruukasu left	21:41
	← alanwill left	21:41
	← zumba_addict left	21:42
	→ boombatower joined	21:43
	← boombatower left	21:43
	→ boombatower joined	21:43
	→ zumba_addict joined	21:43
	→ prince250000 joined	21:43
	→ otter768 joined	21:44
	← metts left	21:44
	← legend1029 left	21:45
	→ ruukasu joined	21:46
	→ Peuc2 joined	21:48
	← Peuc left	21:49
	Peuc2 → Peuc	21:49
	← otter768 left	21:49
	← thibaultcha left	21:49
	← jagob left	21:49
	→ pcypher joined	21:50
	← bdavenport left	21:50
	← paul424 left	21:51
	← prince250000 left	21:52
	← mattstratton left	21:55
	→ bdavenport joined	21:56
	← Kicer86 left	21:58
	→ tmcmahon joined	21:58
	← PinkSpecs left	21:59
	→ fatalhalt joined	22:00
	← m8 left	22:00
	← fedeisas left	22:00
	→ pandeiro joined	22:00
	→ fedeisas joined	22:01
	→ Mixologic joined	22:02
	← Zifre_ left	22:02
	← tmcmahon left	22:03
	← fedeisas left	22:05
	→ otter768 joined	22:06
	→ Nizumzen joined	22:06
	→ Mitchbones joined	22:06
	→ Amandil joined	22:06
	← pcypher left	22:07
	← pandeiro left	22:07
	→ nnyk_ joined	22:07
	→ _welff joined	22:07
	← fatalhalt left	22:08
	→ EminenceHC joined	22:09
	← aswen left	22:10
	← _welff left	22:13
	← EminenceHC left	22:14
	← Amandil left	22:15
	→ Literphor joined	22:16
	← mhi^ left	22:16
	← bdavenport left	22:17
	→ Mr_Psmith joined	22:17
	← otter768 left	22:17
	← dsdeiz left	22:17
	→ dsdeiz joined	22:17
	→ mindlessdemon joined	22:18
	← kriks left	22:18
	← Manny left	22:19
	→ Manny joined	22:19
	← mindlessdemon left	22:19
	← _Vi left	22:19
	← Literphor left	22:20
	← Segfault_ left	22:22
	→ mellernoia joined	22:24
	→ martinklepsch joined	22:24
	← martinklepsch left	22:25
	← zivester left	22:25
	→ bdavenport joined	22:25
	→ wbdecker joined	22:25
	→ zivester joined	22:26
	→ thibaultcha joined	22:26
	→ mennea joined	22:26
	← mennea left	22:27
	← danemacmillan left	22:28
	← MattMaker left	22:30
	→ mindlessdemon joined	22:32
Mr_Psmith	I was able to back up a branch to a previous commit on my local machine, but is there a way to back it up on the origin? No one else has pulled it yet, so it would be safe	22:35
	→ madewokherd joined	22:35
	→ mizu_no_oto joined	22:37
	← zumba_addict left	22:37
	← ockham left	22:37
	→ zumba_addict joined	22:37
	→ JosephFerano joined	22:37
	← boombatower left	22:38
	← bdavenport left	22:39
	→ CosmicLogick joined	22:40
osse	Mr_Psmith: push it	22:42
Mr_Psmith	osse: Naive question, how can I force the remote to accept it, since it’s not a fast forward and the remote ‘dev’ branch is ahead	22:43
	← Manny left	22:43
osse	Mr_Psmith: search in the man page for 'force'	22:44
	→ fedeisas joined	22:44
Mr_Psmith	I see -f in the git-push manpage, but didn’t want to F* up origin	22:44
	Thanks	22:44
osse	Mr_Psmith: you can push it under a different name, then	22:44
	Mr_Psmith: git push origin branch:newname	22:45
Mr_Psmith	Thank you - Wish I had learned git sooner	22:45
	← AKK9 left	22:46
	← FunkyAss left	22:46
	← mikecmpbll left	22:46
	← jargon left	22:46
	← JosephFerano left	22:47
	→ JosephFerano joined	22:47
	→ bdavenport joined	22:47
	← JosephFerano left	22:47
	→ sysvalve joined	22:47
	← fedeisas left	22:48
	→ jargon joined	22:48
	→ Barcollo joined	22:49
	→ ciampix joined	22:49
	← Barcollo left	22:49
	→ knownasilya joined	22:50
	→ jab416171 joined	22:54
	→ kaendfinger joined	22:54
	← TheFuzzball left	22:54
	→ TheFuzzball joined	22:55
	← LeMike left	22:56
	← Tobbi left	22:56
	→ oldWelff joined	22:57
	→ MutSbeta joined	23:00
	← ciampix left	23:03
	← moritzs left	23:03
	→ moritzs joined	23:04
	→ _Atom_ joined	23:05
	← devoldmx left	23:05
	→ devoldmx3 joined	23:05
	← madewokherd left	23:08
	← ojacobson left	23:08
	← nnyk_ left	23:12
	→ aidalgol joined	23:12
	← dsdeiz left	23:13
	→ Mirubiri joined	23:14
	→ cagedwisdom joined	23:14
	← dreiss left	23:15
	← m0ltar left	23:16
	→ a_le joined	23:16
	→ home-pc_ joined	23:16
	← listochkin left	23:16
	→ ojacobson joined	23:16
	→ listochkin joined	23:16
	→ dsdeiz joined	23:19
	→ evildmp joined	23:20
	← listochkin left	23:20
	→ mennea joined	23:21
	← mennea left	23:21
	← _Atom_ left	23:21
	← a_le left	23:22
	← bdavenport left	23:22
	→ mennea joined	23:23
	← mennea left	23:23
	← evildmp left	23:25
	← Zupoman left	23:25
	← hays left	23:27
	← oldWelff left	23:27
	→ bdavenport joined	23:27
	→ fedeisas joined	23:28
	← mizu_no_oto left	23:28
	→ otter768 joined	23:28
	← BlaXpirit left	23:29
	→ hays joined	23:29
	→ nnyk_ joined	23:30
joeyDB	what happens if you add git-tracked directories to dropbox or google drive?	23:31
	cyphase_ → cyphase	23:32
joeyDB	a quick google search told me. nevermind	23:33
	→ dreiss joined	23:33
	→ hexagoxel_ joined	23:33
	← ColdKeyboard left	23:34
	→ m0ltar joined	23:34
	← hexagoxel left	23:37
	← nnyk_ left	23:37
	← joeyDB_ left	23:38
	← home-pc_ left	23:39
	← NoNMaDDeN left	23:41
	← dreiss left	23:41
	→ PsionTheory joined	23:41
	→ dreiss joined	23:41
	← mindlessdemon left	23:42
	← bdavenport left	23:44
	← jgardella left	23:46
	← kaendfinger left	23:47
	→ punchagan joined	23:56
	← jontmorehouse left	23:56
	→ APerson_ joined	23:56
	← jargon left	23:56
	← PsionTheory left	23:57
	← punchagan left	23:58
	← Mr_Psmith left	23:58

Logs Search ←Prev date Next date→

Channels Documentation