IRCloggy #git 2014-09-27

Provider of IRC logs since 2005.

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

	2014-09-27
	← fstd left	00:00
	→ fstd joined	00:00
	→ Quevin joined	00:00
	→ ropav joined	00:01
	→ Cheaterman1 joined	00:01
	← amikiri left	00:02
	→ amikiri joined	00:02
	← imachuchu left	00:02
	← ropav left	00:02
NfNitLoop	related: Is there a way to make 'git clone' via ssh take up less CPU on the other end? We have kindof a ridiculous repository that churns at "counting objects" at 100% cpu for minutes. :p	00:03
	← gratimax\|away left	00:03
	← Sample left	00:03
	→ ojacobson joined	00:03
	→ nettoweb joined	00:03
	← zacg left	00:03
	← nettoweb left	00:03
	→ pheaver joined	00:04
NfNitLoop	(I assume serving via http(s) would solve that problem, and that's in the works but I'm looking for a faster solution before we get there.)	00:04
	→ nettoweb joined	00:04
	← nettoweb left	00:04
	→ gratimax joined	00:04
	← Quevin left	00:04
	→ nettoweb joined	00:05
	← baweaver left	00:05
	← nettoweb left	00:05
	→ nettoweb joined	00:05
	← nettoweb left	00:05
	← gccostabr left	00:06
	← Mso150_l left	00:06
	→ nettoweb joined	00:06
	→ Mso150_l_x joined	00:06
	← endiruna left	00:06
	← nettoweb left	00:06
	→ gccostabr joined	00:06
	→ xSmurf joined	00:06
	→ nettoweb joined	00:07
	→ ferreum_` joined	00:07
	← nettoweb left	00:07
	→ baweaver joined	00:07
	→ nettoweb joined	00:07
	← Neozonz\|Disc left	00:08
Geo	in git, or any of the pretty UI tools, is there a 'something' that allows you to mark a certain commit as a version increment? ie, something that identifies a particular commit as the released codebase, and all work after is the next version?	00:08
	← jargon left	00:08
Geo	I don't know what that name would be	00:09
NfNitLoop	I googled more an answered my own question. git update-server-info. Thanks, http://git-scm.com/book/en/Git-on-the-Server-The-Protocols !	00:09
	→ robarelli joined	00:09
	← Olipro left	00:09
Thorn	Geo: http://git-scm.com/book/en/Git-Basics-Tagging	00:10
	→ hahuang65 joined	00:10
	→ kylethomp18 joined	00:10
NfNitLoop	Geo: No. But by convention people usually 'git tag' each release.	00:10
	→ Olipro joined	00:10
Geo	That's what I'm looking for, thanks	00:11
ojacobson	NfNitLoop: why are you using the dumb protocol	00:11
	like, ever	00:11
	← dccc left	00:11
	← pheaver left	00:12
Geo	And i'm reading that link, I promise, but while i have you- I am doing the work in develop branch, then moving to master- do I want to tag in dvelop, or tag in master?	00:12
ojacobson	sounds like !flow	00:12
gitinfo	[!gitflow] The description of the gitflow branch workflow model is at http://nvie.com/posts/a-successful-git-branching-model/ while a tool to help implement this workflow is at https://github.com/petervanderdoes/gitflow See http://sethrobertson.github.com/GitBestPractices/#workflow for other workflow suggestions/references	00:12
dgpalmer	Geo: merge to master than tag	00:12
	← ColdKeyboard left	00:13
Geo	Why would I not want to track in develop where a version is?	00:13
	honestly asking, not being glib	00:13
	→ kcj joined	00:13
	→ pheaver joined	00:14
ojacobson	you _can_ do anything you want. Git's really more of a mechanism than a set of policies and practices.	00:14
	← baweaver left	00:15
	→ baweaver_ joined	00:15
	← robarelli left	00:15
	← hahuang65 left	00:15
	→ m0ltar joined	00:15
NfNitLoop	ojacobson: I'm not. Yet. But our git server gets CPU-bound when lots of machines clone from it at once. Seems like simple HTTP would be less CPU overhead. No?	00:16
ojacobson	Maybe.	00:16
	For what it's worth, github - who _absolutely_ have more and larger repos than you do - use the smart protocol in all cases.	00:16
NfNitLoop	I just want to make our git server not fall over in that case. I'm open to other suggestions. :)	00:16
ojacobson	Might be worth repacking and gcing some repos :)	00:17
	measure where the time is going, too -- git(1) is amenable to profiling	00:17
NfNitLoop	in all cases? They have https checkouts as the default on their web page.	00:17
ojacobson	https over the smart protocol, though	00:17
NfNitLoop	Oh!? you can do that?	00:17
ojacobson	They do expose the dumb protocol for really old git clients, but git(1) will prefer smart http when it's available, starting in versions that support it at all	00:17
	← oojacoboo left	00:17
	← eletuchy left	00:17
NfNitLoop	I didn't even know that was a thing. I've got some homework to do.	00:18
	→ mechanicalduck_ joined	00:18
ojacobson	man git-http-backend	00:19
gitinfo	the git-http-backend manpage is available at http://jk.gs/git-http-backend.html	00:19
	← baweaver_ left	00:19
	→ a_le joined	00:19
	← mechanicalduck left	00:20
	← ItSANgo left	00:20
	← mechanicalduck_ left	00:21
	→ danemacmillan joined	00:21
	← nettoweb left	00:21
	← dreiss left	00:22
NfNitLoop	Ah, so they're just running that? I Guess they could forward git clients away from [whatever serves the github.com website] to the smart http backend.	00:22
	→ ColdKeyboard joined	00:22
ojacobson	I don't know that they're running that _specifically_, but that's the stock implementation	00:23
	→ EminenceHC joined	00:23
ojacobson	the protocol is sort of tangentially described there, but not explicitly	00:24
	← pheaver left	00:24
	→ mechanicalduck joined	00:24
	→ _Atom_ joined	00:24
	← kevwil left	00:24
	→ eletuchy joined	00:26
	→ nettoweb joined	00:27
	→ mechanicalduck_ joined	00:27
	← JDHawke left	00:28
	← EminenceHC left	00:28
	→ nerddork69420 joined	00:28
	← jfcaron left	00:29
	← mechanicalduck left	00:29
	← jottr left	00:29
nerddork69420	sup	00:30
	hey guys	00:30
	so	00:30
	← eletuchy left	00:30
	← dmarkham left	00:31
	→ havanamint joined	00:31
	← rdbell left	00:33
	→ rdbell joined	00:33
	← kylethomp18 left	00:34
	→ amjam joined	00:35
	← m0viefreak left	00:36
	← rdbell left	00:38
	← Sasazuka left	00:39
	← mueslo left	00:39
	→ jgardella joined	00:39
	→ ItSANgo joined	00:40
ojacobson	that feeling when you look at a week-old shell and see \|REBASE-i 5/8 in the prompt	00:40
	→ mueslo joined	00:41
	← mikecmpbll left	00:41
	← harish left	00:42
	← Manny_ left	00:43
	→ Manny joined	00:43
	← Mso150_l_x left	00:43
	→ Mso150_l_x_g joined	00:43
	← jonalmeida left	00:45
	← jgardella left	00:45
	← sr____ left	00:46
	→ jgardella joined	00:46
	← havanamint left	00:46
gfixler	rebase --abort	00:46
	← gargola left	00:47
ojacobson	tempting	00:48
	but I think the rebase list has some lies in it	00:48
	→ eletuchy joined	00:48
	← a_le left	00:49
	→ Sebtoast joined	00:49
	← Cheaterman1 left	00:49
ojacobson	No, you're right. Thank you.	00:50
Geo	Any thoughts for/against squashing all commits into one when merging to master branch from development? Best practices to keeping them all there, or just a single commit for all?	00:51
ojacobson	if you're going to keep both branches around, definitely _don't_ squash.	00:51
	A merge commit gives both you and git a lot more information to use when reasoning about history, later	00:51
	eg. finding where bugs came from, deciding what is and what is not in each release	00:51
Geo	that to me would suggest the opposite, no? If Im' keeping the dev branch, I could merge as one?	00:52
	and reference the dev branch for info?	00:52
	Just asking; I don't necessarily care and it don't cost a thing to keep the commits :P	00:53
	← eletuchy left	00:53
ojacobson	That's what a merge commit _is_	00:53
	well, in most workflows, anyways	00:54
	a squash commit is completely disconnected from the commits it was created from	00:54
Geo	it rolls everything previous into a single commit	00:54
ojacobson	a merge commit keeps an extra parent, pointing at the exact commit merged in	00:54
Geo	one more quick one, I'm ready to merge dev to master; just checkout master and merge development? Nothing else special or fancy needed?	00:57
	Geo looks at the flow link from eariler	00:58
	← desposo left	00:58
	← looper left	00:59
ojacobson	I would use 'git merge --no-ff develop' personally, to be _extremely_ specific about what I want git to do	00:59
	← thiago left	00:59
	→ Celm joined	00:59
ojacobson	'git merge' on its own otherwise does different things depending on how HEAD and the target branch/es relate to each other	01:00
	(surprise)	01:00
	(git's UI is terrible, basically. Riddled with little contextual, modal traps like that.)	01:00
	← thumpba left	01:01
	← eto left	01:01
	→ ferreum`_ joined	01:01
	← decompiled left	01:02
	→ bbloom joined	01:02
	→ eto joined	01:02
	← _Atom_ left	01:02
	→ LLaurent joined	01:03
	← Cassiopaya left	01:03
	← Fomina left	01:03
	← rjc left	01:03
	← ferreum_` left	01:04
	→ rjc joined	01:05
	← rjc left	01:05
	← Fandekasp left	01:06
	← przemoc left	01:07
Geo	Hmm	01:09
	← zumba_addict left	01:09
Geo	How could I undo the merge I just did? :)	01:09
	I think I do want to use no-ff	01:09
	just reset --hard to the last commit?	01:10
	→ robarelli joined	01:10
	→ zumba_addict joined	01:11
	← nettoweb left	01:11
ojacobson	git reset --hard <branch>@{1} #probably, but check 'git reflog' first, and 'git reset --hard' will destroy any uncommited work	01:12
	→ _Atom_ joined	01:14
	→ GinoMan joined	01:14
	→ XndrK joined	01:14
XndrK	Basic question:	01:14
	I already have a repository on GitHub set up	01:14
	how to I pull that to a local?	01:14
	→ JDHawke joined	01:15
	← robarelli left	01:15
	→ przemoc joined	01:15
GinoMan	XndrK: I'm new to git as well, but i'm gonna take a guess that it's "git clone"	01:16
	XndrK: I'm learning out of this: http://git-scm.com/book ; I'm already on Chapter 2	01:17
dgpalmer	XndrK: GinoMan http://rogerdudler.github.io/git-guide/ is a great beginner git resource	01:19
	XndrK: GinoMan simple and to the point.	01:19
	→ konr joined	01:19
	→ n-st joined	01:20
	← cads2 left	01:20
	← cads left	01:21
	← ncthom91 left	01:21
GinoMan	dgpalmer: THANKS! That's really helpful!	01:21
	was I right though?	01:22
	← govg left	01:23
	→ diegoviola joined	01:23
	← stevenvalladolid left	01:23
dgpalmer	GinoMan: yah thats my favorite git resource to always refer back to for the simple stuff	01:25
	← marchelzo_ left	01:26
	→ EminenceHC joined	01:26
GinoMan	YAY! ok. now I just need to remember to manage my projects this way and push stuff to my github. I can now rule the world muhahahahaha (j/k)	01:27
dgpalmer	GinoMan: github is cool if you are sharing stuff with other people, i prefer bitbucket though because it lets you have private repos for free	01:29
	GinoMan: https://bitbucket.org/	01:29
GinoMan	.... WHY DIDN'T I JOIN THIS CHANNEL SOONER!?!?	01:29
dgpalmer	GinoMan: irc is the shit. :P	01:29
	→ Vampire0 joined	01:29
GinoMan	Tell me about it!	01:29
dgpalmer	anyways, its been a 60 hour work week for me	01:30
	im heading home	01:30
	good luck	01:30
	→ Lyqyd joined	01:30
	← dgpalmer left	01:31
	← EminenceHC left	01:31
	→ thumpba joined	01:32
	→ havanamint joined	01:32
GinoMan	gnight and thanks for everything!	01:32
	← Vampire0_ left	01:32
	← kballou left	01:33
	← leeN left	01:34
	← moritzs left	01:36
	← CheckDavid left	01:36
	← moogumbo left	01:36
	← shennyg__ left	01:36
	← lacrosse__ left	01:36
	← yena left	01:36
	← apipkin left	01:36
	← thumpba left	01:36
	← allouis________ left	01:37
	← philsterin_ left	01:37
	← ggherdov___ left	01:37
	← adev left	01:37
	← kapowaz left	01:37
	← CJD14______ left	01:37
	← GameGamer43 left	01:37
	← mollitz left	01:37
	← dnyy left	01:37
	← akitada__ left	01:37
	← [diecast] left	01:38
	← hguux left	01:38
	← yrashk__ left	01:38
	← titusjose_______ left	01:38
	← chingis__ left	01:38
	→ HanClinto joined	01:40
	← MutSbeta left	01:44
	← ColKurtz left	01:44
	← Marcus left	01:46
	← rutnop left	01:49
	→ thiago joined	01:50
	← darkbasic left	01:55
	→ scarabx joined	01:55
	→ darkbasic joined	01:56
	→ rdbell joined	01:57
	← scarabx left	01:57
	← XndrK left	01:58
	→ jpf_ joined	01:58
	→ ferreum`` joined	01:59
	← mechanicalduck_ left	02:00
	→ Quevin joined	02:01
	← jpf left	02:01
	← damccull left	02:02
	← tmcmahon left	02:02
	← ferreum`_ left	02:02
	← jpf_ left	02:03
	← hagabaka left	02:03
	→ zacg joined	02:03
	← zacg left	02:03
	→ zacg joined	02:03
	← zacg left	02:03
	→ DolpheenDream joined	02:03
	← msonntag left	02:04
	→ johnny2600 joined	02:04
	← Quevin left	02:06
	→ eletuchy joined	02:06
	→ hagabaka joined	02:06
	→ msonntag joined	02:07
	← eletuchy left	02:10
	→ robarelli joined	02:11
	← danemacmillan left	02:13
	→ otter768 joined	02:13
	← faheem__1 left	02:14
	→ jottr joined	02:15
	→ sohail joined	02:15
	← Celm left	02:15
	← akkad left	02:16
	→ irqq joined	02:16
	→ zacg joined	02:17
	← zacg left	02:17
	← robarelli left	02:18
	→ zacg joined	02:18
	→ akkad joined	02:18
	← zacg left	02:19
	→ zacg joined	02:19
	← zacg left	02:19
	← jottr left	02:20
	→ iamjarvo joined	02:20
	← freeman42 left	02:21
	← dsdeiz left	02:23
	← booboy left	02:23
	← havanamint left	02:27
	← JDHawke left	02:27
	→ JDHawke joined	02:28
	gratimax → gratimax\|away	02:30
	→ regreg joined	02:30
	→ mueslo_ joined	02:31
	→ EminenceHC joined	02:31
	← kcm1700_ left	02:32
	→ kcm1700 joined	02:32
	→ thumpba joined	02:32
	→ dv__ joined	02:33
	→ faheem joined	02:33
	← dv_ left	02:33
	← mueslo left	02:35
	← irqq left	02:35
	← EminenceHC left	02:35
	← JosephFerano left	02:36
	← n-st left	02:36
	→ bezet joined	02:37
	→ zacg joined	02:37
	← kcm1700 left	02:37
	→ kcm1700 joined	02:37
	→ it0a joined	02:38
	← DolpheenDream left	02:39
	→ Goplat joined	02:39
	→ DolpheenDream joined	02:40
	→ pheaver joined	02:41
	← bezet left	02:41
	→ Manny_ joined	02:43
	← Manny left	02:43
	→ ericthebold joined	02:48
	→ mmitchell joined	02:49
	← Noldorin left	02:50
	berndj-blackout → berndj	02:50
	← thibaultcha left	02:52
	→ cablop joined	02:56
	← DolpheenDream left	02:59
	← mellernoia left	03:00
	← regreg left	03:00
	→ fold joined	03:01
	← johnny2600 left	03:09
	→ epifanio joined	03:11
	→ robarelli joined	03:13
	→ kukks joined	03:14
	← gccostabr left	03:15
	→ epifanio_ joined	03:16
	← alvaro_o left	03:17
	← epifanio left	03:18
	← robarelli left	03:19
	← brent____ left	03:19
	→ johnny2600 joined	03:22
	← JDHawke left	03:22
	→ booleandilemma joined	03:26
	→ DolpheenDream joined	03:28
	← jonmorehouse left	03:30
	← GinoMan left	03:31
	→ kiran joined	03:32
	← JanC left	03:32
	→ jpf joined	03:33
	← booleandilemma left	03:33
	← mmitchell left	03:33
	← Mitchbones left	03:34
	→ cads joined	03:34
	← amikiri left	03:34
	← maslowbeer left	03:34
	→ GinoMan joined	03:36
	← ColdKeyboard left	03:37
	→ jonmorehouse joined	03:38
	→ lukeholder joined	03:38
	← lukeholder left	03:38
	→ lukeholder joined	03:39
	← lukeholder left	03:39
	→ lukeholder joined	03:40
	→ a_le joined	03:40
	← lukeholder left	03:40
	← GinoMan left	03:41
	→ lukeholder joined	03:41
	← lukeholder left	03:42
	→ pwnz0r joined	03:42
	→ lukeholder joined	03:42
	← DolpheenDream left	03:42
	→ bug_sniper joined	03:43
	← it0a left	03:43
	→ mscook joined	03:44
	→ DolpheenDream joined	03:46
	→ JanC joined	03:47
	→ Marcus joined	03:47
	← mscook left	03:52
	← m0ltar left	03:52
	← epifanio_ left	03:53
	← Marcus left	03:53
	→ [diecast] joined	03:54
	← pheaver left	03:54
	← jonmorehouse left	03:55
	→ jonmorehouse joined	03:56
	→ epifanio joined	04:00
	← BSaboia left	04:00
	magic_ → magic	04:00
	← magic left	04:01
	→ magic joined	04:01
	← HanClinto left	04:02
	→ HanClinto joined	04:04
	← zacg left	04:06
	→ kapowaz joined	04:10
	← gfixler left	04:10
	→ yrashk__ joined	04:12
	→ dnyy joined	04:13
	→ mscook joined	04:14
	← amjam left	04:15
	→ GT4066 joined	04:15
	→ shennyg__ joined	04:15
	→ amjam joined	04:16
	→ robarelli joined	04:16
	→ diegovio1 joined	04:17
	→ thibaultcha joined	04:17
	→ GameGamer43 joined	04:18
	← sohail left	04:18
	← diegoviola left	04:18
	→ Consuela joined	04:19
	diegovio1 → diegoviola	04:19
	→ JosephFerano joined	04:20
	← amjam left	04:20
	← lukeholder left	04:20
	← JosephFerano left	04:21
	→ titusjose_______ joined	04:21
	→ nickgaw joined	04:21
	← nickgaw left	04:22
	← robarelli left	04:22
	← gratimax\|away left	04:22
	← DolpheenDream left	04:23
	→ amjam joined	04:23
	← madewokherd left	04:24
	← Consuela left	04:24
	← mscook left	04:25
	→ akitada__ joined	04:25
	→ robmozart joined	04:26
	→ mscook joined	04:26
	→ yena joined	04:27
	→ smccarthy joined	04:30
	→ hguux joined	04:31
	→ apipkin joined	04:31
	← johnny2600 left	04:32
	→ ggherdov___ joined	04:33
	← HanClinto left	04:33
	→ luc_ joined	04:35
	→ lacrosse__ joined	04:35
	→ Mixologic joined	04:35
	← luc_ left	04:35
	→ iinzng joined	04:36
	→ JosephFerano joined	04:36
	→ CheckDavid joined	04:36
	→ allouis________ joined	04:37
	→ bezet joined	04:37
	← supernaut left	04:37
	→ subhojit777 joined	04:38
	→ philsterin_ joined	04:38
	→ CJD14______ joined	04:38
	→ EminenceHC joined	04:39
	→ aidalgol joined	04:39
	→ adev joined	04:42
	← a_le left	04:42
	← bezet left	04:42
	→ moogumbo joined	04:42
	→ chingis__ joined	04:42
	→ supernaut joined	04:42
	← Manny_ left	04:43
	→ mennea joined	04:43
	→ Manny joined	04:43
	← EminenceHC left	04:43
	← _Atom_ left	04:46
	← iamjarvo left	04:46
	← JanC left	04:49
	→ fatalhalt joined	04:50
	← otter768 left	04:56
	← mscook left	04:58
	→ mscook joined	04:58
	→ b_rare joined	04:59
	→ _Atom_ joined	04:59
	← UmbraMalison left	05:01
	→ JanC joined	05:02
	← Pyrogerg left	05:03
	← unglid left	05:04
	→ UmbraMalison joined	05:05
	← Goplat left	05:07
	→ akagr joined	05:08
	→ unglid joined	05:09
	← mennea left	05:12
	→ mennea joined	05:12
	← aidalgol left	05:12
	→ armyriad joined	05:13
	→ beautifulmind joined	05:15
	→ booboy joined	05:17
	→ robzilla joined	05:18
	← smccarthy left	05:19
	← epifanio left	05:21
	← robzilla left	05:22
	← mscook left	05:24
	→ GinoMan joined	05:25
	→ ilogger2 joined	05:33
	→ lukeholder joined	05:35
	← lukeholder left	05:35
	→ jitendravyas joined	05:35
	→ lukeholder joined	05:35
	← lukeholder left	05:36
	→ lukeholder joined	05:37
	→ ciampix joined	05:37
	→ Vivekananda joined	05:39
	→ nimdAsyS joined	05:39
	→ mennea joined	05:43
	→ EminenceHC joined	05:45
	← nimdAsyS left	05:47
	→ dmarkham joined	05:47
	→ Marcus joined	05:48
	← EminenceHC left	05:50
	→ FunkyAss joined	05:50
	→ frezix joined	05:51
	← Marcus left	05:53
	→ boboc joined	05:54
	→ EminenceHC joined	05:56
	→ awkwardusername joined	05:58
	→ Not_Whatever joined	05:59
	← frezix left	06:00
	← EminenceHC left	06:01
	→ hahuang65 joined	06:01
	→ Quevin joined	06:02
	→ SporkWitch joined	06:03
	→ r0bby_ joined	06:05
	← hahuang65 left	06:06
	← r0bby_ left	06:07
	→ mmitchell joined	06:07
	← Quevin left	06:08
	→ jonmorehouse joined	06:11
	← mmitchell left	06:11
	← mennea left	06:12
	→ mennea joined	06:13
	→ Vivekananda_y510 joined	06:13
	← lukeholder left	06:15
	← boboc left	06:18
	→ robzilla joined	06:19
	→ lukeholder joined	06:21
	→ petersr joined	06:22
	← robzilla left	06:25
	← awkwardusername left	06:26
	→ skynxnex joined	06:27
	← dmarkham left	06:28
	→ St_Marx joined	06:28
	← St_Marx left	06:29
	← skynxnex left	06:29
	→ St_Marx joined	06:30
	← jitendravyas left	06:32
	→ maestrojed joined	06:33
	← maestrojed left	06:37
	→ bezet joined	06:37
	← lukeholder left	06:39
	→ akushner_ joined	06:41
	← bezet left	06:42
	→ Manny joined	06:43
	→ maestrojed joined	06:43
	→ palcu joined	06:45
	→ [diecast] joined	06:47
	→ lukeholder joined	06:50
	← lukeholder left	06:50
	→ lukeholder joined	06:51
	← lukeholder left	06:51
	→ lukeholder joined	06:52
	→ beautifulmind joined	06:54
	← akushner_ left	06:56
	← maestrojed left	06:57
	→ nour joined	07:02
	→ mmitchell joined	07:08
	→ neunon joined	07:09
	← St_Marx left	07:09
	← mennea left	07:12
	← mmitchell left	07:12
	→ mennea joined	07:12
	→ amjam joined	07:15
	← palcu left	07:16
	← lukeholder left	07:16
	→ palcu joined	07:16
nerddork69420	http://www.youtube.com/watch?v=a9Xeot5hylc	07:17
	→ sokoll joined	07:19
	← amjam left	07:20
	← palcu left	07:21
	→ teran joined	07:21
	→ robzilla joined	07:21
	← [diecast] left	07:25
	← teran left	07:26
	← robzilla left	07:27
	→ St_Marx joined	07:27
	← jonmorehouse left	07:28
	→ aidalgol joined	07:30
	→ MutSbeta joined	07:31
	→ Tuna-Fish joined	07:31
	→ jonmorehouse joined	07:32
	→ endiruna joined	07:32
	→ Thorn joined	07:33
	← Thorn left	07:33
	→ Thorn joined	07:33
	→ jds joined	07:34
	→ kerrick joined	07:34
	→ yena joined	07:35
	→ webframp joined	07:35
	→ mehdi___ joined	07:35
	→ mattl joined	07:35
	→ konr joined	07:35
	→ akitada__ joined	07:35
	→ shennyg__ joined	07:35
	→ Obi_obi_ joined	07:36
	→ lebster joined	07:36
	→ zoso joined	07:36
	→ [diecast]_ joined	07:37
	← beautifulmind left	07:40
	→ scarcry joined	07:41
	← mennea left	07:42
	→ noxd joined	07:42
	→ mennea joined	07:43
	→ jenni_naiaretti joined	07:47
	→ kriks joined	07:48
	→ Suchit joined	07:48
	→ ajustrun joined	07:48
	→ palcu joined	07:48
	→ Marcus joined	07:49
	← Suchit left	07:49
	→ Suchit joined	07:50
	→ duderonomy joined	07:51
	← jonmorehouse left	07:51
	→ xdudi joined	07:51
	← duderonomy left	07:52
	→ zapb_ joined	07:53
	← jenni_naiaretti left	07:53
	← Marcus left	07:53
	→ jenni_naiaretti joined	07:53
	→ hexagoxel joined	07:55
	→ EminenceHC joined	07:55
	→ gfixler joined	07:57
	← palcu left	07:57
	→ Wiz_KeeD joined	07:58
	→ nkouevda joined	07:58
	→ foresto joined	07:58
	→ ockham joined	07:58
	← EminenceHC left	07:59
	→ WAANZJP joined	08:01
foresto	Can someone explain why the git-reset man page uses the remote branch syntax "topic/wip" when referring to a local branch? Does the "topic/" prefix have some special meaning?	08:01
	→ jonmorehouse joined	08:02
	← endiruna left	08:02
	→ leeN joined	08:02
	→ dv_ joined	08:03
	→ Quevin joined	08:04
	→ mscook joined	08:05
	← Quevin left	08:08
	→ mmitchell joined	08:08
	→ lukeholder joined	08:09
	← lukeholder left	08:09
	← mscook left	08:10
	→ lukeholder joined	08:10
Seveas	foresto: "topic/wip" is not remote branch syntax. Branchnames can have slashes in them	08:11
	→ Junior joined	08:12
Seveas	e.g. I generally name my branches at work dkaarsemaker/topic_name_here to avoid name clashes	08:12
	← mmitchell left	08:13
	→ sLite joined	08:14
	→ mscook joined	08:16
	→ Kicer86 joined	08:16
	→ ra0 joined	08:17
	← Suchit left	08:17
	→ Suchit joined	08:18
	→ PinkSpecs joined	08:18
	→ endiruna joined	08:18
	→ astrofog joined	08:20
	→ vire joined	08:21
	← endiruna left	08:21
	→ harish joined	08:21
	[diecast]_ → [diecast]	08:22
	→ endiruna joined	08:22
	← Suchit left	08:22
	→ Error404NotFound joined	08:22
foresto	Saveas: In that case, why does the git book's section on remote branches imply that "origin/branchname" indicates a remote branch? And why does git branch -r list all remote branches as "remotename/branchname"? It sure looks like the "somename/" prefix is supposed to be used for remote branches, by convention if not by rule.	08:22
	→ robzilla joined	08:23
	→ awkwardusername joined	08:23
milki	foresto: there are two different types of branches	08:23
moritz	foresto: think of / as separating namespaces; remotes are just one kind of namespaces	08:23
milki	if it beings with the remote name, then its a !tracking branch	08:23
gitinfo	[!remote_tracking_branch] Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the corresponding branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a new local branch based on a remote-tracking branch using e.g. 'git checkout -b <branch> <remote	08:23
	→ dv__ joined	08:24
	← dv_ left	08:24
milki	a branch name, however, can still have / in its name	08:24
	you and some git commands may find the branch name ambiguous in the case that the prefix of a branch name is the same as a remote name	08:25
	→ jagob joined	08:25
foresto	In other words, whomever wrote the git-reset man page chose a branch name that was needlessly confusing.	08:25
milki	but you can always use the absolute ref name which stards with refs/	08:25
	← lukeholder left	08:26
milki	foresto: sure, its always a work in progress	08:26
foresto	Sigh.	08:26
milki	patches accepted	08:26
	names are hard btw	08:27
	← jenni_naiaretti left	08:27
foresto	Oh, I'm no stranger to the difficulty of naming some things. I'm just new to git, and struggling with an abundance of needlessly-confusing nomenclature.	08:28
	Looking at the "contributing to git" instructions now.	08:28
	← robzilla left	08:28
	← jonmorehouse left	08:30
	← dv__ left	08:30
	← endiruna left	08:32
	→ endiruna joined	08:32
	→ mithro joined	08:33
milki	im not sure how friendly the contribution process is to newbies	08:33
	→ adev joined	08:34
	→ bezet joined	08:38
	→ dv_ joined	08:39
	→ nnyk_ joined	08:42
	→ jargon joined	08:42
	← endiruna left	08:42
	← mennea left	08:42
	← bezet left	08:42
	→ endiruna joined	08:42
	→ mennea joined	08:43
	← Manny left	08:43
	→ Manny joined	08:43
	← dv_ left	08:44
foresto	If it's unfriendly, I guess that would explain why this particular issue has been there for eight years without anyone fixing it. I'll probably try anyway.	08:44
bremner	foresto: it's more like people don't always agree about what is "needlessly-confusing".	08:45
foresto	True enough.	08:45
comps	some people use spaces in branch names ;)	08:46
bremner	those should be taken out back	08:46
foresto	Still, when explaining how to use something, adding unnecessary complexity is almost always counterproductive.	08:49
	→ moritzs joined	08:51
	→ mollitz joined	08:51
	→ dv_ joined	08:52
	→ marthinal joined	08:53
	← dv_ left	08:53
	→ joki joined	08:53
	← jargon left	08:54
	← aidalgol left	08:54
	→ dv_ joined	08:55
	→ EminenceHC joined	08:59
	← ajustrun left	08:59
	← EminenceHC left	09:03
	← noxd left	09:03
	← hexagoxel left	09:04
	→ hexagoxel joined	09:05
	← hexagoxel left	09:05
	← dv_ left	09:06
	→ dv_ joined	09:06
	→ mmitchell joined	09:09
	→ govg joined	09:11
	→ masak joined	09:12
	← mmitchell left	09:14
	← mscook left	09:15
	→ jatt joined	09:15
	← jatt left	09:15
	→ jatt joined	09:15
	← jagob left	09:15
	→ anaran joined	09:16
	→ mscook joined	09:17
	← PinkSpecs left	09:17
	→ PinkSpecs joined	09:19
	← mscook left	09:20
	← mennea left	09:23
	→ mennea joined	09:24
	→ robzilla joined	09:26
	← jatt left	09:27
	→ mscook joined	09:28
	→ evildmp joined	09:30
	← robzilla left	09:31
	→ snuffeluffegus joined	09:34
	← govg left	09:35
	→ hexagoxel joined	09:36
	→ Hyknua joined	09:37
	← ra0 left	09:37
	← hexagoxel left	09:37
	→ govg joined	09:37
	→ eletuchy joined	09:38
	→ atomx joined	09:38
	→ ra0 joined	09:38
	← awkwardusername left	09:40
	← mscook left	09:42
	← evildmp left	09:42
	← eletuchy left	09:43
	→ mscook joined	09:43
	→ CheckDavid joined	09:43
	→ SonikBoom joined	09:45
	→ kotopies joined	09:45
	→ Marcus joined	09:48
	← mscook left	09:48
	→ chiromante joined	09:50
	← foresto left	09:50
	→ cntrl joined	09:52
	← mennea left	09:53
	→ mennea joined	09:54
	← nkouevda left	09:55
	→ Matrixiumn joined	09:56
	→ jottr joined	09:56
	← zoso left	09:58
	← Vivekananda_y510 left	10:01
	→ EminenceHC joined	10:01
	→ kcj joined	10:01
	← astrofog left	10:03
	→ yacks joined	10:03
	→ Quevin joined	10:04
	← EminenceHC left	10:05
	← Quevin left	10:09
	→ jeremyheiler joined	10:09
	→ Jackneill joined	10:09
	→ israelpattison joined	10:10
	→ mmitchell joined	10:10
	→ martinklepsch joined	10:10
	← jottr left	10:11
	← kotopies left	10:12
	← moritzs left	10:13
	← mollitz left	10:13
	← mmitchell left	10:14
	← martinklepsch left	10:15
	→ Celm joined	10:18
	→ skeuomorf joined	10:19
	← PinkSpecs left	10:19
	← ra0 left	10:19
	← snuffeluffegus left	10:20
	→ Gizburdt joined	10:21
	→ martinklepsch joined	10:22
	← mennea left	10:23
	← martinklepsch left	10:24
	← Celm left	10:24
	→ jenni_naiaretti joined	10:24
	→ mennea joined	10:24
	→ moritzs joined	10:26
	→ moritzschaefer joined	10:26
	← jenni_naiaretti left	10:26
	→ beautifulmind joined	10:27
	→ robzilla joined	10:28
	→ mscook joined	10:29
	← Jackneill left	10:30
	→ rikko joined	10:31
	← beautifulmind left	10:31
	→ linduxed joined	10:33
	← robzilla left	10:33
	← mscook left	10:34
	← kcj left	10:34
	→ nfk joined	10:35
	→ jatt joined	10:35
	← jatt left	10:35
	→ jatt joined	10:35
	→ TheFuzzball joined	10:36
	→ jottr joined	10:37
	→ FilipNortic joined	10:38
	→ bezet joined	10:38
	→ beautifulmind joined	10:38
	→ ColdKeyboard joined	10:39
	→ sdrfnord1 joined	10:39
	→ tgummerer joined	10:40
	← Gizburdt left	10:41
	→ martinklepsch joined	10:41
	→ Sleepy63 joined	10:42
	→ noxd joined	10:42
	← bezet left	10:43
	→ m8 joined	10:43
	← Manny left	10:43
	→ Manny joined	10:43
	← jottr left	10:44
	← rikko left	10:45
	← jeremyheiler left	10:46
	← martinklepsch left	10:46
	→ khmarbaise joined	10:46
	← khmarbaise left	10:46
	→ khmarbaise joined	10:46
	→ punchagan joined	10:47
	→ mscook joined	10:48
	→ wrouesnel1 joined	10:48
	← mscook left	10:49
	→ mscook joined	10:50
	→ ManicPanic1 joined	10:51
	← ManicPanic1 left	10:52
	→ jeremyheiler joined	10:52
	→ daedeloth joined	10:53
	→ WaReZ joined	10:54
	← mscook left	10:54
	→ sqrrl joined	11:03
	→ mylord joined	11:05
	→ EminenceHC joined	11:06
	→ Toaster` joined	11:09
	← mylord left	11:09
	→ jottr joined	11:10
	← EminenceHC left	11:11
	→ mmitchell joined	11:11
	→ ghostlin_ joined	11:11
	→ jenni_naiaretti joined	11:12
	← khmarbaise left	11:12
	← ghostlin_ left	11:14
	→ lun_ joined	11:15
	→ khmarbaise joined	11:15
	→ amjam joined	11:15
	← mmitchell left	11:16
	→ lukeholder joined	11:17
	← lukeholder left	11:17
	← jenni_naiaretti left	11:17
	→ jenni_naiaretti joined	11:17
	→ mylord joined	11:19
	→ encod3 joined	11:19
mylord	do forks allow push upstream to the forked repo, somehow?	11:19
	← amjam left	11:20
j416	mylord: a "fork" is github lingo for clone	11:20
	or, no	11:20
	→ mscook joined	11:21
j416	it's github lingo for a clone of a copy of the repo	11:21
	sigh the mornings. a copy of the repo without reference to the original.	11:21
	mylord: so what you have is a copy of the original repo but without reference to the original (other than what github (I presume github?)); but rather when you clone your "fork", your local repo will only know about your "fork"	11:22
mylord	ok, makes sense	11:23
j416	mylord: as with any git repo, you can have multiple remotes if you want.	11:23
	← Toaster` left	11:23
mylord	and btw, i’m talking about bitbucket fork, but i suspect your explanation still applies	11:23
cbreak	git has no notion of forking	11:23
	it's just cloning under an other name	11:23
	← mennea left	11:23
j416	mylord: normally, you would push changes to your own fork ("origin" by default if you just cloned the repo); and then tell the maintainer of the original repo to pull from your repo	11:23
	mylord: yes, applies.	11:24
	cbreak: clone without remote reference	11:24
	← jenni_naiaretti left	11:24
	→ mennea joined	11:24
mylord	does it make sense to have 1 copy in bitbucket for “live” code, and another for “dev” or “staging” ?	11:24
	or are these typically better managed as branches of just 1 live repo?	11:24
j416	mylord: branches?	11:24
	what is "live"?	11:25
mylord	as in, the repo whose head is currently running on the servers	11:25
cbreak	j416: how do you know it has no remote reference?	11:25
j416	cbreak: true, I don't. I'm referring to the experience as a user, in that there's no trace of the original repo when cloning your "fork"	11:26
cbreak	j416: there's no trace of the origin's remotes when cloning any repo	11:26
	no cloning is transitive	11:26
mylord	j416: so you recommend have just 1 repo, with branches for code that’s in-development (“dev”), or in-final-testing (“staging”)?	11:26
cbreak	(apart from --mirror I suppose)	11:27
j416	I thought it was more comprehensible to explain it as a copy and not a git clone	11:27
	because you can't know if it's a git clone or a cp, either	11:27
	mylord: your server still has its own clone of the repo so	11:27
	mylord: I'd probably have the master branch match production	11:28
	← jottr left	11:28
j416	mylord: but you can use any	11:28
	→ Mitchbones joined	11:29
	→ robzilla joined	11:30
	→ listochkin joined	11:30
	← ciampix left	11:31
	→ amikiri joined	11:32
	← nnyk_ left	11:33
	← robzilla left	11:34
	← mscook left	11:34
	→ tanath_ joined	11:35
	→ jottr joined	11:35
	→ Noldorin joined	11:36
	← punchagan left	11:37
	→ jenni_naiaretti joined	11:38
	→ skelterjohn joined	11:40
	→ tincan joined	11:44
	→ _morten joined	11:44
	→ darkbasic_ joined	11:44
	← tincan left	11:44
	← jenni_naiaretti left	11:47
	→ jaw221 joined	11:47
	→ segfalt joined	11:47
	→ jenni_naiaretti joined	11:48
	→ palcu joined	11:48
	→ raven-au joined	11:48
	gitinfo set mode: +v	11:50
	← jenni_naiaretti left	11:50
jaw221	Hi all, I'm using capistrano to deploy and getting an error. I have a git repository in /srv/project/repo and when I do "git remote update origin" from there, I get: Fetching origin\nerror: Could not fetch origin	11:50
	but if I take the output of git remote -v and clone it, that works fine	11:51
	← St_Marx left	11:51
jaw221	any advice or ideas are much appreciated	11:51
	→ jenni_naiaretti joined	11:51
	← jenni_naiaretti left	11:53
	→ Gizburdt joined	11:53
	← palcu left	11:53
	← mennea left	11:53
	→ mennea joined	11:54
	→ King_Hual joined	11:55
	→ punchagan joined	11:55
	→ jenni_naiaretti joined	11:56
	→ ecky--ptang-zoob joined	11:57
	← jenni_naiaretti left	11:57
	→ Jackneill joined	11:58
	→ groolot joined	11:59
	← groolot left	12:00
	→ fstd joined	12:00
	→ mscook joined	12:00
Seveas	jaw221: the error usually indicates what goes wrong during the fetch. If it doesn't, fix your capistrano script to actually say what's going wrong	12:00
	← listochkin left	12:00
Seveas	jaw221: but first guess would be git server unreachable or incorrect login details	12:01
jaw221	I shouldn't have mentioned capistrano, I ran those commands myself on the machine that capistrano deploys to. also cloning works fine, I've pushed my public key to the machine with the repo	12:02
	← punchagan left	12:02
Seveas	jaw221: does capistrano have access to your private key?	12:03
	← jatt left	12:03
	← skeuomorf left	12:03
jaw221	yes, it's logging in as the user whose key was pushed	12:03
Seveas	well, time to drag out the error message then :)	12:04
	→ Quevin joined	12:05
jaw221	the error I pasted was from "git remote -v update" there was no more :(	12:05
	actually "git remote -v update origin"	12:05
	← mscook left	12:05
Seveas	jaw221: ah, I missed 'update'. You'll want 'fetch' instead.	12:06
	→ St_Marx joined	12:06
Seveas	update is for doing groups of remotes	12:06
jaw221	:/ so (rhetorical q) why was cap doing update	12:07
Seveas	because you told it to? :)	12:07
	→ beaky joined	12:08
beaky	hello	12:08
	what are common mistakes people do with git	12:08
	that i am probably doing right this moment	12:08
osse	write crappy commit messages	12:09
jaw221	rm -rf your .git and start over because somebody pushed and you don't know how to merge	12:09
	jaw221 guilty	12:09
jaw221	every once in a while	12:09
	→ rtud joined	12:10
jaw221	actually i'm delirious, I haven't done that in years	12:10
	← Gizburdt left	12:10
	← Quevin left	12:10
	→ lukeholder joined	12:10
jaw221	but it does happen!	12:10
_ikke_	beaky: pulling everytime to 'sync' the repo	12:10
	← rtud left	12:10
beaky	yeah my commit messages are horrible one liners like 'add support for csv file'	12:11
	how do i write better commits	12:11
	← lukeholder left	12:11
_ikke_	beaky: Read git commit messages	12:11
	git.git	12:11
	→ lukeholder joined	12:11
	→ mmitchell joined	12:12
	→ mscook joined	12:12
cbreak	the biggest mistake is thinking git is just like svn, but better.	12:12
	← lukeholder left	12:12
beaky	ah i never use svn	12:12
osse	beaky: if the only change in that commit is that you change the supportedFormats array to add csv or something then it's perfectly fine	12:12
_ikke_	Using git to deploy	12:12
	→ lukeholder joined	12:12
_ikke_	Commit messages are good places to document why a change has been made	12:13
	← lukeholder left	12:13
	→ EminenceHC joined	12:13
	→ lukeholder joined	12:13
	← ColdKeyboard left	12:13
	← lukeholder left	12:14
Seveas	beaky: putting config files in git with the application	12:14
	→ lukeholder joined	12:15
Seveas	sticking humongous file in git	12:15
beaky	wow im guilty of all those	12:15
	← lukeholder left	12:15
_ikke_	(svn-ism) add all projects to a single repository	12:15
beaky	i use git to store photos and my bash configs	12:15
Seveas	that's why they're common mistakes :-)	12:15
	← jottr left	12:15
Seveas	_ikke_: ooh, guilty!	12:15
	→ lukeholder joined	12:16
Seveas	not branching enough because you're afraid of merges	12:16
	→ jenni_naiaretti joined	12:16
Seveas	making huge commits	12:16
	← mmitchell left	12:16
Seveas	or being afraid of rebase	12:17
osse	common mistake: doing 'git add .' and then add a lot changes that are totally unrelated to the actual change you wanted to commit	12:17
beaky	wow the git .git has tons of branches and merges	12:17
	← EminenceHC left	12:18
Seveas	git.git has a very special workflow where everything is created on feature branches	12:18
beaky	so the git.git workflow isnt for every project?	12:19
Seveas	I wouldn't recommend it	12:19
	← tomaw- left	12:19
_ikke_	git.git relies on a single integrator	12:19
Seveas	The almighty jch	12:20
	← jenni_naiaretti left	12:21
	→ Kabaka joined	12:22
	→ xSmurf joined	12:23
beaky	for my projects i lean towards the flow like the one in this site: http://nvie.com/posts/a-successful-git-branching-model/	12:23
	is it good?	12:23
	← mennea left	12:23
	→ intellix joined	12:24
osse	I commit willy nilly. Sorts itself out usually .	12:24
	... as long as the commit messages are good :3	12:24
	→ mennea joined	12:24
	← mscook left	12:25
	→ gccostabr joined	12:25
	→ mscook joined	12:26
	→ hahuang65 joined	12:28
	→ donmichelangelo joined	12:28
	→ jottr joined	12:28
	← gccostabr left	12:29
	← mscook left	12:30
	→ aard_ joined	12:30
	→ robzilla joined	12:30
	← lukeholder left	12:31
	→ lukeholder joined	12:33
	← lukeholder left	12:33
	← hahuang65 left	12:33
	← Junior left	12:34
	← endiruna left	12:34
	→ lukeholder joined	12:34
	← lukeholder left	12:34
	→ lukeholder joined	12:35
	← robzilla left	12:35
	← lukeholder left	12:35
	→ jatt joined	12:36
	← jatt left	12:36
	→ jatt joined	12:36
	→ lukeholder joined	12:36
	→ palcu joined	12:38
	→ bezet joined	12:38
	→ khmarbaise_ joined	12:39
	← khmarbaise left	12:40
	khmarbaise_ → khmarbaise	12:40
osse	dump = "!git archive \"$1\" \| tar -xf - -C \"${2:-.}\" && :"	12:42
	goddammit I'm a genius	12:42
	← Manny left	12:43
	← noxd left	12:43
	→ Manny joined	12:43
	← bezet left	12:43
	→ kristofferR joined	12:44
	→ Goplat joined	12:44
	→ Sceorem joined	12:46
	→ Skapadapaduu joined	12:47
	→ looper_ joined	12:52
	→ Nizumzen joined	12:52
	→ giovanni joined	12:52
	→ JEEBcz joined	12:52
	JEEBcz → JEEB	12:52
	→ Cheaterman1 joined	12:52
	giovanni → Guest45166	12:52
	← Guest45166 left	12:52
	← mennea left	12:53
	→ mennea joined	12:54
	→ marscher joined	12:56
	→ FreezingCold joined	12:57
Seveas	osse: why the '&& :'	12:58
	→ mscook joined	12:59
	← sdrfnord1 left	12:59
	→ upene joined	13:01
	← beautifulmind left	13:02
	← mscook left	13:04
	→ noxd joined	13:05
	→ PinkSpecs joined	13:06
	← intellix left	13:07
	→ storrgie joined	13:11
	→ it0a joined	13:12
	← Error404NotFound left	13:12
	→ Err404NotFound joined	13:12
	→ mmitchell joined	13:13
	← aard_ left	13:13
	← storrgie left	13:13
	→ storrgie joined	13:14
	← TheFuzzball left	13:15
	← mmitchell left	13:17
	← Tuna-Fish left	13:17
beaky	can i rename origin	13:18
	to a name like 'github'	13:18
	← jatt left	13:18
	→ kpease joined	13:20
luto	yes	13:20
	← kpease left	13:20
	← storrgie left	13:22
	→ storrgie joined	13:22
	← mennea left	13:23
	→ mennea joined	13:24
	→ awkwardusername joined	13:26
	← Not_Whatever left	13:26
	→ Tuna-Fish joined	13:28
_ikke_	!origin	13:30
	!master	13:30
gitinfo	[!master_branch] 'master' is the default name for the first branch commited by git, and it is in no way special. You can just delete it, and use more meaningful names such as 'dev' 'stable' 'unstable' 'bug/001' etc. If this is a bare repo, you will want to change the default branch(`git symbolic-ref HEAD refs/heads/somebranch`) first.	13:30
_ikke_	The amse counts for origin	13:30
	the same*	13:30
osse	Seveas: because Git confusingly sets the positional arguments and appends them to the command line itself. So either do '!f() { blabla "$@"; }; f' or dp '!blabla "$@" && :'. The : then gets the arguments and does nothing with them.	13:30
	→ CEnnis91 joined	13:30
	← JEEB left	13:30
	→ LLaurent joined	13:31
	← khmarbaise left	13:31
	→ khmarbaise joined	13:32
osse	Seveas: try this alias: test = test = "!printf '%s\n' \"$@\" ----"	13:32
	→ robzilla joined	13:32
osse	Seveas: you'll see any and all arguments twice. once before and once after the dashes	13:32
	→ mscook joined	13:34
	→ m0ltar joined	13:34
	→ btanaka joined	13:37
	← _morten left	13:37
	← robzilla left	13:37
	→ eletuchy joined	13:37
	→ JDHawke joined	13:38
	← Jackneill left	13:39
	→ mizu_no_oto joined	13:40
	← mscook left	13:41
	← eletuchy left	13:42
	→ spareproject joined	13:44
	→ Vile joined	13:49
	← encod3 left	13:50
	← btanaka left	13:51
	← mennea left	13:54
	→ mennea joined	13:54
	→ frankdogg joined	13:54
	← frankdogg left	13:54
	← Nizumzen left	13:55
	→ zacg joined	13:56
	→ burhan joined	13:56
	→ Jackneill joined	13:56
	← St_Marx left	13:56
	→ bezet joined	13:57
	→ amjam joined	13:58
	← xdudi left	13:58
	→ nettoweb joined	13:59
	← mizu_no_oto left	14:01
	→ Quevin joined	14:06
	→ she-24 joined	14:06
	← amjam left	14:08
	→ amjam joined	14:09
	← ecky--ptang-zoob left	14:10
	→ ech0s7 joined	14:10
ech0s7	hi all	14:10
gitinfo	ech0s7: 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.	14:10
	→ jatt joined	14:10
ech0s7	i would create a diff file from last commit	14:10
	← jatt left	14:10
	→ jatt joined	14:10
	→ ecky--ptang-zoob joined	14:10
	← Quevin left	14:11
	→ metRo_ joined	14:13
	→ mmitchell joined	14:13
	← amjam left	14:14
osse	ech0s7: git diff commit~ commit > file.patch	14:16
	→ EminenceHC joined	14:16
osse	or git format-patch commit~	14:16
	← she-24 left	14:16
	← mmitchell left	14:18
ech0s7	thanks osse (format-patch is fantastic)	14:18
	→ rypeck joined	14:19
	← Sceorem left	14:19
	→ BSaboia joined	14:20
rudi_s	ech0s7: format-patch -1 is also useful, -1 means only the last commit, -2 only the last two commits, etc.	14:21
	→ tango_ joined	14:21
	← EminenceHC left	14:21
rudi_s	This way you don't need to type HEAD~, HEAD~2 and so on.	14:21
ech0s7	rudi_s: thanks, i have just seen in help :)	14:22
rudi_s	np	14:22
	→ raw joined	14:23
	← mennea left	14:24
	raw → Guest95173	14:24
	→ mennea joined	14:24
	→ earny joined	14:25
	→ Hello71 joined	14:25
	← nettoweb left	14:26
	← amikiri left	14:27
	→ zoso joined	14:28
	→ GameGamer43 joined	14:29
	→ nettoweb joined	14:29
	← nettoweb left	14:29
	→ Gamecubic joined	14:30
	→ nettoweb joined	14:30
	← nour left	14:31
	→ a_le joined	14:32
	→ endiruna joined	14:33
	← lukeholder left	14:33
	→ JEEB joined	14:33
	→ robzilla joined	14:34
	→ ifmw joined	14:34
	→ cjwilburn joined	14:35
	← Guest95173 left	14:35
	→ sohail joined	14:35
	← jatt left	14:35
	→ jatt joined	14:36
	← jatt left	14:36
	→ jatt joined	14:36
	← jds left	14:37
	← a_le left	14:37
	← palcu left	14:39
	→ palcu joined	14:39
	→ ciampix joined	14:40
	← robzilla left	14:40
	→ Nizumzen joined	14:41
	← bezet left	14:42
	→ pandeiro joined	14:42
	→ khmarbaise_ joined	14:43
	← khmarbaise_ left	14:43
	→ khmarbaise_ joined	14:43
	← Manny left	14:43
	→ Manny joined	14:43
	← khmarbaise left	14:43
	khmarbaise_ → khmarbaise	14:43
	← palcu left	14:43
	→ Sceorem joined	14:45
	→ BQ joined	14:45
	→ jenni_naiaretti joined	14:46
	← cjwilburn left	14:47
	← jenni_naiaretti left	14:48
	→ jenni_naiaretti joined	14:48
	← cntrl left	14:49
	← WaReZ left	14:50
	→ encod3 joined	14:51
	← nettoweb left	14:51
	← Vile left	14:52
	← mennea left	14:54
	→ mennea joined	14:54
	← encod3 left	14:55
	→ dan64 joined	14:59
	→ WormDrink joined	14:59
	→ cjwilburn joined	15:00
	→ amikiri joined	15:00
	→ darkbasic joined	15:01
	← darkbasic_ left	15:01
	→ cntrl joined	15:02
	→ BQ_ joined	15:03
	→ devoldmx3 joined	15:04
	← BQ left	15:04
	← khmarbaise left	15:04
	BQ_ → BQ	15:04
WormDrink	hi	15:06
	having some troub here	15:06
	https://gist.github.com/aucampia/5c23913b8132b8429490	15:08
	I try to push and get access denied - but when I ssh direct its fine	15:08
	→ xobb joined	15:09
WormDrink	ah nvm	15:09
	had forward agent set	15:09
	→ palcu joined	15:10
	← sohail left	15:11
	→ DTSCode joined	15:12
	→ tang^ joined	15:13
	→ mmitchell joined	15:14
	← palcu left	15:16
	→ khmarbaise joined	15:16
	← mylord left	15:16
	← khmarbaise left	15:17
	← it0a left	15:18
	← mmitchell left	15:19
	→ khmarbaise joined	15:20
	← BQ left	15:22
	→ EminenceHC joined	15:22
	← mennea left	15:24
	→ mennea joined	15:24
	← spareproject left	15:24
	→ listochkin joined	15:24
	← metRo_ left	15:25
	← jottr left	15:25
	→ jottr joined	15:26
	→ madewokherd joined	15:26
WormDrink	hi	15:26
	I have two gitlab users	15:26
	← BSaboia left	15:26
WormDrink	one for work and one for home, but gitlab doesnt allow me to add key from one box to both usernames	15:27
	so for one I have to use https auth	15:27
	is there any way I can tell github what key to use for each git repo ?	15:27
	→ wrouesnel2 joined	15:27
	← EminenceHC left	15:27
	← devoldmx3 left	15:29
	→ devoldmx joined	15:29
WormDrink	nvm, got a solution	15:33
	← pandeiro left	15:33
	→ polyzen joined	15:33
	→ evildmp joined	15:35
	← wrouesnel2 left	15:35
	→ toothrot joined	15:36
	→ robzilla joined	15:36
	← devoldmx left	15:36
	→ Gizburdt joined	15:37
	← Gizburdt left	15:37
	→ mechanicalduck joined	15:39
	→ bAnt_ joined	15:40
	← robzilla left	15:41
	→ khmarbaise_ joined	15:42
	← upene left	15:42
	→ eletuchy joined	15:42
	← khmarbaise left	15:43
	khmarbaise_ → khmarbaise	15:43
	→ dmarkham joined	15:44
	→ wrouesnel2 joined	15:45
	← evildmp left	15:46
	→ Sonderblade joined	15:47
	← dmarkham left	15:50
	→ it0a joined	15:51
	→ encod3 joined	15:51
	→ zumba_addict joined	15:51
	→ jstimm joined	15:52
	→ ehmatthes joined	15:53
	← mennea left	15:54
	→ devoldmx joined	15:54
	→ mennea joined	15:54
	← encod3 left	15:56
	→ devoldmx3 joined	15:56
	← listochkin left	15:58
	→ smccarthy joined	15:58
	← devoldmx left	15:58
	← m0ltar left	16:01
	→ FabTG_ joined	16:03
	→ dmarkham joined	16:04
	→ m0ltar joined	16:04
	→ tgunr joined	16:05
	→ guysoft42 joined	16:05
guysoft42	hey all, i am using pygit2 to merge a repo, but after the merge is successful i still see "All conflicts fixed but you are still merging." when using 'git status'. what am i doing wrong?	16:05
	→ Quevin joined	16:07
	← darkbasic left	16:07
Seveas	guysoft42: MERGE_HEAD still exists.	16:07
	→ darkbasic joined	16:07
	← Err404NotFound left	16:08
	→ hmsimha_ joined	16:08
	→ evildmp joined	16:09
	→ glosoli joined	16:10
	← Quevin left	16:11
	→ spareproject joined	16:13
	← bAnt_ left	16:15
	→ zamabe joined	16:15
	← jottr left	16:16
osse	guysoft42: have you commited?	16:17
	→ Celm joined	16:18
	→ khmarbaise_ joined	16:19
	← khmarbaise left	16:19
	khmarbaise_ → khmarbaise	16:19
	← wrouesnel2 left	16:20
	→ Floatingman joined	16:20
	← zoso left	16:21
	← ecky--ptang-zoob left	16:21
	→ ecky--ptang-zoob joined	16:21
	Matrixiumn → Xack	16:24
	← devoldmx3 left	16:24
	→ mellernoia joined	16:24
	← ech0s7 left	16:24
	← jeremyheiler left	16:26
	← mennea left	16:26
	→ EminenceHC joined	16:26
	← ehmatthes left	16:29
	→ encod3 joined	16:30
	→ nnyk_ joined	16:30
	← EminenceHC left	16:31
	→ mennea joined	16:31
	← jatt left	16:33
	← cntrl left	16:33
	→ ErKa joined	16:34
	→ nessib_ joined	16:34
	← encod3 left	16:35
	← hmsimha_ left	16:35
	← nessib_ left	16:36
	→ pwnz0r joined	16:37
	→ rdbell joined	16:38
	→ robzilla joined	16:39
	→ subhojit777 joined	16:39
	← mennea left	16:41
	→ mennea joined	16:41
	→ jottr joined	16:42
	← Manny left	16:43
	→ Manny joined	16:43
	← it0a left	16:43
	← robzilla left	16:44
	→ netameta joined	16:46
	→ irqq joined	16:46
	← jottr left	16:48
	→ iamjarvo joined	16:48
	→ WaReZ joined	16:48
	← m8 left	16:50
	→ thiago joined	16:51
	← beaky left	16:57
	→ jeremyheiler joined	16:59
	← noxd left	16:59
	← mennea left	17:01
	← guysoft42 left	17:01
	→ St_Marx joined	17:04
	→ palcu joined	17:04
	← palcu left	17:04
	→ palcu joined	17:05
	→ nkouevda joined	17:06
	→ thedodd joined	17:09
	→ GGMethos joined	17:09
	← palcu left	17:09
	← pwnz0r left	17:11
	← darkbasic left	17:11
	→ darkbasic joined	17:11
	→ Mixologic joined	17:12
	→ jaeckel joined	17:12
	← jaeckel left	17:12
	→ jaeckel joined	17:12
	← thedodd left	17:13
	→ _Atom_ joined	17:14
	→ ColdKeyboard joined	17:15
	→ akushner_ joined	17:15
	→ a_le joined	17:15
	← a_le left	17:15
	← cjwilburn left	17:15
	→ a_le joined	17:16
	→ mmitchell joined	17:16
	→ Mixologic_ joined	17:19
	→ pheaver joined	17:20
	← mmitchell left	17:20
	→ johnny2600 joined	17:20
	→ noxd joined	17:20
	→ Pyrogerg joined	17:20
	← Mixologic_ left	17:21
	→ akagr joined	17:21
	→ Mixologic_ joined	17:21
	→ jpf joined	17:22
	← Mixologic left	17:22
	← noxd left	17:24
	→ BSaboia joined	17:25
	← amikiri left	17:28
	→ rath joined	17:28
	← MutSbeta left	17:28
	→ King_Hual` joined	17:29
	→ noxd joined	17:29
	→ PerlJam joined	17:30
	→ flaguy481 joined	17:30
	← evildmp left	17:30
	→ hahuang65 joined	17:30
	→ legumbre_ joined	17:30
	→ bhldev joined	17:31
	← masak left	17:31
	→ encod3 joined	17:31
	← m0ltar left	17:32
	→ jgardella joined	17:32
	→ nicetry joined	17:32
	→ ppr joined	17:32
	→ bede joined	17:32
	→ nath_schwarz joined	17:32
	→ kriskrop1 joined	17:33
	→ rs0_ joined	17:33
	← pheaver left	17:34
	→ smw joined	17:34
	→ majuscul1 joined	17:36
	← encod3 left	17:36
	→ trewe joined	17:37
	← iamjarvo left	17:37
	← nnyk_ left	17:37
	← ciampix left	17:37
	← tango_ left	17:37
	← King_Hual left	17:37
	← chiromante left	17:37
	← marthinal left	17:37
	← vire left	17:37
	← akitada__ left	17:37
	← raijin left	17:37
	← Ragnor left	17:37
	← markovh left	17:37
	→ mennea joined	17:38
	→ morphix0 joined	17:38
	→ maestrojed joined	17:39
	→ monokrome joined	17:40
	→ robzilla joined	17:40
	→ evildmp joined	17:42
	→ jdmf joined	17:42
	→ dsdeiz joined	17:42
	→ quizzi joined	17:42
	→ regreg joined	17:43
	← morphix0 left	17:44
	← zamabe left	17:44
	← evildmp left	17:44
	→ blueyed joined	17:44
	→ zamabe joined	17:44
	→ _W_ joined	17:45
	← robzilla left	17:45
	→ masak_ joined	17:46
	→ nnyk_ joined	17:46
	→ ciampix joined	17:46
	→ tango_ joined	17:46
	→ chiromante joined	17:46
	→ vire joined	17:46
	→ akitada__ joined	17:46
	→ eto joined	17:46
	→ P4_Denis joined	17:46
	→ Frodosagbag joined	17:46
	→ farn joined	17:46
	→ mmattice joined	17:46
	→ unreal joined	17:46
	→ ulkesh joined	17:46
	→ hazrpg joined	17:46
	→ TomCat2 joined	17:46
	→ rasto joined	17:46
	→ alexwhitman joined	17:46
	→ fling joined	17:46
	→ graphitemaster joined	17:46
	→ micro_ joined	17:46
	→ leptonix_ joined	17:46
	→ ketas joined	17:46
	→ bipolar joined	17:46
	→ j416 joined	17:46
	→ jamieshepherd joined	17:46
	→ nopc0de joined	17:46
	→ yuzen joined	17:46
	→ Novacha joined	17:46
	→ deavid joined	17:46
	→ mkitson joined	17:46
	→ jlewis joined	17:46
	→ tonyj_ joined	17:46
	→ silviof joined	17:46
	→ Forkk joined	17:46
	→ Dynetrekk joined	17:46
	→ jlewis_ joined	17:46
	→ ciaranm joined	17:46
	→ ClarusCogitatio joined	17:46
	→ Spockz joined	17:46
	→ plilq joined	17:46
	→ mikedep333 joined	17:46
	→ phyzloc joined	17:46
	→ asedeno joined	17:46
	→ crater2150 joined	17:46
	→ ejnahc joined	17:46
	→ Friss joined	17:46
	orwell.freenode.net set mode: +v	17:46
	→ milki joined	17:46
	→ qknight joined	17:46
	→ bambams joined	17:46
	→ harv joined	17:46
	→ mehwork joined	17:46
	→ hefest joined	17:46
	→ daed joined	17:46
	→ Rylee joined	17:46
	→ cYmen joined	17:46
	→ likewhoa joined	17:46
	→ roto joined	17:46
	→ cxz joined	17:46
	→ potteratt joined	17:46
	→ salamanderrake joined	17:46
	→ _dancat_ joined	17:46
	→ roo joined	17:46
	→ ircnode0 joined	17:46
	→ ypcs joined	17:46
	→ quadz joined	17:46
	→ awx joined	17:46
	→ lvh joined	17:46
	→ aep joined	17:46
	→ AndreSomers joined	17:46
	→ platforms joined	17:46
	→ mrkurtz joined	17:46
	→ zequence joined	17:46
	→ Pieter__ joined	17:46
	→ _rgn joined	17:46
	→ kandinski joined	17:46
	→ jeffhung joined	17:46
	→ Levex joined	17:46
	→ wanders joined	17:46
	→ raijin joined	17:46
	→ Ragnor joined	17:46
	→ markovh joined	17:46
	orwell.freenode.net set mode: +vv	17:46
	← moritzschaefer left	17:47
	← zamabe left	17:47
	← moritzs left	17:47
	← fling left	17:48
	← ketas left	17:48
	→ ketas joined	17:48
	→ fling joined	17:48
	→ morphix0 joined	17:49
	← spareproject left	17:49
	← kriskrop1 left	17:50
	→ epifanio joined	17:50
	→ Shusshu joined	17:50
	→ Mso150 joined	17:51
	→ msonntag joined	17:51
	→ oojacoboo joined	17:54
	← kristofferR left	17:57
	→ Guest95173 joined	17:57
	← burhan left	17:58
	→ dnyy joined	17:58
	← morphix0 left	17:59
	← msonntag left	18:00
	→ burhan joined	18:00
	→ CussBot joined	18:01
	→ khmarbaise_ joined	18:01
	← khmarbaise_ left	18:01
	→ khmarbaise_ joined	18:01
	→ listochkin joined	18:01
	← listochkin left	18:02
	→ cntrl joined	18:02
	→ tristanp joined	18:02
	→ listochkin joined	18:02
	← khmarbaise left	18:02
	khmarbaise_ → khmarbaise	18:02
	← nath_schwarz left	18:03
	→ LeMike joined	18:04
	← _Atom_ left	18:05
	→ d2dchat joined	18:06
	→ mnavratil joined	18:06
	← d2dchat left	18:06
	→ SjB joined	18:06
	→ coppro joined	18:07
	← listochkin left	18:07
coppro	When a rebase is aborted, do the commit objcts already created get deleted?	18:07
	or can I partially rebase, create a branch pointing to the intermediate point, and then abort safely?	18:07
	→ Quevin joined	18:08
	← mennea left	18:08
	← oojacoboo left	18:08
	→ mennea joined	18:09
	→ amjam joined	18:09
	→ morphix0 joined	18:09
	→ jatt joined	18:10
	← nnyk_ left	18:10
	← jenni_naiaretti left	18:10
	→ zacts joined	18:12
	legumbre_ → legumbre	18:12
	← Quevin left	18:12
	→ daito joined	18:12
	→ _Atom_ joined	18:12
	← jatt left	18:13
	→ jatt joined	18:13
zacts	hi. I'm working on a project to import NetBSD commands into minix. so I have git cloned git://git.minix3.org/minix.git.	18:13
	I want to git clone another repo git://git.minix3.org/netbsd.git into this minix repo	18:13
	but I don't want to merge it in at all	18:14
	← Wiz_KeeD left	18:14
	→ encod3 joined	18:14
zacts	I wonder what the best way to do this would be?	18:14
	→ n-st joined	18:14
	← amjam left	18:14
bremner	zacts: just fetch it.	18:15
	zacts: or just define a remote and run "git remote update"	18:15
zacts	oh I see	18:15
	ok, now will git status show the netbsd directory?	18:16
bremner	what netbsd directory? this isn't svn	18:16
	→ mmitchell joined	18:17
	← petersr left	18:17
zacts	will the fetched netbsd.git repo be visible to the git status within the minix.git repo?	18:17
	zacts is trying now	18:17
	← akagr left	18:18
bremner	zacts: git status is about your current branch, so no	18:18
	→ petersr joined	18:19
	← daito left	18:20
zacts	ok, thanks	18:20
	→ evildmp joined	18:21
	← mmitchell left	18:22
	→ msonntag joined	18:22
	← Thorn left	18:24
	→ thevishy joined	18:25
	← thevishy left	18:25
	→ thevishy joined	18:26
	← govg left	18:26
	← akushner_ left	18:26
	→ paul424 joined	18:27
	← Guest95173 left	18:27
	→ otter768 joined	18:28
	← tang^ left	18:29
	← petersr left	18:30
	→ petersr joined	18:31
	→ Lyqyd joined	18:32
	← tanath_ left	18:32
	→ EminenceHC joined	18:32
	→ amikiri joined	18:32
	→ bbloom joined	18:35
	→ avvs joined	18:35
	← Sceorem left	18:35
	→ SethM joined	18:36
	← Jackneill left	18:37
	← EminenceHC left	18:37
	← Marcus left	18:38
	← ecky--ptang-zoob left	18:39
	← johnny2600 left	18:39
	→ ecky--ptang-zoob joined	18:40
	← encod3 left	18:40
	← Shusshu left	18:41
	← msonntag left	18:41
	← Celm left	18:41
	← avvs left	18:41
	→ robzilla joined	18:42
	→ bezet joined	18:42
	→ Manny_ joined	18:43
	← Manny left	18:43
	→ oojacoboo joined	18:43
	→ Celm joined	18:44
	← epifanio left	18:45
	← dmarkham left	18:45
	→ epifanio_ joined	18:45
	← trewe left	18:46
	← darkbasic left	18:46
	→ darkbasic joined	18:46
	→ ajustrun joined	18:47
	← bezet left	18:47
	← robzilla left	18:48
	→ dmarkham joined	18:49
	→ bug_sniper joined	18:50
	→ JosephFerano joined	18:51
	← daedeloth left	18:52
	← oojacoboo left	18:53
	→ jenni_naiaretti joined	18:53
	← hahuang65 left	18:53
	HedgeMage plops down in a comfy corner of the channel while reading gitolite docs	18:54
	← FunkyAss left	18:54
	→ dharrigan joined	18:54
	→ mietek joined	18:55
mietek	Is it possible to add another branch of the same repo as a submodule?	18:56
	I found http://blog.blindgaenger.net/generate_github_pages_in_a_submodule.html which says it is	18:56
	But when I follow the instructions, I get a warning from git, saying:	18:56
	→ encod3 joined	18:56
mietek	"A git directory for 'foo' is found locally with remote(s): origin ..."	18:56
	← encod3 left	18:58
	→ robustus\|Off joined	19:01
	robustus\|Off → robustus	19:01
	→ bug_sniper_ joined	19:01
	← maestrojed left	19:01
	← Mso150 left	19:03
	→ maslowbeer joined	19:03
	← bug_sniper left	19:04
	→ Mso150 joined	19:04
	→ kpreid joined	19:04
	→ msonntag joined	19:04
	→ boudiccas joined	19:06
boudiccas	how do you delete a tag please?	19:06
xender	boudiccas: git tag -d	19:07
bremner	not to be a jerk, but really you couldn't find that in the docs?	19:07
boudiccas	thanks	19:07
	← ecky--ptang-zoob left	19:07
xender	burhan: As of deleting on remote repo - I think some kind of git push remote :tag-to-delete	19:08
	→ ecky--ptang-zoob joined	19:08
xender	Sorry, tabfail	19:08
	boudiccas: ^	19:08
	← mennea left	19:08
xender	But if someone has fetched the tag, you have no way of modifying that. You can ask others to delete tag in their repos	19:09
	→ mennea joined	19:09
Sonderblade	how can you git log all commits on a branch, not present on any other branch?	19:11
bremner	boudiccas: for future reference, search for delete in "man git-tag" would have found it for you.	19:11
gitinfo	boudiccas: the git-tag manpage is available at http://jk.gs/git-tag.html	19:11
bremner	sigh. thanks gitinfo.	19:11
gitinfo	bremner: you're welcome, but please note that I'm a bot. I'm not programmed to care.	19:11
osse	Sonderblade: git log branch ^not ^all ^the ^others	19:13
	Sonderblade: or git log branch --not not all the others	19:13
	Sonderblade: this might be useful (no guarantees) https://github.com/Osse/git-scripts/blob/master/git-unique	19:13
	← majuscul1 left	19:13
	→ DARSCODE joined	19:15
	→ boombatower joined	19:16
	← chiromante left	19:17
	→ jheg joined	19:17
	→ mmitchell joined	19:17
	← xobb left	19:19
Sonderblade	osse: actually im happy with just not present on the master branch	19:20
osse	coolio	19:20
	← nkouevda left	19:21
	← Mixologic_ left	19:21
	← mmitchell left	19:22
	→ nkouevda joined	19:22
	← Nizumzen left	19:22
	→ nour joined	19:23
	→ cyphase joined	19:23
	cyphase → Guest69235	19:23
	→ Mixologic joined	19:24
	← msonntag left	19:28
	→ shinnya joined	19:29
	← tristanp left	19:30
	← jatt left	19:35
	← Mixologic left	19:36
	← mennea left	19:38
	→ mennea joined	19:39
	← WaReZ left	19:39
	→ WaReZ joined	19:40
	→ chiromante joined	19:41
	→ EminenceHC joined	19:42
	→ cptylor joined	19:43
	← boombatower left	19:43
	→ tristanp joined	19:43
	→ robarelli joined	19:44
	→ mitzip joined	19:45
Sonderblade	my problem is that git log feature ^master --no-merges and git cherry master feature reports false positives	19:45
osse	orly	19:45
	← _Atom_ left	19:45
	→ mitzip_ joined	19:45
osse	how so =	19:45
Sonderblade	equivalent commits exist on the master branch, but git doesn't see them.	19:45
	← mitzip left	19:45
	← mitzip_ left	19:45
	→ msonntag joined	19:46
	→ mitzip joined	19:46
	→ _Atom_ joined	19:46
	← EminenceHC left	19:46
Sonderblade	if i then rebase feature to master, the commits disappear as expected though	19:46
osse	Sonderblade: git log feature ^master doesn't do any special test to figure out if two commits are "equivalent". I thought git cherry would, though	19:47
	→ anomalyst joined	19:48
	← JosephFerano left	19:48
	← anomalyst left	19:48
	→ freeman42 joined	19:48
	→ Yomi joined	19:49
	Yomi → Guest45975	19:50
	← robarelli left	19:50
	← Guest45975 left	19:51
Sonderblade	osse: it could be because the merge was done using fast forward, so no "real merge" was performed	19:51
	→ yomi_ joined	19:51
	yomi_ → Guest7504	19:52
	← Guest7504 left	19:53
	← petersr left	19:53
osse	if that is the case isn't master and feature identical?	19:53
	→ Yomi- joined	19:53
Sonderblade	osse: no, feature contains a subset of master	19:54
	← Yomi- left	19:54
	→ Yomi- joined	19:55
Sonderblade	ok the difference is that in my commits, committer name = author name = me	19:59
	← Yomi- left	19:59
	← wrouesnel1 left	19:59
Sonderblade	but in the commits that got merged, committer name = person who merged the branch	19:59
	← mellernoia left	19:59
osse	:S	19:59
	→ Yomi- joined	19:59
	→ mellernoia joined	20:00
osse	Sonderblade: git log --oneline --graph --decorate feature master	20:00
	← coppro left	20:00
	→ therealGent joined	20:01
	← therealGent left	20:01
	→ therealGent joined	20:01
Sonderblade	osse: that shows 2 commits, probably because of the committer name diff	20:01
osse	you mean "of all the commits it shows, 2 are equivalent"?	20:01
	← Yomi- left	20:01
osse	or does it actually show only two commits?	20:01
Sonderblade	no it shows lots of commits but duplicates one	20:02
osse	doesn't sound like there was a fast-forward involved	20:02
	→ Yomi- joined	20:03
osse	can you show it to me?	20:03
	← Yomi- left	20:03
	← morphix0 left	20:04
Sonderblade	osse: show what?	20:04
osse	Sonderblade: the log output	20:04
	unless you understand what's going on now	20:05
Sonderblade	http://pastebin.com/0YCY0thV	20:05
	i guess i understand it, but i dont like it :/	20:05
	← nkouevda left	20:05
	← mnavratil left	20:06
	→ nkouevda joined	20:06
osse	lines 4 and 5 are the "same" commit, I assume?	20:06
Sonderblade	yes	20:06
osse	what commands did you run to make this happen?	20:06
	→ Segfault_ joined	20:07
osse	if I were you I'd delete the feature branch and get on with life	20:07
Sonderblade	i ran the git log command you told me	20:08
	→ Yomi- joined	20:08
	→ Quevin joined	20:08
osse	Sonderblade: I mean what command did you run to end up with a duplicate commit	20:08
Sonderblade	git pull upstream master	20:09
osse	what branch did you have checked out at the time? Have you configured pull to do --rebase by default?	20:10
	← Yomi- left	20:10
	← cptylor left	20:10
	← ErKa left	20:10
	→ Yomi- joined	20:11
	← msonntag left	20:11
	← nkouevda left	20:11
	← regreg left	20:12
Sonderblade	osse: master, i dont --rebase by default	20:12
	→ Kitt3n joined	20:12
Kitt3n	Is there a Git Extensions channel?	20:13
HedgeMage	Not to my knowledge.	20:13
	← Quevin left	20:13
osse	Sonderblade: then that command did not create the duplicate	20:14
	← Cheaterman1 left	20:14
Kitt3n	Hmm..well, trying to clone a repo with Git Extensions and PuTTY, but when it connects it asks for 'keyboard-interactive password' for ssh://<username>..which I assume is my passphrase? But that doesn't work.	20:14
	→ nnyk_ joined	20:14
	← WaReZ left	20:15
	← Kicer86 left	20:15
Sonderblade	osse: git doesnt think it is a duplicate because committer name is different	20:15
	← ajustrun left	20:16
osse	i nkwo that	20:17
	→ ajustrun joined	20:18
	← Yomi- left	20:18
osse	I'm just saying that 'git pull upstream master' cannot be the command that created the duplicate	20:18
	← n-st left	20:18
	→ mmitchell joined	20:18
	← jpf left	20:19
Sonderblade	osse: i didnt merge the pr so i dont know what command was used	20:20
	← vire left	20:20
osse	probably cherry-pick or rebase or something like that	20:20
	← mellernoia left	20:21
	→ Yomi- joined	20:22
	← mmitchell left	20:23
	← chiromante left	20:23
Sonderblade	this is what i want: comm -23 <(git log ..feature --pretty=format:"%ae:%s"\|sort) <(git log master --pretty=format:"%ae:%s"\|sort)	20:24
	← Yomi- left	20:25
	← LeMike left	20:26
	→ msonntag joined	20:26
osse	which gives ... ?	20:27
	I don't have the repo so I've no idea what that will do	20:27
	← smccarthy left	20:28
Sonderblade	it lists commits on feature not on master, with the equivalence check being author name+first line of commit message	20:28
	→ Yomi- joined	20:29
	← Yomi- left	20:29
	→ listochkin joined	20:31
	→ MattMaker joined	20:31
osse	Sonderblade: ahh, so git cherry feature master \| grep '^+' :)	20:31
	hmm, maybe switch feature and master around	20:32
	→ iinzg joined	20:33
	← amikiri left	20:33
	→ felixjet_ joined	20:33
	→ HobGoblin joined	20:34
	HobGoblin → Guest94465	20:34
	← ecky--ptang-zoob left	20:34
	← LLaurent left	20:35
	→ Vile joined	20:35
	→ SwedFTP_ joined	20:35
	→ LLaurent joined	20:36
	→ Dreamer3__ joined	20:36
	→ niax_ joined	20:36
	→ shennyg___ joined	20:36
	→ nnyk joined	20:36
	→ bhldev_ joined	20:37
	← nnyk left	20:37
	→ nnyk joined	20:37
	→ zac_g joined	20:38
	→ D-Boy joined	20:38
	→ Overand_ joined	20:38
	→ suffice_ joined	20:38
	← mennea left	20:38
	← shennyg__ left	20:38
	← nnyk_ left	20:38
	← neunon left	20:38
	← maslowbeer left	20:38
	← bhldev left	20:38
	← zacg left	20:38
	← donmichelangelo left	20:38
	← tgunr left	20:38
	← Sonderblade left	20:38
	→ Caius joined	20:38
	SwedFTP_ → SwedFTP	20:38
	← Caius left	20:38
	→ Caius joined	20:38
	→ lazers joined	20:38
	→ hfp_ joined	20:39
	→ dilfridge joined	20:39
	→ mennea joined	20:39
	→ Juri_Agarin joined	20:39
	→ BtbN joined	20:39
	Overand_ → Overand	20:39
	← jdmf left	20:39
	→ Xe joined	20:39
	→ neunon joined	20:39
	hfp_ → hfp	20:39
	→ vladgh joined	20:39
	→ LucasTT joined	20:39
	← PinkSpecs left	20:39
	→ magic joined	20:39
	→ SirCmpwn joined	20:39
	→ Mekkis joined	20:40
	→ Sonderblade joined	20:40
	→ dougsland joined	20:40
	→ edwardly joined	20:40
	→ ngw_ joined	20:40
	→ __main__ joined	20:40
	magic → Guest57710	20:40
	→ sandr8_ joined	20:40
	→ roger_raymond joined	20:40
	→ Fazer joined	20:40
	→ jdmf joined	20:40
	→ mfilipe joined	20:41
	→ adev_ joined	20:41
	→ rypeck_ joined	20:41
	→ _richardJ joined	20:41
	→ Riviera_ joined	20:41
	→ hagebake joined	20:41
	→ konr_ joined	20:41
	→ CussBot_ joined	20:41
	← CussBot left	20:41
	CussBot_ → CussBot	20:41
	→ dharriga1 joined	20:41
	→ tgunr joined	20:41
	→ andres_f joined	20:42
	→ SudoKing_ joined	20:42
	→ jwr___ joined	20:42
	→ rdbell_ joined	20:42
	→ sLite_ joined	20:42
	→ Akagi201_ joined	20:42
	→ mithro_ joined	20:42
	← subhojit777 left	20:42
	→ zizzfizzix_ joined	20:42
	← zizzfizzix_ left	20:42
	→ zizzfizzix_ joined	20:42
	→ whaley joined	20:42
	→ bezet joined	20:43
	← Manny_ left	20:43
	→ vital_ joined	20:43
	→ chris2_ joined	20:43
	→ Manny joined	20:43
	→ qdii_ joined	20:43
	→ muep_ joined	20:43
	→ cxreg2 joined	20:43
	→ pibby_ joined	20:43
	→ neurodam1ge joined	20:43
	→ tureba_ joined	20:43
	→ metze_ joined	20:43
	→ FabTG joined	20:43
	→ tpope joined	20:43
	→ scarcry_ joined	20:43
	→ abrkn__ joined	20:43
	→ BaNzoune1 joined	20:43
	→ comps_ joined	20:43
	→ dropdriv1 joined	20:43
	← ajustrun left	20:43
	→ iokill_ joined	20:43
	→ zacts_ joined	20:43
	→ pekster_ joined	20:43
	→ looper joined	20:44
	← _Atom_ left	20:44
	→ blakbunnie27 joined	20:44
	← zacts left	20:44
	← scarcry left	20:44
	← FabTG_ left	20:44
	← mithro left	20:44
	← dharrigan left	20:44
	→ ch3mical joined	20:44
	→ wwalker joined	20:44
	→ revolve joined	20:44
	→ morphix0 joined	20:44
	→ dzho joined	20:44
	→ avvs joined	20:44
	mithro_ → mithro	20:44
	→ duckydan joined	20:44
	Riviera_ → Riviera	20:45
	→ Nickeeh joined	20:45
	→ bandroidx joined	20:46
	→ CalimeroTeknik joined	20:46
	→ EminenceHC joined	20:46
	← rypeck left	20:46
	← looper_ left	20:46
	← adev left	20:46
	← sLite left	20:46
	← konr left	20:46
	adev_ → adev	20:47
	rypeck_ → rypeck	20:47
	→ robarelli joined	20:47
	konr_ → konr	20:47
	← khmarbaise left	20:47
	← bezet left	20:47
	→ Guest50102 joined	20:47
	gitinfo set mode: +v	20:48
	← rdbell left	20:48
	← zacts_ left	20:49
Fazer	Hi everyone, I came here from git doc page, I need probably quick help with rebase of messy repo or keywords to search in google	20:49
	→ zacts joined	20:49
	→ sgen joined	20:50
	← Hyknua left	20:50
	← EminenceHC left	20:51
	← tristanp left	20:51
	← robarelli left	20:51
	← msonntag left	20:51
	← dharriga1 left	20:52
	← SudoKing_ left	20:52
	→ SudoKing_ joined	20:52
	SudoKing_ → SudoKing	20:52
	← zapb_ left	20:53
Fazer	To clean mess did in some huge commits I created new branch, did a step back to place when everything was fine and did a lot of commits instead of those huge	20:54
	→ eburcat joined	20:54
Fazer	Now I need to "cherry-pick" all commits later than sha1 commit to this cleaned branch	20:55
	→ tmcmahon joined	20:56
Fazer	The issue is that the messy branch was public and there was many merges and doing manually resolve almost 400 commits is to much for me	20:56
	→ dharrigan joined	20:57
Fazer	I searched for rebase with merge commits and I tried some examples but whithout success	20:57
	→ Sceorem joined	20:59
	← Sceorem left	21:01
	→ aidalgol joined	21:05
	← avvs left	21:07
	→ FabTG_ joined	21:07
	→ Hyknua joined	21:07
	→ cagedwisdom joined	21:08
	→ gabedain joined	21:08
	→ lautriv joined	21:09
	→ msonntag joined	21:10
	← dharrigan left	21:10
lautriv	i have a probably simple question for those who are used to git ...... i need to find any commit ( in kernel sources ) where the file include/net/mac80211.h is included and limit/filter them to those containing something about "channel_change_time" but my additional --grep "channel_change_time" gives nothing. how else may i filter ?	21:13
	→ hebz0rl_ joined	21:14
	→ ajustrun joined	21:17
	→ bAnt joined	21:18
TomCat2	lautriv - not sure, but I assume you are trying to do this for some greater purpose. What are you trying to accomplish overall?	21:18
	→ upene joined	21:18
	→ mmitchell joined	21:19
	→ mechanicalduck_ joined	21:19
	← mechanicalduck_ left	21:19
lautriv	TomCat2, the actual purpose is to port a specific driver ( obviously WiFi ) to recent kernels but google won't help enought about changes since 3.7	21:20
	← tmcmahon left	21:20
	→ tapout joined	21:20
	→ sohail joined	21:20
	← mechanicalduck left	21:21
	→ justinmburrous joined	21:22
	← polyzen left	21:22
	← upene left	21:23
	← bAnt left	21:23
	← mmitchell left	21:23
	→ mechanicalduck joined	21:24
TomCat2	lautriv - ok, so you are looking for commits with channel_change_time in the commit message, or looking for changes to the code involving adding the text channel_change_time somewhere?	21:26
	← looper left	21:27
lautriv	TomCat2, i know it is in include/net/mac80211.h, i know it was replaced in a strucht somewhen after 3.7 but i don't know who did that or if the name is in message or just diff.	21:28
	← mennea left	21:29
lautriv	*struct	21:29
TomCat2	ok, so you ultimately are searching for one specific commit where a change occurred, correct?	21:29
	← a_le left	21:29
Fazer	lautriv - maybe blame will help you	21:29
TomCat2	^	21:30
	→ a_le joined	21:30
	← Hyknua left	21:30
lautriv	maybe, but i have no big idea about git, need the time for coding ;)	21:30
TomCat2	look into blame and you will be able to get back to coding sooner	21:31
	:D	21:31
Fazer	lautriv - http://git-scm.com/docs/git-blame	21:31
	→ khmarbaise joined	21:31
TomCat2	also useful and for similar purposes... if you don't know what code change 'broke' something, you can use bisect to narrow things down	21:31
fishey1	lautriv: I've always just done: `git log --follow include/net/mac80211.h` then type '/channel_change_time' (in the pager that appears, assuming you use less :) to search for the term	21:32
TomCat2	also applicable to just finding out what code change introduced some difference in how the program functions... not necessarily limited to just looking for something that is broken	21:32
	→ holler_ joined	21:32
lautriv	fishey1, was there but the / failed.	21:33
holler_	hello, I just did a find / sed (find/replace) of a string recursively in directory and now my git is all messed up!	21:33
fishey1	lautriv: with `-p` so that the patch contents is included?	21:33
	→ mizu_no_oto joined	21:33
TomCat2	holler_ - did that recursion include .git accidentally?	21:33
lautriv	fishey1, i guess so, let me retry now ...	21:34
fishey1	lautriv: anyhow, 685328b296acc810541d2532957912690273c64a	21:34
holler_	TomCat2: it might have Im not sure	21:34
	actually I dont think it did	21:34
TomCat2	holler - if you ran it to start from a directory where you can see .git, it would have hosed you up pretty well	21:35
holler_	but first I got error bad index file sha1 signature and I followed this instructions http://stackoverflow.com/questions/1115854/index-file-corrupt	21:35
	how can I recover?	21:35
	→ ra0 joined	21:35
	→ _Atom_ joined	21:36
	← gabedain left	21:36
holler_	I removed the index file and then did git reset but now i get thishttp://dpaste.com/03XE4HP	21:36
	http://dpaste.com/03XE4HP	21:36
	thats when running "git reset"	21:36
	← ockham left	21:36
TomCat2	holler_ - it seems like your find/replace touched what was in your .git directory	21:37
lautriv	fishey1, THAT was exactly what i assumed, just removed and nowhere mentioned since then. thanks ;)	21:37
	← msonntag left	21:37
	← toothrot left	21:37
	← rath left	21:37
holler_	TomCat2: what should I do? wipe the whole repo and git clone it again?	21:38
TomCat2	holler_ - there's no fixing that except to clear out your local repo and start over and check out again from your remote	21:38
holler_	damn	21:38
	:/	21:38
TomCat2	holler_ - you can still copy all your changes out of your working directory	21:38
	holler_ - back those up and you will be able to piece together any changes you did not yet commit and/or push	21:38
	(assuming you didn't do any further damage after hosing .git)	21:39
	this is the danger of running certain command line tools recursively against any VCS checkout location. Good IDE's usually know what to ignore when doing such things	21:40
	← nfk left	21:40
	← Goplat left	21:41
	→ Ankhers joined	21:43
	→ metRo_ joined	21:43
	→ m0viefreak joined	21:44
	← noxd left	21:44
	← khmarbaise left	21:46
	← Obi_obi_ left	21:46
	← nour left	21:46
lautriv	ok, solved my actual problem, beware of my return when i have time to dig deeper into git ;)	21:46
	← Guest69235 left	21:46
	→ fatalhalt joined	21:47
	→ kcm1700_ joined	21:47
	→ robarelli joined	21:47
	→ msonntag joined	21:47
	← freeman42 left	21:48
	→ Obi_obi_ joined	21:48
	→ jpf joined	21:49
	→ armyriad joined	21:49
	→ cyphase_ joined	21:50
	→ nuck joined	21:50
	→ Pookz joined	21:51
	← JEEB left	21:51
	← ajustrun left	21:51
	← robarelli left	21:51
	← _Atom_ left	21:52
	← cyphase_ left	21:53
	→ cyphase_ joined	21:53
	→ EminenceHC joined	21:53
	→ ajustrun joined	21:53
	→ afhammad joined	21:53
	← nnyk left	21:54
	← metRo_ left	21:55
	→ Dougie187 joined	21:55
	→ _Atom_ joined	21:56
	→ JEEB joined	21:56
	← ajustrun left	21:56
	→ lacrosse__ joined	21:58
	← EminenceHC left	21:58
	→ codeman joined	21:58
	← Manny left	21:58
	→ maestrojed joined	21:59
	→ joeyDB joined	22:02
	← jheg left	22:02
joeyDB	I want to retroactively ignore a file that has already been commited	22:02
	→ Manny joined	22:02
joeyDB	commited and uploaded to github	22:03
	← maestrojed left	22:03
	← mizu_no_oto left	22:04
	→ maestrojed joined	22:04
	← comps_ left	22:05
	← Manny left	22:06
	← eletuchy left	22:06
Dougie187	joeyDB: You want to add it to .gitignore, remove it from the commit, and push that change?	22:06
	→ Manny joined	22:06
	→ mieko joined	22:07
	→ Quevin joined	22:09
	← msonntag left	22:10
	← Manny left	22:12
Fazer	I have explained my problem on: http://stackoverflow.com/q/26079677/4087000	22:12
	→ Manny joined	22:12
Dougie187	Fazer: why not use filter branch?	22:13
	← Quevin left	22:14
Dougie187	Oh, you're trying to divide older commits into smaller chunks?	22:14
Fazer	Dougie187 - yes	22:14
Dougie187	I would honestly do these as part of the work.	22:15
	i.e. split c235 up after resetting to c234	22:15
	basically, cherry-pick c235, but don't commit or stage (`git cherkout c234 -- .`)	22:15
	→ Nizumzen joined	22:15
Dougie187	and then stage parts via `git add -i`	22:15
	make commits of each, until you're done and the working directory is clean.	22:15
	← maestrojed left	22:16
Dougie187	then cherry-pick c236. And do the same thing for c237	22:16
	and then cherry-pick c238 and c239	22:16
Fazer	Dougie187 - but there is more (almost 400) next commits, cherry pick cat take some time	22:17
	→ mmitchell joined	22:20
	→ noxd joined	22:20
Dougie187	Fazer: You can cherry-pick a range.	22:21
	or you can make temporary branches and rebase them.	22:21
	(if you're using an older version of git, I don't think you can cherry-pick a range)	22:21
	→ Malsasa joined	22:23
	← mmitchell left	22:24
	→ Zupoman joined	22:25
	→ msonntag joined	22:25
Fazer	Dougie187 - Yes cherry-pick range is an option for me I will try it	22:26
Dougie187	Yeah, so I would keep everything in the same order.	22:27
	The huge commits will take some time	22:27
	but you can use git stash if you want to help with it.	22:27
	→ lxmorj joined	22:27
Dougie187	and then everything inbetween the huge commits can just be cherry-picked	22:27
	→ amikiri joined	22:28
	→ looper joined	22:28
lxmorj	hey guys, I’m having trouble pushing changes from my local working copy (using Tower) to my remote repository on a linode server	22:28
	→ dccc joined	22:28
lxmorj	I followed the instructions here http://stackoverflow.com/questions/2816369/git-push-error-remote-rejected-master-master-branch-is-currently-checked	22:28
	but that ended up not working for me - the linode directory is where to code runs, and I can’t seem to push back modifications that I make locally at all	22:29
	the code runs*	22:29
Fazer	Dougie187 - thanks a lot, now I have to close computer, bye	22:29
Dougie187	Fazer: np, good luck	22:29
	← glosoli left	22:30
	→ btanaka joined	22:30
	← Fazer left	22:30
	→ Mixologic joined	22:32
	← lautriv left	22:32
	← Frodosagbag left	22:33
	→ Frodosagbag joined	22:33
	tureba_ → tureba	22:34
	← _Atom_ left	22:34
	← codeman left	22:34
	← cntrl left	22:36
	→ az1982 joined	22:36
lxmorj	OK I seem to have gotten a less-than-ideal solution working but I’m sure there is a better way	22:37
	at the moment, when I want to have my code running on the server, I need to have the master branch checked out so that my crontab hits the updated files	22:37
	but when I make updates to my local working copy and want to commit them and push to the remote	22:37
	I have to go to the remote repo	22:37
	checkout branch fake	22:37
	push the local up	22:37
	then checkout branch master	22:38
	← fatalhalt left	22:38
lxmorj	seems like there should be a more proper way to accomplish what i’m looking for	22:38
	← SonikBoom left	22:38
	→ _Atom_ joined	22:38
	→ tac_ joined	22:39
tac_	Is there a way to see the diff over a range of revisions?	22:39
osse	tac_: one diff per revision you mean?	22:40
	→ jottr joined	22:40
tac_	I mean to see the combined diff between two revisions	22:41
	The aggregated changes	22:41
osse	tac_: git diff revision1 revision2	22:41
	→ killtheliterate joined	22:41
	← killtheliterate left	22:41
tac_	oh hmm	22:41
	I was using git show to show the diff	22:41
	perhaps that was not the right thing to be doing	22:42
osse	tac_: that will show the diff a commit introduces	22:42
	git diff is the general-purpose diff thingy	22:42
tac_	cool	22:42
	I think I remember reading this in the docs, but isn't there a way to specify the "meet" of two revisions in the commit graph	22:43
	→ bezet joined	22:43
	← DARSCODE left	22:43
	→ nkouevda joined	22:43
tac_	That is, if I'm on a branch, I want to easily say "the revision where my branch diverged from master"	22:44
	→ jonmorehouse joined	22:44
osse	tac_: git merge-base revision1 revision2	22:44
tac_	there's no syntax for it though, is there?	22:44
	← btanaka left	22:44
osse	tac_: depends on what you want to use it for	22:45
	→ codeman joined	22:45
tac_	hmmm	22:45
osse	tac_: if you want the diff from where your branch merged off from master to your branch then git diff master..yourbranch	22:46
	ie. the combined diff the branch introduces since it was created	22:46
	← jstimm left	22:47
osse	but there is no general-purpose foo~@{bar} syntax thingy to specify that one commit, no.	22:47
	← bezet left	22:47
	← epifanio_ left	22:48
	→ robarelli joined	22:48
	← shinnya left	22:49
	← Pyrogerg left	22:49
	← King_Hual` left	22:50
	← Mso150 left	22:50
	← _Atom_ left	22:51
	← msonntag left	22:51
	→ _Atom_ joined	22:51
	← robarelli left	22:52
	→ zack6849 joined	22:53
	← zack6849 left	22:53
	→ zack6849 joined	22:53
	→ WormDr1nk joined	22:54
	→ shinnya joined	22:55
	→ dreiss joined	22:56
	← listochkin left	22:56
	← WormDrink left	22:56
	← BSaboia left	22:57
	← Dougie187 left	22:58
	← looper left	22:58
	→ listochkin joined	23:00
	→ msonntag joined	23:03
	← Nizumzen left	23:03
	← paul424 left	23:05
	→ WormDrink joined	23:06
	← ciampix left	23:06
	→ eletuchy joined	23:07
	→ Goplat joined	23:08
	← jonmorehouse left	23:08
	← WormDr1nk left	23:09
	→ Nizumzen joined	23:10
	→ axilaris joined	23:11
	← eletuchy left	23:12
	← noxd left	23:13
	→ WormDr1nk joined	23:15
	→ ErKa joined	23:15
	← WormDrink left	23:16
	← LLaurent left	23:18
	→ WormDrink joined	23:20
	→ Guest37899 joined	23:20
	← listochkin left	23:20
	→ mmitchell joined	23:20
	← mieko left	23:21
	← WormDr1nk left	23:22
	→ frogonwheels_ joined	23:23
	→ moritzs joined	23:23
	→ jonmorehouse joined	23:24
	← Guest37899 left	23:25
	← mmitchell left	23:25
	← WormDrink left	23:25
	← holler_ left	23:26
	→ kaendfinger joined	23:26
	← Skapadapaduu left	23:27
	← kriks left	23:28
	← msonntag left	23:30
	chris2_ → chris2	23:33
	← atomx left	23:35
	→ skorgon joined	23:36
	← MattMaker left	23:37
	→ MattMaker joined	23:38
	← lxmorj left	23:38
	← hagebake left	23:38
	→ mizu_no_oto joined	23:40
	→ hagabaka joined	23:41
	→ msonntag joined	23:41
	→ freeman42 joined	23:41
	← MattMaker left	23:43
	← thevishy left	23:43
	→ starkhalo joined	23:45
	→ Mobutils joined	23:46
	← Nizumzen left	23:47
	→ EminenceHC joined	23:47
	← morphix0 left	23:47
	← justinmburrous left	23:48
	→ robarelli joined	23:49
	→ W0rmDr1nk joined	23:51
	→ jonr22 joined	23:51
	→ hmsimha_ joined	23:52
	← EminenceHC left	23:52
	← jonr22 left	23:53
	← shinnya left	23:53
	← robarelli left	23:53
	→ kcj joined	23:57
	→ shinnya joined	23:59

Logs Search ←Prev date Next date→

Channels Documentation