IRCloggy #git 2015-04-30

Provider of IRC logs since 2005.

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

	2015-04-30
	← own3dz left	00:00
	← Cykhet left	00:00
	← Bootinbull left	00:00
	← ropav left	00:01
	← baweaver left	00:02
	← rubyonrailed left	00:02
	← pecg left	00:02
	← mikecmpbll left	00:05
	→ baweaver joined	00:06
	← highcup left	00:06
	← eletuchy left	00:07
	→ lvegerano joined	00:07
	← hahuang65 left	00:08
	→ eletuchy joined	00:08
	← s8321414 left	00:09
	← sburgess left	00:10
	→ otter768 joined	00:12
	→ mizu_no_oto joined	00:13
	← smccully left	00:15
	← otter768 left	00:17
	← EminenceHC left	00:17
	→ smccully joined	00:18
	→ EminenceHC joined	00:20
	→ _Atom_ joined	00:23
	← EminenceHC left	00:25
	← robustus left	00:26
	← Quevin_ left	00:27
	→ amycham joined	00:27
	→ EvilPenguin joined	00:28
	→ ropav joined	00:29
	← nfk left	00:29
	← baweaver left	00:29
	→ robustus joined	00:30
	→ blr joined	00:30
	→ Stevo11 joined	00:30
	→ dsantiago joined	00:31
	← EvilPenguin left	00:33
	← jazzzu left	00:33
	→ Alumin joined	00:35
	← rjc left	00:35
	← Dorf left	00:35
	← ropav left	00:36
Alumin	so, it's my understanding that git doesn't inherently have a concept of a "parent branch", so you can't just do "git rebase to-whatever-branch-I-started-this-current-branch-from". Is there a recommended way to "save" that information when a branch is created (with "git checkout -b") so that a hypothetical alias I would write could access it?	00:36
	← antimatroid left	00:36
	→ juvenal joined	00:37
	→ baweaver joined	00:37
bremner	you could in principle write a "new branch" alias that saved that info in .git/config	00:39
	→ tomog999_ joined	00:40
	← imachuchu left	00:40
	→ HoMM_ joined	00:40
	← HoMM_ left	00:40
	→ HoMM_ joined	00:40
	← HoMM_ left	00:41
Alumin	something like "git config branch.mynewbranch.parentbranch = oldbranch"?	00:41
	→ Guest93193 joined	00:41
Alumin	seems sledgehammerish, but then again sometimes the best solutions are :)	00:42
	← HoMM left	00:42
	← tomog999 left	00:42
	← phoenixz left	00:43
	→ fserb joined	00:44
Alumin	is there a way to access the current branch's name from an alias, or do I need to run "git branch ... \| awk ..." etc.?	00:45
	← cpt_yossarian left	00:45
	→ Vinnie_win joined	00:45
Alumin	oh, here we go..."git rev-parse --abbrev-ref HEAD"	00:46
	→ cpt_yossarian joined	00:46
	← Vinnie_win_m left	00:47
	← Dougie187 left	00:47
	imMute figured it was something with rev-parse and HEAD	00:48
	← jottr_ left	00:50
	→ ErKa joined	00:50
	← clarkpan left	00:51
	← jontmorehouse left	00:51
	← Stevo11 left	00:52
	→ clarkpan joined	00:52
	← m0viefreak left	00:52
	→ modocach_ joined	00:53
	→ zivester joined	00:55
	← juvenal left	00:55
	→ Consuela joined	00:56
	← TinkerTyper left	00:56
	← Sasazuka left	00:57
	← clarkpan left	00:57
	→ clarkpan joined	00:57
	← modocach_ left	00:58
	→ jontmorehouse joined	00:58
	→ TinkerTyper joined	00:59
Alumin	success!	00:59
	cb = "!f() { parent_branch=`git rev-parse --abbrev-ref HEAD`; git checkout -b ${1}; git config branch.${1}.parentbranch ${parent_branch}; }; f"	01:00
	prb = "!git rebase $(git config --get branch.$(git rev-parse --abbrev-ref HEAD).parentbranch)"	01:00
	now comes the hard part...retraining my fingers to use those aliases :)	01:00
	→ Peuc2 joined	01:00
	← lvegerano left	01:00
	← LaptopBrain left	01:01
	← Peuc left	01:02
	← Guest93193 left	01:03
	← sbogg left	01:04
	→ lvegerano joined	01:05
	→ LBV_User joined	01:05
	→ EminenceHC joined	01:08
	← Motoko left	01:09
	← robustus left	01:11
	→ DolphinDream joined	01:12
	← Es0teric left	01:12
	→ robustus joined	01:12
	← EminenceHC left	01:12
	← harish_ left	01:13
	← leeN left	01:15
	← SoFLy left	01:16
	→ Goplat joined	01:20
	← Vinnie_win left	01:21
	← bigsky left	01:21
	→ Vinnie_win joined	01:21
	← Zamyatin left	01:22
	← Wulf left	01:24
	← glebihan left	01:24
	→ glebihan joined	01:25
	→ Wulf joined	01:25
	→ rchavik joined	01:26
	→ Peuc joined	01:26
	← Peuc2 left	01:29
	← glebihan left	01:30
	→ juboba_ joined	01:31
	← juboba_ left	01:31
	← lindenle left	01:31
	→ juboba joined	01:32
juboba	how can I show the short hash for commits in my log?	01:32
	← dougsland left	01:32
	→ daito joined	01:33
	→ ascarter joined	01:33
	→ Vampire0_ joined	01:34
bremner	e.g. with git log --oneline, or with the appropriate --pretty option	01:34
	← akushner left	01:35
	← Vampire0 left	01:37
	→ juvenal joined	01:38
	→ k_sze[work] joined	01:40
	← kirbdee left	01:40
	← rchavik left	01:40
	← jontmorehouse left	01:41
	← gopar left	01:42
	← modocache left	01:43
	← ascarter left	01:43
	→ dstarh joined	01:44
	← kadoban left	01:45
	→ jottr_ joined	01:46
	→ zumba_addict joined	01:46
	→ blubberbop joined	01:46
	→ zumba_ad_ joined	01:47
	→ dvlwrk joined	01:47
	→ ropav joined	01:48
	← effi_ left	01:49
	← leolrrj left	01:50
	← jottr_ left	01:51
	← baweaver left	01:51
	← emandari left	01:51
	← clarkpan left	01:52
	→ clarkpan joined	01:52
	← denete_ left	01:52
	← Alumin left	01:53
	← pks left	01:53
	← blubberbop left	01:53
	← michael_mbp left	01:54
	→ michael_mbp joined	01:54
	→ pks joined	01:54
	→ phoenixz joined	01:55
	← dan_s left	01:56
	→ effi joined	01:58
	→ yuciyuar joined	01:58
	→ Akagi201 joined	01:58
	→ mikiones joined	01:59
	→ JTAA0KE4 joined	02:01
	← Asiajey left	02:02
	← amycham left	02:03
	← durham left	02:03
	← mikiones left	02:04
	← smccully left	02:06
	→ fahadash joined	02:07
	← fahadash left	02:08
	→ fahadash joined	02:08
	← fahadash left	02:08
	→ fahadash joined	02:08
	← vixterra left	02:08
	→ harish_ joined	02:08
	← jgardella left	02:09
	← dik_dak left	02:10
	← Consuela left	02:10
	→ watabou joined	02:10
	→ Consuela joined	02:12
	→ highcup joined	02:13
	← mizu_no_oto left	02:13
	→ otter768 joined	02:13
	← highcup left	02:13
	→ echo-area joined	02:13
	→ highcup joined	02:14
	← pheaver left	02:14
	← dstarh left	02:15
	← teran left	02:16
	→ duderonomy joined	02:16
	→ Dorf joined	02:17
	← otter768 left	02:18
	→ rchavik joined	02:18
	← rchavik left	02:18
	→ rchavik joined	02:18
	← mostlybadfly left	02:18
	→ hazelux joined	02:19
	← Ryanar left	02:22
	→ effi_ joined	02:24
	← effi left	02:24
	← duderonomy left	02:26
	→ leolrrj joined	02:29
	← zumba_addict left	02:29
	→ modocache joined	02:30
	← Thorax15 left	02:31
	← clarkpan left	02:31
	← ropav left	02:33
	→ noabobo joined	02:34
	← modocache left	02:35
	→ zumba_addict joined	02:38
	→ dreiss joined	02:39
	← darkbasic left	02:40
	→ Ryanar joined	02:41
	→ darkbasic joined	02:41
	← rejerson69_ left	02:44
	→ rejerson69 joined	02:44
	← cmn left	02:45
	→ michelangelo joined	02:46
	→ Corey84 joined	02:47
	→ cmn joined	02:48
	← gbit86 left	02:49
	→ gbit86 joined	02:49
	→ otter768 joined	02:50
	← donmichelangelo left	02:50
	← nb_bez___ left	02:50
	→ gopar joined	02:52
	← juvenal left	02:52
	← sdothum left	02:52
	← gfixler left	02:53
	→ rubyonrailed joined	02:54
	→ modocache joined	02:55
	→ rkazak joined	02:56
	← rkazak left	02:57
	→ modocach_ joined	02:57
	← modocache left	02:57
	→ rkazak joined	02:57
	→ intellix joined	03:00
	← modocach_ left	03:01
	→ Vadi joined	03:03
	gitinfo set mode: +v	03:04
Vadi	Is "you cannot modify the contents of the submodule from within the main project" still true - with Git 2.1.4, I am able to commit and push things in submodules repository	03:04
	→ duderonomy joined	03:05
imMute	Vadi: I dont think that was ever true...	03:05
	← SimonNa left	03:06
Vadi	Says that in the manual for https://git-scm.herokuapp.com/docs/git-submodule	03:06
	I'm misunderstanding it perhaps?	03:07
	→ sdothum joined	03:09
	→ ropav joined	03:10
imMute	where does it say that?	03:12
Vadi	Second paragraph	03:12
imMute	oh, that. it's slightly misleading I think. you can modify the submodule, but the parent repository doesn't track that.	03:13
	← rubyonrailed left	03:13
imMute	all that the parent repository tracks is "I want $that over $here and I want it at $version" (where $that is a remote URL for the submodule)	03:13
Vadi	Gotcha thanks	03:14
	→ EminenceHC joined	03:16
	← intellix left	03:16
	← ropav left	03:17
	← xolubi left	03:17
	← EminenceHC left	03:20
	← zumba_addict left	03:20
	→ jontmorehouse joined	03:20
	← _Atom_ left	03:24
	→ monst joined	03:25
monst	ugg I fucked up pretty badly and checked it in	03:25
	I want to revert back to a spesific commit and push	03:25
	anyone able to help?	03:26
imMute	make sure you dont have anything in your working copy you don't want destroyed, then run 'git reset --hard SHA' and 'git push --force' where SHA is the commit you want to go back to	03:27
	actually, just copy the whole repo just in case	03:27
	→ pemf joined	03:28
	← pemf left	03:28
	→ GoddeR joined	03:28
	← Nikhil_D left	03:29
	→ Nikhil_D joined	03:29
	→ Zamyatin joined	03:30
monst	didnt seem to work	03:30
imMute	what did do?	03:30
monst	git reset -- hard 25d0ea7afb1a27c8e8fac601064c8e3ae09484e7	03:31
	← Vadi left	03:31
monst	ls and its still the mistake	03:31
imMute	you have a space between -- and hard. remove it.	03:31
monst	ah	03:31
	→ irqq joined	03:32
	variable → constant	03:32
monst	weird now it says	03:33
	remote: GitLab: You don't have permission	03:33
	Even though I am Master on that project	03:33
	! [remote rejected] master -> master (pre-receive hook declined)	03:33
imMute	the gitlab server is configured to refuse pushes that rewind history, then.	03:34
	need to change the gitlab configuration.	03:34
	← leolrrj left	03:34
	→ bb010g joined	03:34
	gitinfo set mode: +v	03:34
monst	hmm	03:34
	→ leolrrj joined	03:35
monst	can I just repush everything overtop	03:35
	← sdothum left	03:35
	→ jottr_ joined	03:35
monst	reclone, checkout SHA, commit, push?	03:35
imMute	no	03:36
	← ahr3n left	03:36
	← edude03 left	03:37
	→ Peuc2 joined	03:38
	→ Motoko joined	03:38
monst	there is nothing I can do? I can mess with the gitlab config right now =(	03:38
	err I mean I cant mess with the gitlab config	03:38
	← mellernoia-work left	03:38
	← ErKa left	03:39
	→ stantonk joined	03:39
	← jottr_ left	03:39
imMute	you could do a revert instead of a reset.	03:40
	which would make another commit that effectively "undoes" the ones you don't want. they're still there, but their changes were reversed.	03:40
	← LBV_User left	03:40
	← Peuc left	03:40
	→ hahuang65 joined	03:42
monst	git revert 25d0ea7afb1a27c8e8fac601064c8e3ae09484e7	03:43
	error: could not revert 25d0ea7... lul	03:43
	hint: after resolving the conflicts, mark the corrected paths	03:43
	→ edude03 joined	03:43
	← mariuscc left	03:43
monst	damn it	03:43
imMute	you tell git-rever which commits to undo, not where to go back to	03:43
monst	ah ok	03:44
	← otter768 left	03:44
	→ antimatroid joined	03:46
	→ lindenle joined	03:46
	→ fedexo joined	03:46
	→ clarkpan joined	03:48
	→ nettoweb joined	03:48
	→ EminenceHC joined	03:48
	→ z8z joined	03:50
	← nettoweb left	03:50
	← eletuchy left	03:52
	← Consuela left	03:53
	← EminenceHC left	03:53
	← antimatroid left	03:53
	← edude03 left	03:54
	← hcc23 left	03:54
	→ antimatroid joined	03:54
	→ juvenal joined	03:56
	← antimatroid left	03:58
	← daito left	03:58
	← leolrrj left	03:58
	← Dorf left	03:58
	← espindola left	03:59
	→ mikiones joined	04:00
	← lvegerano left	04:01
	→ gfixler joined	04:02
	→ theverbg joined	04:03
	← mikiones left	04:04
	← cagedwisdom left	04:05
	← GoddeR left	04:06
	→ Dragooon joined	04:06
	Briman → Briman\|off	04:08
	→ edude03 joined	04:09
	← cpt_yossarian left	04:09
	→ cpt_yossarian joined	04:11
	← Corey84 left	04:11
	→ cbonobo joined	04:13
	→ hakunin joined	04:13
hakunin	hi, is there a way to "save progress" mid-rebase and switch to work on something else?	04:14
	→ subhojit777 joined	04:14
	← Milk-weed left	04:14
	→ EminenceHC joined	04:17
	→ Tommy[D] joined	04:20
	→ tiff joined	04:20
	→ zumba_addict joined	04:20
	→ Dorf joined	04:21
	← Ryanar left	04:22
	← EminenceHC left	04:22
	← Tommy[D]_ left	04:23
	→ cagedwisdom joined	04:24
	← zumba_addict left	04:25
	← jontmorehouse left	04:25
	→ jontmorehouse joined	04:27
	→ glebihan_ joined	04:27
	← madewokherd left	04:28
	← Dorf left	04:28
	← DolphinDream left	04:28
	← irqq left	04:31
	← drbean left	04:32
	→ skorgon joined	04:35
	→ scientes joined	04:37
Seveas	hakunin: you could probably save the todo list and tag the current HEAD mid-rebase. But this is the first time I hear about someone wanting this. What's your usecase?	04:38
	→ kadoban joined	04:39
	← ra4king left	04:40
	← stantonk left	04:40
	→ ra4king joined	04:41
	← hellome left	04:43
	← ra4king left	04:45
	→ daito joined	04:45
	→ ra4king joined	04:46
	→ tmager joined	04:47
	→ manjaro_user joined	04:48
	← harish_ left	04:49
	→ harish_ joined	04:49
	← monst left	04:51
	← polyzen left	04:51
	← manjaro_user left	04:52
	→ emandari joined	04:53
	← ra4king left	04:54
	→ ra4king joined	04:54
	← ra4king left	04:56
	→ ra4king joined	04:57
	← cbonobo left	04:57
	← ra4king left	04:58
hakunin	Seveas: just a very long rebase with lost of conflicts	04:59
	→ ra4king joined	04:59
hakunin	Seveas: something higher priority popped up	04:59
	the only other way: clone the whole repo elsewhere	04:59
	*lots of conflicts	04:59
milki	hakunin: you can checkout a new workdir to a different folder	04:59
	← ra4king left	05:00
milki	thers a shorthand command for it too uh....	05:00
hakunin	milki: hm	05:00
	→ eletuchy joined	05:01
	→ ra4king joined	05:01
	← ra4king left	05:01
	← Motoko left	05:03
milki	ya... i cant remember what it was -.-	05:03
	→ drbean joined	05:03
	← juboba left	05:03
	→ ra4king joined	05:03
milki	o	05:04
	its in a subdir	05:04
	contrib	05:04
	er	05:04
	https://github.com/git/git/blob/master/contrib/workdir/git-new-workdir	05:04
	hmm	05:04
	← ra4king left	05:04
	→ ReekenX joined	05:04
milki	ya, just execute it i guess	05:05
	→ ra4king joined	05:05
	← mmakunas left	05:06
	← drbean left	05:08
	← Gamecubic left	05:08
	→ Gamecubic joined	05:08
	→ linuxmint joined	05:09
	← ra4king left	05:09
	→ Asiajey joined	05:09
	← tmager left	05:09
	← hazelux left	05:10
	→ ra4king joined	05:11
	→ polyzen joined	05:13
	← NBhosting left	05:13
	← Tekilla left	05:13
	→ MechtiIde joined	05:14
	→ lvh joined	05:15
	← lindenle left	05:15
	→ EminenceHC joined	05:19
	← CEnnis91 left	05:20
	← Lyqyd left	05:21
	→ zumba_addict joined	05:22
	← shinnya left	05:23
	← highcup left	05:23
	→ jottr_ joined	05:24
	← EminenceHC left	05:24
	← dreiss left	05:25
	← Jarboe left	05:26
	← zumba_addict left	05:26
	→ tarkus joined	05:27
	jaaronamo → jonesinator	05:28
	← jottr_ left	05:29
	← juvenal left	05:29
	→ PCatinean joined	05:31
	→ ahr3n joined	05:32
	→ beautifulmind joined	05:34
	Briman\|off → Briman	05:34
	← toothrot left	05:35
	← watabou left	05:35
	→ settermjd joined	05:36
	← ahr3n left	05:37
	← beautifulmind left	05:38
	← novas0x2a\|laptop left	05:39
	→ ThomasLocke joined	05:39
	← theverbg left	05:40
	→ dreiss joined	05:40
	→ NBhosting joined	05:40
	→ beautifulmind joined	05:40
	→ fate_ joined	05:42
	← jleclanche left	05:42
	→ rzeka joined	05:43
	← fate_ left	05:43
	→ fate_ joined	05:44
	→ ahr3n joined	05:44
	← gopar left	05:44
	→ akushner joined	05:45
	→ otter768 joined	05:45
	← fate_ left	05:45
	→ fate_ joined	05:46
	→ ckruczek joined	05:46
	gitinfo set mode: +v	05:46
	→ jakke joined	05:46
	← emandari left	05:47
	← akushner left	05:47
	→ antimatroid joined	05:47
	→ circ-user-SSaBd joined	05:48
	← otter768 left	05:50
	← MechtiIde left	05:52
	→ nilg joined	05:52
	← ktosiek left	05:52
	→ zoso joined	05:53
	→ lucap joined	05:57
	→ ktosiek joined	05:57
	→ jskt joined	06:00
	← fserb left	06:00
	→ mikiones joined	06:00
	→ Raging_Hog joined	06:01
	→ Gizburdt joined	06:01
FreezingCold	oh crap	06:03
	I reverted something important	06:03
	← ahr3n left	06:03
	→ Haris joined	06:04
Haris	hello all	06:04
	I'v read some. but don't get it	06:04
	Q #1: Is a checkout or a pull, one full copy of the tree ?	06:04
	← mikiones left	06:05
	← edude03 left	06:05
FreezingCold	god damn it.	06:05
	I just ruined my project.	06:05
	← Gizburdt left	06:05
	← Ravana left	06:06
	→ lb1a joined	06:07
iveqy	FreezingCold: !revlist	06:07
	→ Assault joined	06:07
iveqy	FreezingCold: no you didn't	06:07
	← tyreld left	06:07
FreezingCold	Never mind, I screwed up my git history so bag.	06:07
	*bad	06:07
iveqy	FreezingCold: man git revlist	06:07
gitinfo	FreezingCold: the git manpage is available at http://jk.gs/git.html	06:07
iveqy	FreezingCold: man git rev-list	06:08
gitinfo	FreezingCold: the git-rev-list manpage is available at http://jk.gs/git-rev-list.html	06:08
iveqy	there you go =)	06:08
	← Malsasa left	06:08
FreezingCold	it's gone.	06:08
	There's not really any sane way of getting it back.	06:08
	→ Malsasa joined	06:09
	← settermjd left	06:09
	← dreiss left	06:09
FreezingCold	iveqy: I can't even figure out how to get rev-list to actually frigging list all my commits.	06:09
	→ Ravana joined	06:10
qsuscs	FreezingCold: --all	06:10
	← babilen left	06:10
	→ Balliad joined	06:11
FreezingCold	The indexes don't even make sense.	06:11
	← dsdeiz left	06:11
	→ dsdeiz joined	06:11
dsdeiz	anyone happen to have any idea how to install `diff-highlight`?	06:11
FreezingCold	it's 2am. rm -rf .git/; git init;	06:11
	→ barduck joined	06:11
qsuscs	!rmrf	06:11
gitinfo	[!startover] There’s usually no need to start over / rm -rf everything and reclone or so. Most situations can be fixed by other means.	06:11
dsdeiz	ah basically just copy it to any directory in $PATH?	06:11
qsuscs	dsdeiz: hm? any git-fnord in $PATH or $GIT_EXEC_PATH will be available as 'git fnord'	06:12
FreezingCold	qsuscs: well it's so screwed up I don't even know how to ask for help.	06:12
	→ stantonk joined	06:12
FreezingCold	I tried to delete a submodule and ended up reverting a bunch of things.	06:12
dsdeiz	ohh ok	06:12
FreezingCold	like how the hell do I even cleanly revert a revert?	06:12
dsdeiz	i had no idea about $GIT_EXEC_PATH	06:12
	→ roelmonnens joined	06:13
	← lamppid left	06:13
qsuscs	FreezingCold: in doubt, reset --hard to the commit before you started to screw it up (unless !rewrite)	06:13
gitinfo	FreezingCold: Rewriting public history is not recommended. Everyone who has pulled the old history have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	06:13
qsuscs	FreezingCold: and then, !submodule_rm	06:13
gitinfo	FreezingCold: [!submodules_rm] To delete a submodule, do this in the superproject: Edit/delete .gitmodules to remove the submodule, and `git add .gitmodules`. Then `rm -rf submodulepath; git rm -f --cached submodulepath; git commit -am "Removed submodules!"` Inspect .git/config for "submodule" entries to remove. Inspect .git/modules for caches to remove. Possible alternatives to submodules: "!gitslave" or "!subtree"	06:13
FreezingCold	I don't know which commit I screwed up at.	06:13
	← tpollard left	06:14
qsuscs	FreezingCold: git log -p might help, or gitk	06:14
FreezingCold	I ran git stash with some important changes, how can I pop them out?	06:14
	git pop?	06:14
	git stash pop?	06:14
	→ justtobe joined	06:14
FreezingCold	I don't want to get it wrong and write over my stash	06:14
ckruczek	git stash pop	06:15
qsuscs	i’d rather git stash apply	06:15
	pop == apply && delete	06:15
ckruczek	or apply right	06:15
FreezingCold	HOLY CRAP	06:15
	I got it back.	06:15
	Wow.	06:15
	Was not expecting that.	06:15
	→ sinkensabe joined	06:15
	← blr left	06:16
	← jskt left	06:17
	← Gamecubic left	06:19
	← boombatower left	06:20
	← stantonk left	06:20
	← CountTwo left	06:21
	→ EminenceHC joined	06:21
	→ CountTwo_ joined	06:21
	← CountTwo_ left	06:21
	→ CountTwo joined	06:22
	→ acolson joined	06:22
	→ mylord joined	06:22
CountTwo	Question on maintaining forks: http://pastebin.com/YPLk4b3y is this correct? And if it is correct is there some better alternative?	06:23
iveqy	CountTwo: a fork is just a branch	06:25
	→ lamppid joined	06:25
iveqy	CountTwo: merge-wise that is. So think of it as a branch	06:25
CountTwo	well I mean more in the sense of a fork of a project	06:25
	← EminenceHC left	06:25
CountTwo	so I'm basically forking a project, making a bunch of my own changes, and want to occasionally pull in changes from the project I forked	06:25
	→ Polyatomic joined	06:25
	← mylord left	06:26
iveqy	CountTwo: usually it's better to rebase, depending on how many commits you have on your own part of the project	06:26
	CountTwo: that is, git fetch and then git rebase, or git pull --rebase	06:26
CountTwo	There are a lot of commits	06:26
	← paulweb515 left	06:27
	← Akagi201 left	06:27
CountTwo	Also wouldn't I still have to re-resolve all the conflicts conflicts again everytime I rebase as well?	06:27
iveqy	CountTwo: is there any change that your local changes can end up in the project you forked?	06:27
	→ Akagi201 joined	06:28
CountTwo	no, can't commit back to the project I forked	06:28
	or rather push	06:28
	is the correct terminology I think	06:28
iveqy	CountTwo: yes, push is the correct terminology, I appriciate that you're trying to use the correct words	06:28
	CountTwo: thinking of the original project as a open source project that might apply your patches after a review process or something like that would make me suggest rebase.	06:29
	→ Akagi201_ joined	06:29
iveqy	CountTwo: however since this isn't your case if I understand you correctly, it would be fine just to merge	06:29
	← ktosiek left	06:30
iveqy	CountTwo: git fetch is your friend here, fetch from the original project and then just git merge to merge it.	06:30
CountTwo	But it does not seem tenable to keep having to re-merge from merge-base of A every single time I want to pull in changes from main.	06:30
	← _rgn left	06:30
	→ _rgn joined	06:30
	→ ciampix joined	06:30
CountTwo	Would something like rerere make this easier/ more tenable?	06:30
	← cagedwisdom left	06:31
	← effi_ left	06:31
	→ Akagi20__ joined	06:32
	← Akagi201 left	06:33
iveqy	CountTwo: I'm not sure about the rerere thing since I don't use it myself. I doubt that it will help you	06:33
	← Rubin left	06:33
iveqy	CountTwo: you'll not merge from mergebase A all the time	06:33
CountTwo	I won't? Isn't that the only common ancestor?	06:34
iveqy	CountTwo: a git branch does not age the same way a subversion branch does	06:34
CountTwo	wait no B is	06:34
	ok, so that's not so bad	06:35
iveqy	the last merge would be one step more than the common ancestor	06:35
	← nilg left	06:35
	→ ktosiek joined	06:35
	← Akagi201_ left	06:35
	→ Alienpruts joined	06:35
	← thiago left	06:35
	← rzeka left	06:35
	→ nilg joined	06:36
	→ pantsman- joined	06:36
CountTwo	cool, that answers my question	06:36
	thanks	06:36
	didn't read my own diagram right	06:36
	→ zumba_addict joined	06:36
hakunin	milki: thx for that link, will take a look	06:36
	→ Ouchy joined	06:37
	← subhojit777 left	06:37
	← zumba_addict left	06:37
	→ Rubin joined	06:37
	→ katherine joined	06:37
	→ zumba_addict joined	06:38
	→ babilen joined	06:38
	→ Sleepy63 joined	06:40
	← Dragooon left	06:40
	← skorgon left	06:42
	→ cagedwisdom joined	06:45
	← btree left	06:46
	→ workerbeetwo joined	06:47
	← Goplat left	06:48
	→ Errorical joined	06:49
	→ dreiss joined	06:49
	→ wicope joined	06:51
	→ Saturn812 joined	06:51
	→ gauke joined	06:52
	→ ntwari joined	06:52
	→ Gama11 joined	06:53
	← clarkpan left	06:55
	→ ashokrajar joined	06:56
	→ zematis joined	06:58
	→ ahr3n joined	06:59
	→ xolubi joined	07:00
	→ jnavila joined	07:01
	← dreiss left	07:01
	← jontmorehouse left	07:03
	→ blr joined	07:03
	← circ-user-SSaBd left	07:03
	← MLM left	07:03
	→ hserra0 joined	07:04
	← jonmasters_ left	07:04
	→ hebz0rl joined	07:04
	← ahr3n left	07:04
	→ subhojit777 joined	07:05
	→ DavidDudson joined	07:05
	← beautifulmind left	07:05
	→ lindenle joined	07:06
	→ Sceorem joined	07:06
	→ rath joined	07:06
	← Zamyatin left	07:06
	← fate_ left	07:06
	→ encod3 joined	07:06
	← Malsasa left	07:07
	← ashokrajar left	07:07
	← lindenle left	07:08
	← JEEBcz left	07:08
	→ petersr joined	07:09
	→ JEEBcz joined	07:10
	→ drag0niu1 joined	07:10
	→ clarkpan joined	07:10
	← Rubin left	07:10
	← nitrix left	07:10
	→ circ-user-SSaBd joined	07:11
	→ jonmasters joined	07:11
	← zumba_addict left	07:12
	← SporkWitch left	07:12
	→ jottr_ joined	07:12
	→ proq` joined	07:13
	← drag0nius left	07:13
	→ Rubin joined	07:13
	← xolubi left	07:13
	→ dan_s joined	07:14
	→ zumba_addict joined	07:14
	→ SporkWitch joined	07:14
	← avtobiff left	07:14
	→ avtobiff joined	07:14
dan_s	hello, should I say wich file I´m editing in a commit or not? Like ¨Add xxxxxx functionality to Main class¨	07:15
	← roger_padactor_w left	07:16
	→ bonswouar joined	07:16
	← wethu left	07:16
	← bonswouar left	07:16
kadoban	Probably not. What file(s) you edit is already visibile in the commit.	07:17
	← jottr_ left	07:17
	→ Guest29689 joined	07:18
	→ offbyone joined	07:19
	→ stantonk joined	07:20
	→ Spriz joined	07:20
	→ ferr joined	07:21
	→ EminenceHC joined	07:22
	→ Gabri joined	07:24
	← stantonk left	07:25
	→ TomyWork joined	07:25
	→ teran joined	07:25
	← meatmanek left	07:26
	← daito left	07:26
lb1a	dan_s, depends on your code. if your file only holds that one class, you'll not need to mention it as kadoban said. but if you have many classes in a file, you probably include a hint about which class you edited.	07:26
	← trepidaciousMBR2 left	07:27
	← EminenceHC left	07:27
	→ daito joined	07:27
	→ skylite joined	07:27
	← Balliad left	07:28
	→ Adib joined	07:28
	← oojacoboo left	07:28
	← DavidDudson left	07:28
	→ herr_jth joined	07:28
	→ Balliad joined	07:28
	← herr_jth left	07:28
	← justtobe left	07:28
	→ herr_jth joined	07:29
	→ DavidDudson joined	07:29
	← kadoban left	07:29
	← DavidDudson left	07:30
	→ DavidDudson joined	07:31
	→ pierre-emmanuel joined	07:31
	← nadim left	07:31
	→ effi joined	07:32
	→ jazzzu joined	07:32
	→ emandari joined	07:33
	← scientes left	07:33
	← jnavila left	07:34
	→ Hounddog joined	07:34
	→ cdown joined	07:35
	→ intellix joined	07:36
	← constant left	07:37
	→ addict joined	07:38
osse	!yolo	07:40
gitinfo	git config alias.yolo '!git commit -fA -m "Yolo swag!"; git push -f'	07:40
	← akiva left	07:40
	→ mutbuerger joined	07:41
	→ e^0 joined	07:41
	→ cite joined	07:41
	← DerisiveLogic left	07:42
	→ donnib joined	07:42
	→ mikiones joined	07:43
	← dvlwrk left	07:43
	← ciampix left	07:43
	→ scientes joined	07:43
	→ Kamran joined	07:43
	← mikiones left	07:43
	← DavidDudson left	07:43
donnib	when i do this git cherry-pick master..synced_repo/master then it takes all commits between my master and the remote master and applies to current branch ?	07:44
	→ mikiones joined	07:44
osse	yes	07:45
	← zematis left	07:45
	← barduck left	07:46
	→ meatmanek joined	07:46
	→ otter768 joined	07:46
	← zumba_ad_ left	07:48
	← mikiones left	07:48
	→ settermjd joined	07:49
	→ dvlwrk joined	07:50
	← otter768 left	07:51
	← Spriz left	07:52
	→ Spriz joined	07:53
	→ morois joined	07:53
	→ DavidDudson joined	07:53
donnib	osse, thank you, is it possible to apply cherry picks on other branches withotu switching to them or that’s just agains git philosophy ?	07:53
	← cagedwisdom left	07:53
	→ nadim joined	07:54
	← Vinnie_win left	07:54
	→ Vinnie_win joined	07:54
osse	donnib: it's not not possible. but I don't see why it would be against git''s philosophy :p	07:54
	← DavidDudson left	07:55
donnib	ok so i would just switch to them and do the cherry pick	07:55
osse	yes	07:55
	← D-Boy left	07:55
	→ cdown_ joined	07:55
donnib	i guess i could write an automated script that checks which branches have diverged from the remote then swith to those then do the cherry-pick	07:55
osse	but are you sure you don't want to use merge or rebase?	07:55
	→ DavidDudson joined	07:55
osse	cherry-picking upstream commits sounds a bit icky	07:56
	you end up with duplicates of everything	07:56
	← DavidDudson left	07:56
	← rasto left	07:56
	Briman → Briman\|off	07:57
	→ D-Boy joined	07:58
donnib	yes i think i am, i am in the middle of an svn migration where 1. i did a git svn clone from svn 2. i keep this clone up to date with git svn fetch. 3. i do a bare clone of this repo to do cleaning with BFG (this removes all svn info so i can’t fetch changes anymore) 4. i do git svn fetch on the clone (not the bare one). 5. after clean of the bare clone i convert it to a normal repo 6. Now i need the changes that has been introduced in the original clone into t	07:58
	repo that is clean, this is the place i use cherry-pick	07:58
	← jakke left	07:58
	← cdown left	07:58
	cdown_ → cdown	07:58
donnib	if you have other ideas i would like to hear them, the intention is that when we are ready i do the last cherry pick then push the repo to our server then developers start using git	07:58
	← Padawan left	07:59
	→ clmsy joined	07:59
	→ Padawan_ joined	07:59
	→ ciampix joined	08:00
	→ kukks joined	08:01
	← kukks left	08:01
	→ kukks joined	08:01
	→ zgzgzg joined	08:01
	→ nfk joined	08:01
	→ Gizburdt joined	08:02
	← ngladitz left	08:04
	← kerrick left	08:06
	← addict left	08:06
	→ DavidDudson joined	08:06
	→ kerrick joined	08:07
	→ BuenGenio joined	08:07
	← Agusanz left	08:07
	→ nikio_ joined	08:08
	← nikio_ left	08:08
	→ rasto joined	08:09
	→ granthatcher joined	08:09
	→ shinnya joined	08:10
donnib	osse: u there ?	08:10
	← nikio___ left	08:10
	→ psoo joined	08:10
	← cdown left	08:12
	→ doev joined	08:14
osse	donnib: it sounds sensible to use cherry-pick in that situation	08:14
donnib	osse: great, that’s what i wanted to hear from somebody with Git experience ;)	08:15
osse	but this is something you'll do one once, I suppose	08:15
	→ Agusanz joined	08:15
donnib	ummm	08:15
osse	at least one once for realsies	08:15
donnib	i will do the cherry pick each day or multiple times a day	08:15
	← Agusanz left	08:15
	→ Agusanz joined	08:15
osse	hmm	08:15
	→ ahr3n joined	08:15
osse	I thought the idea was that after the cherry-pick you would pull the plug on the svn server	08:16
donnib	so every time i do this 1. git svn fetch 2. git fetch from remote (the one in 1) 3. cherry pick	08:16
	← DavidDudson left	08:16
donnib	not after one time cherry pick but after several days where i have run the cherry pick	08:16
	i have done the migration now but waiting a month or so for a release we have and in the mean time i want to keep everything up to date to be able to do the migration as quickly as possible	08:17
	→ lqi_ joined	08:17
	← mutbuerger left	08:17
	← clarkpan left	08:17
donnib	does it hurt that i do the 1,2,3 many times, no body will commit to git, we will start using git when we have turned off svn	08:18
osse	I have git experience, but I don't have svn experience and certainly not migration experience. So I dont' think I have anything to add :p	08:18
	← lqi left	08:18
	→ DavidDudson joined	08:18
	→ mutbuerger joined	08:18
osse	no that should be fine	08:18
j416	donnib: is there not a git-svn option to remove that info from the start?	08:18
osse	yeah I wondered about that. I thought git-svn did that by default	08:18
donnib	j416: what do you mean ?	08:18
osse	(unless he means removing binaries and such)	08:18
j416	donnib: --no-metadata	08:18
	donnib: man git-svn	08:19
gitinfo	donnib: the git-svn manpage is available at http://jk.gs/git-svn.html	08:19
qsuscs	donnib: when you do the one-time migration, i’d go for !svn2git	08:19
gitinfo	donnib: For a one-time conversion of SVN to git, svn2git should be used instead of git-svn. There are many tools with this name. Probably the best is the KDE one at https://gitorious.org/svn2git. To analyze the SVN repo history upfront for building up proper rules for svn2git, you might use svneverever from here: http://blog.hartwork.org/?p=763	08:19
	→ PeterBooker joined	08:19
donnib	j416: you mean remove the metadata ?	08:19
j416	yes	08:19
donnib	i won’t remove the svn metadata until last minnute	08:19
	← dvlwrk left	08:19
j416	I see	08:19
donnib	otherwise i won’t be able to git svn fetch	08:20
j416	you cannot take the svn repo offline during the migration?	08:20
	that would be best	08:20
	← ahr3n left	08:20
j416	do it when no one needs it	08:20
donnib	nope, well sort of, probably the svn will be offline for 1-2 hours while i tell people to stop commit to svn or git then i remove all the metadata then i push to git and we are off with git	08:20
	i need as little down time as possible so that’s why i need to do as much as possible in advance, keep doing git svn fetch	08:21
j416	I see	08:21
donnib	clean repo for big binaries and other stuff that should not have been into scm	08:21
	→ psoo_ joined	08:22
j416	alright	08:22
donnib	the way i have designed the migration now i should in theory be able to switch very quickly (it all depends how quickly the no-metadata takes)	08:22
j416	I'd go for downtime during the whole migration process anyway, but the way you're doing it should work more or less	08:22
	→ cagedwisdom joined	08:23
	→ irqq joined	08:23
j416	except your dates and committer info will be off unless you take care to set it right	08:23
	(for the commits you cherry-pick)	08:23
osse	hmm, I think I'd use the next month to practice switching and when the time comes do it all at once.	08:23
donnib	whole migration process is 1-2 days, i don’t think i wold be popular if i asked 20 developers to not commit that long time	08:23
j416	plus you need to check all branches	08:23
donnib	what do you mean about the dates and committer info ?	08:24
j416	donnib: weekend?	08:24
qsuscs	jast: i just screwed up !For@p … i guess _i_ can’t delete it	08:24
donnib	the dates and author should be ok	08:24
	→ marcogmonteiro joined	08:24
j416	donnib: that's a huge repo if it takes that long btw	08:24
donnib	j416: yes maybe but why work the weekend if it’s possible to do this ? ;)	08:24
	yup it is	08:24
	2,5gb, 15years repo in svn	08:25
j416	make a local copy of the svn repo before you git-svn-clone it	08:25
	I see.	08:25
donnib	j416: done that already	08:25
j416	alright	08:25
donnib	actually that is how i did the git svn clone	08:25
	← zumba_addict left	08:25
donnib	i did it from an synced svn local repo on an ssd drive	08:25
	← psoo left	08:25
j416	I'd still go for downtime but that's me. less hassle. :)	08:25
donnib	it took 17hours to do the clone	08:25
j416	but your way might work.	08:25
donnib	j416: i hope :)	08:25
	← DavidDudson left	08:26
j416	17 hours	08:26
qsuscs	donnib: git-svn is just not too intelligent and a bit slow, use svn2git for a one-time convert	08:26
donnib	i don’t know svn2git, is it fast ?	08:26
qsuscs	faster than git-svn	08:26
j416	so just do it in the afternoon and it'll be ready in the morning for you to fix the stuff and you'll have a downtime of one evening and before lunch the next day	08:27
donnib	and does it support the sync afterwards ?	08:27
qsuscs	i’m not sure	08:27
tobiasvl	in the morning! lol. I converted a 13 year old svn repo last year, it churned for days and days	08:27
j416	tobiasvl: well, he said 17 hours explicitly. :)	08:27
donnib	j416: not that simple, i also need to do the cleaning, rewriting the history (that takes huge ammount of time as well)	08:27
j416	donnib: it does? hm ok	08:27
	→ heroux joined	08:28
	← Agusanz left	08:28
donnib	j416: yeah rewriting that much history takes time	08:28
j416	work faster. :)	08:28
qsuscs	tobiasvl: hah, peanuts! git cvsimport on gentoo-x86 eventually crashed my server!	08:28
j416	:D	08:28
donnib	also the git gc agressively takes hours to do	08:28
	← ktosiek left	08:28
jast	.trigger_edit For -	08:28
gitinfo	jast: Okay.	08:28
jast	qsuscs: fixed	08:28
j416	donnib: you don't need to do that before letting people start	08:28
qsuscs	TIL	08:28
	!For	08:28
	→ c0mrad3 joined	08:28
qsuscs	thx	08:29
jast	access to that is restricted because it doesn't preserve history	08:29
	→ EminenceHC joined	08:29
donnib	j416: true, but then i would have to force push the changes and tell them to clone again	08:29
j416	donnib: no	08:29
qsuscs	yeah i’ll just tell you when this happens again :>	08:29
j416	donnib: git gc does not change the repo history	08:29
jast	actually, scratch that, I do version it now	08:29
j416	donnib: it just cleans up and compresses stuff	08:29
donnib	j416: not git gc but filter-branch does	08:29
jast	.priv add qsuscs trigger_delete	08:29
gitinfo	jast: Okay.	08:29
j416	donnib: yes, but you didn't say filter-branch. you said gc :)	08:29
donnib	to remove the meatadata that rewrites the whole history, BFG cleaner also changes the history	08:30
	yeah i know	08:30
j416	BFG uses filter-branch so yes	08:30
	natually	08:30
tobiasvl	how large is the repo?	08:30
	tbh, just convert it and don't look back	08:31
	:P	08:31
j416	hm maybe it doesn't use filter-branch, I wonder how it works. /me reads	08:31
donnib	BFG no it doesn’t but still needs to be force push, in the end the outcome is the same whether you do BFG clean or filter-branch, the difference beeing BFG is faster	08:31
	→ ktosiek joined	08:31
	← dustinm left	08:31
qsuscs	.version	08:31
	gitinfo changed the topic to: Welcome to #git, the place for git help and amended promises \| Current stable version: 2.3.7 \| Start here: http://jk.gs/git \| Getting "cannot send to channel"? /msg gitinfo .voice \| Commit early, commit often. A tip for version controlling - not for relationships	08:31
donnib	tobiasvl: i don’t want to look back but for some time i have to until we make the switch	08:31
	tuor_ → tuor	08:31
	← Ricaz left	08:32
tobiasvl	ah, ok. you're going to run them in parallel	08:32
j416	donnib: here's another way to transition: have users install git and run git-svn against your repo	08:32
	they have to learn git anyway	08:32
	then say ok the repo will be offline for 2 days, but you can commit locally of course	08:32
	→ Ricaz joined	08:32
	→ mkoskar joined	08:33
donnib	j416: uhhhhhh noooooo, that would not work for my people :D, i have average age of 50 and i have a fight learning git using a UI so i don’t need to complicate things more	08:33
j416	haha alright	08:33
	fair enough	08:33
	j416 been there	08:33
	← EminenceHC left	08:33
tobiasvl	yeah we did that. jsut said "ok, now there's a feature freeze for a couple of days here" wink wink took down the central repo	08:33
donnib	yeah, it’s been a fight getting to this point where they can see the benefits	08:33
j416	donnib: awesome that you won. I had the same fight and just gave up.	08:34
donnib	tobiasvl: yes i know, that is the easiest way to do it but i really like to be able to have the downtime as little as possible	08:34
	→ bousquet joined	08:34
donnib	j416: well i won in the sense that i can now make the shift but the fights are not over yet, they don’t know what they are goint into :D	08:34
tobiasvl	sure, understandable.	08:34
	I had the same fight and won too :) still have some people who haven't bothered to learn git properly and still don't see the benefits, but it's ok	08:34
j416	donnib: :D svn? no, that doesn't exist anymore, sorry.	08:35
	← cagedwisdom left	08:35
	→ elote joined	08:35
donnib	i foresee many fights, the benefit for me is that i have a team that i am responsible for and in this team we use Git and they like it and i hope it’s easier to have other teams on board now that i have dev’s using Git close. When i started i was the only one so all fingers pointed at me :D	08:36
qsuscs	“our SVN license has expired and a new one is too expensive”	08:36
donnib	j416: yeah, sorry we can’t go back, deal with it :D	08:36
osse	not to be a dick but: have you considered not migrating at all? it sounds like more trouble than it's worth	08:36
	→ skullcrasher joined	08:36
donnib	osse: no problem at all, fair question. Yes we have and we have problems with SVN that we can’t work as agile as we want just as we do in my team with Git	08:37
	my team needs very ofter to make changes in the code and they like the way we can work with branches in Git	08:37
	so actually the devs asked if we could move the old svn repo to git	08:37
osse	ah	08:37
	then it's cool. I thought you were a lone crusader	08:37
	← rasto left	08:38
	→ avvs joined	08:38
	← D-Boy left	08:39
	← katherine left	08:39
	→ aidalgol joined	08:39
	→ D-Boy joined	08:40
donnib	no, have 3 devs on my side :D	08:40
	→ lucianangelus joined	08:40
	→ achadwick joined	08:40
	→ liamkeily joined	08:40
qsuscs	out of?	08:41
donnib	there are 5 more (the other team)	08:42
qsuscs	hmm. might even work.	08:42
donnib	qsuscs: regarding svn2git, It uses git-svn to clone an svn repository	08:42
qsuscs	wat	08:42
donnib	the docs says so no performance gain	08:42
qsuscs	i doubt.	08:42
donnib	it just uses git-svn	08:42
qsuscs	you are talking about the KDE one? !svn2git	08:43
gitinfo	For a one-time conversion of SVN to git, svn2git should be used instead of git-svn. There are many tools with this name. Probably the best is the KDE one at https://github.com/svn-all-fast-export/svn2git. To analyze the SVN repo history upfront for building up proper rules for svn2git, you might use svneverever from here: http://blog.hartwork.org/?p=763	08:43
	← liamkeily left	08:43
donnib	https://github.com/nirvdrum/svn2git#readme	08:43
qsuscs	no, use the one i/gitinfo linked	08:43
	→ jottr_ joined	08:43
	← avvs left	08:44
	← avtobiff left	08:44
donnib	hmm, a quick look does seem to describe an easy way to do a svn -> git clone	08:45
	→ trepidaciousMBR2 joined	08:45
	← kukks left	08:46
	→ rcn joined	08:46
	→ jnavila joined	08:46
	→ jseplae joined	08:46
osse	how about http://www.catb.org/esr/reposurgeon/	08:48
	I don't know what a "Subversion dump file" is, but it sounds awesome	08:48
	→ ngladitz joined	08:48
	← jottr_ left	08:49
	← jazzzu left	08:50
	→ rasto joined	08:50
	← eletuchy left	08:50
	→ eletuchy_ joined	08:50
	→ Agusanz joined	08:52
	→ DavidDudson joined	08:52
	→ dustinm joined	08:52
	← Gabri left	08:52
	← harish_ left	08:53
	← DavidDudson left	08:53
	→ KronTMX joined	08:53
	← sparetire left	08:54
	→ Kronuz joined	08:54
j416	osse: an svn dump file is just a single file containing the repo; cf. a relational database exported to sql (not sure if the svn file is binary maybe, though)	08:56
	→ butyoudonot joined	08:56
j416	osse: it takes some time to re-create a repo from that file, so it's easier if it can be used directly	08:56
butyoudonot	How to get a diff between 2 tree objects? Cannot find it in `man git-diff-tree'	08:57
gitinfo	the git-diff-tree manpage is available at http://jk.gs/git-diff-tree.html	08:57
	← Agusanz left	08:57
j416	butyoudonot: is this !xy problem? what is your goal?	08:57
gitinfo	butyoudonot: Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...	08:57
	→ kukks joined	08:58
	← effi left	08:59
	→ mikiones joined	08:59
butyoudonot	`git diff-tree t1 t2' shows diff in some kind of strange format. How to convert it patch or smth like that?	08:59
j416	butyoudonot: if that's what you really want to do, the manpage clearly says: git diff-tree <tree-ish> [<tree-ish>]	08:59
	butyoudonot: -p	08:59
	butyoudonot: still, xy.	08:59
butyoudonot	j416: nice, thanks	08:59
	→ Gabri joined	08:59
j416	you didn't even answer my question. but as long as you	09:00
	're happy doing it that way...	09:00
	← noabobo left	09:00
	→ contentsafe_ joined	09:01
	← donguston left	09:01
	← BuenGenio left	09:02
	→ nnyk_ joined	09:02
	← fedexo left	09:03
	← mutbuerger left	09:03
	→ bviktor joined	09:04
bviktor	hi, is there anyone who can use tlsv1.2 with git on centos?	09:04
Seveas	bviktor: I've got a recent git on centos 6. How would I test tlsv1.2 support?	09:06
bviktor	well it'd require changes on the server side	09:06
	so it's a bit tricky	09:06
Seveas	got a live server I can test with?	09:06
bviktor	nah, only if i set up a new vm in azure or something. i wonder how one could check the protocol from the client side ...	09:07
	← tiff left	09:07
bviktor	maybe that's what i will do but it'll take time	09:07
Seveas	me as well, and I'm not curious enough to actually set up a server :)	09:07
bviktor	yaeh, that's totally understood	09:07
	→ tumulte joined	09:08
bviktor	it's strange though, it works from ubuntu, osx and windows	09:08
	but not from centos, not even 7.1 with openssl 1.0.1	09:08
	okay i think i'll set up a test vm	09:10
	→ pobivan joined	09:10
	→ King_Hual joined	09:10
	→ sundev70 joined	09:12
	← quazimodo left	09:13
	→ Cust0sL1men joined	09:13
	→ cdown joined	09:14
	← daito left	09:14
	→ Ionut joined	09:15
	← e^0 left	09:15
	→ haavstr joined	09:15
	← Ionut left	09:15
	→ kcj joined	09:15
	→ Ionut joined	09:16
	← Ionut left	09:16
	← ali1234 left	09:16
	→ cvanball joined	09:16
	← teran left	09:16
	← circ-user-SSaBd left	09:17
	→ paulweb515 joined	09:17
	→ Dumblez0r joined	09:18
	← clmsy left	09:19
	← scientes left	09:20
	← ckruczek left	09:21
	→ seal joined	09:21
	← bousquet left	09:22
	→ daito joined	09:23
	← Padawan_ left	09:24
	→ Padawan_ joined	09:25
	→ clmsy joined	09:25
	← seal left	09:25
	→ circ-user-SSaBd joined	09:26
	← sundev70 left	09:26
	→ Grimlock1 joined	09:27
	→ scientes joined	09:28
	← kcj left	09:30
	← intellix left	09:31
	← paulweb515 left	09:31
	← trepidaciousMBR2 left	09:31
	→ trepidaciousMBR2 joined	09:32
jantje	Hi, I want to rewrite the commit log message in a pre-receive hook. We have a bugtracking system and when the developer starts his commit log message with BUG12345 : fix something, we would like to reform that roughly in to "BUG12345 : $bug_topic : fix something"	09:34
	→ EminenceHC joined	09:35
	← trepidaciousMBR2 left	09:35
	← phantombeta left	09:36
	→ trepidaciousMBR2 joined	09:36
	→ bvi joined	09:37
	→ xolubi joined	09:37
jantje	I realize it could leave the pushers repository in a bad state (it does change the sha1, right!?)	09:38
tobiasvl	yes	09:38
	!rewrite	09:38
gitinfo	Rewriting public history is not recommended. Everyone who has pulled the old history have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	09:38
tobiasvl	does the developer know the $bug_topic before pushing? if so you can set the hook to reject commits with malformed messages	09:39
	← EminenceHC left	09:40
jantje	tobiasvl: that's the thing, it would be too much work to look it up each time	09:40
	← sin3t left	09:40
jantje	I can probably get away with it when using a local pre-commit hook to rewrite it, that would work I think	09:41
j416	jantje: local hook would be the right way to go	09:42
qsuscs	commit-msg hook	09:42
	→ veganista joined	09:42
jantje	it's a portability nightmare	09:43
	:/	09:43
	← Assault left	09:43
jantje	how to write a hook that works on linux, windows (cygwin) and with all gui's like eclipse	09:43
	brb	09:44
	← clmsy left	09:45
butyoudonot	Is it possible that git-diff-tree and git-diff uses a different diff-strategies for comparing same blobs?	09:45
	→ Assault joined	09:45
	→ intellix joined	09:46
	→ paulweb515 joined	09:46
qsuscs	jantje: use sh, sed, awk and curl. and cease using eclipse.	09:46
	← jerematic left	09:46
iveqy	jantje: afaik you can't. Eclipse uses jgit (if I recall correctly) and that has some implications	09:47
	→ otter768 joined	09:47
	← pantsman- left	09:47
iveqy	butyoudonot: I've never heard about diff strategies, a diff is a difference between two objects. It will be the same however you do it	09:48
	← trepidaciousMBR2 left	09:49
	→ trepidaciousMBR2 joined	09:50
	← scientes left	09:52
	← Spriz left	09:52
	← otter768 left	09:52
	→ Spriz joined	09:53
	← tuor left	09:53
	← kukks left	09:53
	→ flipperWhip joined	09:54
	← mkoskar left	09:54
	← emandari left	09:54
	← blr left	09:55
butyoudonot	iveqy: my thoughts entirely. But see what I've got https://gist.github.com/dmalikov/864ac4d0eed93ae282a0	09:55
	→ jds joined	09:57
	→ jost joined	09:57
	← trepidaciousMBR2 left	09:59
	→ jottr_ joined	09:59
	← nnyk_ left	10:00
iveqy	butyoudonot: looks like the --stat is calculated differently	10:00
	butyoudonot: you could always ask !list	10:01
gitinfo	butyoudonot: [!mailing_list] The mailing list can be reached via [email@hidden.address] You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://j.mp/gitlist	10:01
iveqy	butyoudonot: may I ask for your usecase?	10:01
butyoudonot	iveqy: just curious :)	10:02
	iveqy: also it's not about the --stat. Patches look differently, but the result is the same (as far as I can verify it)	10:03
	→ IP92 joined	10:03
IP92	how should one resolve dependencies? via submodules?	10:03
	← jottr_ left	10:04
iveqy	IP92: that's one way, !submodules	10:07
gitinfo	IP92: [!submodule] git-submodule is ideal to add subsidiary git repositories to a git superproject when you do not control the subprojects or more specifically wish to fix the subproject at a specific revision even as the subproject changes upstream. See http://www.git-scm.com/book/en/Git-Tools-Submodules	10:07
iveqy	IP92: !sub	10:07
gitinfo	IP92: [!subgit] SubGit is a two-way git<->svn bridge. It provides a (self-)hosted alternative to git-svn, with some advantages. See http://subgit.com/	10:07
	→ bonswouar joined	10:07
iveqy	IP92: !subtree is an other	10:07
gitinfo	IP92: The subtree merge method is great for incorporating a subsidiary git repo into your current one with "unified" history. Read http://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_subtree_merge for more info, see also !git-subtree and !git-stich-repo.	10:07
	→ sdothum joined	10:08
iveqy	butyoudonot: well, it's not the same since different sha1 represents different things so it's not strange that there's a difference	10:08
	→ trepidaciousMBR2 joined	10:08
iveqy	what difference, that's the interesting part	10:08
	← Gitzilla left	10:08
butyoudonot	iveqy: take a closer look, first diff is commit's, second one is trees'	10:09
	← sdothum left	10:09
butyoudonot	For a corresponding commits	10:09
	→ stamina joined	10:09
	→ Brain joined	10:09
butyoudonot	To be able to show a difference I need to reproduce it on some public repo	10:09
	← ThomasLocke left	10:11
	→ nikio_ joined	10:12
	→ RaceCondition joined	10:12
	→ hichamat joined	10:13
	→ teran joined	10:13
hichamat	how to get a version of code (whitout .git) by a given date	10:14
	→ liamkeily joined	10:14
tobiasvl	without .git?	10:15
	→ ckruczek joined	10:15
	→ wethu joined	10:15
tobiasvl	check out the commit you want and remove .git? :P	10:15
	← eletuchy_ left	10:15
	→ eletuchy joined	10:16
	→ tuor joined	10:17
	← jnavila left	10:17
osse	hichamat: man git-archive	10:17
gitinfo	hichamat: the git-archive manpage is available at http://jk.gs/git-archive.html	10:17
	→ s8321414 joined	10:17
hichamat	thank you, I will test	10:18
	← teran left	10:18
	← Padawan_ left	10:18
	→ sdothum joined	10:19
	→ Padawan_ joined	10:20
	← eletuchy left	10:20
	← phoenixz left	10:21
	→ tvw joined	10:23
	← ScottE left	10:23
	← cyphase left	10:23
	← King_Hual left	10:24
	→ cagedwisdom joined	10:25
	→ bluesm joined	10:25
	→ mkoskar joined	10:27
	← daito left	10:27
	← IP92 left	10:27
	→ drbean joined	10:30
	← rcn left	10:30
	← seg_ left	10:31
	→ avtobiff joined	10:33
	← frobware_ left	10:35
	→ ScottE joined	10:35
	→ mtakkman joined	10:35
	→ beautifulmind joined	10:35
	← settermjd left	10:35
	→ JoshSyn joined	10:37
	← fahadash left	10:37
	→ cyphase joined	10:38
	→ nmnm joined	10:39
	→ darkbasic_ joined	10:39
	→ seg joined	10:40
	← seg left	10:40
	→ seg joined	10:40
	← darkbasic left	10:40
	← drbean left	10:41
hichamat	I can't see a date filter in git-archive, do I must checkout a commit first ?	10:42
	→ jokester joined	10:42
	→ EminenceHC joined	10:42
	→ jamesheston joined	10:42
	→ d3r1ck joined	10:43
d3r1ck	hello	10:43
gitinfo	d3r1ck: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	10:43
	→ rcn joined	10:43
	→ jnavila joined	10:43
Seveas	hichamat: that sentence doesn't parse at all. What are you trying to do?	10:43
d3r1ck	I am a git fan and i have been using it for a long time now	10:43
	Say 1+ years	10:43
Seveas	that's not long :)	10:43
d3r1ck	When i looked at its development issues, i noticed it was developed in C	10:44
	Seveas: :)	10:44
hichamat	+Seveas get the code of a given date without .git folder	10:44
osse	hichamat: you can give a commit as argument. and you can find a commit with git rev-list for example	10:44
d3r1ck	so i wish to write some codes or contribute code to the organisation	10:44
	so i need a way forward. Any help please	10:44
hichamat	+osse Ah I see :)	10:44
d3r1ck	?	10:44
Seveas	d3r1ck: I'd suggest subscribing toi the !list and lurking a bit. That way you'll get a feel for how the development/review process works. Then find an issue you want to work on and work on it	10:45
gitinfo	d3r1ck: [!mailing_list] The mailing list can be reached via [email@hidden.address] You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://j.mp/gitlist	10:45
qsuscs	d3r1ck: git:kernel:git/git:HEAD:Documentation/SubmittingPatches	10:46
gitinfo	d3r1ck: Git web link: https://git.kernel.org/cgit/git/git.git/tree/Documentation/SubmittingPatches?h=HEAD	10:46
	← EminenceHC left	10:47
liamkeily	Can someone help me understand something. I have a commit from a few weeks ago, that i can still see in the history. The day after there was a merge from another user, and I'm suspecting my commit was not merged properly. If i look in the history for the file i changed, the commit isn't there.	10:48
	→ teran_ joined	10:48
jamesheston	Hey guys, I need a little help on developing a git workflow/strategy for sharing code between two sites.	10:48
	→ clmsy joined	10:49
jamesheston	I'm wondering if I should be using forks, or repos within repos or...	10:49
	Or something else.	10:49
	→ Nizumzen joined	10:49
	→ makhzi joined	10:49
jamesheston	Basically, I have one site, and 90% of the files should be used for another site.	10:49
liamkeily	jamesheston, you probably want to use submodules	10:50
jamesheston	with submodules, would I be able to update the master repo and have it populate those changes to both sites?	10:50
liamkeily	although a lot of languages have package managers which you might prefer	10:50
j416	liamkeily: submodules are a hassle, often	10:50
jamesheston	but still have select files that are tracked indepedently for the second site?	10:50
qsuscs	jamesheston: that’s halfway a question of !deploy	10:50
gitinfo	jamesheston: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html	10:50
	← aidalgol left	10:51
	← ciampix left	10:51
jamesheston	it's for two shopify site themes	10:51
	→ ciampix joined	10:51
jamesheston	so my server-side options are a bit limited	10:51
	→ Tennis joined	10:51
	→ drbean joined	10:51
j416	jamesheston: either those two sites are the same project, or they are two projects using the same library	10:51
	jamesheston: in the former case, put them in the same repo, in the latter case, put the shared lib in its own repo and version it properly, as with any other lib you use	10:52
	← Spriz left	10:52
	→ settermjd joined	10:52
	→ OnBrokenWings joined	10:52
	→ Spriz joined	10:52
j416	jamesheston: submodules can definitely work, but in my experience it's more hassle to learn and teach people how to use than it's worth.	10:52
	← echo-area left	10:53
liamkeily	I've had trouble with submodules in the past, they seem easy to mess up	10:53
	← OnBrokenWings left	10:54
jamesheston	it'd be nice to be able to build a list sort of like .gitignore	10:54
	but instead of ignoring it, the two child projects would have their own repos for those files	10:54
	does that make sense?	10:54
j416	jamesheston: no	10:54
	jamesheston: you still need to manage the dependency	10:54
liamkeily	you can do that with a package manager and list dependencies	10:54
	→ nnyk_ joined	10:54
d3r1ck	Seveas: just to ask you something, i want to develop on Git with some passion	10:55
j416	liamkeily: is there an ad-hoc package manager to do that?	10:55
d3r1ck	Seveas: i have some pretty nice ideas to contribute and i can only do that if i have maximum help from you guys	10:55
	Seveas: So please i really need help from you and the others.	10:55
qsuscs	d3r1ck: there are practically no git developers in here	10:55
j416	d3r1ck: the mailinglist is the place	10:56
liamkeily	j416, for me it'd depend what language I'm using.	10:56
qsuscs	sure, the most active guys occassionally submitted one or two patches, but apart from that, we’re not devs	10:56
j416	d3r1ck: post your idea and if people think it's good, maybe they will help out	10:56
	→ gccostabr joined	10:56
jamesheston	So it looks like I should do some research on submodules and package managers to see if either of those meets my needs adequetly?	10:56
j416	jamesheston: how often does the shared code change?	10:56
jamesheston	basically	10:57
d3r1ck	j416: ok, but just to ask, you mean the only way i can get to a developer on git is my mailing list?	10:57
jamesheston	the shared code is most of the HTML/CSS for the site	10:57
	← Saturn812 left	10:57
jamesheston	and the code that is different between the sites	10:57
	is a config folder which stores some JSON data	10:57
j416	d3r1ck: not the only way, but the mailing list is where you will get most dev eyes on your idea.	10:57
jamesheston	and random files like images/logos in an assets folder	10:57
	so, for bug fixes	10:58
liamkeily	jamesheston, submodules might work ok for you. Id use a package manager if it was library and not project specific	10:58
j416	jamesheston: so then it sounds like the other way round, you have one site, and just some different themes on that	10:58
jamesheston	it's a specific project/client, and the client has 2 sites	10:58
d3r1ck	j416: i got you very well. So can i first clone the repo while reading the documentations?	10:58
jamesheston	but both sites use like 90% the same code	10:58
j416	jamesheston: I'd probably put it all in the same repo to begin with	10:58
d3r1ck	Seveas: is the programming in Git to difficult?	10:58
jamesheston	so j416, would you recommend submodules as well?	10:59
j416	jamesheston: I would never recommend submodules. I dislike them.	10:59
jamesheston	what would you recommend then?	10:59
j416	I already wrote that to you above	10:59
jamesheston	> so then it sounds like the other way round, you have one site, and just some different themes on that	11:00
	that?	11:00
	→ jottr_ joined	11:00
	← antimatroid left	11:00
j416	you want me to scroll for you	11:00
	hang on	11:00
qsuscs	the best way is usually the language’s package manager (cabal, setuptools/pip, gem, …)	11:00
j416	jamesheston:	11:00
	12:51:40 j416 \| jamesheston: either those two sites are the same project, or they are two projects using the same library	11:00
	12:52:05 j416 \| jamesheston: in the former case, put them in the same repo, in the latter case, put the shared lib in its own repo and version it properly, as with any other lib you use	11:00
qsuscs	submodules are doable, but you should know them well	11:00
	→ gobbler joined	11:00
qsuscs	there are surprising effects if you handle them wrongly	11:00
	← Akagi20__ left	11:01
jamesheston	K, thanks for the pointers guys.	11:01
	Looks like I have some researchin' to do.	11:01
	Appreciate the advice.	11:01
j416	jamesheston: to clarify the latter option, that would be the way to go if you decide on using the package manager approach.	11:02
	jamesheston: but really, save yourself the hassle and put it in the same repo unless you have a good reason not to.	11:02
liamkeily	yeah ^	11:02
	← gobbler left	11:02
liamkeily	it sounds like your overcomplicating it a bit for html and css	11:02
	→ goldstar joined	11:02
goldstar	so I want to move my entire repo to a new server, I use the --mirror option but that doesnt copy my remote branches to the new repo, how can I also copy branches ?	11:02
jamesheston	well	11:02
	← Vgr left	11:02
jamesheston	it's also a good deal of logic, too	11:02
	← nmnm left	11:03
	← beautifulmind left	11:03
jamesheston	using Shopify's `programming/templating` language liquid	11:03
qsuscs	goldstar: clone --mirror the “old” repo, push --mirror it to the new location	11:03
jamesheston	*language, "liquid"	11:03
goldstar	qsuscs: thanks	11:03
jamesheston	So	11:03
	Would there be a way to have 1 master repo	11:04
	That tracked all of the shared code	11:04
	← Polyatomic left	11:04
liamkeily	jamesheston, you could maybe have some build scripts or something for each version of the theme	11:04
Seveas	d3r1ck: developing on git is no more difficult than developing on any other mature open source software product. But don't count on "maximum support": your ideas are yours and you need to drive them. If others agree that your ideas are nice, they might help you out, but that's not a guarantee.	11:04
jamesheston	and be able to specify a list of files/folders that it didn't track, but was tracked by "child" repos?	11:04
	← Assault left	11:04
	→ mojibake joined	11:04
	← mtakkman left	11:05
	← jottr_ left	11:05
d3r1ck	Seveas: thanks very much and thats what i wanted to hear	11:06
liamkeily	Can someone help me understand something. I have a commit from a few weeks ago, that i can still see in the history. The day after there was a merge from another user, and I'm suspecting my commit was not merged properly. If i look in the history for the file i changed, the commit isn't there.	11:06
d3r1ck	Seveas: but are you a developer for git??	11:06
jamesheston	like, in git, can you create child repos? that have their own unique files, but you can still pull updates from the master/parent repo?	11:06
	← ferr left	11:06
	→ SimonNa joined	11:06
liamkeily	jamesheston, that would be forking	11:06
	→ Dragooon joined	11:06
	← nagromlt left	11:06
	→ Assault joined	11:06
d3r1ck	Seveas: my point is i want to devote all my attention on Git	11:07
Seveas	d3r1ck: no. I've submitted a few patches, but that's it.	11:07
d3r1ck	Seveas: i have many things i can really contribute to it.	11:07
liamkeily	jamesheston, you could fork your master theme to create a child theme, and still pull commits from the master.	11:07
jamesheston	hm	11:07
	I think that might be the ticket for this project	11:07
Seveas	d3r1ck: as I said, subscribe to the list and lurk a bit. Then implement one of your ideas and send a patch series the way the devs expect them.	11:08
qsuscs	Seveas: two.	11:08
j416	jamesheston: git is not a dependency manager; I've been in the same situation as you and realised that the git hammer isn't for everything. 1) use the same repo; or 2) put it in a separate repo either a) use a package manager of some kind, or b) don't use a package manager and simply copy the code in from the other repo and commit it saying "Upgrade shared library to version X" - it's actually not a very bad	11:08
	idea either.	11:08
liamkeily	jamesheston, you could run into a bit of trouble with conflicts and stuff doing it that way.	11:08
Seveas	qsuscs: two accepted. A few more not accepted :-)	11:08
j416	jamesheston: but, if the shared lib changes a lot, use the same repo.	11:08
Seveas	and all tiny.	11:08
jamesheston	alright	11:08
	thanks again for the pointers guys	11:08
	→ ixjlyons joined	11:08
liamkeily	jamesheston, could just use a symbolic link ;)	11:09
qsuscs	Seveas: :Þ -- i need to answer on the thread to the patch i sent a few weeks ago, i just haven’t had much time …	11:09
jamesheston	I think I've got enough info to start investigating on my own	11:09
j416	liamkeily: that doesn't work, no.	11:09
	→ sCiphre joined	11:09
	→ beautifulmind joined	11:09
j416	liamkeily: dependency management zero :/	11:09
d3r1ck	Seveas: i have subscribed to the mailing list already	11:09
bviktor	Seveas, still there?	11:09
	← Dumblez0r left	11:10
Seveas	d3r1ck: excellent. Now patience is key. Just lurk along for a few weeks and get a feel for the development process	11:10
j416	liamkeily: I guess for some cases if the libs maintain compatibility with each other for very long periods of time, it could work.	11:10
Seveas	bviktor: no	11:10
bviktor	i've set up a public git server	11:10
j416	liamkeily: but it doesn't sound like this project is such a project. hm :)	11:10
	← ckruczek left	11:10
d3r1ck	Seveas: as you said, so shall i do.	11:11
liamkeily	j416, not sure if you can even commit symlinks. But i meant a symbolic link within one repo.	11:11
d3r1ck	Seveas: but you've played around with the source codes right?	11:11
	Seveas: before coming up with your patches	11:11
	← Assault left	11:12
Seveas	d3r1ck: sure, I play around with them quite frequently to understand git's inner workings and test other people's patch series	11:12
	bviktor: ok, give me something to clone :)	11:12
	→ e^0 joined	11:12
j416	liamkeily: within the same repo, hum. sure, that works.	11:13
	liamkeily: not sure of the benefit in his case.	11:13
	← hichamat left	11:13
j416	liamkeily: (yes, you can commit a symlink)	11:13
	← paulweb515 left	11:13
	→ jottr_ joined	11:13
	← xolubi left	11:13
	→ harish_ joined	11:14
	← stamina left	11:14
liamkeily	jamesheston, have you checked if Shopify has anything built in for extending themes?	11:14
jamesheston	it doesn't	11:15
	→ nmnm joined	11:15
	→ clarkpan joined	11:15
d3r1ck	ok, so you can help me on certain things right?	11:15
	like guide me?	11:15
	← qdk left	11:15
d3r1ck	Seveas: the question is for you.	11:15
Seveas	d3r1ck: I can, but won't promise anything	11:16
liamkeily	jamesheston, ah, most e-commerce stores I've worked with allow you to have a master theme and child theme where you only replace certain files.	11:16
jamesheston	Yeah Shopify is pretty limited when it comes to theme programming	11:16
d3r1ck	Seveas: sure.	11:18
	← flipperWhip left	11:18
	← goldstar left	11:18
d3r1ck	well Seveas i am cloning the repo now	11:18
	← intellix left	11:18
liamkeily	jamesheston, yeh.. I'm hoping to do something which i think might be impossible on it today lol	11:18
d3r1ck	it is 8% complete	11:18
jamesheston	whatcha trying to do?	11:18
d3r1ck	Seveas: i am just waiting for it to finish and then i will make sure i start working	11:19
jamesheston	I'm pretty knowledgeable on it.	11:19
	← zgzgzg left	11:19
	← reim left	11:19
d3r1ck	Seveas: do you know about GSoC? i have heard about it for sometime now	11:19
liamkeily	jamesheston, pm	11:19
	← clarkpan left	11:19
	← nyomaszto left	11:19
	← nmnm left	11:20
	← jokester left	11:20
	→ reim joined	11:21
	→ moreirapontocom joined	11:22
	→ Assault joined	11:22
	→ BuenGenio joined	11:22
	← herr_jth left	11:23
	← jnavila left	11:24
	→ nyomaszto joined	11:24
	→ effi joined	11:25
	← gv left	11:27
	→ leolrrj joined	11:27
	→ freestyl3r joined	11:27
	Vampire0_ → Vampire0	11:28
	→ lsiv568 joined	11:29
	→ ozanhazer joined	11:29
	← Assault left	11:29
	→ Assault joined	11:30
	← effi left	11:30
	→ gv joined	11:32
ska-fan	Is there a way to push one branch and one tag to a remote in one command without modifying .git/config?	11:32
qsuscs	ska-fan: try push $remote $branch $tag (add --dry-run if you are a WIMP)	11:33
	← BuenGenio left	11:34
ska-fan	qsuscs: I could have sworn I tried that and it didn't work before. This is of course the most obvious syntax.	11:35
	← nyomaszto left	11:35
	→ cbonobo joined	11:35
	→ StuartMI joined	11:36
d3r1ck	Seveas: so what other advice can you add to what you just said?	11:39
	← cbonobo left	11:40
	← e^0 left	11:41
	← drbean left	11:42
	→ e^0 joined	11:44
	→ edude03 joined	11:46
	← e^0 left	11:46
	← cvanball left	11:47
	→ nmnm joined	11:47
	→ EminenceHC joined	11:48
	→ otter768 joined	11:48
	→ mikecmpbll joined	11:48
	→ nyomaszto joined	11:48
	← nikio_ left	11:49
	→ vixterra joined	11:49
d3r1ck	Anyone with some .pdf materials on how i can start developing on git while i try google. I will like to just have links	11:49
	← leolrrj left	11:50
	→ jas4711 joined	11:50
	← nmnm left	11:51
	← Spriz left	11:51
	→ juvenal joined	11:52
	→ Spriz joined	11:52
	← otter768 left	11:53
	← EminenceHC left	11:53
qsuscs	d3r1ck: look around in git:kernel:git/git:HEAD:Documentation and Documentation/technical	11:53
gitinfo	d3r1ck: Git web link: https://git.kernel.org/cgit/git/git.git/tree/Documentation?h=HEAD	11:53
	→ e^0 joined	11:53
	← nyomaszto left	11:54
	← ethanol left	11:54
	← michael_mbp left	11:55
	→ nyomaszto joined	11:56
	→ Akagi201 joined	11:56
	→ ethanol joined	11:57
	← Nizumzen left	11:57
d3r1ck	qsuscs: thanks	11:58
	qsuscs: do you like to work with someone that is devoted?	11:58
qsuscs	d3r1ck: huh?	11:58
	→ michael_mbp joined	11:58
	← fstd left	11:59
	→ fstd joined	11:59
	← e^0 left	12:00
	← circ-user-SSaBd left	12:00
d3r1ck	qsuscs: i wish to really contriute to Git	12:00
	qsuscs: but first i have to get to know some people that i can work with	12:01
	→ jokester joined	12:01
d3r1ck	qsuscs: so what i am asking is that, do you like devoted coders or developers?	12:01
	← nilg left	12:01
	→ qdk joined	12:01
qsuscs	d3r1ck: i am not a developer or anything alike, so, i don’t know	12:02
d3r1ck	qsuscs: ohhh, ok	12:02
	← JoshSyn left	12:02
	→ mostlybadfly joined	12:03
	← nodedfree left	12:03
	→ mezod joined	12:03
	→ circ-user-SSaBd joined	12:03
	→ intellix joined	12:04
	→ Akagi201_ joined	12:04
Seveas	d3r1ck: hint: if this were a date, you'ld be the creepy guy who can't take a hint. Relax and don't try to push too hard. You're not the most important person around, and especially without having proven yourself, you should be humble and not demanding.	12:04
	I understand you're enthousiastic, but don't overdo it.	12:04
	→ nodedfree joined	12:05
	→ BlaXpirit joined	12:05
d3r1ck	Seveas: thanks for the advice.	12:05
	→ rnsanchez joined	12:05
	→ e^0 joined	12:05
	← Akagi201 left	12:06
	← nyomaszto left	12:08
	→ nikio_ joined	12:08
_ikke_	d3r1ck: one advise, start with simple patches, things like small documentation updares or small fixes. This will help you to learn the development process	12:08
	← ScottE left	12:09
	← cyphase left	12:09
	→ BlaXpirit-UA joined	12:09
	→ prillian5 joined	12:10
	← wicope left	12:10
prillian5	is there a hook for "change branch" ?	12:10
	→ zgzgzg joined	12:11
Seveas	prillian5: post-checkout	12:11
	→ DerisiveLogic joined	12:11
	← BlaXpirit left	12:12
	← jottr_ left	12:13
	→ ScottE joined	12:13
	→ sburgess joined	12:14
	← gamename left	12:14
	→ sin3t joined	12:14
d3r1ck	_ikke_: thanks for the advice and i will do exactly that	12:15
	_ikke_: my download is 27%	12:15
	← DerisiveLogic left	12:16
	→ jolda joined	12:16
	← edude03 left	12:18
	→ Dorf joined	12:19
	← Ceber left	12:20
	← e^0 left	12:20
prillian5	Seveas: thank you. Is tere also a hook for removing a branch post-rm or something like this?	12:20
	→ Assault_ joined	12:20
	← tristanseifert left	12:21
tobiasvl	post-rm?	12:21
	→ Milk-weed joined	12:21
	← Assault left	12:21
tobiasvl	but yes, sure, you can delete a branch post-merge for example	12:22
	→ Texan joined	12:22
	← wethu left	12:27
	→ amycham joined	12:28
	→ Ryanar joined	12:28
osse	can you delete it post-haste?	12:29
	→ m1dnight_ joined	12:29
	← ixjlyons left	12:31
	← ciampix left	12:31
	← David left	12:31
	← sepia left	12:32
	→ wicope joined	12:32
	→ BuenGenio joined	12:33
	→ cvanball joined	12:34
	→ chitopunk joined	12:34
	← jost left	12:35
	→ phillip joined	12:35
	← jolda left	12:36
	← Assault_ left	12:37
phillip	hi, how can I squash commits together which are not directly after each other?	12:37
_ikke_	phillip: interactive rebase, you can reorder the lines in the commit and the squash / fixup them	12:38
tobiasvl	phillip: !interactive_rebase	12:38
gitinfo	phillip: Interactive rebase sounds similar to rebase but has completely different abilities. It can do this to commits: change the order, squash some of them together, remove some, add random existing commits from other branches, split them, and more... it's very powerful. Documentation is in the section "Interactive Rebase" in 'man git-rebase'.	12:38
_ikke_	tobiasvl: didn't know that one	12:38
phillip	_ikke_: ahh I was not aware that I can also reorder them thanks!	12:38
	← m1dnight_ left	12:38
	→ jottr joined	12:39
	→ phantombeta joined	12:39
	→ mtakkman joined	12:40
	→ Assault joined	12:40
	→ evertheylen2 joined	12:41
	→ CEnnis91 joined	12:41
	→ m1dnight_ joined	12:41
	gitinfo set mode: +v	12:42
evertheylen2	Say I have branch A and branch master, how can I merge A into master, and picking the version of A whenever there's a merge conflict?	12:42
	→ dstarh joined	12:42
grawity	-X theirs	12:43
	← bluesm left	12:43
_ikke_	git merge -Xtheirs A	12:43
	→ pm90_ joined	12:44
	← pm90_ left	12:45
evertheylen2	thanks!	12:45
	→ drbean joined	12:45
	→ pm90_ joined	12:45
	← Assault left	12:47
	← Milk-weed left	12:48
	← cagedwisdom left	12:48
	→ e^0 joined	12:49
	← Asiajey left	12:50
	→ jerematic joined	12:50
	← Spriz left	12:52
	← mtakkman left	12:52
	→ tristanp joined	12:52
	→ Spriz joined	12:52
	→ livingstn joined	12:52
	→ cavallari joined	12:53
	→ dougsland joined	12:53
	→ gamename joined	12:54
	← gamename left	12:54
	→ xolubi joined	12:54
	→ gamename joined	12:55
	→ EminenceHC joined	12:55
butyoudonot	Is it right that every commit have only one corresponding tree?	12:56
	← xolubi left	12:56
_ikke_	Multiple commits can redfer to the same tree	12:57
	← gamename left	12:58
	→ mmakunas joined	12:58
	→ sgambino joined	12:58
	→ xolubi joined	12:58
	→ gamename joined	12:58
	→ modocache joined	12:58
	→ frender joined	12:58
	cpt_yossarian → woodruffw	12:58
	→ e^0_ joined	12:59
	→ jswhitworth joined	12:59
	← EminenceHC left	12:59
	← woodruffw left	12:59
butyoudonot	But can one commit have 2 corresponding trees?	13:00
	→ woodruffw joined	13:00
_ikke_	A tree is a recursive structure	13:00
	So there is one root tree, which can refer to other trees	13:00
	← e^0 left	13:01
	→ xolubi_ joined	13:01
_ikke_	So, yes, a commit can refer to only one tree	13:01
	← subhojit777 left	13:02
	→ sgen joined	13:03
	← modocache left	13:03
	← morois left	13:03
	← xolubi left	13:04
	← DTekk left	13:04
	← Dorf left	13:04
d3r1ck	Can you run git directly from the build?	13:05
	→ macabre joined	13:06
frender	if i want to do a complete sync of a fork, i have to merge all branches individually, right?	13:06
	→ ErKa joined	13:07
	← wicope left	13:07
	→ dvl_ joined	13:07
d3r1ck	what i mean is after building git, can you run the build not necessarily installing it?	13:08
	→ BigWillie joined	13:08
	← amycham left	13:09
	← Brain left	13:10
	→ jazzzu joined	13:10
	→ paulweb515 joined	13:11
qsuscs	d3r1ck: mostly yes, i’m not aware of any issues (you’ll notice)	13:11
	→ Brain joined	13:11
	← k_sze[work] left	13:11
qsuscs	d3r1ck: what i often do is mkdir foo; make prefix=foo; make prefix=foo install	13:11
	← dsdeiz left	13:12
d3r1ck	ohhh, nice and can you explain abit?	13:13
	← jottr left	13:14
	→ knownasilya joined	13:14
	← MattMaker left	13:15
	→ th3fallen joined	13:15
	← paulweb515 left	13:16
	← cvanball left	13:16
	→ beckyconning_ joined	13:16
	→ espindol_ joined	13:16
d3r1ck	qsuscs: just some little explanation please	13:16
	→ fusionx86 joined	13:16
	→ earational joined	13:16
qsuscs	d3r1ck: i build and install it to a prefix directly inside the source	13:16
	if you want to develop, you should know such simple things …	13:16
	→ leolrrj joined	13:17
d3r1ck	qsuscs: sure, i was just asking if it is thesame for git	13:18
earational	hey	13:19
	→ daedeloth joined	13:20
qsuscs	earational: !hi	13:20
gitinfo	earational: [!welcome] Welcome to #git, a place full of helpful gits. If you have a question, feel free to just go ahead and ask—somebody should answer shortly. For more info on this channel, see http://jk.gs/git/ Take backups (type !backup to learn how) before taking advice.	13:20
	→ ajf- joined	13:21
	← woodruffw left	13:22
	→ krasimir joined	13:22
krasimir	I have cloned a git repo and now want to add is a submodule , but all info I find is for adding the submodule before the folder already exists.	13:23
	← drbean left	13:23
krasimir	how do add a submodule after it has been cloned	13:23
	→ uri_ joined	13:23
	→ Dorf joined	13:24
earational	thank you gitinfo	13:24
	→ cbonobo joined	13:25
gitinfo	earational: you're welcome, but please note that I'm a bot. I'm not programmed to care.	13:25
d3r1ck	earational: talking to a bot :)	13:25
	gitinfo: nice to see you talk	13:25
earational	i know gitinfo im not programmed to care either :)	13:25
	← veganista left	13:25
	← d3r1ck left	13:26
	→ King_Hual joined	13:26
	← King_Hual left	13:26
	→ King_Hual joined	13:26
	← elote left	13:28
	→ lucap1 joined	13:28
	→ paulweb515 joined	13:28
	→ d3r1ck joined	13:29
	← cbonobo left	13:29
	← lucap left	13:30
	→ AaronMT joined	13:30
	→ kukks joined	13:30
	← hahuang65 left	13:31
	← nadim left	13:32
	← jamesheston left	13:32
	→ hahuang65 joined	13:32
	→ jottr joined	13:32
	→ jwhisnant joined	13:32
	→ jerius joined	13:34
	← hserra0 left	13:35
	← twoface88 left	13:35
	→ zumba_addict joined	13:36
	← e^0_ left	13:37
	← KevinSjoberg left	13:37
	← zumba_addict left	13:37
	← noname left	13:38
	→ zumba_addict joined	13:38
	→ t4nkd joined	13:38
d3r1ck	I have an idea i want to work on in Git	13:39
	← ErKa left	13:39
d3r1ck	When a user is cloning a repo and stops it at a point when it is not complete, it seems Git rolls back to the initial state	13:39
	which is, it deletes the folder and all what was cloned upto that point	13:40
_ikke_	That's not an easy thing to fix	13:40
Seveas	resumable clones are often requested, but it's a very tricky peoblem to solve	13:40
	if you manage to fix that, I'll buy you a beer :)	13:40
_ikke_	They're kind of working on it	13:40
d3r1ck	But i want Git to be able to continue cloning at a point where it stopped	13:40
Seveas	_ikke_: oh? got a (gmane) link?	13:40
d3r1ck	Seveas: you seem to be funny	13:41
Seveas	d3r1ck: looks can be deceiving.	13:41
_ikke_	Seveas: The topic about the new protocol	13:41
d3r1ck	Seveas: are you a German?	13:41
Seveas	_ikke_: ah, I haven't kept up too much with that topic	13:41
	looks like O should	13:41
d3r1ck	_ikke_: are they working on it already?	13:41
_ikke_	Yeah, it's not directly related to it, but it's laying the groundworrk for it to be possible	13:42
d3r1ck	This is what wget usually do, when you start downloading and you stop half way,	13:42
	← leolrrj left	13:42
	→ nettoweb joined	13:42
d3r1ck	using wget -c will continue the download from where it stopped.	13:42
	→ leolrrj joined	13:42
_ikke_	d3r1ck: Problem is that the thing you are downloading will be gone when you cancel the clone	13:42
	← linuxmint left	13:43
_ikke_	There is no file stored that can be resumed	13:43
d3r1ck	_ikke_: exactly that what we both are saying	13:43
	_ikke_: we need that problem to be fixed	13:43
osse	Since Git is a DVCS and everything, how about using torrents :D	13:43
bremner	for a 3rd try?	13:43
	→ jnavila joined	13:43
Stummi	is it because, everytime I clone a repository I see the "remote: Counting objects" and "remote: Compressing objects" stuff? Isn't a "git-server" capable of caching/persisting the data clients request on clone?	13:43
_ikke_	d3r1ck: Everybody agrees, but it's not a simple patch, it requires significant changes	13:44
d3r1ck	osse: to do what with torrent? :)	13:44
_ikke_	On that protocol mailing topic, they are talking about an extension to refer people to a preseed bundle that can be resumed	13:44
osse	d3r1ck: file transfer in general	13:45
d3r1ck	osse: :)	13:45
_ikke_	Stummi: theoretical it's possible, but there is nothing in the protocol to make it work	13:45
	← RaceCondition left	13:45
	→ ehmatthes joined	13:46
d3r1ck	_ikke_: hahahaa.... you said its not a simple patc	13:46
	→ woodruffw joined	13:46
	→ talin_ joined	13:46
d3r1ck	_ikke_: meaning it is fit to be a GSoC project?	13:46
Stummi	_ikke_, okay, got it. and the new protocoll should be able to do this? Because thats what eats up the most time everytime I clone something from our internal company git server :D	13:46
talin_	hello. from outside a gir-dir, can i do git status -specify-path-of-git-repo?	13:46
iveqy	d3r1ck: that's probably a too advanced topic for GSoC	13:46
_ikke_	d3r1ck: absolutely not	13:46
osse	talin_: git -C path status	13:46
talin_	osse: thank you :)	13:46
d3r1ck	:)	13:46
	→ fserb joined	13:47
	→ hserra0 joined	13:47
	→ NosBit joined	13:47
	→ Zamyatin joined	13:47
d3r1ck	Well, i brought this up because i have been a victim of several cases	13:47
Seveas		13:47
talin_	osse: is this very new git versions?	13:47
	← NosBit left	13:47
d3r1ck	when i clone source codes to about 90%, something can just happen and i stop the cloning process	13:48
qsuscs	Seveas: you seem to be out of pixel ink. i have a spare pack here, do you want it?	13:48
iveqy	d3r1ck: it is an actual problem. But if it was a simple one it would have been corrected	13:48
d3r1ck	and i loose everything meaning i have to start back	13:48
_ikke_	d3r1ck: Best solutiion right now is to create an initial bundle that you can download resumably	13:48
talin_	osse: server has 1.7.6.5	13:48
osse	talin_: yes	13:48
	← hserra0 left	13:48
	← lb1a left	13:48
osse	talin_: then you need git --git-dir=path/to/.git --work-tree=path/to status	13:48
	→ drbean joined	13:48
	→ hserra0 joined	13:49
d3r1ck	_ikke_: how does the cloning process work? Does it follow some cronology?	13:49
	→ otter768 joined	13:49
d3r1ck	like starting from creating a folder then files in the folder and so on?	13:49
qsuscs	no	13:49
	it downloads a packfile of the history	13:50
	← beautifulmind left	13:50
	→ perlsyntax joined	13:50
qsuscs	_then_ it checks out HEAD	13:50
	you can also leave out the latter part, that would be a bare clone	13:50
d3r1ck	because we can do it in such a way that we can commit when a file is completely downloaded	13:50
_ikke_	The packfile is a compressed file containing all reachable history	13:50
iveqy	d3r1ck: !cs	13:50
gitinfo	d3r1ck: "Git for Computer Scientists" is a quick introduction to git internals for people who are not scared by phrases like Directed Acyclic Graph. http://eagain.net/articles/git-for-computer-scientists/ See also !concepts !bottomup	13:50
_ikke_	d3r1ck: git doesn't operate on seperate files when cloning	13:50
qsuscs	you can indeed do a shallow clone and deepen its history subsequently	13:50
perlsyntax	I got mac and i can't get git i am useing 10.9.5 and is there any other way?	13:51
iveqy	d3r1ck: you should read it, I will help you if you're trying to develop on git	13:51
_ikke_	perlsyntax: What do you mean, can't get git	13:51
	← ReekenX left	13:51
iveqy	perlsyntax: why can't you get git?	13:51
d3r1ck	iveqy: thanks so much	13:51
	← Spriz left	13:51
bremner	iveqy: too complicated	13:51
perlsyntax	it will not let me install it becuase it require 10.10	13:51
iveqy	bremner: too complicated for d3r1ck ?	13:51
d3r1ck	iveqy: i thought git clones that way like it will be very simple to solve that problem of continuation of cloning	13:52
bremner	iveqy: was just a little pun on "can't get git"	13:52
perlsyntax	iveqy, Understand now?	13:52
Seveas	d3r1ck: except that the packfile gets generated ont he fly and is not cached	13:52
iveqy	bremner: I see, nice one, sorry I didn't got it =)	13:52
	→ Spriz joined	13:52
Seveas	so the server will have to regenerate it even if you want only the last 1%	13:52
_ikke_	They're stored in memory, and get lost when the send-pack process stops	13:53
	→ edude03 joined	13:53
iveqy	perlsyntax: then use an older version	13:53
Seveas	which in theory could be done, but is wasteful. That's why they're fixing the protocol instead	13:53
perlsyntax	ivegy,Where can i get that?	13:53
	i never thought of that.	13:53
iveqy	perlsyntax: from the same place you're trying to get git now I guess.	13:53
	← otter768 left	13:53
perlsyntax	you mean xcode.	13:54
iveqy	perlsyntax: I've no idea what you're trying to install.	13:54
	← chitopunk left	13:54
iveqy	perlsyntax: xcode? I've never mentioned xcode	13:54
perlsyntax	i want to get my github to work with git on android studio.	13:54
	← krasimir left	13:54
perlsyntax	now xcode require 10.10	13:54
Seveas	then install 10.10 or don't use xcode. Git itself works fine on 10.9.5	13:55
	→ phpcoder joined	13:55
phpcoder	hello everybody	13:55
	how can i change the text of a commit that has not been pushed yet ?	13:55
osse	is it the newest?	13:55
phpcoder	i know --amend but it is 5 commits back	13:55
	osse, no	13:56
Seveas	rebase --interactive	13:56
osse	git rebase -i HEAD~5	13:56
	mark it as 'reword'	13:56
Seveas	~6	13:56
phpcoder	after rebasing what should i do ?	13:56
	← perlsyntax left	13:56
Seveas	have a coffee	13:56
osse	follow the instructions in the editor	13:56
phpcoder	ahahah	13:56
	← woodruffw left	13:57
	← liamkeily left	13:57
phpcoder	yes i know i can change the text....but should i point to HEAD after changes	13:57
osse	after you have changed 'pick' to 'reword', saved and closed, then changed the message, saved and closed, you are done.	13:58
	nothing to do after	13:58
phpcoder	osse, magic :D that because we use -i ?	13:58
osse	yre	13:58
phpcoder	good!!	13:58
	thank you so much guys	13:58
	→ jolda joined	13:59
	→ liamkeily joined	13:59
	→ kadoban joined	14:01
talin_	is there a simple way to get a "yes" or "no" to the question: do i need to fetch the latest sources?	14:01
	← rchavik left	14:01
	→ EminenceHC joined	14:02
talin_	by somehow comparing what i have and what is on remote?	14:02
	← jswhitworth left	14:02
	← BigWillie left	14:02
Seveas	talin_: you could compare for-each-ref output with ls-remote output	14:03
	and you can wrap this in a script to make it easier :)	14:03
osse	talin_: the easiest thing to do is to run git fetch	14:04
	it's harmless	14:04
talin_	hmm. i have a widget on my screen and i want it to say "you are up to date" or "you need to fetch" based on this check	14:05
pasky	and why don't you want to fetch unconditionally?	14:05
	← c0mrad3 left	14:05
kadoban	Just have it always say "you need to fetch" and call it a day.	14:06
phpcoder	OMG this rebase with -i is awesome thank you again :D	14:06
	← EminenceHC left	14:06
	→ chrisgeorge joined	14:07
tobiasvl	talin_: set up a cron job to fetch every 5 seconds :P	14:08
qsuscs	there is fetch --dry-run	14:08
tobiasvl	https://github.com/magicmonty/bash-git-prompt does some magic (perhaps just fetching) to show you if you're up to date in the shell prompt	14:08
	→ denete joined	14:09
	← denete left	14:10
	← Raging_Hog left	14:11
	→ denete joined	14:11
d3r1ck	my download is 94%	14:13
	i am almost upto the task	14:13
	← evertheylen2 left	14:13
d3r1ck	just imagine now that if i make another mistake and stop the cloning process, everything gets lost	14:13
	→ darkbasic joined	14:14
d3r1ck	then i will have to spend another few hours cloning again :)	14:14
	→ modocache joined	14:14
	← Haris left	14:14
	→ nadim joined	14:14
qsuscs	d3r1ck: git.git?	14:15
	← darkbasic_ left	14:15
	← lucap1 left	14:15
	→ MattMaker joined	14:16
	← z8z left	14:16
d3r1ck	yes the repo	14:16
	→ ErKa joined	14:16
	→ lucap joined	14:17
_ikke_	d3r1ck: That the problem exists is clear	14:18
qsuscs	i’ll create a bundle	14:18
	→ dreiss joined	14:18
	← modocache left	14:18
	← reim left	14:19
	← ItSAN____ left	14:19
	→ thiago_ joined	14:20
	→ reim joined	14:21
qsuscs	d3r1ck: download this (should support HTTP range requests) and read man git bundle https://qsuscs.de/git.gitbundle	14:21
gitinfo	d3r1ck: the git-bundle manpage is available at http://jk.gs/git-bundle.html	14:21
	→ ItSANgo_ joined	14:21
	← MattMaker left	14:21
	← nettoweb left	14:22
	← s8321414 left	14:22
	→ bollullera joined	14:23
	← Junior left	14:23
	← zso left	14:23
	← Spriz left	14:23
	→ skorgon joined	14:24
	← drbean left	14:24
	→ Spriz joined	14:24
	→ nmnm joined	14:25
	→ nettoweb joined	14:26
d3r1ck	i got an error	14:27
	Cloning into 'Git'...	14:27
	remote: Counting objects: 185459, done.	14:27
	error: RPC failed; result=56, HTTP code = 2002 MiB 2 KiB/s	14:27
	fatal: The remote end hung up unexpectedly	14:27
	fatal: early EOF	14:27
	fatal: index-pack failed	14:27
	what is that?	14:27
	i lost everything	14:28
	← rath left	14:28
	← r00tWearsRedHats left	14:28
	← nadim left	14:29
	→ AhabsBeard joined	14:29
qsuscs	a) !pastebin	14:30
gitinfo	[!paste] Please paste snippets longer than one line at a pastebin site, such as https://gist.github.com/ rather than in-channel.	14:30
qsuscs	b) !www	14:30
gitinfo	What did you do (which commands?), what happened as a result (any messages?), and what was the result you expected instead?	14:30
	← kukks left	14:30
	→ twoface88 joined	14:31
	→ stantonk joined	14:31
	→ nadim_ joined	14:31
d3r1ck	qsuscs: i lost every thing	14:31
moritz	not your internet connection, it seems	14:32
qsuscs	/dev/crystalbowl: -ENOTTY	14:32
	→ GoddeR joined	14:32
qsuscs	it looks like _you_ have to explain a bit more.	14:32
	*crystalball	14:32
	← earational left	14:34
d3r1ck	qsuscs: thats the link http://pastebin.com/CxGDgqA7	14:34
	→ chitopunk joined	14:34
	→ Saturn812 joined	14:34
	→ highcup joined	14:35
	→ Asiajey joined	14:35
	→ Raging_Hog joined	14:35
qsuscs	d3r1ck: yes, i already saw that. now, again, what did you actually do?	14:35
d3r1ck	nothing	14:35
	→ Es0teric joined	14:35
d3r1ck	i did nothing, it was just cloning until it showed me that error	14:36
	now it is showing another error	14:36
	can i paste it here?	14:36
	it is actually quite short	14:36
qsuscs	is it > 1 line? yes? pastebin	14:36
	and then, the damn COMMAND	14:36
	if you did nothing and your shell just spits out that, i’d be worried.	14:37
	← stantonk left	14:37
d3r1ck	qsuscs: i did nothing seriously	14:37
	← settermjd left	14:38
	→ jamesheston joined	14:38
	→ zso joined	14:38
	← lsiv568 left	14:38
d3r1ck	qsuscs: http://pastebin.com/FFmWmY4A	14:39
	← dreiss left	14:39
	→ lsiv568 joined	14:39
	→ fusionx8_ joined	14:39
	→ IrishPrime joined	14:39
qsuscs	this does not show the command you issued.	14:39
	→ fxn joined	14:39
moritz	Cloning into 'Git'... implies that there was an upper-case 'Git' in the clone URL somehow	14:39
	which might be bad	14:39
	← lsiv568 left	14:40
	→ c0mrad3 joined	14:40
	→ lsiv568_ joined	14:40
	→ odin22 joined	14:40
	→ afs joined	14:40
_ikke_	You seem to have the incorrect clone url	14:40
	git:github:git:git	14:40
gitinfo	Git web link: https://github.com/git/commits/git	14:40
d3r1ck	this is my command	14:40
_ikke_	that's not the clone link	14:40
	← CountTwo left	14:40
	→ CountTwo joined	14:41
	← fusionx86 left	14:41
d3r1ck	git clone https://github.com/git/git Git	14:41
_ikke_	https://github.com/git/git.git	14:41
d3r1ck	Git is just the folder that is created and then the repo is put inside	14:41
	← tvw left	14:41
d3r1ck	is that a problem?	14:41
	← lsiv568_ left	14:41
_ikke_	notice the .git that is missing from your url	14:42
d3r1ck	ok let me add it.	14:42
	← nmnm left	14:42
	→ lsiv568 joined	14:42
CountTwo	Is this statement correct?: The choice of merge-base doesn't really matter in terms of conflicts you'll get. It just helps you when you have a conflict - the diff for each target will be relative to the merge base.	14:42
	← AhabsBeard left	14:42
fxn	the leading colon in "git push origin :branch" is Git notation that has a broader uniform meaning?	14:42
_ikke_	that's incorrect	14:42
qsuscs	_ikke_: github doesn’t care	14:42
_ikke_	ok	14:43
	Or is it git that's fixing it automatically	14:43
	fxn: if you have an old merge base, it means git sees more incompatible changes	14:43
	so more conflicts	14:43
	→ AhabsBeard joined	14:44
moritz	fxn: yes, it's 'git push remote localname:remotename'	14:44
_ikke_	CountTwo: *	14:44
moritz	fxn: so you can push your local 'foo' branch as the remote 'master' branch, for example	14:44
fxn	moritz: ahhhh	14:44
moritz	fxn: and leaving the local branch empty means 'pushing the empty thing there', thus deleting it	14:44
fxn	moritz: awesome	14:44
_ikke_	fxn: the official name is refspec	14:44
	← sinkensabe left	14:45
	← fusionx8_ left	14:45
d3r1ck	_ikke_: i have another error after typing this: git clone https://github.com/git/git.git Git	14:46
	→ pcypher joined	14:46
	→ sinkensabe joined	14:46
	← sburgess left	14:46
_ikke_	does it ask for a username?	14:46
	→ fusionx86 joined	14:46
	← tenaglia left	14:46
	← contentsafe_ left	14:46
	← lsiv568 left	14:46
_ikke_	hmm, that's not necessary for clone	14:46
	→ m0ltar joined	14:46
	→ cbonobo joined	14:47
d3r1ck	_ikke_: no it doesn't	14:47
	← Raging_Hog left	14:47
d3r1ck	is the https to be replaced by git?	14:47
_ikke_	d3r1ck: what version of git do you have/	14:48
	→ lsiv568 joined	14:48
	→ sburgess joined	14:48
d3r1ck	git version 1.7.10.4	14:48
	← lucap left	14:48
	→ endiruna joined	14:48
	← fxn left	14:49
	→ r00tWearsRedHats joined	14:49
	← boushi_ left	14:50
d3r1ck	_ikke_: did you see the version	14:50
	git version 1.7.10.4	14:50
	← r00tWearsRedHats left	14:50
	← pm90_ left	14:50
	← sinkensabe left	14:51
_ikke_	yes	14:51
	← Adib left	14:51
	← afs left	14:51
	→ pheaver joined	14:52
	← AhabsBeard left	14:52
	← m1dnight_ left	14:52
d3r1ck	_ikke_: is there any problem with it?	14:52
_ikke_	I don't think so	14:53
	← nnyk_ left	14:53
d3r1ck	well it might be my internet connection	14:53
	i am sure	14:53
_ikke_	In any case, https://github.com/git/git/info/refs is a 404	14:53
	← Es0teric left	14:53
d3r1ck	_ikke_: i will try cloning it in the night	14:53
	_ikke_: but this is how i will get to know the internal of git	14:54
	i will follow the dev process for a while	14:54
	→ AhabsBeard joined	14:54
d3r1ck	and during that period i can be doing some testing and documentation	14:54
	after that i will start writing patches and fixing bugs	14:54
	→ Bootinbull joined	14:54
d3r1ck	_ikke_: is that a good approach?	14:54
	→ gebjgd joined	14:54
	← gebjgd left	14:54
	→ gebjgd joined	14:54
	→ mutbuerger joined	14:55
	→ sarink joined	14:55
_ikke_	sure	14:55
	← hserra0 left	14:55
	← t4nkd left	14:55
	← joki left	14:56
qsuscs	(nah, ignore the bundle i posted over half an hour ago)	14:56
	← intellix left	14:56
	→ jskt joined	14:57
	← roelmonnens left	14:58
	→ Raging_Hog joined	14:58
	← AhabsBeard left	14:59
	← skorgon left	14:59
	← fserb left	14:59
	← zoso left	15:00
	→ joki joined	15:01
	← macabre left	15:01
	← acolson left	15:01
	→ moreirap_ joined	15:01
	→ macabre joined	15:02
	→ incredible joined	15:02
	→ tyreld joined	15:02
	← zumba_addict left	15:03
	→ Zupoman joined	15:03
	← jskt left	15:03
	→ stantonk joined	15:03
	← moreirapontocom left	15:04
	→ effi joined	15:04
	→ Technocrat7 joined	15:04
	→ Milkweed joined	15:06
	→ Assault joined	15:08
	← effi left	15:08
	→ EminenceHC joined	15:08
	→ AhabsBeard joined	15:09
	→ Es0teric joined	15:09
	← CountTwo left	15:11
	→ boombatower joined	15:11
	← thiago_ left	15:11
	← tumulte left	15:11
	← Gizburdt left	15:11
ojacobson	one of those "build git 1.7.0 from source" days	15:12
	← Gabri left	15:13
	← skylite left	15:13
	← gccostabr left	15:14
	→ jskt joined	15:14
	→ gargola joined	15:15
	← jerematic left	15:15
	← sin3t left	15:16
	← Alienpruts left	15:16
	← EminenceHC left	15:16
	← Sceorem left	15:17
	→ EminenceHC joined	15:17
	→ nnyk_ joined	15:18
	→ Milk_weed joined	15:18
	→ editshare-ericf joined	15:18
	← pcypher left	15:18
	→ bigsky joined	15:18
	← jskt left	15:18
bigsky	hi all	15:18
butyoudonot	https://gist.github.com/dmalikov/9c7413c765ab80a00811 any ideas?	15:20
bigsky	i have only one branch, and only one person work on that branch, why git rebase -i HEAD~10 could lead to conflict sometimes	15:21
	→ qpdb joined	15:21
	← jazzzu left	15:21
	← NBhosting left	15:21
	→ tummy joined	15:21
bigsky	i just want to abandon some commits, and the formmer 10-20 commit could be merged into 1	15:22
	why conflict happends	15:22
	← Milkweed left	15:22
	← Spriz left	15:23
	→ MLM joined	15:23
Seveas	ojacobson: why would you do that to yourself?	15:23
	→ Spriz joined	15:24
ojacobson	Seveas: figuring out why -- and how -- my day job's handling of pushes _from_ shallow repos changed	15:24
	(we finally got rid of the thing serving 1.7.0 to the internet!)	15:24
	← qpdb_ left	15:24
ojacobson	(and now circleci is sad at us.)	15:24
	← nnyk_ left	15:24
	→ nnyk_ joined	15:25
	→ AcidNerd joined	15:25
	← jds left	15:25
Seveas	ojacobson: 2dacf26d0985521c0f30e535963a45257b63ea21 maybe?	15:26
	→ cromero joined	15:26
	← Technocrat7 left	15:26
	→ EvilPenguin joined	15:26
Seveas	or the 1684c1b219e02c91655ad929f752f4f864c72faf / fbd4a70 pair (a performance regression I also had to deal with)	15:26
ojacobson	Probably not, we only got as far as 1.9.1 (Ubuntu Trusty Tahr)	15:26
	→ alex1a joined	15:26
ojacobson	There's a change in 1.9.0 that looks likely.	15:27
	→ zumba_addict joined	15:27
	→ pm90_ joined	15:27
	→ Spacew00t joined	15:27
Seveas	that makes fbd4a70 a candidate too (1.8.4.2)	15:27
ojacobson	I can tell it's the future, because Nguyễn's name came out right	15:27
	→ Gamecubic joined	15:28
Seveas	:)	15:28
	← Errorical left	15:28
	→ barduck joined	15:28
	← pierre-emmanuel left	15:28
	← doev left	15:29
ojacobson	That's a possible, for sure.	15:30
	Really my answer is going to be "stop doing that, then!" but I'd like to give better info than mere best practice :)	15:30
	→ sin3t joined	15:30
	← Peuc2 left	15:30
Seveas	"stop doing that, it's stupid"	15:31
	"it's stupid" is adequate info :)	15:31
d3r1ck	Seveas: :(	15:31
	← jnavila left	15:31
	← cromero left	15:32
	→ MattMaker joined	15:32
	→ leeN joined	15:33
ojacobson	"Stop doing that, it breaks pushes, like, _all the time_"	15:33
	← Vinnie_win left	15:33
ojacobson	Anyways I really like the folks at Circle, they're great	15:33
	it's just this one wacky decision	15:33
	no SCM caching, so they do shallow clones	15:33
	→ Vinnie_win joined	15:33
ojacobson	they also support git-based publishing _and_ let users inject their own commands, so there's lots of room for users to be surprised by shallowness	15:33
	← FenikkusuOsiris left	15:34
	→ Fenikkusu joined	15:35
	← encod3 left	15:35
Fenikkusu	I just created a new branch to do some work on. After doing my work, which didn't take as long as I had thought it would, I want to apply the changes back to the main branch, but a merge at this point seems overkill. Is there an easy way to just 'apply these changes to the parent branch that hasn't changed'	15:35
	← Milk_weed left	15:35
	← edude03 left	15:35
	← Nikoli left	15:35
	→ zoraj_ joined	15:35
PerlJam	"merge seems overkill" sounds insane to me.	15:36
	→ modocache joined	15:36
PerlJam	Fenikkusu: you can always rebase the changes.	15:36
Seveas	Fenikkusu: rebase the branch on top of master and do a fast-forward merge (which isn't really a merge)	15:36
	← shinnya left	15:37
	→ woodruffw joined	15:37
	← MattMaker left	15:37
	← zoraj__ left	15:37
	→ edude03 joined	15:39
	← Assault left	15:39
	← zoraj_ left	15:40
	→ Technocrat7 joined	15:40
ojacobson	on the upside, git 1.7.0 actually does build, once you get all the pieces installed	15:41
	have to go all the way back to autoconf, because there's no source dist	15:41
	→ Nikoli joined	15:41
	← claz left	15:41
Fenikkusu	PerlJam, Seveas, wouldn't you do such, wouldn't the 'branch' essentially still exist in the repo? At this point this repo is completely irrelevant and I only created it on the off chance I would need to work on something else.	15:43
	this branch*	15:43
Seveas	Fenikkusu: branches don't exist. A branch is nothing more than a label for a commit.	15:43
	← hebz0rl left	15:44
_ikke_	There are two concepts that are both called branches	15:44
	← jseplae left	15:44
Seveas	so once merged, literally all the overhead of a branch is the files .git/refs/heads/branchname and .git/log/refs/heads/branchname	15:44
	and those will be deleted if you delete the branch :)	15:45
_ikke_	One is diverging history, and the other is the references to a commit	15:45
PerlJam	and "overhead" makes it sound like much more than it is	15:45
	:)	15:45
	→ rubyonrailed joined	15:45
	← liamkeily left	15:45
	→ dvlwrk joined	15:45
	← rkazak left	15:45
Fenikkusu	I say overhead because historically I would have my one or two commits, in addition to the merge commit. To be, that is overhead/overkill for something that was only created for the purpose of ensuring the changes are seperate from the main branch in the off chance I have to quickly switch back and fix something else.	15:46
	← juvenal left	15:46
	← gauke left	15:47
	→ Gama11_ joined	15:48
	→ glosoli joined	15:48
	→ Malsasa joined	15:49
d3r1ck	_ikke_: i will clone git tomorrow	15:49
	but for now let me reading documentations	15:49
	← macabre left	15:49
	→ otter768 joined	15:50
	← Gama11 left	15:50
	→ Gama11 joined	15:51
	← jamesheston left	15:52
	← ntwari left	15:53
	← prillian5 left	15:53
	→ jamesheston joined	15:53
	→ leehambley joined	15:53
	← jamesheston left	15:53
	← Gama11_ left	15:54
	← otter768 left	15:55
	→ nb_bez___ joined	15:55
	→ rcn_ joined	15:55
	→ Ceber joined	15:56
	→ antimatroid joined	15:57
	← Spriz left	15:57
	→ Jackneill joined	15:57
	→ pcypher joined	15:58
	→ ascarter joined	15:58
	← rcn left	15:59
	→ DerisiveLogic joined	15:59
	← Technocrat7 left	15:59
	← pheaver left	16:00
	→ jswhitworth joined	16:00
	→ sinkensabe joined	16:00
	← gfixler left	16:01
	← ewong left	16:01
	← bonswouar left	16:01
	→ pm90__ joined	16:02
	← bollullera left	16:02
	← modocache left	16:02
	→ ropav joined	16:02
	← Raging_Hog left	16:02
	← clmsy left	16:03
	→ ewong joined	16:03
	← ewong left	16:03
	→ ewong joined	16:03
	← DerisiveLogic left	16:03
	← nnyk_ left	16:03
	← bvi left	16:04
	→ rath joined	16:04
	→ dreiss joined	16:04
	→ nnyk_ joined	16:04
	← Es0teric left	16:05
	← pm90_ left	16:05
	→ gsingh93 joined	16:05
	→ macabre joined	16:06
	← odin22 left	16:07
	← irqq left	16:08
	← dvlwrk left	16:08
	→ Es0teric joined	16:08
	→ Technocrat7 joined	16:08
	→ alcuadrado joined	16:10
	→ nour joined	16:11
	→ lindenle joined	16:11
	→ guillaume-rb joined	16:11
	→ maletor joined	16:12
alcuadrado	I'm using git-svn, and there is a folder in which everything is ignored by svn, and I did the same with a gitignore. I need to have some local files in that folder. But whenever I run "git svn rebase" it deletes everything in it thoug. Any idea?	16:12
	→ mike_oalian joined	16:12
	→ niu joined	16:12
	← sinkensabe left	16:12
	← edude03 left	16:12
	← ktosiek left	16:13
	← mike_oalian left	16:13
	→ Vinnie_win_w joined	16:13
milki	could be a bug	16:13
	← jottr left	16:13
	→ jontmorehouse joined	16:13
	← Vinnie_win left	16:14
d3r1ck	i am done cloning the Git repo	16:14
	← ropav left	16:14
d3r1ck	so can anyone lead me on the building process?	16:14
kadoban	Did you read the docs?	16:14
	→ edude03 joined	16:14
	→ sinkensa_ joined	16:15
	→ ropav joined	16:15
	← Technocrat7 left	16:15
d3r1ck	kadoban: links?	16:15
kadoban	d3r1ck: Look in the repo …	16:16
	← bviktor left	16:16
	← workerbeetwo left	16:16
	→ jskt joined	16:17
	← niu left	16:17
	→ ktosiek joined	16:17
	→ niu joined	16:17
	← niu left	16:17
	← lsiv568 left	16:18
	→ lsiv568 joined	16:18
	→ jottr joined	16:19
	→ jubalh joined	16:19
	→ r00tWearsRedHats joined	16:19
	→ Sasazuka joined	16:19
jubalh	hello, i have one commit on master, but i would like to delete it there and commit it to a seperate branch instead. i have not pushed my (wrong) master yet. is there a way to do this?	16:19
	→ effi joined	16:19
	→ jazzzu joined	16:20
	← d3r1ck left	16:21
	← jskt left	16:21
	→ HenriettaSalt joined	16:21
	→ imachuchu joined	16:22
qsuscs	jubalh: git checkout $right_branch; git cherry-pick master; !eek; git checkout master; git reset --hard @^	16:22
gitinfo	jubalh: [!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	16:22
	→ tang^ joined	16:22
	→ noname joined	16:23
	← lsiv568 left	16:23
qsuscs	.oO( format-patch -1 -o - \| am instead of cherry-pick … narf )	16:23
jubalh	qsuscs: okay i am try this	16:23
	qsuscs: the can i just retype the first thing you said ?	16:23
	actually i have to leave work in 5 minutes..damn..	16:24
	← effi left	16:24
qsuscs	jubalh: do it tomorrow—wait, may 1st. do it on monday :>	16:24
	→ d3r1ck joined	16:24
	← nikio_ left	16:24
	→ MechtiIde joined	16:24
jubalh	:P	16:24
	it has to be today	16:24
qsuscs	jubalh: yeah, then do as i typed, except for the !_eek	16:24
	← King_Hual left	16:25
qsuscs	i’m off for dinner, too, but in case of trouble, there are enough helpful gits in here	16:25
	← jottr left	16:25
	← sagittarian left	16:25
jubalh	qsuscs: one problem	16:25
	reset --hard @^ sais : not matches found	16:26
	→ m0viefreak joined	16:26
d3r1ck	i am back	16:26
	→ lsiv568 joined	16:26
d3r1ck	i want to compile git now	16:26
	→ modocache joined	16:27
jubalh	ah got it :)	16:28
	thanks a lot qsuscs , you saved me :)	16:28
d3r1ck	i have an error while compiling git	16:28
	In file included from http.c:2:0:	16:28
	http.h:6:23: fatal error: curl/curl.h: No such file or directory	16:28
	compilation terminated.	16:28
	make: *** [http.o] Error 1	16:28
	→ linuxboytoo joined	16:29
	← pm90__ left	16:29
	→ pm90_ joined	16:29
	← rubyonrailed left	16:30
	rcn_ → rcn	16:30
	→ thiago_ joined	16:30
	→ durham joined	16:31
jubalh	dont know, but looks like you should have curl installed, or at least the curl-libs	16:31
	← lsiv568 left	16:31
	← jubalh left	16:31
rath	d3r1ck: on ubuntu i had to install package "libcurl4-openssl-dev" to get rid of this error	16:31
	→ lsiv568 joined	16:31
	→ rubyonrailed joined	16:32
	← cdown left	16:32
	← duderonomy left	16:33
	→ MattMaker joined	16:33
d3r1ck	rath: ok	16:34
	← mikecmpbll left	16:34
	← beckyconning_ left	16:34
	→ e^0 joined	16:34
	← ehmatthes left	16:35
	← ascarter left	16:35
	← xolubi_ left	16:36
	← lsiv568 left	16:36
	→ mtakkman joined	16:36
	← MattMaker left	16:38
	← kadoban left	16:38
	← chrisgeorge left	16:38
	→ chrisgeorge joined	16:38
	← granthatcher left	16:39
	← BuenGenio left	16:39
	→ weblife joined	16:40
	→ fahadash joined	16:40
	← fahadash left	16:40
	→ fahadash joined	16:40
	← fahadash left	16:40
	→ fahadash joined	16:40
	→ ascarter joined	16:41
	← Cust0sL1men left	16:41
	→ mellernoia joined	16:42
	← ascarter left	16:42
	→ chrisgeo joined	16:42
	→ _1_John2 joined	16:42
	→ ascarter joined	16:42
	← nnyk_ left	16:42
	← jazzzu left	16:42
	← chrisgeorge left	16:43
	← ascarter left	16:43
	→ ascarter joined	16:44
	← BlaXpirit-UA left	16:44
	→ Milkweed joined	16:45
d3r1ck	make ran to completion	16:45
	so the build is complete. How can i install in a directory?	16:45
	so that i don't change my version of git installed in my machine	16:45
	→ ende joined	16:46
rath	d3r1ck: read file INSTALL in the git sources	16:47
	← Xiti left	16:47
	→ gauke joined	16:47
	← gauke left	16:48
	← chrisgeo left	16:48
d3r1ck	rath: that is wat i am reading right now.	16:48
	← rubyonrailed left	16:49
	→ yuuhi joined	16:49
	→ The_Phoenix joined	16:50
d3r1ck	rath: is it the prefix stuff?	16:50
rath	d3r1ck: yes	16:50
	← The_Phoenix left	16:50
d3r1ck	but i don't know how to construct the command	16:51
	rath: can you help me?	16:51
	→ sbogg joined	16:51
	→ earational joined	16:51
	→ The_Phoenix joined	16:51
	← _1_John2 left	16:51
	← The_Phoenix left	16:52
	→ The_Phoenix joined	16:52
	← The_Phoenix left	16:53
	← pacbard_ left	16:53
d3r1ck	rath: i am stuck and i need your help please	16:53
	→ The_Phoenix joined	16:53
rath	d3r1ck: well, I'd create a directory for this installation, like "~/mygit" and run make with "prefix=~/mygit" on both commands. Then you should be able to run this version of git with "~/mygit/bin/git ...". now you can add "~/mygit/bin" to your path to use this version.	16:53
qsuscs	how about reading the INSTALL file?	16:54
	← The_Phoenix left	16:54
	← hguux____ left	16:54
	→ CheckDavid joined	16:54
	← DeMiNe0_ left	16:54
	← achadwick left	16:54
qsuscs	seriously, if you intend to develop on git, i’d start with READING docs, and not crying for help at the very first step	16:54
	→ The_Phoenix joined	16:54
	← cmn left	16:54
	← The_Phoenix left	16:55
	→ rubyonrailed joined	16:55
	← thebrush left	16:56
	→ doener joined	16:56
	→ The_Phoenix joined	16:56
	← HenriettaSalt left	16:56
	→ Xiti joined	16:57
	← mikiones left	16:57
	→ DeMiNe0 joined	16:57
d3r1ck	qsuscs: ok	16:58
	rath: thanks	16:58
rath	d3r1ck: for just running the git version of the currently compiled state, you can also execute git directly from the source dir as the compilation will create the binary.	16:58
d3r1ck	rath: sure	16:58
	→ cmn joined	16:58
Kartagis	hi	16:58
	← ascarter left	16:58
	← stantonk left	16:59
	Briman\|off → Briman	16:59
	→ jwmann joined	16:59
Kartagis	what are the cases I am asked to merge? I've just done a pull and I got the vim screen with a nice shiny merging message	16:59
	← moreirap_ left	16:59
	→ moreirapontocom joined	17:00
osse	Kartagis: you're currently experiencing one of two possible cases	17:00
	→ nVee joined	17:00
osse	the other is:	17:00
	drumroll	17:00
	when you run git merge	17:00
	→ wicope joined	17:00
	← mutbuerger left	17:01
Kartagis	I didn't run git merge	17:01
osse	I know	17:02
	git merge is the other case	17:02
d3r1ck	rath: i just did the command but it is still creating binaries in the git directory	17:02
nVee	hey guys, we've setup git for our shared hosting clients. We're running cloudlinux and using cpanel. We're able to init repos by ssh per client, but I am unsure as to where the user needs to initialise their repos? Should it be in /home/username/repos so that it is outside of public access and if so, how would I go about connecting to that specific repo to push to it as a remote server?	17:02
	← bigsky left	17:02
nVee	ive tried but i am unable to do so without using the root credentials	17:02
	→ nilg joined	17:03
	→ pheaver joined	17:03
	← ende left	17:03
	→ ende joined	17:03
	→ pantsman- joined	17:03
	→ majorseitan joined	17:03
rath	d3r1ck: what command?	17:04
	→ stantonk joined	17:04
d3r1ck	make prefix=build/	17:04
	→ OddDuck joined	17:04
	← The_Phoenix left	17:04
	← sinkensa_ left	17:04
osse	it will always create the build output in the current dir	17:04
rath	d3r1ck: you need to run the "install" target	17:04
d3r1ck	rath: let me do a make clean and do it again	17:05
	→ daviorocha joined	17:05
	← c0mrad3 left	17:05
OddDuck	I created a copy of the files from a repo in a bare directory and then made some significant changes. Is there any way to merge the bare files back into the repo without losing history? (So basically result of the diff between the two would be the merge commit and everything else would retain it's history)	17:06
rath	d3r1ck: the file INSTALL shows two calls of "make", first is building the stuff, second is installing the stuff	17:06
d3r1ck	rath: i am not denying what you are saying	17:07
osse	OddDuck: "merge commit"? I think you want a regular commit. or has there been other development in the mean time since you made the copy =	17:07
d3r1ck	rath: what i am confused at is building to a particular directory	17:07
	i have seen many commands and the documentation is not quite clear to me	17:08
OddDuck	osse: just a regular commit I guess. I meant "the commit resulting from the merge of the updated bare files and the unchanged files in the repo"	17:08
osse	OddDuck: the easiest thing to do is to copy the files back into the repo then git add && git commit	17:08
	OddDuck: making sure the correct commit is checked out first	17:08
	d3r1ck: i don't think git's makefile supports that	17:09
OddDuck	osse: any quick way to capture deletions? (anything removed in the bare files should be removed in the commit)	17:09
osse	OddDuck: not that I know of	17:10
qsuscs	.oO( mount -t overlayfs )	17:10
OddDuck	osse: ok thanks	17:10
d3r1ck	oppss i am really stuck here	17:10
	i even tried "make .."	17:11
	in the build directory but it did not run	17:11
	← AhabsBeard left	17:11
d3r1ck	can i use make -	17:12
osse	you are stuck because it's impossible	17:12
	→ AhabsBeard joined	17:12
d3r1ck	can i use make -C dir?	17:12
	← Evey_Hammond left	17:12
	← kerrick left	17:12
d3r1ck	osse: can i use make -C dir?	17:12
	will it work?	17:12
	where dir is build?	17:12
	→ _1_Soraj143S joined	17:13
osse	sure, but I don't think you know what -C does then	17:13
	← _1_Soraj143S left	17:13
	→ pm90__ joined	17:13
d3r1ck	osse: it didn't work	17:13
	but -C was to change directory to dir before reading the makefiles	17:14
	← pm90__ left	17:14
	← dvl_ left	17:14
	→ daum joined	17:14
	← e^0 left	17:15
	→ DolphinDream joined	17:15
	rath wonders what's that hard in just using the commands "INSTALL" mentions with replacing "/usr" to some other dir if you like so	17:15
osse	d3r1ck: are there any makefiles in the dir?	17:15
	→ gopar joined	17:15
osse	rath: he wants the build output to be placed somewhere else. git's build system doesn't support that	17:16
	← DolphinDream left	17:16
	→ sinkensabe joined	17:16
d3r1ck	osse: exactly that is what i want to do	17:16
	since you said it is impossible, then fine	17:16
	i wanted all the .o to be a directory on its own	17:17
	→ liamkeily joined	17:17
	← psoo_ left	17:17
	→ apflieger joined	17:17
d3r1ck	osse: let me just build it	17:17
	← pm90_ left	17:17
osse	often one can do ../git/configure from somewhere else, but even this doesn't work :/	17:18
d3r1ck	so what is the name of the executable that will be created when make finishes?	17:18
daum	hi guys - i have a git repo which i have one commit which i made from a git pull other-origin master --squash. Now I'm trying to get the latest files from the other origin again so doing git pull --squash other-origin master but i'm getting merge conflicts....why would there be merge conflicts when the only two pulls are both from the other-origins master?	17:18
osse	d3r1ck: git	17:18
Kartagis	git	17:18
rath	d3r1ck: I thought you just want to compile and maybe install git. I am sorry.	17:18
	→ aard_ joined	17:18
d3r1ck	rath: no problem	17:18
	rath: maybe i did not explain to your understanding	17:18
	→ dvl_ joined	17:19
d3r1ck	rath: its ok, i am building it now	17:19
	→ rockstar_ joined	17:19
	← jswhitworth left	17:19
	→ dvlwrk joined	17:19
d3r1ck	i just want to building and test. Thats all and maybe i can fix one bug today :)	17:19
	or write a documentation	17:19
	:)	17:19
	→ jswhitworth joined	17:20
	gitinfo set mode: +v	17:20
	→ dvl__ joined	17:20
	→ Milk_weed joined	17:20
osse	d3r1ck: if you really want to it seems that 'lndir' works	17:21
	← rcn left	17:21
	→ Zoddo joined	17:21
d3r1ck	osse: what is lndir?	17:21
	→ jottr joined	17:21
	← ende left	17:21
	← hahuang65 left	17:21
osse	man lndir	17:22
	← AhabsBeard left	17:22
	→ helo joined	17:22
	→ c0mrad3 joined	17:22
	← BlaDe^ left	17:22
osse	it creates A LOT of symlinks	17:22
	→ fate_ joined	17:22
	→ DerisiveLogic joined	17:22
	← Cork left	17:22
rath	d3r1ck: why do you want *.o files to be in another directory?	17:22
osse	cleanliness	17:22
	→ Gizburdt joined	17:22
	← cmn left	17:23
osse	so that when you go $EDITOR file<tab> you don't have to manually type 'c' at the end for example	17:23
	← dvl_ left	17:23
osse	and of course it makes it easy to get rid of build artifacts	17:23
	← m0ltar left	17:24
	→ lsiv568 joined	17:24
	← EvilPenguin left	17:24
	← Milkweed left	17:24
	← Gizburdt left	17:25
	← helo left	17:25
d3r1ck	osse: which makes some sense right?	17:25
	→ Cork joined	17:25
osse	yes	17:25
	I use it when I can	17:25
	← pantsman- left	17:25
d3r1ck	osse: i successfully compiled and ran git	17:25
osse	although for git-managed projects using 'git clean' makes it easy	17:25
d3r1ck	so i am up and running now to start working :)	17:25
	→ pacbard joined	17:26
d3r1ck	when you run make clean, it will do recursive traversal to delete all the .o files	17:26
	← jottr left	17:26
	→ pantsman- joined	17:27
	← skullcrasher left	17:27
	→ zapb_ joined	17:27
d3r1ck	but if all the .o files where in a directory on its own, then make clean will just delete the build/ directory like normal rm -r build/	17:27
	rather than doind recursive traversal to delete single .o files reducing overheads	17:28
	← noname left	17:28
	← edude03 left	17:28
d3r1ck	osse, rath what do you think about that?	17:28
	→ cmn joined	17:28
	→ ayylemayo joined	17:28
	→ shafox joined	17:28
	→ BlaDe^ joined	17:28
	→ ascarter joined	17:29
	← Hounddog left	17:29
osse	"recursive traversal" sounds heavy, but it's not like make has to find them. it knows exactly where they are	17:29
	← lsiv568 left	17:30
d3r1ck	osse: ok	17:30
	if so then fine	17:30
	→ lsiv568 joined	17:30
osse	but you already know I agree	17:30
	← gargola left	17:31
	← mtakkman left	17:31
d3r1ck	osse: so what can i do now?	17:31
	look at the source codes or read documentations	17:31
rath	"make clean" tries to remove a bit more than *.o files, btw	17:31
d3r1ck	rath: ok i see	17:32
	→ ende joined	17:32
osse	of course. most 'make clean' do	17:32
	make clean should remove everything make creates	17:32
	→ Jetchisel joined	17:33
	← ayylemayo left	17:33
	← uri_ left	17:33
	← trepidaciousMBR2 left	17:33
	← teran_ left	17:34
	← lsiv568 left	17:34
	→ lsiv568 joined	17:34
	→ teran joined	17:34
	← dvl__ left	17:34
d3r1ck	rath, osse, Seveas , what should i do now?	17:34
	← circ-user-SSaBd left	17:34
	← sCiphre left	17:34
	→ decrypt joined	17:34
d3r1ck	i am looking at the source codes and the code base is huge.	17:34
	← earational left	17:34
	→ oojacoboo joined	17:35
rath	osse: make even creates source files > "common-cmds.h" ;-)	17:35
	→ reim_ joined	17:45
	← apflieger left	17:46
	← Jetchisel left	17:46
	← maletor left	17:46
	← nour left	17:46
	← qpdb left	17:46
	← twoface88 left	17:46
	← ItSANgo_ left	17:46
	← haavstr left	17:46
	← rasto left	17:46
	← lamppid left	17:46
	← PCatinean left	17:46
	← tomog999_ left	17:46
	← tango_ left	17:46
	← kloeri left	17:46
	← neanderslob left	17:46
	← Quevin left	17:46
	← kjs left	17:46
	← lahwran left	17:46
	← zso_ left	17:46
	← cebor left	17:46
	← silviof left	17:46
	← PaulCapestany left	17:46
	← wrouesnel3 left	17:46
	← staafl left	17:46
	← fr33domlover left	17:46
	← jumpman left	17:46
	← BennyPlayboy left	17:46
	← HarryHallman left	17:46
	← arand left	17:46
	← traxo left	17:46
	← akkad left	17:46
	← Toaster- left	17:46
	← sokoll- left	17:46
	← levifig left	17:46
	← jlewis_ left	17:46
	← tjbp left	17:46
	← tsunamie left	17:46
	← hxm left	17:46
	← EspadaV8 left	17:46
	← ascarter left	17:46
	← shafox left	17:46
	← rubyonrailed left	17:46
	← Malsasa left	17:46
	← qdk left	17:46
	← fstd left	17:46
	← Nikhil_D left	17:46
	← TinkerTyper left	17:46
	← jbondhus left	17:46
	← Internet13 left	17:46
	← fzhu left	17:46
	← SwedFTP left	17:46
	← ManneW left	17:46
	← diget left	17:46
	← edk left	17:46
	← evanc left	17:46
	← xnox left	17:46
	← DonRichie left	17:46
	← splenetic left	17:46
	← alexwhitman left	17:46
	← skasturi left	17:46
	← relrod left	17:46
	← teadrop_ left	17:46
	← epic left	17:46
	← kke_ left	17:46
	← ndim left	17:46
	← jakob left	17:46
	← metze left	17:46
	← Ziber left	17:46
	← twisted` left	17:46
	← stakewinner00 left	17:46
	← slick left	17:46
	← Mekkis left	17:46
	← _flow_ left	17:46
	← up_the_irons left	17:46
	← derrzzaa left	17:46
	← pwds left	17:46
	← KekSi left	17:46
	← Caius left	17:46
	← greymalkin left	17:46
	← quizzi left	17:46
	← joako left	17:46
	← liamkeily left	17:46
	← gopar left	17:46
	← majorseitan left	17:46
	← mellernoia left	17:46
	← r00tWearsRedHats left	17:46
	← guillaume-rb left	17:46
	← pcypher left	17:46
	← glosoli left	17:46
	← leeN left	17:46
	← editshare-ericf left	17:46
	← sgen left	17:46
	← dougsland left	17:46
	← tristanp left	17:46
	← dstarh left	17:46
	← ajf- left	17:46
	← mezod left	17:46
	← Tennis left	17:46
	← meatmanek left	17:46
	← jonmasters left	17:46
	← babilen left	17:46
	← polyzen left	17:46
	← michelangelo left	17:46
	← bipolar left	17:46
	← f3lp left	17:46
	← bynarie left	17:46
	← Impaloo left	17:46
	← hakunin left	17:46
	← mozzarella left	17:46
	← weaksauce left	17:46
	← Joseph__Silber left	17:46
	← jcp left	17:46
	← flipp left	17:46
	← netameta left	17:46
	← Ssquidly left	17:46
	← wagle left	17:46
	← kanzure left	17:46
	← przemoc left	17:46
	← vith left	17:46
	← iml left	17:46
	← Zarthuss left	17:46
	← drodger left	17:46
	← moei left	17:46
	← ChauffeR left	17:46
	← tazle__ left	17:46
	← thedudez0r left	17:46
	← ping-pong left	17:46
	← Mark_ left	17:46
	← ffualo left	17:46
	← jaeckel left	17:46
	← taru left	17:46
	← bremner left	17:46
	← deavidsedice left	17:46
	← mw left	17:46
	← cmn left	17:46
	← moreirapontocom left	17:46
	← sbogg left	17:46
	← durham left	17:46
	← Vinnie_win_w left	17:46
	← joki left	17:46
	← denete left	17:46
	← Texan left	17:46
	← zgzgzg left	17:46
	← michael_mbp left	17:46
	← KronTMX left	17:46
	← Kronuz left	17:46
	← ngladitz left	17:46
	← donnib left	17:46
	← Ouchy left	17:46
	← robustus left	17:46
	← fnky left	17:46
	← ciaranm left	17:46
	← drathir left	17:46
	← Dreamer3 left	17:46
	← BaNzounet left	17:46
	← iveqy left	17:46
	← jzk left	17:46
	← infernix left	17:46
	← shaunoo left	17:46
	← ninsei left	17:46
	← dlitz_ left	17:46
	← metaf5 left	17:46
	← cworth left	17:46
	← kevc_ left	17:46
	← fishey1 left	17:46
	← soosfarm_ left	17:46
	← s34n left	17:46
	← squentin left	17:46
	← mhi^ left	17:46
	← Karunamon left	17:46
	← andres left	17:46
	← Silex left	17:46
	← iokill left	17:46
	← joelsmith left	17:46
	← cYmen_ left	17:46
	← comps left	17:46
	← baloney left	17:46
	← doop left	17:46
	← awx left	17:46
	← joevandyk left	17:46
	← c0mrad3 left	17:46
	← lindenle left	17:46
	← dreiss left	17:46
	← Nikoli left	17:46
	← alex1a left	17:46
	← tyreld left	17:46
	← cbonobo left	17:46
	← Asiajey left	17:46
	← AaronMT left	17:46
	← espindol_ left	17:46
	← th3fallen left	17:46
	← nodedfree left	17:46
	← Akagi201_ left	17:46
	← mostlybadfly left	17:46
	← StuartMI left	17:46
	← D-Boy left	17:46
	← heroux left	17:46
	← JEEBcz left	17:46
	← petersr left	17:46
	← bb010g left	17:46
	← melter left	17:46
	← Mathiasdm left	17:46
	← kaendfinger left	17:46
	← [cust] left	17:46
	← legumbre left	17:46
	← CussBot left	17:46
	← nicechap left	17:46
	← nyuszika7h left	17:46
	← catsup left	17:46
	← dcpc0071 left	17:46
	← markelite left	17:46
	← milki left	17:46
	← frogonwheels left	17:46
	← MindfulMonk left	17:46
	← _ikke_ left	17:46
	← mrkake left	17:46
	← __main__ left	17:46
	← constantinexvi left	17:46
	← Al1ve left	17:46
	← Nothing4You left	17:46
	← hide_ left	17:46
	← interru left	17:46
	← andschwa left	17:46
	← Guest8183 left	17:46
	← nutron left	17:46
	← c74d left	17:46
	← bbhoss left	17:46
	← gniourf left	17:46
	← Fissure left	17:46
	← Vorisi left	17:46
	← ixian8 left	17:46
	← Mapleyy left	17:46
	← cschneid left	17:46
	← DSH105 left	17:46
	← akitada left	17:46
	← jgornick left	17:46
	← Aa4on left	17:46
	← wcpan left	17:46
	← Hedgework left	17:46
	← HedgeMage left	17:46
	← k4r1m left	17:46
	← Trozz left	17:46
	← edenist left	17:46
	← synfinatic left	17:46
	← milli left	17:46
	← mariorz left	17:46
	← webmeister left	17:46
	← alanwill left	17:46
	← xyNNN left	17:46
	← sfr^ left	17:46
	← shauna left	17:46
	← gsilva left	17:46
	← totesmuhgoats left	17:46
	← Mixologic left	17:46
	← junecaz left	17:46
	← troyt left	17:46
	← arminius left	17:46
	← Guest76884 left	17:46
	← blackjid left	17:46
	← Klumben left	17:46
	← murph left	17:46
	← Forkk left	17:46
	← ozymandias left	17:46
	← c0ded left	17:46
	← Korvin left	17:46
	← Bigcheese left	17:46
	← bandroidx left	17:46
	← jamietech left	17:46
	← uidzer0 left	17:46
	← aseidl left	17:46
	← Spinkzeit left	17:46
	← deste left	17:46
	← Telvana left	17:46
	← javaJake left	17:46
	← Xe left	17:46
	← qsuscs left	17:46
	← grawity left	17:46
	← DistantStar left	17:46
	← de-vri-es left	17:46
	← cstrahan left	17:46
	← Gravitron left	17:46
	← Bilge left	17:46
	← lacrosse__ left	17:46
	← casual__ left	17:46
	← jmfcool____ left	17:46
	← bailon left	17:46
	← ketas left	17:46
	← ORiON--- left	17:46
	← dlb76 left	17:46
	← yuciyuar left	17:46
	← xr4nd left	17:46
	← boombatower left	17:46
	← dustinm left	17:46
	← ag4ve_ left	17:46
	← vstoniest left	17:46
	← slixpk left	17:46
	← stealthii left	17:46
	← smferris left	17:46
	← CareBear\ left	17:46
	← kossy left	17:46
	← fate_ left	17:46
	← jswhitworth left	17:46
	← daviorocha left	17:46
	← weblife left	17:46
	← MechtiIde left	17:46
	← Gama11 left	17:46
	← tummy left	17:46
	← EminenceHC left	17:46
	← sburgess left	17:46
	← zso left	17:46
	← ErKa left	17:46
	← paulweb515 left	17:46
	← harish_ left	17:46
	← seg left	17:46
	← mkoskar left	17:46
	← dan_s left	17:46
	← rejerson69 left	17:46
	← flaguy48 left	17:46
	← tobiasBora left	17:46
	← kermit left	17:46
	← bsanford left	17:46
	← hgl left	17:46
	← smrtz left	17:46
	← Lunatrius left	17:46
	← JDHawke left	17:46
	← markovh left	17:46
	← knopwob2 left	17:46
	← cwillu_at_work left	17:46
	← elektrinis-wrk left	17:46
	← fuchstronaut left	17:46
	← Rhonda left	17:46
	← jonesinator left	17:46
	← _W_ left	17:46
	← UmbraMalison left	17:46
	← Kovensky left	17:46
	← Ragnor left	17:46
	← surfdue left	17:46
	← JrCs_ left	17:46
	← blueyed left	17:46
	← MKCone`Office left	17:46
	← darnir left	17:46
	← kingoftcp left	17:46
	← Briman left	17:46
	← Devels left	17:46
	← iron_houzi left	17:46
	← nephyrin` left	17:46
	← BooK_ left	17:46
	← falstaff left	17:46
	← phillip left	17:46
	← elementalest left	17:46
	← Milos left	17:46
	← aucecil left	17:46
	← loz-- left	17:46
	← oojacoboo left	17:46
	← doener left	17:46
	← linuxboytoo left	17:46
	← leehambley left	17:46
	← zumba_addict left	17:46
	← Saturn812 left	17:46
	← jerius left	17:46
	← daedeloth left	17:46
	← mmakunas left	17:46
	← Dragooon left	17:46
	← avtobiff left	17:46
	← tuor left	17:46
	← makhzi left	17:46
	← Guest29689 left	17:46
	← Sleepy63 left	17:46
	← lvh left	17:46
	← meLon left	17:46
	← xcpep left	17:46
	← noname1 left	17:46
	← rivarun left	17:46
	← tgies left	17:46
	← Tuna-Fish left	17:46
	← mquin left	17:46
	← msm left	17:46
	← daum left	17:46
	← v0n left	17:46
	← zidoh left	17:46
	← albel727 left	17:46
	← luksaur left	17:46
	← ghormoon left	17:46
	← tibl left	17:46
	← ben_alman left	17:46
	← nem_z left	17:46
	← guampa left	17:46
	← daynaskully left	17:46
	← Cathy left	17:46
	← ojacobson left	17:46
	← jiriki- left	17:46
	← M-ou-se left	17:46
	← Seikho left	17:46
	← hyperair left	17:46
	← romanovic left	17:46
	← Zeedox left	17:46
	← teran left	17:46
	← pantsman- left	17:46
	← stantonk left	17:46
	← pheaver left	17:46
	← nVee left	17:46
	← imachuchu left	17:46
	← woodruffw left	17:46
	← Spacew00t left	17:46
	← cavallari left	17:46
	← ethanol left	17:46
	← Kamran left	17:46
	← offbyone left	17:46
	← ra4king left	17:46
	← dsantiago left	17:46
	← jason237 left	17:46
	← tirengarfio_ left	17:46
	← Nevik left	17:46
	← aboccia left	17:46
	← JanC left	17:46
	← hagabaka left	17:46
	← AndreSomers left	17:46
	← spb left	17:46
	← danemacmillan left	17:46
	← nuck left	17:46
	← Zarthus left	17:46
	← tbsaunde left	17:46
	← tomzx left	17:46
	← moparisthebest left	17:46
	← sharkz_ left	17:46
	← jfield left	17:46
	← calops1 left	17:46
	← pooh22 left	17:46
	← niax_ left	17:46
	← rockstar_ left	17:46
	← nilg left	17:46
	← m0viefreak left	17:46
	← alcuadrado left	17:46
	← Gamecubic left	17:46
	← Zupoman left	17:46
	← GoddeR left	17:46
	← reim left	17:46
	← phpcoder left	17:46
	← Padawan_ left	17:46
	← Grimlock1 left	17:46
	← SporkWitch left	17:46
	← proq` left	17:46
	← drag0niu1 left	17:46
	← codebam left	17:46
	← felixjet_ left	17:46
	← tchan left	17:46
	← maqr left	17:46
	← PaulePanter left	17:46
	← djh left	17:46
	← Ch3ck left	17:46
	← boblee left	17:46
	← likewhoa left	17:46
	← wedgie left	17:46
	← nowhere_man left	17:46
	← UTAN_dev left	17:46
	← marienz left	17:46
	← TheMoonMaster left	17:46
	← blahdodo left	17:46
	← jave left	17:46
	← lamont left	17:46
	← devians left	17:46
	← sLite left	17:46
	← tokik_ left	17:46
	← phantomcircuit left	17:46
	← simpleuser1 left	17:46
	← salamanderrake left	17:46
	← graphitemaster left	17:46
	← zizzfizzix left	17:46
	← roknir left	17:46
	← wgrant left	17:46
	← Sammy8806 left	17:46
	← thomas left	17:46
	← Polylith left	17:46
	← icedp left	17:46
	← Goles left	17:46
	← diminoten left	17:46
	← gmac left	17:46
	← wicope left	17:46
	← CheckDavid left	17:46
	← tang^ left	17:46
	← Ceber left	17:46
	← fusionx86 left	17:46
	← darkbasic left	17:46
	← CEnnis91 left	17:46
	← phantombeta left	17:46
	← mojibake left	17:46
	← marcogmonteiro left	17:46
	← PeterBooker left	17:46
	← Vampire0 left	17:46
	← tHEMtZ left	17:46
	← DolphinDreamm left	17:46
	← wowaname left	17:46
	← danmackay left	17:46
	← here left	17:46
	← duckson left	17:46
	← stfn left	17:46
	← Olipro left	17:46
	← Zamerick_ left	17:46
	← Neico left	17:46
	← rishi left	17:46
	← BtbN left	17:46
	← same_ol_geez left	17:46
	← abec0 left	17:46
	← truh_ left	17:46
	← chris2 left	17:46
	← Aaeriele left	17:46
	← xrogaan_ left	17:46
	← creppe_ left	17:46
	← guide left	17:46
	← Caelum left	17:46
	← tinanoo left	17:46
	← belak left	17:46
	← Nickeeh left	17:46
	← heftig left	17:46
	← ELLIOTTCABLE left	17:46
	← devhost left	17:46
	← GGMethos left	17:46
	← batrick left	17:46
	← Cerise left	17:46
	← cpach left	17:46
	← MadsRC left	17:46
	← leprechau left	17:46
	← erichf left	17:46
	← kjnilsson left	17:46
	← huhlig left	17:46
	← haaja_ left	17:46
	← Seveas left	17:46
	← CalimeroTeknik left	17:46
	← robinsmidsrod left	17:46
	← introom left	17:46
	← synchronous left	17:46
	← apipkin left	17:46
	← c355E3B left	17:46
	← da5id left	17:46
	← henriquev left	17:46
	← frender left	17:46
	← JStoker left	17:46
	← mroth left	17:46
	← mithro left	17:46
	← HicksD left	17:46
	← kwmiebach left	17:46
	← roto left	17:46
	← grandrew left	17:46
	← kalz left	17:46
	← lethosor left	17:46
	← vedu left	17:46
	← Kage left	17:46
	← Kartagis left	17:46
	← ende left	17:46
	← pacbard left	17:46
	← Zoddo left	17:46
	← Milk_weed left	17:46
	← jwmann left	17:46
	← yuuhi left	17:46
	← modocache left	17:46
	← Es0teric left	17:46
	← ewong left	17:46
	← antimatroid left	17:46
	← nb_bez___ left	17:46
	← MLM left	17:46
	← endiruna left	17:46
	← leolrrj left	17:46
	← Brain left	17:46
	← livingstn left	17:46
	← Ryanar left	17:46
	← ScottE left	17:46
	← jokester left	17:46
	← jas4711 left	17:46
	← pobivan left	17:46
	← Balliad left	17:46
	← Wulf left	17:46
	← tzero left	17:46
	← FreezingCold left	17:46
	← Khisanth left	17:46
	← decrypt left	17:46
	← Emperor_Earth left	17:46
	← happy-dude left	17:46
	← pekster left	17:46
	← dwmw2 left	17:46
	← dmarr left	17:46
	← Bucciarati left	17:46
	← dserodio left	17:46
	← tgummerer left	17:46
	← mehdi left	17:46
	← GGflags left	17:46
	← dling left	17:46
	← novas0x2a left	17:46
	← cods_ left	17:46
	← moop left	17:46
	← DrNick left	17:46
	← killerpty left	17:46
	← fullstack left	17:46
	← quentusrex left	17:46
	← atn34 left	17:46
	← vishal left	17:46
	← dawik_ left	17:46
	← ldlework left	17:46
	← DANtheBEASTman left	17:46
	← wbdecker left	17:46
	← leTali left	17:46
	← rika left	17:46
	← iamtakingiteasy left	17:46
	← aspiers left	17:46
	← rom1504 left	17:46
	← bambams left	17:46
	← lsiv568 left	17:46
	← zapb_ left	17:46
	← sinkensabe left	17:46
	← thiago_ left	17:46
	← rath left	17:46
	← Fenikkusu left	17:46
	← gebjgd left	17:46
	← IrishPrime left	17:46
	← highcup left	17:46
	← SimonNa left	17:46
	← sdothum left	17:46
	← lqi_ left	17:46
	← cite left	17:46
	← Tommy[D] left	17:46
	← micechal left	17:46
	← Floatingman left	17:46
	← ashnur left	17:46
	← scriptThis left	17:46
	← bede_ left	17:46
	← c^ left	17:46
	← Orbitrix left	17:46
	← FabTG left	17:46
	← hoodow left	17:46
	← doebi left	17:46
	← jab416171 left	17:46
	← scarcry left	17:46
	← srcerer left	17:46
	← ntio left	17:46
	← tabakhase left	17:46
	← warthog9 left	17:46
	← Orphis left	17:46
	← potteratt left	17:46
	← tracer-t left	17:46
	← Sonderblade left	17:46
	← PerlJam left	17:46
	← nanga left	17:46
	← ale_ left	17:46
	← ShibMcNe_ left	17:46
	← Chipzz left	17:46
	← wrouesnel1 left	17:46
	← spaceone left	17:46
	← wanders_ left	17:46
	← systmkor left	17:46
	← Cork left	17:46
	← OddDuck left	17:46
	← ropav left	17:46
	← nadim_ left	17:46
	← Zamyatin left	17:46
	← sgambino left	17:46
	← lucianangelus left	17:46
	← Ricaz left	17:46
	← nfk left	17:46
	← zivester left	17:46
	← sword left	17:46
	← NQ left	17:46
	← cxz left	17:46
	← bket left	17:46
	← CentaurWarchief left	17:46
	← misty_g3ar left	17:46
	← moritz left	17:46
	← Ankhers left	17:46
	← plasticboy left	17:46
	← ValicekB left	17:46
	← Drakevr left	17:46
	← crater2150 left	17:46
	← perrier left	17:46
	← elnur left	17:46
	← Dumle29 left	17:46
	← yahoshi left	17:46
	← Neptu left	17:46
	← tomek left	17:46
	← bob_f left	17:46
	← preilly left	17:46
	← ujjain left	17:46
	← daurnimator left	17:46
	← Novacha left	17:46
	← frdmn left	17:46
	← hplar left	17:46
	← KennyRayFL left	17:46
	← technivore left	17:46
	← maxb left	17:46
	← butyoudonot left	17:46
	← moat_joe left	17:46
	← jpleau left	17:46
	← BlaDe^ left	17:46
	← DerisiveLogic left	17:46
	← Xiti left	17:46
	← macabre left	17:46
	← gsingh93 left	17:46
	← nettoweb left	17:46
	← jolda left	17:46
	← sarink left	17:46
	← jwhisnant left	17:46
	← ozanhazer left	17:46
	← freestyl3r left	17:46
	← TomyWork left	17:46
	← hexagoxel left	17:46
	← _rgn left	17:46
	← ayan left	17:46
	← howlymowly left	17:46
	← kotk left	17:46
	← MissionCritical left	17:46
	← And1 left	17:46
	← KeelOfSteel left	17:46
	← cbreak left	17:46
	← Weezey left	17:46
	← same_ol_1eez left	17:46
	← Walex left	17:46
	← Chex left	17:46
	← sonOfRa left	17:46
	← mansel left	17:46
	← kenansulayman left	17:46
	← EgS left	17:46
	← TDJACR left	17:46
	← dilfridge left	17:46
	← dkn64738 left	17:46
	← colona left	17:46
	← niko left	17:46
	← RusAlex left	17:46
	← rdema left	17:46
	← Mo0O left	17:46
	← Guest46769 left	17:46
	← Arokh left	17:46
	← Gege left	17:46
	← Ornacia- left	17:46
	← fahadash left	17:46
	← d3r1ck left	17:46
	← jontmorehouse left	17:46
	← Jackneill left	17:46
	← AcidNerd left	17:46
	← incredible left	17:46
	← chitopunk left	17:46
	← Dorf left	17:46
	← knownasilya left	17:46
	← rnsanchez left	17:46
	← Ravana left	17:46
	← tarkus left	17:46
	← glebihan_ left	17:46
	← johtso_ left	17:46
	← neunon left	17:46
	← bgerber left	17:46
	← thorie left	17:46
	← reinrag left	17:46
	← benbergman left	17:46
	← crose left	17:46
	← skoop left	17:46
	← loglaunch left	17:46
	← WakiMiko left	17:46
	← Slush- left	17:46
	← robbyoconnor left	17:46
	← oisfwijiwiofjwoe left	17:46
	← navls left	17:46
	← deltab left	17:46
	← GarethAdams left	17:46
	← sess left	17:46
	← brewmaster left	17:46
	← hellschreiber left	17:46
	← hiironymus left	17:46
	← clone1018 left	17:46
	← Phtes left	17:46
	← yrashk left	17:46
	← manuel___ left	17:46
	← thejoecarroll_ left	17:46
	← daxroc left	17:46
	← mattl left	17:46
	← brandonw left	17:46
	← tobiasvl left	17:46
	← doppo left	17:46
	← mtscout6_ left	17:46
	← dx left	17:46
	← ksk left	17:46
	← Werring left	17:46
	← ruskie left	17:46
	← bittyx left	17:46
	← toydestroyer left	17:46
	← [diecast] left	17:46
	← eternnoir_ left	17:46
	← relgar left	17:46
	← nasso_ left	17:46
	← tfnico left	17:46
	← shennyg left	17:46
	← Moult left	17:46
	← axion left	17:46
	← souther left	17:46
	← electrogeek left	17:46
	← Guest7237 left	17:46
	→ boblee joined	17:47
	→ akkad joined	17:50
	→ ivan\ joined	17:50
	→ salamanderrake joined	17:50
	→ Sceorem joined	17:50
	→ Malsasa joined	17:50
	→ MadLamb joined	17:50
	→ TheMoonMaster_ joined	17:50
	→ WakiMiko joined	17:50
	→ bakingbread joined	17:50
	→ codebam joined	17:50
	→ staafl joined	17:50
	→ mr_rich102 joined	17:50
	→ tsukasa_ joined	17:50
	→ Zumonchi joined	17:50
	→ Gizburdt joined	17:50
	→ rheddry joined	17:50
	→ NightMonkey joined	17:50
	→ lahwran_ joined	17:50
	→ dr_lepper joined	17:50
	→ phantomcircuit_ joined	17:50
	→ tomaw_ joined	17:50
	→ graphitemaster_ joined	17:50
	→ SporkWitch joined	17:50
	→ devians_ joined	17:50
	→ blahdodo joined	17:50
	→ HarryHallman_oth joined	17:50
	→ cebor_ joined	17:50
	→ svkurowsm joined	17:50
	→ diminoten_ joined	17:50
	→ thesquib_ joined	17:50
	→ Hetu joined	17:50
	→ goles_ joined	17:50
	→ wedgie_ joined	17:50
	→ gmac- joined	17:50
	→ Milk-weed joined	17:50
	→ jlewis joined	17:50
	→ traxo_ joined	17:50
	→ oelewapp1rke joined	17:50
	→ errr_ joined	17:50
	→ kloeri_ joined	17:50
	→ likewhoa- joined	17:50
	→ vals_ joined	17:50
	→ Kneiva joined	17:50
	→ kjs_ joined	17:50
	→ vmiklos joined	17:50
	→ drag0nius joined	17:50
	→ zso__ joined	17:50
	→ tokik joined	17:50
	→ Gamecubic_ joined	17:50
	→ arand_ joined	17:50
	→ floppyea1s joined	17:50
	→ PaulePan1er joined	17:50
	→ sLite_ joined	17:50
	→ neanderslob_ joined	17:50
	→ zizzfizzix_ joined	17:50
	→ BennyPlayboy_ joined	17:50
	→ nowhereman joined	17:50
	→ Padawan joined	17:50
	→ nilg` joined	17:50
	→ m0viefreak joined	17:50
	→ mikecmpbll joined	17:50
	→ proq`` joined	17:50
	→ UTAN_dev1 joined	17:50
	→ ItSANg___ joined	17:50
	→ smithbone_ joined	17:50
	→ Grimlock11 joined	17:50
	→ maqr_ joined	17:50
	→ Ch3ck_ joined	17:50
	→ PaulCape_ joined	17:50
	→ Quevin_ joined	17:50
	→ EvilPenguin joined	17:50
	→ felixjet__ joined	17:50
	→ Toaster` joined	17:50
	→ GoddeR_ joined	17:50
	→ denete_ joined	17:50
	→ oojacoboo joined	17:50
	→ decrypt joined	17:50
	→ lsiv568 joined	17:50
	→ ende joined	17:50
	→ BlaDe^ joined	17:50
	→ shafox joined	17:50
	→ cmn joined	17:50
	→ zapb_ joined	17:50
	→ pantsman- joined	17:50
	→ pacbard joined	17:50
	→ Cork joined	17:50
	→ DerisiveLogic joined	17:50
	→ fate_ joined	17:50
	→ c0mrad3 joined	17:50
	→ Zoddo joined	17:50
	→ jswhitworth joined	17:50
	→ gopar joined	17:50
	→ daviorocha joined	17:50
	→ OddDuck joined	17:50
	→ stantonk joined	17:50
	→ majorseitan joined	17:50
	→ pheaver joined	17:50
	→ wicope joined	17:50
	→ nVee joined	17:50
	→ moreirapontocom joined	17:50
	→ jwmann joined	17:50
	→ Xiti joined	17:50
	→ doener joined	17:50
	→ rubyonrailed joined	17:50
	→ CheckDavid joined	17:50
	→ sbogg joined	17:50
	→ yuuhi joined	17:50
	→ mellernoia joined	17:50
	→ fahadash joined	17:50
	→ weblife joined	17:50
	→ durham joined	17:50
	→ thiago_ joined	17:50
	→ linuxboytoo joined	17:50
	→ modocache joined	17:50
	→ MechtiIde joined	17:50
	→ d3r1ck joined	17:50
	→ tang^ joined	17:50
	→ imachuchu joined	17:50
	→ r00tWearsRedHats joined	17:50
	→ ropav joined	17:50
	→ Vinnie_win_w joined	17:50
	→ guillaume-rb joined	17:50
	→ lindenle joined	17:50
	→ macabre joined	17:50
	→ gsingh93 joined	17:50
	→ dreiss joined	17:50
	→ rath joined	17:50
	→ ewong joined	17:50
	→ pcypher joined	17:50
	→ Jackneill joined	17:50
	→ antimatroid joined	17:50
	→ Ceber joined	17:50
	→ nb_bez___ joined	17:50
	→ leehambley joined	17:50
	→ Gama11 joined	17:50
	→ glosoli joined	17:50
	→ Nikoli joined	17:50
	→ woodruffw joined	17:50
	→ Fenikkusu joined	17:50
	→ leeN joined	17:50
	→ zumba_addict joined	17:50
	→ alex1a joined	17:50
	→ AcidNerd joined	17:50
	→ MLM joined	17:50
	→ editshare-ericf joined	17:50
	→ EminenceHC joined	17:50
	→ boombatower joined	17:50
	→ tyreld joined	17:50
	→ incredible joined	17:50
	→ joki joined	17:50
	→ gebjgd joined	17:50
	→ endiruna joined	17:50
	→ sburgess joined	17:50
	→ cbonobo joined	17:50
	→ fusionx86 joined	17:50
	→ IrishPrime joined	17:50
	→ zso joined	17:50
	→ Asiajey joined	17:50
	→ highcup joined	17:50
	→ Saturn812 joined	17:50
	→ chitopunk joined	17:50
	→ nadim_ joined	17:50
	→ nettoweb joined	17:50
	→ ErKa joined	17:50
	→ darkbasic joined	17:50
	→ jolda joined	17:50
	→ Zamyatin joined	17:50
	→ leolrrj joined	17:50
	→ jerius joined	17:50
	→ jwhisnant joined	17:50
	→ AaronMT joined	17:50
	→ paulweb515 joined	17:50
	→ Dorf joined	17:50
	→ ajf- joined	17:50
	→ daedeloth joined	17:50
	→ espindol_ joined	17:50
	→ th3fallen joined	17:50
	→ knownasilya joined	17:50
	→ Brain joined	17:50
	→ sgen joined	17:50
	→ frender joined	17:50
	→ sgambino joined	17:50
	→ mmakunas joined	17:50
	→ dougsland joined	17:50
	→ cavallari joined	17:50
	→ livingstn joined	17:50
	→ tristanp joined	17:50
	→ dstarh joined	17:50
	→ CEnnis91 joined	17:50
	→ phantombeta joined	17:50
	→ phillip joined	17:50
	→ Ryanar joined	17:50
	→ Texan joined	17:50
	→ ScottE joined	17:50
	→ zgzgzg joined	17:50
	→ rnsanchez joined	17:50
	→ nodedfree joined	17:50
	→ Akagi201_ joined	17:50
	→ mezod joined	17:50
	→ mostlybadfly joined	17:50
	→ qdk joined	17:50
	→ jokester joined	17:50
	→ fstd joined	17:50
	→ michael_mbp joined	17:50
	→ ethanol joined	17:50
	→ jas4711 joined	17:50
	→ StuartMI joined	17:50
	→ ozanhazer joined	17:50
	→ freestyl3r joined	17:50
	→ harish_ joined	17:50
	→ Dragooon joined	17:50
	→ SimonNa joined	17:50
	→ mojibake joined	17:50
	→ Tennis joined	17:50
	→ makhzi joined	17:50
	→ seg joined	17:50
	→ avtobiff joined	17:50
	→ mkoskar joined	17:50
	→ sdothum joined	17:50
	→ tuor joined	17:50
	→ pobivan joined	17:50
	→ butyoudonot joined	17:50
	→ Kronuz joined	17:50
	→ KronTMX joined	17:50
	→ dustinm joined	17:50
	→ ngladitz joined	17:50
	→ lucianangelus joined	17:50
	→ D-Boy joined	17:50
	→ Ricaz joined	17:50
	→ heroux joined	17:50
	→ marcogmonteiro joined	17:50
	→ lqi_ joined	17:50
	→ nfk joined	17:50
	→ meatmanek joined	17:50
	→ Kamran joined	17:50
	→ donnib joined	17:50
	→ cite joined	17:50
	→ Balliad joined	17:50
	→ TomyWork joined	17:50
	→ offbyone joined	17:50
	→ Guest29689 joined	17:50
	→ dan_s joined	17:50
	→ jonmasters joined	17:50
	→ JEEBcz joined	17:50
	→ petersr joined	17:50
	→ Sleepy63 joined	17:50
	→ babilen joined	17:50
	→ Ouchy joined	17:50
	→ Ravana joined	17:50
	→ tarkus joined	17:50
	→ lvh joined	17:50
	→ polyzen joined	17:50
	→ ra4king joined	17:50
	→ glebihan_ joined	17:50
	→ Tommy[D] joined	17:50
	→ hakunin joined	17:50
	→ bb010g joined	17:50
	→ Nikhil_D joined	17:50
	→ michelangelo joined	17:50
	→ rejerson69 joined	17:50
	→ yuciyuar joined	17:50
	→ Vampire0 joined	17:50
	→ Wulf joined	17:50
	→ robustus joined	17:50
	→ TinkerTyper joined	17:50
	→ zivester joined	17:50
	→ dsantiago joined	17:50
	→ jason237 joined	17:50
	→ meLon joined	17:50
	→ hexagoxel joined	17:50
	→ tirengarfio_ joined	17:50
	→ xcpep joined	17:50
	→ _rgn joined	17:50
	→ Nevik joined	17:50
	→ sword joined	17:50
	→ noname1 joined	17:50
	→ tHEMtZ joined	17:50
	→ bipolar joined	17:50
	→ melter joined	17:50
	→ f3lp joined	17:50
	→ tzero joined	17:50
	→ aboccia joined	17:50
	tepper.freenode.net set mode: +v	17:50
	→ Mathiasdm joined	17:50
	→ FreezingCold joined	17:50
	→ Khisanth joined	17:50
	→ johtso_ joined	17:50
	→ jbondhus joined	17:50
	→ ChauffeR joined	17:50
	→ ayan joined	17:50
	→ micechal joined	17:50
	→ neunon joined	17:50
	→ bgerber joined	17:50
	→ flaguy48 joined	17:50
	→ rivarun joined	17:50
	→ tgies joined	17:50
	→ tobiasBora joined	17:50
	→ kermit joined	17:50
	→ DolphinDreamm joined	17:50
	→ elementalest joined	17:50
	→ Emperor_Earth joined	17:50
	→ moat_joe joined	17:50
	→ wowaname joined	17:50
	→ Tuna-Fish joined	17:50
	→ Kage joined	17:50
	→ fnky joined	17:50
	→ Floatingman joined	17:50
	→ mquin joined	17:50
	→ JanC joined	17:50
	→ Guest46769 joined	17:50
	→ Impaloo joined	17:50
	→ bynarie joined	17:50
	→ bsanford joined	17:50
	→ happy-dude joined	17:50
	→ msm joined	17:50
	→ howlymowly joined	17:50
	→ kaendfinger joined	17:50
	→ ciaranm joined	17:50
	→ pekster joined	17:50
	→ danmackay joined	17:50
	→ here joined	17:50
	→ thorie joined	17:50
	→ [cust] joined	17:50
	→ legumbre joined	17:50
	→ duckson joined	17:50
	→ CussBot joined	17:50
	→ nicechap joined	17:50
	→ NQ joined	17:50
	→ nyuszika7h joined	17:50
	→ kotk joined	17:50
	→ MissionCritical joined	17:50
	→ catsup joined	17:50
	→ reinrag joined	17:50
	→ cxz joined	17:50
	→ dwmw2 joined	17:50
	→ dcpc0071 joined	17:50
	→ stfn joined	17:50
	→ Milos joined	17:50
	→ ashnur joined	17:50
	→ hagabaka joined	17:50
	→ AndreSomers joined	17:50
	→ benbergman joined	17:50
	→ bket joined	17:50
	→ oisfwijiwiofjwoe joined	17:50
	→ hgl joined	17:50
	→ scriptThis joined	17:50
	→ quizzi joined	17:50
	→ And1 joined	17:50
	→ Internet13 joined	17:50
	→ bede_ joined	17:50
	→ Arokh joined	17:50
	→ markelite joined	17:50
	→ milki joined	17:50
	→ mithro joined	17:50
	→ dmarr joined	17:50
	→ Olipro joined	17:50
	→ frogonwheels joined	17:50
	→ ag4ve_ joined	17:50
	→ vstoniest joined	17:50
	→ fzhu joined	17:50
	→ mozzarella joined	17:50
	→ smrtz joined	17:50
	→ MindfulMonk joined	17:50
	→ c^ joined	17:50
	→ slixpk joined	17:50
	→ CentaurWarchief joined	17:50
	→ SwedFTP joined	17:50
	→ Zamerick_ joined	17:50
	→ _ikke_ joined	17:50
	→ Orbitrix joined	17:50
	→ weaksauce joined	17:50
	→ ManneW joined	17:50
	→ KeelOfSteel joined	17:50
	→ Neico joined	17:50
	→ misty_g3ar joined	17:50
	→ rishi joined	17:50
	→ cbreak joined	17:50
	tepper.freenode.net set mode: +v	17:50
	→ Joseph__Silber joined	17:50
	→ Lunatrius joined	17:50
	→ Bucciarati joined	17:50
	→ moritz joined	17:50
	→ drathir joined	17:50
	→ Slush- joined	17:50
	→ RusAlex joined	17:50
	→ skoop joined	17:50
	→ Ankhers joined	17:50
	→ v0n joined	17:50
	→ crose joined	17:50
	→ jcp joined	17:50
	→ Weezey joined	17:50
	→ diget joined	17:50
	→ JDHawke joined	17:50
	→ loglaunch joined	17:50
	→ flipp joined	17:50
	→ mrkake joined	17:50
	→ BtbN joined	17:50
	→ same_ol_1eez joined	17:50
	→ spb joined	17:50
	→ plasticboy joined	17:50
	→ same_ol_geez joined	17:50
	→ __main__ joined	17:50
	→ Dreamer3 joined	17:50
	→ stealthii joined	17:50
	→ abec0 joined	17:50
	→ markovh joined	17:50
	→ constantinexvi joined	17:50
	→ jgornick joined	17:50
	→ Walex joined	17:50
	→ smferris joined	17:50
	→ Al1ve joined	17:50
	→ truh_ joined	17:50
	→ Nothing4You joined	17:50
	→ knopwob2 joined	17:50
	→ chris2 joined	17:50
	→ vedu joined	17:50
	→ hide_ joined	17:50
	→ tgummerer joined	17:50
	→ robbyoconnor joined	17:50
	→ Aaeriele joined	17:50
	→ interru joined	17:50
	→ FabTG joined	17:50
	→ BaNzounet joined	17:50
	→ hoodow joined	17:50
	→ doebi joined	17:50
	→ zidoh joined	17:50
	→ andschwa joined	17:50
	→ xrogaan_ joined	17:50
	→ jab416171 joined	17:50
	→ cwillu_at_work joined	17:50
	→ Chex joined	17:50
	→ scarcry joined	17:50
	→ danemacmillan joined	17:50
	→ dserodio joined	17:50
	→ srcerer joined	17:50
	→ loz-- joined	17:50
	→ albel727 joined	17:50
	→ iveqy joined	17:50
	→ navls joined	17:50
	→ DANtheBEASTman joined	17:50
	→ creppe_ joined	17:50
	→ ValicekB joined	17:50
	→ deltab joined	17:50
	→ elektrinis-wrk joined	17:50
	→ Guest8183 joined	17:50
	→ GarethAdams joined	17:50
	→ nutron joined	17:50
	→ romanovic joined	17:50
	→ c74d joined	17:50
	→ sonOfRa joined	17:50
	→ nuck joined	17:50
	→ Zarthus joined	17:50
	→ sess joined	17:50
	→ ntio joined	17:50
	→ jzk joined	17:50
	→ netameta joined	17:50
	→ guide joined	17:50
	→ mansel joined	17:50
	→ Briman joined	17:50
	→ mehdi joined	17:50
	→ edk joined	17:50
	→ CareBear\ joined	17:50
	→ Ssquidly joined	17:50
	→ Caelum joined	17:50
	→ evanc joined	17:50
	→ tabakhase joined	17:50
	→ bbhoss joined	17:50
	→ warthog9 joined	17:50
	→ tbsaunde joined	17:50
	→ tinanoo joined	17:50
	→ fuchstronaut joined	17:50
	→ Drakevr joined	17:50
	→ wagle joined	17:50
	→ tomzx joined	17:50
	→ belak joined	17:50
	→ crater2150 joined	17:50
	→ kanzure joined	17:50
	→ Orphis joined	17:50
	→ kenansulayman joined	17:50
	→ jpleau joined	17:50
	→ przemoc joined	17:50
	→ Nickeeh joined	17:50
	→ luksaur joined	17:50
	→ moparisthebest joined	17:50
	→ gniourf joined	17:50
	→ heftig joined	17:50
	→ brewmaster joined	17:50
	→ Rhonda joined	17:50
	→ xnox joined	17:50
	→ sharkz_ joined	17:50
	→ Fissure joined	17:50
	→ ghormoon joined	17:50
	→ Vorisi joined	17:50
	→ ixian8 joined	17:50
	→ Mapleyy joined	17:50
	→ frdmn joined	17:50
	→ Zeedox joined	17:50
	→ cschneid joined	17:50
	→ GGflags joined	17:50
	→ mhi^ joined	17:50
	→ infernix joined	17:50
	→ henriquev joined	17:50
	→ DSH105 joined	17:50
	→ joako joined	17:50
	→ hellschreiber joined	17:50
	→ akitada joined	17:50
	→ Aa4on joined	17:50
	→ DonRichie joined	17:50
	→ wcpan joined	17:50
	→ ELLIOTTCABLE joined	17:50
	→ devhost joined	17:50
	→ splenetic joined	17:50
	→ Hedgework joined	17:50
	→ HedgeMage joined	17:50
	→ k4r1m joined	17:50
	→ Trozz joined	17:50
	→ edenist joined	17:50
	→ synfinatic joined	17:50
	→ jonesinator joined	17:50
	→ GGMethos joined	17:50
	→ tibl joined	17:50
	→ batrick joined	17:50
	→ perrier joined	17:50
	→ alexwhitman joined	17:50
	→ vith joined	17:50
	→ milli joined	17:50
	→ jfield joined	17:50
	→ potteratt joined	17:50
	→ skasturi joined	17:50
	→ Cerise joined	17:50
	→ relrod joined	17:50
	→ webmeister joined	17:50
	→ mariorz joined	17:50
	→ yrashk joined	17:50
	→ alanwill joined	17:50
	→ teadrop_ joined	17:50
	→ hiironymus joined	17:50
	→ Phtes joined	17:50
	→ xyNNN joined	17:50
	→ clone1018 joined	17:50
	→ epic joined	17:50
	→ gsilva joined	17:50
	→ sfr^ joined	17:50
	→ shauna joined	17:50
	→ ben_alman joined	17:50
	→ iml joined	17:50
	→ Zarthuss joined	17:50
	→ nem_z joined	17:50
	→ _W_ joined	17:50
	→ stakewinner00 joined	17:50
	→ cpach joined	17:50
	→ Mo0O joined	17:50
	→ systmkor joined	17:50
	→ tracer-t joined	17:50
	→ UmbraMalison joined	17:50
	→ kossy joined	17:50
	→ dling joined	17:50
	→ drodger joined	17:50
	→ moei joined	17:50
	→ EgS joined	17:50
	→ novas0x2a joined	17:50
	→ Sonderblade joined	17:50
	→ aucecil joined	17:50
	→ TDJACR joined	17:50
	→ guampa joined	17:50
	→ Kartagis joined	17:50
	tepper.freenode.net set mode: +v	17:50
	→ shaunoo joined	17:50
	→ MadsRC joined	17:50
	→ ninsei joined	17:50
	→ totesmuhgoats joined	17:50
	→ calops1 joined	17:50
	→ elnur joined	17:50
	→ pooh22 joined	17:50
	→ niax_ joined	17:50
	→ Kovensky joined	17:50
	→ leprechau joined	17:50
	→ tazle__ joined	17:50
	→ dilfridge joined	17:50
	→ dlitz_ joined	17:50
	→ Ragnor joined	17:50
	→ cods_ joined	17:50
	→ PerlJam joined	17:50
	→ kke_ joined	17:50
	→ manuel___ joined	17:50
	→ thejoecarroll_ joined	17:50
	→ surfdue joined	17:50
	→ Mixologic joined	17:50
	→ ndim joined	17:50
	→ thedudez0r joined	17:50
	→ jakob joined	17:50
	→ dkn64738 joined	17:50
	→ moop joined	17:50
	→ tjbp joined	17:50
	→ EspadaV8 joined	17:50
	→ hxm joined	17:50
	→ tsunamie joined	17:50
	→ daynaskully joined	17:50
	→ Telvana joined	17:50
	→ erichf joined	17:50
	→ JrCs_ joined	17:50
	→ junecaz joined	17:50
	→ troyt joined	17:50
	→ arminius joined	17:50
	→ yahoshi joined	17:50
	→ tomek joined	17:50
	→ DrNick joined	17:50
	→ Guest76884 joined	17:50
	→ daxroc joined	17:50
	→ mattl joined	17:50
	→ brandonw joined	17:50
	→ blackjid joined	17:50
	→ Klumben joined	17:50
	→ kjnilsson joined	17:50
	tepper.freenode.net set mode: +vv	17:50
	→ huhlig joined	17:50
	→ murph joined	17:50
	→ Forkk joined	17:50
	→ ozymandias joined	17:50
	→ killerpty joined	17:50
	→ fullstack joined	17:50
	→ jamietech joined	17:50
	→ Ziber joined	17:50
	→ metze joined	17:50
	→ c0ded joined	17:50
	→ Seveas joined	17:50
	→ Spinkzeit joined	17:50
	→ bandroidx joined	17:50
	→ aseidl joined	17:50
	→ Korvin joined	17:50
	→ quentusrex joined	17:50
	→ uidzer0 joined	17:50
	→ atn34 joined	17:50
	→ haaja_ joined	17:50
	→ vishal joined	17:50
	→ doppo joined	17:50
	→ Bigcheese joined	17:50
	→ deste joined	17:50
	→ tobiasvl joined	17:50
	→ metaf5 joined	17:50
	→ Neptu joined	17:50
	→ javaJake joined	17:50
	→ colona joined	17:50
	→ cworth joined	17:50
	→ dawik_ joined	17:50
	→ mtscout6_ joined	17:50
	→ kevc_ joined	17:50
	→ niko joined	17:50
	→ blueyed joined	17:50
	→ fishey1 joined	17:50
	→ ping-pong joined	17:50
	→ ruskie joined	17:50
	→ MKCone`Office joined	17:50
	→ twisted` joined	17:50
	→ Cathy joined	17:50
	→ darnir joined	17:50
	→ Xe joined	17:50
	→ bob_f joined	17:50
	→ CalimeroTeknik joined	17:50
	→ ldlework joined	17:50
	→ preilly joined	17:50
	→ qsuscs joined	17:50
	tepper.freenode.net set mode: +vv	17:50
	→ soosfarm_ joined	17:50
	→ nanga joined	17:50
	→ Mark_ joined	17:50
	→ kingoftcp joined	17:50
	→ Devels joined	17:50
	→ ujjain joined	17:50
	→ Mekkis joined	17:50
	→ iron_houzi joined	17:50
	→ slick joined	17:50
	→ daurnimator joined	17:50
	→ grawity joined	17:50
	→ dx joined	17:50
	→ Novacha joined	17:50
	→ ksk joined	17:50
	→ wbdecker joined	17:50
	→ ffualo joined	17:50
	→ ale_ joined	17:50
	→ jaeckel joined	17:50
	→ nephyrin` joined	17:50
	→ leTali joined	17:50
	→ Werring joined	17:50
	→ ojacobson joined	17:50
	→ ShibMcNe_ joined	17:50
	→ Chipzz joined	17:50
	→ jiriki- joined	17:50
	→ BooK_ joined	17:50
	→ M-ou-se joined	17:50
	→ Seikho joined	17:50
	→ rika joined	17:50
	→ dlb76 joined	17:50
	→ rom1504 joined	17:50
	→ Gege joined	17:50
	→ robinsmidsrod joined	17:50
	→ DistantStar joined	17:50
	→ xr4nd joined	17:50
	→ de-vri-es joined	17:50
	→ hyperair joined	17:50
	→ _flow_ joined	17:50
	→ up_the_irons joined	17:50
	→ derrzzaa joined	17:50
	→ hplar joined	17:50
	→ pwds joined	17:50
	→ KekSi joined	17:50
	→ KennyRayFL joined	17:50
	→ cstrahan joined	17:50
	→ Caius joined	17:50
	→ greymalkin joined	17:50
	→ taru joined	17:50
	→ bremner joined	17:50
	→ bittyx joined	17:50
	→ introom joined	17:50
	→ s34n joined	17:50
	→ toydestroyer joined	17:50
	→ technivore joined	17:50
	→ Gravitron joined	17:50
	→ Bilge joined	17:50
	→ synchronous joined	17:50
	→ apipkin joined	17:50
	→ squentin joined	17:50
	→ da5id joined	17:50
	→ c355E3B joined	17:50
	→ Ornacia- joined	17:50
	→ [diecast] joined	17:50
	→ JStoker joined	17:50
	→ eternnoir_ joined	17:50
	→ maxb joined	17:50
	→ deavidsedice joined	17:50
	→ relgar joined	17:50
	→ nasso_ joined	17:50
	→ wrouesnel1 joined	17:50
	→ mroth joined	17:50
	→ lacrosse__ joined	17:50
	→ tfnico joined	17:50
	→ kalz joined	17:50
	→ casual__ joined	17:50
	→ shennyg joined	17:50
	→ jmfcool____ joined	17:50
	→ iamtakingiteasy joined	17:50
	→ aspiers joined	17:50
	→ kwmiebach joined	17:50
	→ HicksD joined	17:50
	→ spaceone joined	17:50
	→ bailon joined	17:50
	→ falstaff joined	17:50
	→ axion joined	17:50
	→ Moult joined	17:50
	→ roto joined	17:50
	→ grandrew joined	17:50
	→ souther joined	17:50
	→ electrogeek joined	17:50
	→ bambams joined	17:50
	→ ketas joined	17:50
	→ wanders_ joined	17:50
	→ lethosor joined	17:50
	→ ORiON--- joined	17:50
	→ cybersphinx joined	17:50
	→ armyriad joined	17:50
	→ Boniche joined	17:50
	→ aberrant joined	17:50
	→ Someguy123 joined	17:50
	→ niax joined	17:50
	→ RTG` joined	17:50
	→ mw joined	17:50
	→ Ratler joined	17:50
	→ arcanis joined	17:50
	→ strictlyb joined	17:50
	→ GyrosGeier joined	17:50
	→ ChrisWarrick joined	17:50
	→ mknn joined	17:50
	→ Stummi joined	17:50
	→ mmattice joined	17:50
	→ sharkz joined	17:50
	→ Ionic joined	17:50
	→ milieu joined	17:50
	→ ajpiano joined	17:50
	→ axisys joined	17:50
	→ howitdo joined	17:50
	→ soerenb joined	17:50
	→ Pookz joined	17:50
	→ f0ster joined	17:50
	→ themill joined	17:50
	→ dharrigan joined	17:50
	→ BinGOs joined	17:50
	→ Cata\|Work joined	17:50
	→ Joost` joined	17:50
	→ i_ron joined	17:50
	→ Somasis joined	17:50
	→ Xack joined	17:50
	→ gdrc joined	17:50
	→ tapout joined	17:50
	→ Remram joined	17:50
	→ opdavies joined	17:50
	→ jfbouchard joined	17:50
	→ Samual joined	17:50
	→ nevyn joined	17:50
	→ d1b joined	17:50
	→ cpt-oblivious joined	17:50
	→ HSaka joined	17:50
	→ nemesit\|znc joined	17:50
	→ yoh_ joined	17:50
	→ therealklanni joined	17:50
	→ hfp_work joined	17:50
	→ hfp joined	17:50
	→ Gianormagantrous joined	17:50
	→ byaruhaf joined	17:50
	→ rounce joined	17:50
	→ salparadise joined	17:50
	→ kirjs_______ joined	17:50
	→ saidelike joined	17:50
	→ trig-ger joined	17:50
	→ dualbus joined	17:50
	→ chernjie joined	17:50
	→ t-mart__ joined	17:50
	→ totte joined	17:50
	→ harleypig joined	17:50
	→ Sp4rKy joined	17:50
	→ sarrri joined	17:50
	→ jast joined	17:50
	→ kaictl joined	17:50
	→ faheem_ joined	17:50
	→ markmarkmark joined	17:50
	→ ulkesh joined	17:50
	→ woshty joined	17:50
	→ saurik joined	17:50
	→ drager joined	17:50
	→ webguynow joined	17:50
	→ BeerSerc joined	17:50
	→ fugiman joined	17:50
	→ sea-gull joined	17:50
	→ zorzar joined	17:50
	→ BytesAndCoffee joined	17:50
	→ rdema joined	17:50
	→ mattcen joined	17:50
	→ Nugget joined	17:50
	→ nioncode joined	17:50
	→ Schrostfutz joined	17:50
	→ mika joined	17:50
	→ kdlv joined	17:50
	→ pR0Ps joined	17:50
	→ chimeracoder joined	17:50
	→ ColdKeyboard joined	17:50
	→ raymond joined	17:50
	→ ix007 joined	17:50
	→ Bombe joined	17:50
	→ dewdrop joined	17:50
	→ Celelibi joined	17:50
	→ netj_ joined	17:50
	→ SJr joined	17:50
	→ rylinaux_ joined	17:50
	→ frobnic joined	17:50
	→ __name__ joined	17:50
	→ Juri_Agarin joined	17:50
	→ ctag joined	17:50
	→ canton7 joined	17:50
	→ FilipNortic joined	17:50
	→ luto joined	17:50
	→ jfive joined	17:50
	→ GodEater joined	17:50
	→ doobi-sham_ joined	17:50
	→ EvanDotPro joined	17:50
	→ dropdrive joined	17:50
	→ Timvde joined	17:50
	→ TheTeapot_ joined	17:50
	→ Kobaz joined	17:50
	→ krzywy joined	17:50
	→ deryni joined	17:50
	→ yohnnyjoe joined	17:50
	→ lrvick joined	17:50
	→ juril joined	17:50
	→ ReScO joined	17:50
	→ wolog_ joined	17:50
	→ Jeroen52 joined	17:50
	→ someplace joined	17:50
	→ AlexanderS joined	17:50
	→ MacGyver joined	17:50
	→ ryanneufeld joined	17:50
	→ skelterjohn joined	17:50
	→ jantje joined	17:50
	→ jokajak joined	17:50
	→ vlt joined	17:50
	→ JelmerD joined	17:50
	→ kini joined	17:50
	→ osse joined	17:50
	→ ejnahc joined	17:50
	→ ghoti joined	17:50
	→ mutex joined	17:50
	→ GothAlice joined	17:50
	→ phy1729 joined	17:50
	→ hydrajump joined	17:50
	→ linduxed joined	17:50
	→ hohum joined	17:50
	→ h12o_ joined	17:50
	→ Alenah- joined	17:50
	→ brainproxy joined	17:50
	→ nowox_ joined	17:50
	tepper.freenode.net set mode: +v	17:50
	→ tokkee joined	17:50
	→ ThiefMaster joined	17:50
	→ KnightRider00 joined	17:50
	→ njbair joined	17:50
	→ chilversc_ joined	17:50
	→ unholycrab joined	17:50
	→ l1ght joined	17:50
	→ averell joined	17:50
	→ scorphus joined	17:50
	→ musca joined	17:50
	→ madduck joined	17:50
	→ lewellyn joined	17:50
	→ tyteen4a03 joined	17:50
	→ mitzip joined	17:50
	→ adnap joined	17:50
	→ ruukasu joined	17:50
	→ Muzer joined	17:50
	→ Grum joined	17:50
	→ fold joined	17:50
	→ Ring0` joined	17:50
	→ oomi joined	17:50
	→ RoryHughes joined	17:50
	→ dsop joined	17:50
	→ Happzz joined	17:50
	→ mino- joined	17:50
	→ hegge joined	17:50
	→ Fiouz joined	17:50
	→ cloudcell_ joined	17:50
	→ tmz joined	17:50
	→ dlester joined	17:50
	→ haasn joined	17:50
	→ bernalex joined	17:50
	→ uber joined	17:50
	→ epitron joined	17:50
	→ cannonball joined	17:50
	→ du joined	17:50
	→ Hello71 joined	17:50
	→ AKPWD joined	17:50
	→ Brando753 joined	17:50
	→ bauruine joined	17:50
	→ Blkt joined	17:50
	→ pythonsnake joined	17:50
	→ j416 joined	17:50
	→ weyer joined	17:50
	→ Vadtec joined	17:50
	→ ribasushi joined	17:50
	→ bashcoder joined	17:50
	→ terkelg joined	17:50
	→ kschlesselmann joined	17:50
	→ crane_ joined	17:50
	→ jhermann joined	17:50
	→ jmcantrell joined	17:50
	→ blast_hardcheese joined	17:50
	→ wenzowski joined	17:50
	→ berndj joined	17:50
	→ bball joined	17:50
	→ mjbrender joined	17:50
	→ SleePy joined	17:50
	→ zero7 joined	17:50
	→ parshap joined	17:50
	→ sybariten joined	17:50
	→ mitsuhiko joined	17:50
	→ quadz joined	17:50
	→ mirko joined	17:50
	→ tystr joined	17:50
	→ vigilvindex joined	17:50
	→ joevandyk joined	17:50
	→ awx joined	17:50
	→ doop joined	17:50
	→ baloney joined	17:50
	→ comps joined	17:50
	→ cYmen_ joined	17:50
	→ joelsmith joined	17:50
	→ iokill joined	17:50
	→ Silex joined	17:50
	→ andres joined	17:50
	→ Karunamon joined	17:50
	→ xrogaan joined	17:50
	→ Pieter__ joined	17:50
	→ jayne joined	17:50
	→ Esya joined	17:50
	→ Kamilion joined	17:50
	→ Virox joined	17:50
	→ Sigma joined	17:50
	→ mischief joined	17:50
	→ ratsupremacy joined	17:50
	→ drawkula joined	17:50
	→ timthowtdi joined	17:50
	→ Davey joined	17:50
	→ alicef joined	17:50
	→ camt joined	17:50
	→ wilornel joined	17:50
	→ gabc joined	17:50
	→ neurodamage joined	17:50
	→ cherwin joined	17:50
	→ jesse__ joined	17:50
	→ preaction joined	17:50
	→ UukGoblin joined	17:50
	→ frobware joined	17:50
	→ cxreg joined	17:50
	→ Wader joined	17:50
	→ knittl joined	17:50
	→ Levex joined	17:50
	→ marvinpinto joined	17:50
	→ joshc joined	17:50
	→ MrC joined	17:50
	→ EnergyCoffee joined	17:50
	→ ag4vef joined	17:50
	→ tonyj joined	17:50
	→ kennon_ joined	17:50
	→ [swift] joined	17:50
	tepper.freenode.net set mode: +vvvv	17:50
	→ sparr joined	17:50
	→ weltall joined	17:50
	→ murr4y joined	17:50
	→ Jupelius joined	17:50
	→ OMGOMG joined	17:50
	→ tpope joined	17:50
	→ PasiFist joined	17:50
	→ tomred joined	17:50
	→ DonVitoCorleone joined	17:50
	→ Ram-Z joined	17:50
	→ mischat joined	17:50
	→ callumacrae joined	17:50
	→ hdrv joined	17:50
	→ forgot joined	17:50
	→ siprbaum joined	17:50
	→ mukmuk joined	17:50
	→ Kuukunen joined	17:50
	→ ruediger joined	17:50
	→ avar joined	17:50
	→ gnarf joined	17:50
	→ bond joined	17:50
	→ jeffhung_ joined	17:50
	→ s_e joined	17:50
	→ tm512 joined	17:50
	→ zack6849 joined	17:50
	→ john-dev joined	17:50
	→ NaiveFrost joined	17:50
	→ SirCmpwn joined	17:50
	→ dl9pf joined	17:50
	→ ska-fan joined	17:50
	→ nanonyme joined	17:50
	→ enleeten joined	17:50
	→ schlumpi joined	17:50
	→ retard joined	17:50
	→ Hamled joined	17:50
	→ ahf joined	17:50
	→ Takumo joined	17:50
	→ [su] joined	17:50
	→ roflin joined	17:50
	→ kevinfagan_ joined	17:50
	→ SebastianFlyte joined	17:50
	→ viktorgodard joined	17:50
	→ ohcibi joined	17:50
	→ leptonix joined	17:50
	→ ToBeFree joined	17:50
	→ erichmenge joined	17:50
	→ eXeC64 joined	17:50
	→ kgadek joined	17:50
	→ rudi_s joined	17:50
	→ MMukherjee joined	17:50
	→ adambrenecki joined	17:50
	→ thibaultcha joined	17:50
	→ sitaram joined	17:50
	→ kapowaz joined	17:50
	→ dsteplight___ joined	17:50
	→ antispaceman joined	17:50
	→ Spockz joined	17:50
	→ RichardJ joined	17:50
	→ eagles0513875_ joined	17:50
	→ monty joined	17:50
	→ SegFaultAX joined	17:50
	→ dachary joined	17:50
	→ blarson_ joined	17:50
	→ monokrome joined	17:50
	→ Chaser_ joined	17:50
	→ pasky joined	17:50
	→ bdesmet joined	17:50
	→ xnrand joined	17:50
	→ gitinfo joined	17:50
	→ zequence joined	17:50
	→ beagleGuy joined	17:50
	→ RichiH joined	17:50
	→ imMute joined	17:50
	→ skul joined	17:50
	→ b0ne_ joined	17:50
	→ krabat joined	17:50
	→ u1106 joined	17:50
	tepper.freenode.net set mode: +vov	17:50
	→ rezzrov joined	17:50
	→ Sharker joined	17:50
	→ martinbmadsen joined	17:50
	→ timewalker joined	17:50
	→ Soliton joined	17:50
	→ jrnieder joined	17:50
	→ dan64 joined	17:50
	→ gtmanfred joined	17:50
	→ Yomi joined	17:50
	→ dfedde joined	17:50
	→ Eugene joined	17:50
	→ midnightmagic joined	17:50
	→ sadmac joined	17:50
	→ yena joined	17:50
	→ Rastus_Vernon joined	17:50
	→ harv joined	17:50
	→ bjornars1 joined	17:50
	→ bret joined	17:50
	→ GameGamer43 joined	17:50
	→ lebster joined	17:50
	→ rvirding joined	17:50
	→ Outsider__ joined	17:50
	→ preyalone joined	17:50
	→ ggherdov joined	17:50
	→ kd` joined	17:50
	→ manitu joined	17:50
	→ mt joined	17:50
	→ billy_ran_away joined	17:50
	tepper.freenode.net set mode: +vv	17:50
	← tg left	17:50
	← githogori left	17:50
	← daedeloth left	17:50
	← Ceber left	17:50
	→ drbean joined	17:50
	→ Guest96958 joined	17:50
MadLamb	my master had A - B, I worked on it and got A - B - C - D. Then i rebased it to another branch and got A - B - X - Y - C - D. I tried rebasing back to master but it still A - B - X - Y - C - D. How I go back to A - B - C - D?	17:50
	→ lamont joined	17:50
	→ skullcrasher joined	17:50
	→ githogori joined	17:50
	→ jave joined	17:51
	→ otter768 joined	17:51
	tomaw_ → tomaw	17:51
	← srcerer left	17:51
	→ circ-user-SSaBd joined	17:51
	→ tg joined	17:51
	← nicechap left	17:52
	→ shudon joined	17:52
	← shudon left	17:52
	→ PCatinean joined	17:52
	→ Jetchisel joined	17:52
	→ qpdb joined	17:52
rath	MadLamb: "git rebase --onto master HEAD~2" I think	17:52
	→ HenriettaSalt joined	17:52
	→ shudon joined	17:52
	← shudon left	17:52
	→ djh joined	17:52
	→ haavstr joined	17:53
	→ parasite joined	17:53
	→ Segfault_ joined	17:53
	→ nour joined	17:53
	→ Zupoman joined	17:53
	→ simpleuser1 joined	17:53
	→ lamppid joined	17:53
	→ phpcoder joined	17:53
	→ rasto joined	17:53
	→ shudon joined	17:53
	← shudon left	17:53
	→ tomog999_ joined	17:53
	→ shudon joined	17:53
	← shudon left	17:53
	← skullcrasher left	17:53
	← Ryanar left	17:53
	→ shudon joined	17:53
	← shudon left	17:53
	→ ToxicFrog joined	17:54
	→ marienz joined	17:54
	→ tchan joined	17:54
	→ JargonNode joined	17:54
	→ roknir joined	17:54
d3r1ck	does Git have a Client?	17:54
	→ wgrant joined	17:54
MadLamb	rath, i want to keep C and D, not X and Y, HEAD~2 wouldn't mean removing C and D?	17:54
d3r1ck	some sort of an interface that one can work from?	17:54
	→ Steve_Jobs joined	17:54
rath	MadLamb: yeah, then a misread it	17:55
	→ sokoll joined	17:55
	← otter768 left	17:55
rath	MadLamb: well, no	17:55
	→ wrouesnel3 joined	17:55
	← Vinnie_win_w left	17:55
	→ silviof joined	17:56
	→ nwf joined	17:56
rath	this command will rebase on "master" and will rebase all commits that are beyond HEAD~2, so C and D	17:56
	PaulePan1er → PaulePanetr	17:56
	→ shudon joined	17:56
	PaulePanetr → PaulePanter	17:56
	← shudon left	17:56
	→ shudon joined	17:56
	← shudon left	17:56
rath	so you will have master -> C -> D	17:57
	→ shudon joined	17:57
	← shudon left	17:57
	→ shudon joined	17:57
	← shudon left	17:57
	→ Vinnie_win joined	17:57
	→ shudon joined	17:57
	← shudon left	17:57
rath	you can replace "master" with "origin/master" or something, it is the branch you want to rebase on	17:57
	→ shudon joined	17:58
	← shudon left	17:58
	→ ule joined	17:58
ule	hi guys	17:58
	→ shudon joined	17:58
	← shudon left	17:58
	→ shudon joined	17:58
	← shudon left	17:59
d3r1ck	ule: hi	17:59
	→ shudon joined	17:59
	← shudon left	17:59
	→ hahuang65 joined	17:59
	→ shudon joined	17:59
	← shudon left	17:59
ule	I have two remotes.. A and B.. how can I merge a specific branch from repo B into my repo A (master) ?	17:59
	Quevin_ → Quevin	17:59
	← Vinnie_win left	17:59
	→ shudon joined	17:59
	← shudon left	17:59
	→ nikio_ joined	18:00
	→ shudon joined	18:00
	← shudon left	18:00
	→ edude03 joined	18:00
	→ shudon joined	18:00
	← shudon left	18:00
	← barduck left	18:00
	→ shudon joined	18:00
	← shudon left	18:00
ule	it looks like its similar of merging branches	18:00
	but from different remotes	18:01
	?	18:01
	→ shudon joined	18:01
	← shudon left	18:01
	→ shudon joined	18:01
	← shudon left	18:01
	→ shudon joined	18:01
	← shudon left	18:01
	→ liamkeily joined	18:02
	→ shudon joined	18:02
	← shudon left	18:02
	← leehambley left	18:02
	→ shudon joined	18:02
	← shudon left	18:02
	→ shudon joined	18:03
	← shudon left	18:03
	→ shudon joined	18:03
	← shudon left	18:03
	→ shudon joined	18:03
	← shudon left	18:03
	→ shudon joined	18:04
	← shudon left	18:04
	→ shudon joined	18:04
	← shudon left	18:04
	→ nicechap joined	18:04
	→ shudon joined	18:04
	← shudon left	18:04
	→ shudon joined	18:05
	← shudon left	18:05
	→ akushner joined	18:05
	→ shudon joined	18:05
	← ajf- left	18:05
	→ redondos joined	18:06
	→ ascarter joined	18:06
	← fate_ left	18:07
	← ule left	18:07
redondos	hi. when I run `git log --stat' I only see 16 commits. how can I see the last 100, or the whole history? I tried using -100 or --stat=,100 to no avail.	18:07
	→ duderonomy joined	18:07
	← diminoten_ left	18:08
rath	ule: there are several ways. One way is to use "git pull <options> <repo-url> <branch>".	18:08
	← mellernoia left	18:09
imachuchu	redondos: I just ran that exact command "git log --stat" in a repo with many more then 16 commits and saw them all. Are you running it from a branch that has more then 16 commits on it?	18:09
	← lsiv568 left	18:11
	← zso left	18:11
	← chitopunk left	18:11
d3r1ck	i will start reading things on git developement this night	18:12
	→ zso joined	18:12
	← micechal left	18:13
	← Grimlock11 left	18:13
redondos	imachuchu: yes I am	18:13
	← d3r1ck left	18:13
	← thiago_ left	18:13
	← ropav left	18:14
	→ ropav joined	18:14
	→ katherine joined	18:15
	→ naftilos76 joined	18:15
	← ascarter left	18:16
redondos	imachuchu: it looks like the problem is in one particular commit. thanks for looking	18:17
	it stops listing them and shows "fatal: unable to read 6b9d7862c504d03e1ec1a83d0dd87c89a39105f3"	18:17
	← jason237 left	18:18
	← Impaloo left	18:18
	→ Impaloo joined	18:18
	← Gianormagantrous left	18:18
imachuchu	redondos: my knee jerk reaction is to tell you to run git fsck (it never hurts to be extra cautious)	18:19
redondos	i recloned the repo, it's all there now	18:19
	thanks for your help	18:19
	→ fr33domlover joined	18:19
	→ charon joined	18:20
	→ m0ltar joined	18:20
	→ encod3 joined	18:20
	→ sd_ joined	18:20
	← encod3 left	18:20
	→ Gianormagantrous joined	18:20
	← Gianormagantrous left	18:21
	→ ropav_ joined	18:22
	→ MattMaker joined	18:22
	→ diphtherial joined	18:22
diphtherial	hey, i'm trying to think of a nice workflow in the case where i have to immediately sync my local changes to a remote server to try them out (mostly web development at this point)	18:23
	→ Gianormagantrous joined	18:23
diphtherial	i have the repo cloned both locally and on the remote, and i make edits in the local checked-out copy which are immediately sent to the remote	18:24
	→ hans_s joined	18:24
diphtherial	i'm unsure of where to make commits; ideally, i'd make them locally, push them to the git server, then pull them on the remote	18:24
	← TomyWork left	18:24
diphtherial	but since the remote is effectively up to date, i anticipate that that'll lead to a lot of merge errors...	18:25
	← ropav left	18:25
diphtherial	maybe it's time to start working in increments of commits instead of the remote instantly reflecting the change	18:26
	→ jottr joined	18:26
	← MattMaker left	18:26
	← wicope left	18:28
	→ wicope_ joined	18:28
Remram	don't use Git on the remote if you're syncing via some other mean	18:30
	→ Ceber joined	18:30
	→ dvl_ joined	18:30
	→ BuenGenio joined	18:31
	→ ManikM joined	18:31
	← gopar left	18:31
	Briman → Briman\|off	18:32
diphtherial	that's a fair point	18:32
	← Gianormagantrous left	18:32
	→ Es0teric joined	18:32
diphtherial	my IDE unfortunately only copies individual files when they change, so i'm kind of stuck on how to use branches if the repo's not on the remote as well	18:32
	→ Dougie187 joined	18:33
diphtherial	i'm thinking of dropping the IDE remote sync completely and just adding a hook on the server to auto-pull when there's a commit on github	18:33
Remram	rsync or something? I don't know	18:33
	← paulweb515 left	18:33
	← ManikM left	18:33
	→ ManikM joined	18:34
	← tarkus left	18:34
diphtherial	that could work, yeah. so i'd not have a repo checked out on the remote, then i'd use a daemon like rsync to make sure that it's in sync with my client	18:35
	← lqi_ left	18:35
	→ chitopunk joined	18:35
	← redondos left	18:35
	→ AhabsBeard joined	18:36
	Briman\|off → Briman	18:37
	← Gizburdt left	18:37
	→ Gizburdt joined	18:38
	← Dreamer3 left	18:38
	→ Dreamer3 joined	18:39
	← ewong left	18:39
	← PCatinean left	18:39
	→ ewong joined	18:40
	→ shinnya joined	18:40
	→ tarkus joined	18:41
	→ brettfrable joined	18:41
	lahwran_ → lahwran	18:42
	← Es0teric left	18:43
	→ Cust0sL1men joined	18:44
	→ woodruffw_ joined	18:44
	→ ketul joined	18:44
	→ BigWillie joined	18:44
	← tarkus left	18:45
	→ Es0teric joined	18:45
ketul	hello how can I update my forked repo along with my changes saved	18:45
	→ holodoc joined	18:45
	→ tarkus joined	18:45
	← sin3t left	18:45
ketul	can anyone help me with commands	18:45
	?	18:45
	← tarkus left	18:45
	← liamkeily left	18:46
diphtherial	ketul: just to verify, you forked a repo (i assume on github), checked it out locally, made changes, and now you want to commit your local changes to your local repo?	18:46
	(and i assume eventually push them back up to github to your fork?)	18:46
ketul	yep as assumed	18:47
	I made changes diphtherial pushed to forked repo	18:47
	→ tarkus joined	18:47
ketul	but the forked repo got updated	18:47
	→ noname joined	18:48
diphtherial	ah, you mean the original repo from which you forked has new commits?	18:48
ketul	yep and I want to merge it	18:48
	← bynarie left	18:48
	← woodruffw left	18:48
ketul	along with my changes diphtherial	18:48
diphtherial	first you'll want to stage and commit your changes if you haven't done that already	18:49
ketul	that I made also on github using git push	18:49
diphtherial	ok, great, so your local changes are all committed	18:49
ketul	yep	18:49
	→ cyphase joined	18:49
diphtherial	basically, the only thing special about a "forked" repo is that it has a remote named "upstream" from which you can pull to integrate changes from the original repo into yours	18:50
ketul	so how can merge new commits made after my fork	18:50
diphtherial	first you want to git fetch upstream to pull the upstream changes into your local branch	18:50
	are you on the master branch, or some other branch?	18:51
	er, local repo, not branch	18:51
	→ hawks43 joined	18:51
ketul	master	18:51
	← doener left	18:51
diphtherial	k, cool	18:51
	so now to merge the upstream changes into your local master branch, do a git merge upstream/master	18:52
	hopefully it'll merge cleanly; if not, you'll have to resolve the merge conflicts, add them, then commit the merge manually	18:52
	gitinfo set mode: +v	18:52
diphtherial	ketul: for reference, https://help.github.com/articles/syncing-a-fork/	18:52
hawks43	hi all	18:52
gitinfo	hawks43: 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.	18:52
	← Hetu left	18:53
	← mojibake left	18:53
	← tarkus left	18:53
hawks43	does anyone have experience using git svn clone and problems with the generated branches and tags?	18:53
	→ tarkus joined	18:53
	→ Hetu joined	18:54
	← Emperor_Earth left	18:54
	→ lpax joined	18:54
	→ Gama11_ joined	18:55
	← zgzgzg left	18:55
hawks43	I have a legacy svn repo that I'm trying to checkout and clean up to start using git. I was looking at the migration guide in the git manual and they suggest cleaning up the refs remotes and tags, but everything is packed so I have nothing in those directories	18:56
ketul	ty diphtherial	18:57
	← Padawan left	18:57
	→ Padawan_ joined	18:57
	→ ixjlyons joined	18:58
	← stantonk left	18:58
	← Gama11 left	18:58
	← AhabsBeard left	18:59
	← nb_bez___ left	19:00
	→ AhabsBeard joined	19:00
	→ MattMaker joined	19:01
	→ leehambley joined	19:01
	→ sin3t joined	19:01
	← tarkus left	19:01
	→ Nizumzen joined	19:02
	← Gizburdt left	19:02
	→ Gizburdt joined	19:02
	→ tarkus joined	19:02
	← maqr_ left	19:03
	→ Motoko joined	19:03
	← BigWillie left	19:03
diphtherial	ketul: np; nice to be able to give back sometimes	19:04
	hawks43: your question is heard, but i unfortunately haven't used svn for years :\	19:04
	← ketul left	19:04
	← linduxed left	19:05
hawks43	ha, thanks diphtherial. Do you happen to know if I could manually reorganize my refs in git? I modified my .git/packed-refs and my local then saw them as appropriate branches. But when I pushed that to my remote, the refs now are incorrect on a fresh clone	19:05
	← Motoko left	19:06
	→ PeterBooker joined	19:06
	→ halfline joined	19:07
diphtherial	be warned, i am a newbie, but iirc packed-refs is just a cached version of .git/refs	19:07
	you should make the changes in .git/refs, then use git pack-refs to sync them, i think	19:07
	→ doener joined	19:07
	← Gizburdt left	19:07
	→ paulweb515 joined	19:08
	← EminenceHC left	19:09
hawks43	thanks, that was my thought also.	19:09
	→ oskarkv joined	19:09
	→ BigWillie joined	19:09
	→ tmager joined	19:09
	← tmager left	19:10
	← Cust0sL1men left	19:10
	→ Error404NotFound joined	19:10
	← AaronMT left	19:11
	← tarkus left	19:11
	→ AaronMT joined	19:11
	→ zematis joined	19:12
	→ rockstar_ joined	19:13
	← zematis left	19:14
	→ Gianormagantrous joined	19:14
	← Gianormagantrous left	19:14
	→ Gianormagantrous joined	19:14
qsuscs	hawks43: !svn2git	19:15
gitinfo	hawks43: For a one-time conversion of SVN to git, svn2git should be used instead of git-svn. There are many tools with this name. Probably the best is the KDE one at https://github.com/svn-all-fast-export/svn2git. To analyze the SVN repo history upfront for building up proper rules for svn2git, you might use svneverever from here: http://blog.hartwork.org/?p=763	19:15
qsuscs	and you should not poke around in .git, there are plumbing tools	19:15
	← nilg` left	19:15
	woodruffw_ → woodruffw	19:15
	← AaronMT left	19:16
	← paulweb515 left	19:16
	→ tarkus joined	19:16
hawks43	awesome, thanks everyone	19:16
	→ AaronMT joined	19:16
	← ende left	19:16
	→ ende joined	19:17
	← phpcoder left	19:17
	→ akiva joined	19:18
	→ linduxed joined	19:20
	← guillaume-rb left	19:20
	← rath left	19:20
	diphtherial thumbs ups	19:20
	← diphtherial left	19:20
	← rockstar_ left	19:20
	→ effi joined	19:21
	← tristanp left	19:21
	← pythonsnake left	19:21
	← leolrrj left	19:22
	→ Gizburdt joined	19:22
	→ tristanp joined	19:23
	→ dreinull75 joined	19:23
	→ trepidaciousMBR2 joined	19:23
	← tarkus left	19:23
	→ King_Hual joined	19:24
	← King_Hual left	19:24
	→ King_Hual joined	19:24
	← gsingh93 left	19:24
	→ jumpman joined	19:24
	← dreinull75 left	19:24
	→ dreinull75 joined	19:25
	→ lmat joined	19:25
lmat	I have a project with submodules, but I think ... it's not working?	19:25
	gitinfo set mode: +v	19:25
	→ Dorf_ joined	19:25
dreinull75	I messed with my wip branch but want to commit all changes of a specific file to master. Can I just squash all commits and merge only this one file?	19:25
	← Sasazuka left	19:25
lmat	I have boost checked out on a computer, and cd tools/build; git lola; gives a certain output	19:25
	→ tarkus joined	19:25
	← manitu left	19:26
	→ denisMone joined	19:26
	← effi left	19:26
lmat	Then, I checked it out on this computer, and cd tools/build; git lola; gives the same output as the other computer's root log;	19:26
	In other words, it looks like I don't have the submodule...	19:26
	← Dorf left	19:26
	→ EminenceHC joined	19:26
lmat	git submodule status; shows the submodule in the list...	19:27
	→ manitu joined	19:27
lmat	Although... I just noticed, all the submodules have '-' before the hash	19:27
	→ vdv joined	19:27
	← circ-user-SSaBd left	19:27
	→ Technocrat7 joined	19:28
	phantomcircuit_ → phantomcircuit	19:29
	← Es0teric left	19:29
	← cavallari left	19:29
lmat	hmm... git help submodule says that they're not initialized. I ran git submodule init build; but git submodule status build; still has the '-'.	19:29
	→ cavallari joined	19:29
	← tarkus left	19:30
	→ jaaronamo joined	19:30
	← hawks43 left	19:30
	← linduxed left	19:30
	← incredible left	19:30
	← Technocrat7 left	19:30
	→ dan_s_ joined	19:30
	→ Es0teric joined	19:30
	← hgl left	19:30
	← cavallari left	19:30
	→ cavallari joined	19:31
	← EminenceHC left	19:31
	← ColdKeyboard left	19:31
	← manitu left	19:31
	← jswhitworth left	19:32
	← ErKa left	19:32
	→ hgl joined	19:32
	→ Dorf joined	19:32
	→ jswhitworth joined	19:32
	→ Polylith joined	19:32
	→ liamkeily joined	19:32
	→ Technocrat7 joined	19:33
	→ JrCs joined	19:33
	→ Remram_ joined	19:33
	→ bluesm joined	19:33
	← jumpman left	19:33
	← wgrant left	19:33
	← sburgess left	19:33
	← harish_ left	19:33
	← mkoskar left	19:33
	← markovh left	19:33
	← fuchstronaut left	19:33
	← Ragnor left	19:33
	← Devels left	19:33
	← falstaff left	19:33
	← themill left	19:33
	← Gianormagantrous left	19:33
	← weblife left	19:33
	← jonesinator left	19:33
	← JrCs_ left	19:33
	← MKCone`Office left	19:33
	← Remram left	19:33
	← JDHawke left	19:33
lmat	aha, clone --recursive!	19:33
	→ Lunatrius` joined	19:33
	← nephyrin` left	19:33
	← Dorf_ left	19:33
	→ fuchstronaut_ joined	19:33
	← tobiasBora left	19:33
	← elektrinis-wrk left	19:33
	← surfdue left	19:33
	→ themill_ joined	19:33
	→ thomas joined	19:33
	→ sparetire joined	19:33
	→ JDHawke joined	19:33
	→ Ragnor joined	19:33
	→ ascarter joined	19:33
	→ ErKa joined	19:34
	→ tarkus joined	19:34
	Lunatrius` → Guest65143	19:34
	← MattMaker left	19:34
	← dan_s left	19:34
	→ manitu joined	19:34
	themill_ → themill	19:34
	→ harish_ joined	19:34
	→ markovh joined	19:34
	→ falstaff joined	19:34
	→ nephyrin joined	19:34
	← bgerber left	19:34
	← kloeri_ left	19:34
	← rheddry left	19:34
	← Lunatrius left	19:34
	← Briman left	19:34
	→ Devels joined	19:34
	→ kloeri joined	19:35
	→ levifig joined	19:35
	→ ColdKeyboard joined	19:35
	→ mkoskar joined	19:35
	→ sburgess joined	19:35
	→ Briman joined	19:35
	→ tobiasBora joined	19:35
	→ MattMaker joined	19:35
	→ effi joined	19:35
	→ weblife joined	19:35
	→ wgrant joined	19:35
	→ Gianormagantrous joined	19:35
	→ student_ joined	19:35
	→ Kicer86 joined	19:35
	← c0mrad3 left	19:35
	← cavallari left	19:36
	→ novas0x2a\|laptop joined	19:36
	gitinfo set mode: +v	19:36
student_	hi all	19:36
	could someone share the steps and scripts to migrate code from svn to git ?	19:36
	→ cavallari joined	19:36
	← tsukasa_ left	19:37
	← tarkus left	19:37
	→ surfdue joined	19:37
lmat	student_: I wrote a script for that once... but google should be able to provide you with a much better one ;-)	19:37
	→ MKCone`Office joined	19:38
	→ joo-_ joined	19:39
	→ bgerber joined	19:39
	→ elektrinis joined	19:39
student_	hi lmat but havent found a link that provides good explanation and tool	19:40
butyoudonot	Does anyone know in which version `force-with-lease` was introduced?	19:40
	← hgl left	19:41
Hetu	student_: try https://git-scm.herokuapp.com/book/en/v1/Git-and-Other-Systems-Git-and-Subversion	19:41
	clone the subversion repository, then forget about it	19:41
student_	hi hetu thanks for responding...let me go there brb	19:42
	→ hgl joined	19:42
	← StuartMI left	19:42
	→ MasterPiece joined	19:43
	→ tarkus joined	19:43
student_	hi hetu	19:43
	← tarkus left	19:43
	← EvilPenguin left	19:43
student_	it doesnt look like what we are looking for - its a bridge - git svn	19:44
	→ yqt joined	19:44
student_	we like to migrate out of SVN into Git	19:44
Hetu	I migrated code from SVN to Git using exactly that.	19:44
	There may be other ways, but I thought it easiest using git svn in order to	19:45
	clone the subversion repository	19:45
	← sd_ left	19:45
	→ linduxed joined	19:45
Hetu	use your git clone for your work	19:45
tang^	hmm, I have a very long running branch that somebody just asked: when did it separate from master?	19:45
	← edude03 left	19:46
Hetu	you can use your git clone as new repository server	19:46
	→ lqu joined	19:46
	← rabit left	19:46
	← lqu left	19:47
	← Gizburdt left	19:48
	→ jumpman joined	19:48
	← jumpman left	19:48
	→ jumpman joined	19:48
	← gebjgd left	19:49
	→ sd_ joined	19:49
	← moreirapontocom left	19:49
	→ Kedz joined	19:50
	← modocache left	19:50
	← ropav_ left	19:50
	→ GT4066 joined	19:51
	→ otter768 joined	19:52
	→ durham_ joined	19:52
	← PaulCape_ left	19:52
	→ PaulCapestany joined	19:52
	← dharrigan left	19:52
	← durham_ left	19:53
	← Milos left	19:54
	← jolda left	19:55
	← Nizumzen left	19:55
	→ modocache joined	19:55
	← durham left	19:55
	← naftilos76 left	19:56
	→ twoface88 joined	19:56
	← endiruna left	19:56
	→ tarkus joined	19:56
	→ durham joined	19:56
	← twoface88 left	19:56
	← otter768 left	19:56
	→ jolda joined	19:56
	→ juvenal joined	19:56
	→ blr joined	19:56
	← misty_g3ar left	19:57
	→ Balliad_ joined	19:58
	→ endiruna joined	19:58
	← tarkus left	19:58
	← Balliad left	19:59
	→ Guest80 joined	19:59
	→ misty_g3ar joined	19:59
	← denete_ left	19:59
	→ variable joined	19:59
	→ pm90_ joined	19:59
	← ende left	20:00
	→ ende joined	20:00
	← pm90_ left	20:00
	← hans_s left	20:00
	← antimatroid left	20:01
	→ pm90_ joined	20:01
	← freestyl3r left	20:01
	→ denete joined	20:01
	← denete left	20:01
	→ EvilPenguin joined	20:01
	→ denete joined	20:02
	← blr left	20:02
	← dvlwrk left	20:03
	→ cagedwisdom joined	20:03
	→ Gama11 joined	20:04
	→ EminenceHC joined	20:05
	→ tarkus joined	20:06
	variable → trout	20:06
	→ Cust0sL1men joined	20:06
	→ dharrigan joined	20:07
	← dharrigan left	20:07
	→ dharrigan joined	20:07
	← Gama11_ left	20:07
	→ Sasazuka joined	20:08
	→ stantonk joined	20:09
	← jswhitworth left	20:09
	← sin3t left	20:09
	→ _Atom_ joined	20:09
	← cbonobo left	20:09
	← halfline left	20:09
	→ naftilos76 joined	20:12
	← AhabsBeard left	20:12
	← Kedz left	20:12
	← DerisiveLogic left	20:13
	← pm90_ left	20:13
	→ Tauf joined	20:14
	→ AhabsBeard joined	20:15
	→ halfline joined	20:15
	← Balliad_ left	20:16
	← wicope_ left	20:16
	← stantonk left	20:16
	→ Milos joined	20:17
	→ kadoban joined	20:17
	← mmakunas left	20:19
	→ rockstar_ joined	20:20
	← bb010g left	20:20
	→ paulweb515 joined	20:22
	→ basiclaser joined	20:23
	← liamkeily left	20:24
	← yqt left	20:24
	→ elote joined	20:25
	→ sin3t joined	20:25
	← weblife left	20:25
	→ hichamat joined	20:26
	→ pm90_ joined	20:27
hichamat	I have git on Windows 7, I'm using git bash;	20:27
	I have git on Windows 7, I'm using git bash; where is the default path of private key please	20:27
	← sd_ left	20:27
	→ linuxboy_ joined	20:27
	← lindenle left	20:28
	→ lindenle joined	20:28
	← lpax left	20:28
_ikke_	hichamat: cd ~/	20:30
	in git bash	20:30
	← linuxboytoo left	20:31
	← BigWillie left	20:31
	← joo-_ left	20:32
	← Gama11 left	20:32
	→ Gama11 joined	20:33
hichamat	thank you very much, so it's cd ~/.git/id_rsa	20:33
	← Milos left	20:33
	← ManikM left	20:33
	→ Manny joined	20:33
	→ DerisiveLogic joined	20:33
hichamat	there is a config file to change this path or private key file name ?	20:33
	→ Zadruga joined	20:34
	← dvl_ left	20:34
tang^	it should be in ~/.ssh/id_rsa	20:34
	on all systems where git runs	20:34
	err, in ~/.ssh	20:35
	→ stantonk joined	20:35
hichamat	thank you	20:35
	→ Milos joined	20:36
	← nour left	20:36
	→ nour joined	20:37
	→ Balliad joined	20:37
	← ixjlyons left	20:37
	→ apflieger joined	20:38
	← Jackneill left	20:38
_ikke_	hichamat: of openssl it's ~/.ssh/config, but not sure how it works with the one shipped with git bash	20:38
	→ phoenixz joined	20:39
	→ barduck joined	20:39
	← Texan left	20:39
	→ Texan joined	20:40
	← brettfrable left	20:41
	→ xckpd7 joined	20:42
xckpd7	question: is there anyway to do a rebase on something I pull in, without having to go through the song and dance of checking it out separately, rebasing it, and then going back to the original branch and merging it in?	20:43
tang^	that's still openssl	20:43
	_ikke_: ^	20:43
	→ blr joined	20:43
	← apflieger left	20:43
	→ sd_ joined	20:43
	← pcypher left	20:43
	← m0ltar left	20:43
	← barduck left	20:44
	← ErKa left	20:44
	← jolda left	20:45
	→ jolda joined	20:46
	← Asiajey left	20:47
	← endiruna left	20:47
	→ leolrrj joined	20:47
	← elote left	20:48
	→ elote joined	20:48
xckpd7	so git pull --rebase rebases your work off the other persons branch	20:48
	I want the other persons work to be rebased off of whatever branch I'm on	20:48
	→ Ryanar joined	20:49
	bakingbread → icedp	20:50
kadoban	xckpd7: That sounds like a really bad thing to have made easy. You'll be changing published history every time.	20:50
	← blr left	20:50
xckpd7	kadoban: I'll explain. so basically I manage the project, so I have everyone rebase off of the main project and send me feature branches. everything dandy so far	20:51
	the only thing is, is if 2 people submit feature branches and rebase off of the main branch	20:51
	← cavallari left	20:51
	← Es0teric left	20:51
xckpd7	if I merge the first feature branch, it'll work. but because the other feature branch doesn't account for this newest branch merged, it'll make 2 commits	20:51
	one with the work, one saying "merged blah blah"	20:52
	so I have to go into that branch and rebase it again off of the main branch to get rid of that	20:52
	but I don't want to go through the trouble of checking out that branch, rebasing, going back into the main branch, and then merging just to get that. a simple command to do it would be ideal	20:52
	← Technocrat7 left	20:53
tang^	you could just tell the second author that a new rebase is needed and resubmit	20:53
	← levifig left	20:53
	← zumba_addict left	20:54
xckpd7	tang^: right but... that gets unmangeable right... you have 5 feature branches, and then for each new subsequent merge, you make someone go rebase	20:54
	essentially for no reason (if there isn't any code conflicts)	20:54
	→ dermoth_ joined	20:54
	→ ixjlyons joined	20:54
xckpd7	the work merges cleanly without conflicts, if I want to keep my branch clean of double commits I shouldn't have to go through more trouble than what would already be just checkout out the feature branch and rebasing myself	20:55
	← dermoth left	20:55
	dermoth_ → dermoth	20:55
	→ baweaver joined	20:55
	← Tauf left	20:55
	← Zamyatin left	20:56
	← tristanp left	20:56
	→ nnyk_ joined	20:56
xckpd7	I'm about to just write a bash script if this doesn't exist. It shouldn't be too hard	20:57
	← baweaver left	20:57
	→ baweaver joined	20:57
	← novas0x2a\|laptop left	20:57
	← misty_g3ar left	20:58
	→ tpollard joined	20:59
	← qdk left	21:00
	→ ril joined	21:00
	→ dvlwrk joined	21:00
	← Remram_ left	21:01
	← HenriettaSalt left	21:01
	→ Alienpruts joined	21:01
	→ Remram joined	21:01
	→ HenriettaSalt joined	21:01
	← halfline left	21:02
_ikke_	xckpd7: Junio, gits maintainer also uses shell scripts to manage his work	21:02
	← Error404NotFound left	21:03
	→ blr joined	21:03
	→ darkircd joined	21:03
_ikke_	xckpd7: But when you are ready to intergrate those topic branch, are the other expect to work further on it, or is that branch 'finished' ?	21:03
	← Texan left	21:03
	← sin3t left	21:03
xckpd7	once I merge it, it's finished	21:04
	← petersr left	21:04
	→ icfo joined	21:04
	← blr left	21:05
	← baweaver left	21:05
xckpd7	if it doesn't go cleanly, I don't merge it. so the rebasing is safe	21:05
	← naftilos76 left	21:05
	→ brettfrable joined	21:06
	← HenriettaSalt left	21:06
	← modocache left	21:06
_ikke_	Than rebasing others branch shouldn't be a problem	21:07
	← hichamat left	21:07
_ikke_	As long as it's clear to them	21:07
xckpd7	yeah it's fine. it's just the actual hassle of having to do it. Yeah it's a process	21:07
	← rnsanchez left	21:07
xckpd7	they all rebase their branches to keep things predictable (their work on top of whatever is "master")	21:07
_ikke_	That's life of an integrator :P	21:07
xckpd7	well what I mean, is the hassle of having to manually checkout their branches and rebase them after I merge in the first feature branch	21:08
_ikke_	xckpd7: that's one command	21:08
xckpd7	so as long as I get a command to do that for me, I'm good	21:08
_ikke_	git rebase master topic	21:08
xckpd7	that rebases topic on top of master and merges it in?	21:08
	→ joo-_ joined	21:08
	← johtso_ left	21:08
_ikke_	no, not the merging part	21:09
	git rebase master topic && git checkout master && git merge -	21:09
	→ nurey joined	21:09
	→ halfline joined	21:09
	← nurey left	21:09
_ikke_	rebase_merge () { git rebase master $1 && git checkout master && git merge $1; }	21:10
	→ johtso_ joined	21:10
xckpd7	ooo does that work, I'm going to try that later	21:10
	→ modocache joined	21:10
_ikke_	You can even make it a git alias	21:10
	← Zoddo left	21:10
	← pantsman- left	21:11
	← dreinull75 left	21:11
	← lucianangelus left	21:11
	→ ahr3n joined	21:12
xckpd7	thanks	21:13
	← modocache left	21:13
	← Balliad left	21:15
	← Manny left	21:16
	← BuenGenio left	21:16
	→ odin22 joined	21:16
	→ sin3t joined	21:16
	→ sinkensabe joined	21:17
	→ baweaver joined	21:17
	→ pecg joined	21:18
	→ monst joined	21:18
	→ zumba_addict joined	21:18
	→ cbonobo joined	21:18
	← leolrrj left	21:19
	→ Es0teric joined	21:19
	→ jnavila joined	21:19
	← jnavila left	21:19
	← _Atom_ left	21:20
	→ Technocrat7 joined	21:20
	→ ManikM joined	21:20
	→ liamkeily joined	21:20
	TheMoonMaster_ → TheMoonMaster	21:20
	gitinfo set mode: +v	21:20
	← liamkeily left	21:21
	← Es0teric left	21:21
	← IrishPrime left	21:21
	→ liamkeily joined	21:21
	→ Zamyatin joined	21:22
	← joo-_ left	21:22
	← zumba_addict left	21:23
	← Zamyatin left	21:23
	← Dorf left	21:23
	→ Zamyatin joined	21:24
	← th3fallen left	21:24
	→ endiruna joined	21:25
	→ DolphinDream joined	21:25
	← Zamyatin left	21:25
	← Cust0sL1men left	21:25
	→ Zamyatin joined	21:26
	← dling left	21:26
	← Hetu left	21:26
	← Technocrat7 left	21:26
	← dan_s_ left	21:27
	← Zamyatin left	21:27
	← ManikM left	21:27
	→ Manny joined	21:27
	→ Zamyatin joined	21:28
	← shafox left	21:28
	← MadLamb left	21:29
	→ jason237 joined	21:29
	→ jswhitworth joined	21:29
	→ wethu joined	21:29
	← livingstn left	21:30
	→ Not_Whatever joined	21:30
	← denete left	21:31
	→ denete joined	21:31
	→ thiago_ joined	21:32
	→ phpcoder joined	21:33
	→ cdown joined	21:33
	→ m0ltar joined	21:33
	← denisMone left	21:35
	← pobivan left	21:36
	← Manny left	21:37
	← denete left	21:37
	→ tristanseifert joined	21:38
	← tarkus left	21:38
	← nVee left	21:38
	← endiruna left	21:38
	→ ManikM joined	21:39
	← dstarh left	21:39
	← jottr left	21:39
	← monst left	21:40
	→ HenriettaSalt joined	21:40
	→ jottr joined	21:40
	→ madewokherd joined	21:42
	→ endiruna joined	21:42
	← ManikM left	21:42
	← pm90_ left	21:43
	→ pm90_ joined	21:43
	→ ManikM joined	21:43
	→ cdown_ joined	21:44
	→ ErKa joined	21:44
	→ gsingh93 joined	21:44
	→ codebam_ joined	21:44
	← codebam left	21:45
	← ManikM left	21:45
	codebam_ → codebam	21:45
	← Zadruga left	21:45
	→ ManikM joined	21:46
	← pm90_ left	21:46
	→ szymek joined	21:46
	← nnyk_ left	21:48
	← icfo left	21:49
	→ dtgk joined	21:50
	→ nnyk_ joined	21:50
	← jerius left	21:50
	← linuxboy_ left	21:51
	→ zumba_addict joined	21:51
	← elote left	21:51
	← Kicer86 left	21:51
	← Dragooon left	21:52
	→ elote joined	21:52
	→ otter768 joined	21:52
	→ blr joined	21:53
	→ airdisa joined	21:53
	← vixterra left	21:53
	← nnyk_ left	21:55
	← michael_mbp left	21:55
	→ michael_mbp joined	21:56
	← zumba_addict left	21:56
	← otter768 left	21:57
	→ eka joined	21:57
	→ toothrot joined	21:58
	← Alienpruts left	21:58
	← szymek left	21:58
	→ qdk joined	21:58
	← DolphinDream left	21:58
	→ zumba_addict joined	21:59
	← sgen left	22:00
	← glosoli left	22:00
	← Sceorem left	22:00
	← odin22 left	22:00
	← editshare-ericf left	22:00
	← zumba_addict left	22:01
	→ zumba_ad_ joined	22:01
	← macabre left	22:01
	← juvenal left	22:01
	← kadoban left	22:02
eka	hi, I have this project that is based on SVN but I use git svn to do all the work locally, so they used 2 separated repos of the same code to do the REST API per say... I need to merge both locally, locally both are git... which is the best way to go?	22:03
	→ _Atom_ joined	22:03
	← dtgk left	22:03
	← zumba_ad_ left	22:04
	→ mingwandroid joined	22:04
	→ zumba_addict joined	22:04
iveqy	eka: I'm not sure how well git svn handles two remote svn repos	22:04
eka	iveqy: they are local... meaning I cloned them locally with git svn so both are git repos	22:05
	← mingwandroid left	22:05
iveqy	eka: to be on the safe side, you can use two git repo, one for each svn repo. And then fetch from one of the git repos to the other	22:05
eka	iveqy: how? just use fetch?	22:05
	→ nwa joined	22:06
	← King_Hual left	22:06
	→ s8321414 joined	22:08
	→ granthatcher_ joined	22:08
	← DerisiveLogic left	22:09
	→ pm90_ joined	22:10
	← chitopunk left	22:11
	← Guest80 left	22:11
	← blr left	22:12
FreezingCold	Huh, why would my Git repo think that I've staged a file to be deleted when it hasn't been deleted?	22:13
	Any way I can tell it to check again and clear that?	22:13
	← dsantiago left	22:13
	→ pcypher joined	22:14
	→ modocache joined	22:14
ojacobson	FreezingCold: It thinks that because the file is (a) present in HEAD and (b) absent in the staging area	22:15
	→ rkazak joined	22:15
ojacobson	and possibly (c) present in the work tree, if you see the same file listed in both sections of `git status`	22:15
FreezingCold	Hmm, how can I reset it?	22:15
	Without fscking up all my changes :p	22:15
	← graphitemaster_ left	22:16
	→ graphitemaster_ joined	22:16
	graphitemaster_ → graphitemaster	22:16
	→ DerisiveLogic joined	22:17
	← DerisiveLogic left	22:17
	→ DerisiveLogic joined	22:17
	← zumba_addict left	22:17
	← vdv left	22:17
	← pcypher left	22:18
	← modocache left	22:19
	← phantombeta left	22:19
	← pm90_ left	22:19
	← rkazak left	22:20
	→ xolubi joined	22:20
	→ pm90_ joined	22:20
	← leehambley left	22:20
	→ blr joined	22:20
	← darkircd left	22:21
	→ kadoban joined	22:22
	→ Gama11_ joined	22:22
	→ pm90__ joined	22:23
	→ Dorf joined	22:23
	→ diegoviola joined	22:23
	← m0ltar left	22:25
	← parasite left	22:25
	← nwa left	22:25
	→ amycham joined	22:25
	← Gama11 left	22:26
	← rubyonrailed left	22:26
deltab	FreezingCold: you need to put a version of the file into the staging area: git reset -- the/path/name to get it from HEAD, git add the/path/name to get it from the work tree	22:27
	← pm90_ left	22:27
FreezingCold	Weird. I don't get how it happened in the first place.	22:27
deltab	git log should be able to tell you	22:28
	at least when it happened	22:28
	→ dsantiago joined	22:28
	→ Yis joined	22:28
	← AhabsBeard left	22:28
	← HenriettaSalt left	22:29
	→ Dorf_ joined	22:29
	→ pantsman- joined	22:29
	← cbonobo left	22:30
	← Dorf left	22:30
	← amycham left	22:31
	→ pandeiro joined	22:31
	→ AhabsBeard joined	22:32
	← kadoban left	22:32
	← Dorf_ left	22:32
	← fusionx86 left	22:33
	← jwhisnant left	22:33
	← _Atom_ left	22:33
	→ rubyonrailed joined	22:33
	← qdk left	22:34
	→ rubyonra_ joined	22:34
	← baweaver left	22:35
	← sgambino left	22:37
	← jolda left	22:37
	← blr left	22:37
	← rubyonrailed left	22:38
	← ManikM left	22:38
	← AhabsBeard left	22:38
	→ leolrrj joined	22:40
	→ AhabsBeard joined	22:40
	← nour left	22:40
	← lindenle left	22:41
	→ mingwandroid joined	22:41
	← gamename left	22:41
	→ gamename joined	22:42
	← pantsman- left	22:42
	← leolrrj left	22:42
	→ _Atom_ joined	22:42
	← PeterBooker left	22:42
	← tang^ left	22:43
	Briman → Briman\|off	22:43
	← xrogaan left	22:44
	xrogaan_ → xrogaan	22:44
	← Not_Whatever left	22:45
	← Gama11_ left	22:47
	← gamename left	22:47
	← DerisiveLogic left	22:48
	→ DerisiveLogic joined	22:48
	→ Motoko joined	22:49
	→ antimatroid joined	22:51
	← AaronMT left	22:51
	← cdown left	22:52
	← ascarter left	22:53
	→ leolrrj joined	22:55
	← rubyonra_ left	22:56
	← Saturn812 left	22:57
	→ goldstar_ joined	22:57
	← diegoviola left	22:58
	→ pcypher joined	22:59
	→ ascarter joined	22:59
	→ baweaver joined	22:59
	← ozanhazer left	22:59
	→ blr joined	23:00
	← _Atom_ left	23:01
	← xckpd7 left	23:02
	→ _Atom_ joined	23:02
	← eka left	23:03
	← knownasilya left	23:03
	← bluesm left	23:03
	← c355E3B left	23:03
	→ RusAlex_ joined	23:03
	← haavstr left	23:05
	← brettfrable left	23:06
	← RusAlex left	23:07
	← mingwandroid left	23:07
	← espindol_ left	23:08
	← jswhitworth left	23:08
	→ Sieigeie joined	23:08
	← sd_ left	23:10
	← pm90__ left	23:10
	← _Atom_ left	23:12
	← liamkeily left	23:12
	→ pr0ton joined	23:16
	← Sieigeie left	23:16
	→ _Atom_ joined	23:17
	→ vixterra joined	23:18
	← nettoweb left	23:19
	← _Atom_ left	23:21
	→ _Atom_ joined	23:21
	← highcup left	23:22
	→ gamename joined	23:23
	← Yis left	23:24
	← Motoko left	23:24
	← _Atom_ left	23:24
	← basiclaser left	23:24
	→ _Atom_ joined	23:24
	← flaguy48 left	23:25
	← aard_ left	23:26
	← durham left	23:26
	→ durham joined	23:27
	← durham left	23:27
	→ durham joined	23:27
	← baweaver left	23:28
	← DerisiveLogic left	23:29
	→ cbonobo joined	23:29
	→ HenriettaSalt joined	23:30
	→ modocache joined	23:30
student_	hi	23:31
	→ kadoban joined	23:31
	→ DerisiveLogic joined	23:32
	← pcypher left	23:33
student_	is it advisable to not have regular word documents or pdfs in a git project sharing with src directory code ?	23:33
	← HenriettaSalt left	23:34
	← gamename left	23:34
	→ gamename joined	23:35
	← modocache left	23:35
	→ sonthonax joined	23:35
	← _Atom_ left	23:35
	→ _Atom_ joined	23:36
	← ixjlyons left	23:36
	← happy-dude left	23:36
sonthonax	Hey, I have a question about workflow and proper practice. When I make a number of changes to a spaning multiple files (often in the very early stages). Should I split up the commits per file?	23:36
kadoban	student_: It depends. If the PDFs or word docs are outputs of a script you're running, don't track them, just track the source. I do that a lot with LaTeX which I compile into PDF. If they're documentation that doesn't change, you can track that too. If it's PDFs/Word that you change often and are working on … it doesn't work amazingly well, but I guess you can still do it as long as you don't mind merges being pretty painful.	23:36
	← cdown_ left	23:36
kadoban	sonthonax: Doesn't matter if they're commits that change multiple files, but you should split by commit so one commit does one conceptual "thing" that you can name and describe.	23:37
	→ baweaver joined	23:38
sonthonax	kadoban: ideally that would be the case, but in the early stages of a product (like when you’re still storing out the directory structure), it’s difficult to do that.	23:38
student_	hi kadoban thanks for responding	23:38
	i ask that because its related to merging	23:39
	→ pcypher joined	23:39
student_	we r in svn and we want to move to git but we r new	23:39
	→ kofione joined	23:39
sonthonax	Is is considered okay to have commits which wont build?	23:39
student_	we have a hard time trying to stop svn merges of jars and zips but we cant because they are ci to svn	23:40
	← gamename left	23:40
kadoban	student_: Yeah, merging PDFs kinda sucks, git can't do it automatically. There's not really a solution to that in any version control system I know of. If you can, switch to something text-based like LaTeX … or just plain text files :)	23:40
student_	these artifacts r in the svn directory sharing with src files	23:40
	svn ignore does not work	23:40
	and we r afraid of seeing the same issue with git	23:40
kadoban	Well, git won't be that bad. You can at least tell it not to merge certain things, or actually it should figure it out on its own almost always.	23:41
student_	and we wonder if we should move all documentation of all projects in a documents.git project to be shared by all groups	23:41
sonthonax	student_: why are you tracking pdf files?	23:41
	← dougsland left	23:42
	← kofione left	23:42
kadoban	student_: You should really do documentation in a better format, IMO. If you need PDF output, a few things can be converted to it easily. That way you just have to track the source-code for the PDF and the script to convert it.	23:42
	← pcypher left	23:43
sonthonax	pdf is really an intermediate format for printing really.	23:43
kadoban	LaTeX can work like that. Markdown, probably even HTML and stuff with pandoc, etc. Lots of options.	23:43
	← GoddeR_ left	23:43
	← hexagoxel left	23:43
	→ GoddeR joined	23:43
student_	hi sonthonax not sure what u mean by tracking in git context....we have documents and jars we don't want to merge between branches in svn but we couldnt stop that in svn	23:44
	wonder if we would get the same problem in git	23:45
	← ril left	23:45
	→ Motoko joined	23:45
	→ hexagoxel joined	23:45
sonthonax	student_: you should ignore the pdf files in pretty much any version control system.	23:45
	→ DolphinDream joined	23:45
sonthonax	How do you even edit them?	23:45
	→ Lyqyd joined	23:45
student_	sonthonax it didnt work - svn ignore didnt ignore the jars we set	23:46
	wonder if git ignore is better	23:46
sonthonax	Then ask around in svn or read the docs.	23:46
student_	or should we have altogether have a documents.git and not mix these documents in other projects	23:46
	these other projects we think should only contain src text files	23:47
sonthonax	It’s not any better, it’s simple to configure, but you still have to configure it.	23:47
	← GoddeR left	23:48
lmat	I have a project that has submodules (boost), and would like to checkout a particular tag that has the same name in all the submodules. How should I proceed? Shell script?	23:48
student_	another git question.	23:49
	→ clarkpan joined	23:49
	← DerisiveLogic left	23:50
student_	is it possible to perform git merge between 2 git projects if both projects have the same branch tag	23:50
	→ quazimodo joined	23:50
bremner	student_: what precisely do you mean by "branch tag"?	23:51
student_	hi bremner thanks for responding....	23:52
lmat	student_: Put both in the same repo?	23:52
student_	support 2 projects named a.git, b.git	23:52
	suppose...typo	23:52
sonthonax	student_: Are they completely different projects?	23:52
	does a.git depend on b.git?	23:53
	← sinkensabe left	23:53
	→ otter768 joined	23:53
student_	also suppose a general tag rel1 is given to a.git and b.git	23:53
	→ th3fallen joined	23:53
	→ meatmanek_ joined	23:54
student_	can we perform git merge from a.git/src/a.txt to b.git/src/a.txt	23:54
	← Motoko left	23:54
sonthonax	student_: you tags the commits… not the repo.	23:54
	← _Atom_ left	23:54
bremner	student_:	23:54
student_	yes sonthonax they are different projects but have common source code	23:54
	hence the need to merge	23:55
	→ _Atom_ joined	23:55
bremner	oops, sorry. Anyway, try it out, make a repo with two remotes, fetch both, merge	23:55
sonthonax	student_: if they have common source code, extract that source code into a seperate project.	23:55
	← akiva left	23:55
sonthonax	literally, you need to do the opposite of what you’re thinking.	23:56
	What is the nature of this common code?	23:56
student_	sonthonax in our svn it used to be that branch b was branched off from branch a	23:56
sonthonax	Is it a library you’ve written?	23:56
student_	and we have to code sync from branch a to branch b	23:56
	← meatmanek left	23:56
student_	but branches a and b are serving different projects/products	23:57
	→ linuxboytoo joined	23:57
sonthonax	Then why even have a relationship between them.	23:57
	They should forked.	23:57
student_	we wonder how we might need to change the src file/folders structre in git	23:57
	→ xckpd7 joined	23:58
sonthonax	You’re not going to have fun changing over from svn to git if you’re in such a mess already.	23:58
	→ DerisiveLogic joined	23:58
sonthonax	And you’re going about it the wrong way.	23:58
	Essentially you have two products now.	23:58
	projects**	23:58
	← otter768 left	23:58
	← fstd left	23:59
sonthonax	Which depend on a library which you code sync from another branch of the same project?	23:59
	→ fstd joined	23:59
	← meatmanek_ left	23:59

Logs Search ←Prev date Next date→

Channels Documentation