IRCloggy #git 2014-11-06

Provider of IRC logs since 2005.

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

	2014-11-06
	→ ome joined	00:00
	→ yacoob joined	00:00
	← smw left	00:01
	← towski_ left	00:01
	gitinfo set mode: +v	00:02
yacoob	Hello there. Out of blue, git subtree push started to fail with 'bad object <sha>'. What are my options regarding debugging this? (here's some details: http://pastebin.com/F3k9LVs2 )	00:02
	→ HanClinto_ joined	00:02
	← mattstratton left	00:02
	← acharlieh left	00:03
	→ BigWillie joined	00:03
	← MrSavage left	00:04
	← BigWillie left	00:04
	→ ki0 joined	00:04
	← HanClinto left	00:04
	← cart05 left	00:04
	→ HanClinto joined	00:04
	→ thiago joined	00:05
	← zmuser3 left	00:06
	→ sinkensabe joined	00:06
	← crobays_ left	00:06
	→ LBV_User joined	00:07
	← HanClinto_ left	00:08
	→ smw joined	00:09
	← sinkensabe left	00:10
	← decompiled left	00:12
	← ag4ve_ left	00:12
	← thiago left	00:12
	→ cart05 joined	00:13
	← purak left	00:13
	← SonikBoom left	00:14
	← regedit_ left	00:15
	← HanClinto left	00:15
	→ kirin` joined	00:17
	→ HanClinto joined	00:18
	← Alpha-17 left	00:18
	← JohnBat26 left	00:19
	→ jfelchner joined	00:20
	← kirin` left	00:21
	→ jgardella joined	00:21
	← ki0 left	00:21
	← n-st left	00:22
	← nfk left	00:22
	← mellernoia left	00:23
	← ropav left	00:23
	← hebz0rl left	00:23
	→ mytec joined	00:24
	→ zumba_addict joined	00:24
	← MattMake_ left	00:25
	← intellix left	00:26
	← s8321414 left	00:26
	← davispuh left	00:27
	← shinnya left	00:28
	→ MattMaker joined	00:28
	→ shampine_ joined	00:29
	→ n-st joined	00:29
	→ ropav joined	00:31
	→ kotk joined	00:33
	← maestrojed left	00:33
	→ mkaesz joined	00:33
	← Not_Whatever left	00:35
	← ascarter left	00:35
	→ maestrojed joined	00:35
	→ hever_ joined	00:35
	← kenz_ left	00:35
	← Nizumzen left	00:35
	→ kenz_ joined	00:35
	→ st1gma joined	00:35
	← st1gma left	00:35
	← smw left	00:35
	← kotk_ left	00:36
	→ solker joined	00:36
	→ st1gma joined	00:36
	← st1gma left	00:37
	→ Freeman42x joined	00:37
	← freeman42 left	00:37
	→ st1gma joined	00:37
	← st1gma left	00:37
	→ st1gma joined	00:37
	→ ki0 joined	00:38
	← st1gma left	00:38
	→ moritzs joined	00:38
	← mizu_no_oto left	00:38
	← hever left	00:39
	← mkaesz left	00:39
	← crumpler left	00:39
	→ st1gma joined	00:39
	← st1gma left	00:39
	← solker left	00:40
	→ st1gma joined	00:40
	← st1gma left	00:40
	→ hexagoxel_ joined	00:40
	← Sasazuka left	00:41
	→ st1gma joined	00:41
	← faylite left	00:41
	← st1gma left	00:41
	← ciampix left	00:42
	→ zmuser3 joined	00:42
	← tgunr left	00:42
	→ toothrot joined	00:42
	← tyreld left	00:42
	← hexagoxel left	00:44
	← imkmf left	00:44
	→ Sasazuka joined	00:45
	← Sasazuka left	00:45
	→ Sasazuka joined	00:45
	← MattMaker left	00:48
	← shampine_ left	00:48
	← a_le left	00:49
	← lpax left	00:50
	→ ag4ve_ joined	00:51
	→ shampine_ joined	00:51
	← kenz_ left	00:52
	→ kirin` joined	00:53
	← harish left	00:53
	← User458764 left	00:54
	← jfran left	00:54
	→ tmcmahon joined	00:54
	→ ascarter joined	00:56
	→ Lyqyd joined	00:56
	→ kenz_ joined	00:57
	← kirin` left	00:58
	← GT left	00:58
	→ CentaurWarchief\| joined	01:00
	← fstd left	01:00
	→ fstd joined	01:00
	← leeN left	01:00
	→ tgunr joined	01:00
	← ropav left	01:01
	← imachuchu left	01:01
	→ St1gma joined	01:02
	← CentaurWarchief\| left	01:02
	← checkItOut left	01:03
	← tmcmahon left	01:03
	← kenz_ left	01:03
	← ethlor left	01:04
	alxgnon → ALXGNON	01:05
	← Manny left	01:06
	→ Manny joined	01:06
	→ HanClinto_ joined	01:06
	ALXGNON → alxgnon	01:06
	← upene left	01:07
	← shampine_ left	01:07
	← devoldmx left	01:07
	← HanClinto left	01:07
	← kballou left	01:07
	← arthurb_ left	01:08
	← n-st left	01:08
	→ devoldmx joined	01:08
	→ arthurb_ joined	01:08
	→ zumba_ad_ joined	01:08
	→ Mobutils joined	01:09
	→ CentaurWarchief\| joined	01:09
	→ thiago joined	01:09
	← lindenle left	01:09
	← CentaurWarchief\| left	01:09
	← CentaurWarchief left	01:10
	→ leeN joined	01:10
	→ CentaurWarchief joined	01:11
	→ rrrross1 joined	01:11
	← rrrross left	01:11
	← CentaurWarchief left	01:11
	← zumba_addict left	01:11
	→ daito joined	01:11
	→ rchavik joined	01:11
	← ag4ve_ left	01:12
	← EminenceHC left	01:12
	→ CentaurWarchief joined	01:12
	→ devoldmx3 joined	01:12
	→ fairuz joined	01:12
	← CentaurWarchief left	01:13
	← Freeman42x left	01:14
	→ CentaurWarchief joined	01:14
	← devoldmx left	01:15
	← CentaurWarchief left	01:15
	→ CentaurWarchief joined	01:15
	→ ropav joined	01:16
	← hexagoxel_ left	01:16
	→ shampine_ joined	01:16
	← ascarter left	01:17
	→ weiyang joined	01:17
	← thiago left	01:17
	→ freeman42 joined	01:18
	← DaveD_PDX left	01:18
	→ philipd joined	01:19
	← HanClinto_ left	01:19
	→ n-st joined	01:19
	← philipd left	01:19
	← devoldmx3 left	01:20
	→ jb55_ joined	01:20
	→ devoldmx joined	01:21
	→ n-st_ joined	01:21
	→ MattMaker joined	01:22
	← alexh_ left	01:22
	← jb55 left	01:24
	← n-st left	01:24
	← ropav left	01:25
	← jb55_ left	01:25
	← devoldmx left	01:25
	← n-st_ left	01:26
	→ jason237 joined	01:26
	← tgunr left	01:26
	← buffal0 left	01:26
	← rrrross1 left	01:27
	→ DaveD_PDX joined	01:27
	→ HanClinto_ joined	01:28
	← jgardella left	01:28
	← rchavik left	01:28
	→ devoldmx joined	01:28
	→ Dougie187 joined	01:29
	→ smw joined	01:29
	→ ethlor joined	01:29
	← HanClinto_ left	01:30
	← Alumin left	01:30
Eugene	yacoob - man git-fsck	01:31
gitinfo	yacoob: the git-fsck manpage is available at http://jk.gs/git-fsck.html	01:31
	← RagnarDanneskjol left	01:31
	← DaveD_PDX left	01:32
Eugene	It's not subtree per se; rather your filesystem has decided to eat the file containing the named object.	01:32
	You'll likely want to fsck the partition it lives on, and probably go buy a new HD, too.	01:32
	git is more aggressive about finding & reporting these sorts of errors because it SHA1s /everything/. Other apps just ignore the occasional tiny corruption that results in a dropped frame in your Movie ;-)	01:32
	→ n-st_ joined	01:33
	→ Nijikokun joined	01:33
	← Noldorin left	01:33
	→ _Atom_ joined	01:35
	→ mkaesz joined	01:35
	← _Atom_ left	01:35
	← shampine_ left	01:35
	→ solker joined	01:37
	← warcuy left	01:37
	→ Noldorin joined	01:38
	→ PerlJam joined	01:40
	← mkaesz left	01:40
	← solker left	01:41
	→ rchavik joined	01:41
	→ palcu joined	01:43
	← stamina left	01:43
	← glebihan left	01:43
	← ethlor left	01:44
	← devoldmx left	01:44
	← looper_ left	01:44
	→ pcypher joined	01:44
	← AndroidLoverInSF left	01:45
	← raven-au left	01:45
	← Lyqyd left	01:45
	← danemacmillan left	01:47
	← rchavik left	01:47
	→ sohail joined	01:47
	← palcu left	01:47
	→ zumba_addict joined	01:48
	→ raven-au joined	01:48
	← zumba_ad_ left	01:51
	← maestrojed left	01:51
	→ punchagan joined	01:52
	→ imkmf joined	01:53
	← in_deep_thought left	01:53
	← nkouevda left	01:54
	← hever_ left	01:54
	→ awkwardusername joined	01:54
	← imkmf left	01:55
	→ _Atom_ joined	01:55
	← robustus\|Off left	01:56
	← LucasTT left	01:57
	→ rchavik joined	01:57
	→ robustus joined	01:58
	→ neonixcoder joined	01:59
	→ Goplat joined	01:59
	← Sasazuka left	01:59
	← pcypher left	02:00
	← hahuang65 left	02:00
	→ fatalhalt joined	02:01
	← smccarthy left	02:01
	← jottr left	02:02
	→ Motoko joined	02:03
	→ smccarthy joined	02:04
yacoob	Eugene: actually, I've found out what's wrong - the way git subtree split works, it's susceptible to creation of dangling commits	02:05
	once they're reaped, you hit this	02:05
	(and no, it's not a dead hdd, believe, I'd notice :)	02:05
	← cannonball left	02:07
	→ EminenceHC joined	02:07
	→ studmuf joined	02:08
	← neonixcoder left	02:09
	→ sirchopsalot joined	02:10
	→ lindenle joined	02:10
	→ harish joined	02:10
sirchopsalot	guys, I forgot to merge my dev branch to my master at the last time I had a live version of my app. I have since made another commit to my dev branch. How do I merge the dev branch to my master branch, but not including the last commit (so all commits up until like HEAD^1)	02:11
	→ BiggFREE joined	02:12
	← EminenceHC left	02:12
	→ neonixcoder joined	02:13
	← studmuf left	02:13
	→ studmuf joined	02:14
	← lindenle left	02:14
sirchopsalot	anyone?	02:14
	← studmuf left	02:14
fairuz	sirchopsalot: something like git merge dev^ don't work?	02:16
thibaultcha	sirchopsalot: interactive rebase?	02:16
sirchopsalot	fairuz: probably would, I'm a total git noob so have no idea what to type	02:16
	git merge dev^ sounds like what I want I think	02:16
	← rchavik left	02:18
fairuz	sirchopsalot: Don't know if it will work, never tried it. :)	02:19
sirchopsalot	ahh :)	02:19
fairuz	or else you can create branch at dev^ and merge that branch instead	02:19
	after the merge, you can delete the temporary branch	02:19
sirchopsalot	dont need to, dev^ worked perfectly!	02:20
	:D	02:20
	\o/	02:20
	thanks fairuz	02:20
	← Celm left	02:22
	→ rchavik joined	02:22
Eugene	yacoob - ugh, that sounds horrible. This must be why I don't sub-anything	02:23
	→ ethlor joined	02:25
sirchopsalot	gtg - thanks fairuz	02:25
	← sirchopsalot left	02:25
	→ Nizumzen joined	02:26
	→ tgunr joined	02:27
	← rchavik left	02:29
	← Travisty left	02:29
	← smw left	02:31
	← ki0 left	02:33
	→ tranzfuse joined	02:33
	← tranzfuse left	02:34
	→ kenz_ joined	02:34
	← kenz_ left	02:34
	← madewokherd left	02:35
	← brucelee left	02:35
	→ mkaesz joined	02:37
	→ solker joined	02:37
	→ Lyqyd joined	02:38
	→ Vampire0_ joined	02:39
	→ smw joined	02:40
	→ rchavik joined	02:40
	← kermit left	02:41
	→ kirin` joined	02:41
	→ l0x3py joined	02:41
	← ethlor left	02:42
	← solker left	02:42
	← Vampire0 left	02:42
	← mkaesz left	02:43
	← kevinb left	02:45
	← mytec left	02:46
	→ gancl joined	02:46
	→ ethlor joined	02:46
	← kirin` left	02:47
	→ muhaha03__ joined	02:48
	← rchavik left	02:49
	→ madewokherd joined	02:49
	→ jb55 joined	02:50
	← moritzs left	02:50
	→ kevinb joined	02:51
	← n-st_ left	02:52
	← m0viefreak left	02:52
	→ Daisuke joined	02:53
	→ msmith_ joined	02:53
	← msmith_ left	02:53
	→ msmith_ joined	02:53
	← CentaurWarchief left	02:55
	→ kirin` joined	02:55
	→ ehmatthes joined	02:55
	← akushner_ left	02:55
	← jontmorehouse left	02:56
	← lasers left	02:56
	← drbean left	02:56
	← Daisuke left	02:57
	→ CentaurWarchief joined	02:58
	→ palcu joined	02:58
	← kirin` left	03:00
	← ethlor left	03:00
	→ robbyoconnor joined	03:00
	→ drbean joined	03:00
	← thibaultcha left	03:00
	→ rchavik joined	03:01
	← neonixcoder left	03:03
	→ kopparam joined	03:03
	← Sonderblade left	03:03
	← palcu left	03:04
	← Manny left	03:06
	→ lasers joined	03:06
	→ Manny joined	03:06
	← kopparam left	03:07
	→ galileopy joined	03:08
	← mribeirodantas left	03:08
	← yacoob left	03:08
	→ belac joined	03:09
	→ Guest71507 joined	03:10
	← mozzarella left	03:11
	← fatalhalt left	03:11
	→ neonixcoder joined	03:11
	→ chartractegg joined	03:13
	→ EminenceHC joined	03:13
	→ Malsasa_ joined	03:14
	Malsasa_ → Malsasa	03:14
	← St_Marx left	03:14
	→ mozzarella joined	03:14
	mozzarella → Guest52396	03:15
	← Guest52396 left	03:16
belac	I am trying to remove a few large files from my repo using bfg, but it keeps blowing up. my understanding is that bfg is a wrapper for git-filter-branch. how can i delete them manually using git-filter-branch?	03:16
	→ mozzarel1 joined	03:16
	← bburky left	03:17
	→ zanchoPansa joined	03:18
	← EminenceHC left	03:18
	← zanchoPa1sa left	03:19
	→ tratrala joined	03:19
	→ colorbot joined	03:20
	→ gregsmith joined	03:21
	→ ethlor joined	03:21
	← gregsmith left	03:21
	→ rrrross joined	03:22
	← Motoko left	03:22
	← darkbasic_ left	03:23
	→ darkbasic joined	03:24
	← toothrot left	03:24
	→ St_Marx joined	03:25
	→ mizu_no_oto joined	03:25
	→ magic_ joined	03:25
	← ClarusCogitatio left	03:25
	← tratrala left	03:26
	← chartractegg left	03:26
	→ tratrala joined	03:26
	→ cfxd joined	03:26
	→ ClarusCogitatio joined	03:26
	← cfxd left	03:27
	→ AndroidLoverInSF joined	03:28
	← Nizumzen left	03:28
	← colorbot left	03:28
	← darkbasic left	03:28
	← luriv left	03:29
	→ colorbot joined	03:30
	← Noldorin left	03:30
	→ Celm joined	03:31
	→ kermit joined	03:32
	→ darkbasic joined	03:32
	← rrrross left	03:33
	→ toothrot joined	03:34
	→ ki0 joined	03:34
	← LBV_User left	03:34
	← ethlor left	03:34
	→ dorp joined	03:36
	→ rrrross joined	03:36
	← CheckDavid left	03:37
	→ k4r1m joined	03:38
	← rchavik left	03:38
	→ solker joined	03:38
	→ mkaesz joined	03:38
	← ClarusCogitatio left	03:39
	→ palcu joined	03:39
	← ki0 left	03:39
	→ phanimahesh joined	03:39
	gitinfo set mode: +v	03:39
	← mizu_no_oto left	03:39
	← Celm left	03:40
	← colorbot left	03:40
thomas	.	03:41
	→ ClarusCogitatio joined	03:41
	← darkbasic left	03:42
	→ Celm joined	03:42
	← solker left	03:43
	← nonickn left	03:43
	← tratrala left	03:44
	← jb55 left	03:44
	← Celm left	03:44
	← mkaesz left	03:44
	→ jb55 joined	03:45
	→ scriptThis joined	03:45
	→ mizu_no_oto joined	03:45
	→ darkbasic joined	03:46
	← rrrross left	03:46
	→ rchavik joined	03:46
	← kermit left	03:48
	→ koderok joined	03:48
	← jb55 left	03:49
	← gyeates left	03:49
	← Dougie187 left	03:49
	← jeffmjack left	03:49
	← koderok left	03:51
	← Guest71507 left	03:51
	→ techrat joined	03:51
	→ Celm joined	03:51
	← ClarusCogitatio left	03:52
	→ colorbot joined	03:52
	→ ethlor joined	03:53
	← Celm left	03:53
	→ darkbasic_ joined	03:54
	← BiggFREE left	03:54
	→ ClarusCogitatio joined	03:54
	← darkbasic left	03:55
Eugene	belac - !filter	03:56
gitinfo	belac: [!filters] Filters can be very useful for automatically making changes to files at checkout(smudge) and checkin/add(clean). See 'man gitattributes' for more information	03:56
Eugene	Ugh, useless bot.	03:56
	!filter_sensitive	03:56
gitinfo	You can use filter-branch to remove sensitive data from a repository's history. https://help.github.com/articles/remove-sensitive-data/	03:56
Eugene	That one ^	03:56
	→ lindenle joined	03:56
belac	thx!	03:57
	← Neozonz left	03:57
	→ nonickn joined	03:58
techrat	!branch	03:59
gitinfo	A branch and a tag are just convenient ways of spelling the name of a particular commit. A commit represents a specific set of files and the history of all commits which came before it, and the SHA-1 hash tag official name provides cryptographic assurance of the lineage of a particular commit (and thus branch or tag). A branch's reference may change. A tag usually doesn't.	03:59
	← ClarusCogitatio left	03:59
	← leeN left	04:00
	→ sadmac joined	04:00
	→ ClarusCogitatio joined	04:00
	→ leeN joined	04:00
	→ darkbasic joined	04:00
REdOG	anyone know how to make a repo on github from cli? im hitting a im stupid wall trying	04:00
	curl gives me "Not Found" and v3 documentation error	04:00
	→ kirin` joined	04:01
sadmac	If I'm writing a git command (binary installed as git-foo) how can I determine where the repo is (in case the user used --git-dir before the command)	04:01
	← lindenle left	04:01
	← darkbasic_ left	04:01
	← CodeTroth left	04:01
	→ dreiss joined	04:01
	→ gancl_ joined	04:02
	→ Neozonz joined	04:02
techrat	sadmac: git remote -v?	04:02
	→ arnaud___ joined	04:03
	← freeman42 left	04:03
sadmac	techrat: this appears to do nothing	04:03
	← palcu left	04:03
	→ freeman42 joined	04:04
sadmac	techrat: let me back up. I think you're missing what I'm doing.	04:04
	techrat: I have a python script installed as git-foo	04:04
	← kirin` left	04:04
sadmac	techrat: I want it to operate on the repository when the user writes "git foo"	04:04
	← gancl left	04:04
	← ClarusCogitatio left	04:04
	← abec0 left	04:05
	← darkbasic left	04:05
sadmac	techrat: How do I do that in a way that will still work if the user types "git --git-dir=somewhere_far_away/folder" foo"	04:05
	→ Celm joined	04:05
	→ darkbasic joined	04:05
	→ ag4ve_ joined	04:06
sadmac	techrat: it appears the GIT_DIR environment will be set.	04:06
	→ hahuang65 joined	04:06
	← ethlor left	04:06
	← mizu_no_oto left	04:06
	← daito left	04:07
	→ brucelee joined	04:07
	→ rrrross joined	04:07
	→ snuffeluffegus joined	04:08
	← punchagan left	04:08
	← darkbasic left	04:09
	→ Vivekananda joined	04:09
	→ darkbasic joined	04:09
	→ abec0 joined	04:10
	→ ClarusCogitatio joined	04:10
	← hahuang65 left	04:11
	← blubberbop left	04:11
	← rubyonrailed left	04:13
	→ blubberbop joined	04:13
	← belac left	04:13
	→ kopparam joined	04:13
	→ rubyonrailed joined	04:13
	← techrat left	04:15
	→ JosephFerano joined	04:15
	← colorbot left	04:15
	← aidalgol left	04:17
	→ subhojit777 joined	04:17
	← rubyonrailed left	04:17
	← darkbasic left	04:18
	← awkwardusername left	04:18
	→ EminenceHC joined	04:18
	→ darkbasic joined	04:18
	→ awkwardusername joined	04:18
	← kopparam left	04:19
	← legrady left	04:20
	→ IIT joined	04:22
	← kadoban left	04:22
	← dreiss left	04:23
	← EminenceHC left	04:23
IIT	are contents in .git directory compressed ?	04:23
offby1	sure	04:23
IIT	which compression technique is used ?	04:24
	→ ethlor joined	04:26
offby1	beats me	04:26
IIT	offby1, ?	04:27
	→ jeffreylevesque joined	04:28
	→ EvilPenguin joined	04:29
	← ErKa left	04:30
	← ethlor left	04:31
	← Mitchbones left	04:33
	← JosephFerano left	04:33
jeffreylevesque	how do i change my repo, instead of version the current webroot, the entire html/ directory?	04:33
	→ ethlor joined	04:33
jeffreylevesque	does that involve just moving a .git file?	04:34
	← darkbasic left	04:35
	→ magic joined	04:36
	← toothrot left	04:37
	→ beautifulmind joined	04:37
	→ kyb3r_ joined	04:37
	→ kiran joined	04:38
	→ solker joined	04:39
	→ mkaesz joined	04:41
	← kukks left	04:41
	← l0x3py left	04:41
	→ kukks joined	04:42
	→ darkbasic joined	04:42
	→ kirin` joined	04:42
	← beautifulmind left	04:43
	← solker left	04:43
	← Neozonz left	04:44
	→ IIT_ joined	04:44
	→ daito joined	04:45
	→ beautifulmind joined	04:45
	→ maestrojed joined	04:46
	← ethlor left	04:46
	← mkaesz left	04:46
	← kirin` left	04:47
	← yena left	04:47
	← IIT left	04:47
	→ geomyidae_ joined	04:47
	← smccarthy left	04:47
	→ yena joined	04:48
	← scriptThis left	04:49
	← arnaud___ left	04:50
	→ arnaud___ joined	04:51
	→ akiress joined	04:52
	← Mobutils left	04:52
	→ scriptThis joined	04:52
	→ sinkensabe joined	04:53
	← michael_mbp left	04:53
	← rchavik left	04:54
	→ michael_mbp joined	04:54
	← michael_mbp left	04:55
	→ michael_mbp joined	04:55
	→ irqq joined	04:57
	← brucelee left	04:58
	→ neurokraft joined	04:58
	→ dreiss joined	04:58
	← darkbasic left	04:58
	→ darkbasic joined	04:58
	← neurokraft left	04:59
	→ backsorry joined	05:00
	← akiress left	05:01
	← REdOG left	05:02
	→ palcu joined	05:04
	→ rchavik joined	05:06
	← Manny left	05:06
	→ Manny joined	05:06
	→ Mobutils joined	05:06
	← listochkin left	05:09
	→ ethlor joined	05:09
	← palcu left	05:09
	→ listochkin joined	05:09
	→ darkbasic_ joined	05:11
	← kukks left	05:12
	← darkbasic left	05:12
	← duckydan left	05:12
	← listochkin left	05:13
	← ruskie left	05:14
	→ rubyonrailed joined	05:14
	→ ruskie joined	05:14
	← ScottG left	05:14
	→ duckydan joined	05:15
	← darkbasic_ left	05:15
	← EvilPenguin left	05:15
	→ darkbasic joined	05:15
	← ClarusCogitatio left	05:16
	→ ScottG joined	05:17
	← jeffreylevesque left	05:17
	→ ClarusCogitatio joined	05:17
	← madewokherd left	05:18
	← rubyonrailed left	05:19
	→ EminenceHC joined	05:19
	← msmith_ left	05:21
	→ colorbot joined	05:21
	→ JohnBat26 joined	05:21
	← smw left	05:22
	→ jrvlima joined	05:22
	← netcarver left	05:22
	→ darkbasic_ joined	05:24
	← EminenceHC left	05:24
	← darkbasic left	05:25
	← ClarusCogitatio left	05:25
	← colorbot left	05:25
	← jrvlima left	05:26
	← subhojit777 left	05:27
	← darkbasic_ left	05:27
	→ bhws joined	05:27
	→ darkbasic joined	05:28
	→ ClarusCogitatio joined	05:28
	→ thiago joined	05:33
	← ethlor left	05:34
	← AndroidLoverInSF left	05:36
	→ nnyk_ joined	05:38
	← phanimahesh left	05:39
	→ subhojit777 joined	05:40
	→ solker joined	05:40
	ChanServ set mode: +o	05:40
	→ arup_r joined	05:40
	Eugene kicked offby1 (as requested)	05:40
Eugene	IIT_ - objects are run through zlib	05:40
	← dreiss left	05:41
Eugene	IIT_ - http://git-scm.com/book/en/v2/Git-Internals-Git-Objects	05:41
	→ rrrross1 joined	05:41
	← rrrross left	05:42
	Eugene changed the topic to: Welcome to #git, the place for git help and electronically transmitted diseases \| Current stable version: 2.1.3 \| Start here: http://jk.gs/git \| Getting "cannot send to channel"? /msg gitinfo .voice \| The git that keeps on giving.	05:42
	Eugene set mode: +v	05:42
	→ mkaesz joined	05:42
	Eugene set mode: -o	05:42
	← arup_r left	05:42
	→ saurabh joined	05:43
	saurabh → Guest18520	05:43
IIT_	Eugene, is their any specific reason to use zlib technique ?	05:43
	← irqq left	05:43
Eugene	Actual historical reason? Dunno, ask Linus.	05:44
	→ kopparam joined	05:44
IIT_	ok :)	05:44
Eugene	Common reasons? Light, fast, multiple implementations exist.	05:44
	← solker left	05:44
	→ sinequanon joined	05:44
	← polyzen left	05:45
IIT_	yeah on wikipedia it states there are many implementation of zlib	05:45
Eugene	It's basically the default choice when you need to do inline compression	05:46
	← rrrross1 left	05:46
	→ govg joined	05:46
IIT_	hmm ok	05:46
Eugene	zlib is also used in the kernel, see zImage. ;-)	05:47
	→ Sieigeie joined	05:47
Eugene	No surprise its in git	05:47
	← ehmatthes left	05:47
	← mkaesz left	05:47
	← ClarusCogitatio left	05:48
	← _Atom_ left	05:48
	→ ClarusCogitatio joined	05:48
IIT_	it's all because of Linus :P	05:48
	→ arup_r joined	05:48
Eugene	Sometimes shit just works. Don't argue with it	05:48
	→ darkbasic_ joined	05:48
	→ Dreadnaught joined	05:48
	← Dreadnaught left	05:48
	→ Dreadnaught joined	05:48
	← cschneid left	05:49
IIT_	hehe	05:49
	← nnyk_ left	05:49
	← Bigcheese left	05:49
IIT_	actually i am finding a mathematical component on which i can do my final year project on, been searching for a long time what can be done and what not.	05:49
	→ Bigcheese joined	05:49
	← darkbasic left	05:49
	← tpollard left	05:49
IIT_	mathematical component in git.	05:49
	→ brucelee joined	05:49
	← freeman42 left	05:50
	→ l0x3py joined	05:50
	→ cschneid joined	05:51
	→ arup_r_ joined	05:52
	← arup_r_ left	05:53
	→ arup_r_ joined	05:54
	→ darkbasic joined	05:54
	→ jontmorehouse joined	05:55
	← arup_r left	05:55
	← darkbasic_ left	05:55
	← sohail left	05:56
	← gancl_ left	05:56
	→ Consuela joined	05:56
	← arup_r_ left	05:57
	→ arup_r joined	05:57
	← nob124 left	05:57
	→ glebihan joined	05:58
	→ nob124 joined	05:58
	← maestrojed left	05:59
	← nob124 left	05:59
	← Gamecubic left	05:59
	→ nob124 joined	05:59
	← nob124 left	06:00
	→ jfelchne_ joined	06:00
	→ nob124 joined	06:00
	← nob124 left	06:00
	→ nob124 joined	06:02
	← thiago left	06:02
	← UmbraMalison left	06:02
	← nob124 left	06:02
	→ rrrross joined	06:03
	→ nob124 joined	06:03
	← nob124 left	06:03
	← jfelchner left	06:03
	→ zumba_ad_ joined	06:03
	→ thiago joined	06:04
	→ nob124 joined	06:04
	← thiago left	06:04
	→ thiago joined	06:04
	← nob124 left	06:04
	← Consuela left	06:05
	→ UmbraMalison joined	06:05
	← russt left	06:05
	→ nob124 joined	06:06
	← zumba_addict left	06:06
	→ groolot joined	06:07
	← Sieigeie left	06:07
	← nob124 left	06:07
	→ BlaXpirit joined	06:08
	→ kirin` joined	06:08
	← groolot left	06:08
	→ nob124 joined	06:08
	← Segfault_ left	06:08
	← nob124 left	06:09
	→ ethlor joined	06:09
	→ nob124 joined	06:10
	← nob124 left	06:10
	→ colorbot joined	06:10
	→ nob124 joined	06:11
	→ levity_island joined	06:11
	← nob124 left	06:11
	← St1gma left	06:11
	→ St1gma joined	06:12
	→ nob124 joined	06:12
	← nob124 left	06:12
	← kirin` left	06:13
	← akushner left	06:13
	← thiago left	06:13
	→ nob124 joined	06:13
	← nob124 left	06:14
	→ hexafluoride joined	06:14
hexafluoride	what to do after rewriting an entire repo?	06:14
	hint: Updates were rejected because the remote contains work that you do	06:15
	hint: not have locally. This is usually caused by another repository pushing	06:15
	→ rubyonrailed joined	06:15
hexafluoride	quick pls	06:15
	→ nob124 joined	06:15
	→ darkbasic_ joined	06:15
	← nob124 left	06:15
	→ ErKa joined	06:15
	→ nob124 joined	06:16
	← darkbasic left	06:16
	← nob124 left	06:16
	→ ehmatthes joined	06:16
	→ nob124 joined	06:17
	← nob124 left	06:18
	→ j0hnlam joined	06:18
	← neonixcoder left	06:19
	← j0hnlam left	06:19
	→ punchagan joined	06:19
	→ nob124 joined	06:19
	← nob124 left	06:20
	← rubyonrailed left	06:20
	→ nob124 joined	06:21
	← nob124 left	06:21
	→ darkbasic joined	06:21
	→ Segfault_ joined	06:21
	→ EminenceHC joined	06:21
	← punchagan left	06:22
	→ punchagan joined	06:22
	← darkbasic_ left	06:22
	← punchagan left	06:23
	← ethlor left	06:23
	→ nob124 joined	06:23
	→ ethlor joined	06:23
	← nob124 left	06:24
	→ nob124 joined	06:24
	← nob124 left	06:25
	→ polyzen joined	06:25
	→ Xethron joined	06:25
	← EminenceHC left	06:26
	→ nob124 joined	06:26
	← nob124 left	06:26
	← darkbasic left	06:27
	→ nob124 joined	06:27
	← nob124 left	06:27
	→ darkbasic joined	06:28
	← gabeio left	06:28
	→ nob124 joined	06:29
	← nob124 left	06:29
	→ nob124 joined	06:30
	← nob124 left	06:30
	→ gabeio joined	06:30
	gabeio → Guest66430	06:30
	→ solker joined	06:31
	→ nob124 joined	06:31
	← nob124 left	06:31
	← ErKa left	06:32
	→ nob124 joined	06:33
	← nob124 left	06:33
	← joelm left	06:33
	→ nob124 joined	06:35
	← nob124 left	06:35
	→ nob124 joined	06:36
	← nob124 left	06:36
	← robinsmidsrod left	06:36
	→ Sazpaimon_ joined	06:36
	→ Junior joined	06:36
	→ CustosLimen joined	06:37
	→ a_le joined	06:37
	→ nob124 joined	06:37
	→ darkbasic_ joined	06:37
	→ pantsman- joined	06:37
	← nob124 left	06:38
	→ robinsmidsrod joined	06:38
	← darkbasic left	06:38
	→ nob124 joined	06:39
	← nob124 left	06:39
	→ palcu joined	06:39
	← Sazpaimon left	06:40
	← tonyj left	06:40
	→ nob124 joined	06:40
	← nob124 left	06:41
	← jason237 left	06:41
	→ kcj joined	06:41
	→ nob124 joined	06:41
	← nob124 left	06:42
	→ ThomasLocke joined	06:42
	→ nob124 joined	06:42
	← nob124 left	06:43
	→ Novitsh_ joined	06:43
	→ nob124 joined	06:43
	← nob124 left	06:44
	← ClarusCogitatio left	06:44
	← palcu left	06:44
	→ mkaesz joined	06:45
	→ nob124 joined	06:45
	← nob124 left	06:45
	→ nob124 joined	06:46
	→ ClarusCogitatio joined	06:46
	← nob124 left	06:46
	→ maestrojed joined	06:46
	→ nob124 joined	06:47
	← nob124 left	06:48
	← levity_island left	06:48
	← leeN left	06:48
	→ nob124 joined	06:49
	← nob124 left	06:49
	← Lyqyd left	06:49
	→ jmverges joined	06:49
	← mkaesz left	06:49
	→ nob124 joined	06:50
	← nob124 left	06:50
	← Goplat left	06:51
	→ nob124 joined	06:52
	← nob124 left	06:53
	→ nob124 joined	06:53
	← nob124 left	06:53
	← rrrross left	06:53
	← Rixius left	06:54
	→ Rixius joined	06:55
	→ nob124 joined	06:55
	← l0x3py left	06:55
	← nob124 left	06:55
	← harish left	06:56
	← a_le left	06:56
	← pantsman- left	06:56
	→ aidalgol joined	06:57
	→ nob124 joined	06:57
	← nob124 left	06:57
	→ User458764 joined	06:58
	← ValicekB left	06:59
	→ Macaveli joined	06:59
	→ nob124 joined	06:59
	← nob124 left	07:00
	← arup_r left	07:00
	→ Raging_Hog joined	07:00
	→ lindenle joined	07:01
	→ punchagan joined	07:01
	→ nob124 joined	07:01
	← punchagan left	07:01
	→ punchagan joined	07:01
	← nob124 left	07:01
	← ap0c left	07:02
	→ zumba_addict joined	07:02
	← colorbot left	07:02
	→ regreg joined	07:02
	→ nob124 joined	07:03
	← nob124 left	07:03
	← bhws left	07:04
	← zumba_ad_ left	07:04
	→ a_le joined	07:04
	→ nob124 joined	07:04
	← nob124 left	07:04
	→ mihaicris joined	07:05
	→ arup_r joined	07:05
	→ corkfuse joined	07:05
	→ nob124 joined	07:06
	← lindenle left	07:06
	← nob124 left	07:06
	→ darkbasic joined	07:06
	← Manny left	07:06
	→ Manny joined	07:06
	← darkbasic_ left	07:07
	← maestrojed left	07:07
	→ nob124 joined	07:07
	→ colorbot joined	07:07
	← nob124 left	07:07
	→ nob124 joined	07:09
	← nob124 left	07:09
	→ Amandil joined	07:09
	← mihaicris left	07:10
	→ nob124 joined	07:11
	← nob124 left	07:11
	→ nob124 joined	07:12
	← nob124 left	07:12
	→ darkbasic_ joined	07:13
	→ ValicekB joined	07:13
	← darkbasic left	07:13
	→ nob124 joined	07:14
	← nob124 left	07:14
	→ Polyatomic joined	07:14
	→ jceb joined	07:15
	→ nob124 joined	07:17
	← nob124 left	07:17
	→ nrsk joined	07:18
	→ nnyk_ joined	07:18
	→ nob124 joined	07:18
	← nob124 left	07:18
	← snuffeluffegus left	07:18
	→ mkaesz joined	07:18
	→ wrouesnel joined	07:19
	→ nob124 joined	07:19
	← nob124 left	07:19
	← mkaesz left	07:20
	→ darkbasic joined	07:20
	→ nob124 joined	07:20
	← darkbasic_ left	07:21
	← nob124 left	07:21
	→ nob124 joined	07:22
	← nob124 left	07:22
	→ nob124 joined	07:22
	← nob124 left	07:23
	→ shampine joined	07:23
	→ marthinal joined	07:23
	→ nob124 joined	07:24
	← nob124 left	07:24
	→ unixpro1970 joined	07:24
	→ roelmonnens joined	07:24
	→ acolson joined	07:24
	→ levity_island joined	07:24
	← arup_r left	07:25
	→ freimatz joined	07:25
	← ehmatthes left	07:25
	→ arup_r joined	07:25
	← colorbot left	07:25
	→ kriks joined	07:26
	→ nob124 joined	07:26
	← nob124 left	07:26
	← mikecmpbll left	07:26
	→ nob124 joined	07:26
	← nob124 left	07:27
	→ EminenceHC joined	07:27
	→ m0viefreak joined	07:28
	→ nfk joined	07:28
	→ nob124 joined	07:28
	← nob124 left	07:29
	→ nob124 joined	07:30
	← nob124 left	07:30
	← sinkensabe left	07:31
	→ nob124 joined	07:32
	→ BiggFREE joined	07:32
	← nob124 left	07:32
	← EminenceHC left	07:32
	→ sinkensabe joined	07:32
	→ nob124 joined	07:32
	→ purak joined	07:32
	← nob124 left	07:33
	→ nob124 joined	07:33
	← nob124 left	07:34
	→ nob124 joined	07:34
	← nob124 left	07:35
	→ nob124 joined	07:35
	← proq left	07:35
	← nob124 left	07:36
	→ Gizburdt joined	07:36
	← markgrady left	07:36
	← nfk left	07:37
	← solker left	07:37
	→ nob124 joined	07:38
	← nob124 left	07:38
	→ cbr joined	07:39
	← darkbasic left	07:39
	→ nob124 joined	07:39
	← nob124 left	07:39
	← Amandil left	07:40
	→ nob124 joined	07:40
	→ darkbasic joined	07:41
	← nob124 left	07:41
	→ nob124 joined	07:42
	← nob124 left	07:42
	→ hami joined	07:43
	← Tuna-Fish left	07:43
	← a_le left	07:43
	→ Tuna-Fish joined	07:43
	← hami left	07:43
	→ nob124 joined	07:43
	← nob124 left	07:44
	← purak left	07:44
	→ ciampix joined	07:44
	← iamtakingiteasy left	07:44
	→ nob124 joined	07:45
	← nob124 left	07:45
	→ ilhami joined	07:45
	← beautifulmind left	07:45
ilhami	can you give me the git commands guide+	07:45
	?	07:45
	there is a special page	07:45
	→ nob124 joined	07:46
	← nob124 left	07:46
	→ mkaesz joined	07:46
	← jontmorehouse left	07:46
	→ b1nar1_ joined	07:46
tobiasvl	man git ?	07:47
gitinfo	the git manpage is available at http://jk.gs/git.html	07:47
	→ nob124 joined	07:47
ilhami	not that.	07:47
	← nob124 left	07:47
	← unixpro1970 left	07:47
milki	git <TAB><TAB>	07:47
	← arnaud___ left	07:47
tobiasvl	git commands guide. doesn't ring a bell. please elaborate	07:47
	→ nilg joined	07:48
	← b1nar1 left	07:48
	→ nob124 joined	07:48
	← nob124 left	07:49
	← ValicekB left	07:49
	← govg left	07:49
	← Tuna-Fish left	07:50
	→ nob124 joined	07:50
	← nob124 left	07:50
	→ doev joined	07:51
	← sinkensabe left	07:51
ilhami	it's a weird url	07:51
	I remember	07:51
	:D	07:51
	→ nob124 joined	07:51
	← nob124 left	07:52
	← jfelchne_ left	07:52
	→ zoso joined	07:52
	→ l0x3py joined	07:52
	← shampine left	07:53
	← arup_r left	07:53
	→ nob124 joined	07:53
	← nob124 left	07:53
	→ jnavila joined	07:54
	→ LeMike joined	07:54
	→ Amandil joined	07:54
	← zoso left	07:54
	→ nob124 joined	07:55
	← nob124 left	07:55
	→ Daisuke joined	07:55
	→ zoso joined	07:56
	→ ValicekB joined	07:56
	→ harish joined	07:56
	← zoso left	07:56
	→ sinkensabe joined	07:57
	← sinkensabe left	07:57
	→ jagob joined	07:57
	→ nob124 joined	07:57
	← nob124 left	07:58
	← ClarusCogitatio left	07:58
	→ nob124 joined	07:58
	→ sinkensabe joined	07:58
	← nob124 left	07:59
	← sinkensabe left	07:59
	← CentaurWarchief left	07:59
	→ sinkensabe joined	07:59
	→ palcu joined	08:00
	→ colorbot joined	08:00
	→ ClarusCogitatio joined	08:00
	→ nob124 joined	08:00
	→ Tuna-Fish joined	08:00
	← nob124 left	08:00
	← User458764 left	08:01
	→ proq joined	08:01
	→ nob124 joined	08:02
	← nob124 left	08:02
	→ PCatinean joined	08:03
	→ nob124 joined	08:03
	← nob124 left	08:03
	→ rubyonrailed joined	08:03
	← palcu left	08:05
	→ flavioberetti joined	08:05
	→ nob124 joined	08:05
	← nob124 left	08:06
flavioberetti	hi people. if i clone a git-svn repository, will the new one have everything set up for interacting with svn as well? i mean cloning kinda implies that for me, just want to be sure.	08:06
	→ corni joined	08:06
flavioberetti	i have a git-svn repo on my disk which tracks our svn repo. now i want to have a bare repo on my server where my different hosts can clone from and push to (on feature branches) before one of the does the git svn dcommit.	08:07
	→ moritzs joined	08:07
canton7	flavioberetti, git-svn repos should never ever interact with anything other than their svn repo	08:08
	→ nob124 joined	08:08
	← proq left	08:08
canton7	flavioberetti, the reason is that git-svn rewrites commits when it dcommits them, so if you make those commits "public" (i.e. share them with any other git repo), you've got a rewriting public history situation on your hands	08:08
	← rubyonrailed left	08:08
	→ orangestickynote joined	08:09
	← nob124 left	08:09
canton7	with all the duplication of commits that that normally involves	08:09
	→ irqq joined	08:09
flavioberetti	canton7: aww that's too bad. so the workflow i imagined can not be realized easily...	08:09
canton7	so if you have a single svn repo in your setup, every git repo must only ever interact with that svn repo, and never with each other	08:09
	flavioberetti, there are other tools... !subgit	08:09
	canton7 kicks the bot	08:10
canton7	ok, it doesn't have a trigger for that, forgiven	08:10
flavioberetti	i'll look it up	08:10
	→ govg joined	08:10
canton7	http://subgit.com/ - that's a hosted svn<->git bridge which doesn't do rewriting	08:10
	which might be more suited	08:10
	→ nob124 joined	08:11
	← nob124 left	08:11
	← nrsk left	08:12
	→ diegoviola joined	08:12
	→ TomyWork joined	08:12
	→ nob124 joined	08:12
	← nob124 left	08:13
	← colorbot left	08:13
	← Rixius left	08:14
	→ Rixius joined	08:14
	→ nob124 joined	08:15
	← nob124 left	08:15
	→ hs366 joined	08:15
	← m0viefreak left	08:16
	→ nob124 joined	08:16
	→ aswen joined	08:16
	← nob124 left	08:16
	→ ferr joined	08:16
flavioberetti	canton7: thanks!	08:16
canton7	:)	08:16
	→ nob124 joined	08:17
	← nob124 left	08:17
	→ kirin` joined	08:17
	← daito left	08:18
	→ arnaud___ joined	08:18
flavioberetti	still i think about wether there's some way i could realize this with git tools only... my actual requirement is sharing commits between hosts before pushing them back upstream to svn.	08:18
canton7	that is exactly the thing that goes wrong with git-svn	08:18
	← BlaXpirit left	08:18
	→ nob124 joined	08:18
canton7	it's fine up to the point where you dcommit: dcommitting rewrites the commit, and now you have two versions of it in circulation	08:18
	← nob124 left	08:19
	← staafl left	08:19
	→ grindmodeon joined	08:19
flavioberetti	and there is no way of, like, force-merging them back to the local commits are matched and rewritten as well?	08:19
	g/to/so/	08:20
	← cmn left	08:20
	→ staafl joined	08:20
	→ alorence joined	08:20
	← Xethron left	08:20
flavioberetti	s/g/s ;)	08:20
	flavioberetti needs another coffee	08:20
canton7	it's possible, but you have to be so freaking careful. anything to do with 'pull' or 'merge' is out of the window, and most of git's helpful messages become wrong	08:20
	→ nob124 joined	08:21
canton7	so you're going to have to do a load of very careful education, and no-one will be able to make a single little mistake	08:21
	← nob124 left	08:21
flavioberetti	canton7: well i would be the only person involved, so that would actually be manageable i think.	08:21
canton7	I've got a friend whose company tried it. They're a small number of really smart guys, and they screwed it up royally	08:21
	no, I really seriously recommend against it.	08:22
	→ cmn joined	08:22
	→ colorbot joined	08:22
	→ nob124 joined	08:22
canton7	I don't know how to word this any more strongly: DON'T DO IT. You don't know enough about git to even know what the consequences are exactly.	08:22
	← Xe left	08:22
flavioberetti	i see :) well then i'd rather not try. will read up on the specific issues and decide on wether gitsub is worth the effort or i will just use an svn branch (yuck) and share the commits as svn revisions via the upstream repo.	08:22
	→ liamkeily joined	08:23
	← nob124 left	08:23
	← kirin` left	08:23
canton7	yea, unfrortunately once you put an svn repo in the mix it tends to stay pretty central: svn likes being central, and it's too dumb to know any better	08:23
	← corni left	08:23
	→ Xe joined	08:23
	→ nob124 joined	08:23
	→ kirin` joined	08:24
flavioberetti	yup, alright thanks for your help!	08:24
	← nob124 left	08:24
	→ gua_ould joined	08:24
canton7	no worries	08:24
	→ HelperW joined	08:25
	→ nob124 joined	08:25
	← Manny left	08:25
	← nob124 left	08:25
	← polyzen left	08:26
	← corkfuse left	08:26
	→ nob124 joined	08:27
	→ Manny joined	08:27
	← nob124 left	08:27
	→ joo-_ joined	08:27
	← orangestickynote left	08:28
	← kirin` left	08:28
	← govg left	08:28
	→ nob124 joined	08:28
	→ iamtakingiteasy joined	08:29
	← nob124 left	08:29
	← Celm left	08:29
	→ gam joined	08:30
	← wrouesnel left	08:30
	← ClarusCogitatio left	08:30
	→ nob124 joined	08:30
	← nob124 left	08:31
	→ arup_r joined	08:31
	→ solker joined	08:31
	→ nob124 joined	08:32
	← nob124 left	08:32
	→ ClarusCogitatio joined	08:32
	→ after_r joined	08:32
after_r	Hello..	08:32
gitinfo	after_r: 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.	08:32
after_r	Hello... does anyone know how to make Git log all activity in the background in a log file like /var/log/git.log where it writes any time it does a checkout, etc... Without modifying the command (like a config file?)	08:33
	← punchagan left	08:33
	→ nob124 joined	08:33
	→ nrsk joined	08:33
	← nob124 left	08:33
	→ daito joined	08:34
	→ EminenceHC joined	08:34
	→ durre joined	08:34
	→ nob124 joined	08:34
	← regreg left	08:35
	← nob124 left	08:35
jast	after_r: there's no such thing built into git, you can only build something around it, e.g. in your shell	08:35
after_r	i see	08:35
	→ thevishy joined	08:35
bremner	after_r: of course this won't help when activities take place on several computers at once, somewhat the normal case	08:36
	→ nob124 joined	08:36
	← nob124 left	08:36
	← colorbot left	08:37
	→ nob124 joined	08:37
	← nob124 left	08:38
	← ClarusCogitatio left	08:38
cbreak	after_r: git logs checkouts	08:38
	← EminenceHC left	08:38
cbreak	after_r: git also logs commits, some resets	08:38
	→ nob124 joined	08:38
cbreak	it doesn't log fetches, pushes, file modifications, diffs, status, ...	08:39
	after_r: those logs are per-branch and per repository	08:39
	→ ClarusCogitatio joined	08:39
cbreak	after_r: see man git reflog	08:39
gitinfo	after_r: the git-reflog manpage is available at http://jk.gs/git-reflog.html	08:39
	← nob124 left	08:39
	→ seschwar joined	08:40
	← Malsasa left	08:40
	→ nob124 joined	08:40
	← nob124 left	08:41
	→ CheckDavid joined	08:41
	→ nob124 joined	08:42
	← nob124 left	08:42
	← Manny left	08:43
	← thevishy left	08:43
	← marthinal left	08:43
	← sinequanon left	08:43
	← evie_ham1 left	08:43
	→ CentaurWarchief joined	08:43
	→ nob124 joined	08:44
	← nob124 left	08:44
	← Daisuke left	08:44
	ome → __me	08:45
	Matrixiumn → Xack	08:45
	← dialeth left	08:45
	→ dialeth joined	08:45
	→ colorbot joined	08:46
	→ nob124 joined	08:46
	← flarn left	08:46
	← nob124 left	08:46
	← sinkensabe left	08:46
after_r	well i already wrote a shell wrapper..	08:46
	→ sinkensabe joined	08:46
	← colorbot left	08:47
after_r	I just want to log all commands	08:47
	→ nob124 joined	08:47
	→ psoo joined	08:47
	← liamkeily left	08:47
	← HelperW left	08:47
after_r	but my shell wrapper is causing these errors: /usr/bin/git: 4: /usr/bin/git: Cannot fork	08:47
	← nob124 left	08:47
after_r	when another program that uses git tries to git	08:47
	→ nob124 joined	08:48
	← nob124 left	08:48
	→ tvw joined	08:48
	→ nob124 joined	08:49
	← nob124 left	08:49
after_r	i guess i will write a little c app	08:49
	→ lindenle joined	08:50
	→ nob124 joined	08:50
	← nob124 left	08:50
	→ danjordan joined	08:50
	← IIT_ left	08:51
osse	git() { echo "$@" >> ~/git.log; command git "$@"; }	08:51
	← joo-_ left	08:51
	→ nob124 joined	08:51
	← nob124 left	08:52
	→ joo-_ joined	08:52
	← arnaud___ left	08:52
	← geomyidae_ left	08:52
	→ nob124 joined	08:53
	← nob124 left	08:53
	→ arnaud___ joined	08:53
after_r	osse: it has to be in the path	08:53
	as another program tries to use the git binary	08:53
	← Rixius left	08:54
	→ punchagan joined	08:54
	→ Rixius joined	08:54
	← lindenle left	08:54
	← punchagan left	08:54
	→ punchagan joined	08:54
	→ nour joined	08:54
	→ nob124 joined	08:54
	→ ap0c joined	08:54
	← ap0c left	08:54
	→ ap0c joined	08:54
	← nob124 left	08:54
	→ thevishy joined	08:55
	→ nob124 joined	08:56
	← nob124 left	08:56
	→ nob124 joined	08:57
	← nob124 left	08:57
	→ skylite joined	08:58
	← dialeth left	09:00
	→ nob124 joined	09:00
	← nob124 left	09:00
	→ skylite_ joined	09:00
	→ dialeth joined	09:00
	← c74d left	09:00
	→ palcu joined	09:00
	← harish left	09:01
	→ nob124 joined	09:01
	← nob124 left	09:01
	→ marthinal joined	09:01
	→ nob124 joined	09:02
	← nob124 left	09:02
	→ c74d joined	09:03
	← skylite left	09:03
	→ basiclaser_ joined	09:03
	→ nob124 joined	09:03
osse	for example git itself	09:03
	← nob124 left	09:03
osse	ahh, that won't be a problem since git prepends something to PATH	09:04
	→ proq joined	09:04
	← proq left	09:04
	→ proq joined	09:04
	→ nob124 joined	09:04
	← nob124 left	09:05
	→ unixpro1970 joined	09:05
	← linduxed left	09:05
	← palcu left	09:05
after_r	hmm?	09:06
	i have to write a c app that calls exec(`git`)	09:06
	and passes the parameters passed to the app to git	09:06
osse	after_r: git sometimes executes itself. but since it prepends soemthing to PATH which contains a hardlin kto git you won't end up in a recursive mess	09:06
after_r	so my plan is good?	09:07
osse	yes	09:07
	→ nob124 joined	09:07
osse	wait..	09:07
	← nob124 left	09:08
osse	if "all you do" is exec("git") from C then it searches PATH, no? and your git c wrapper is first there I assume	09:08
	→ nob124 joined	09:08
	→ mlechner joined	09:09
	← nob124 left	09:09
	← Raging_Hog left	09:09
	→ listochkin joined	09:09
	→ jrvlima joined	09:10
	→ HelperW joined	09:10
	→ nob124 joined	09:10
	← nob124 left	09:10
	← proq left	09:11
	→ nob124 joined	09:11
	→ colorbot joined	09:12
	← nob124 left	09:12
after_r	yeh execv	09:12
	← arnaud___ left	09:12
after_r	4 return execv("/usr/bin/git", argv);	09:12
	it works	09:12
	← marthinal left	09:13
	→ nob124 joined	09:13
osse	ahh, yeah that'll work since you put the full path	09:13
	← nob124 left	09:13
	← joki left	09:14
	→ nob124 joined	09:14
	← nob124 left	09:14
	← grindmodeon left	09:14
	← listochkin left	09:14
	← ClarusCogitatio left	09:15
	← tgunr left	09:15
after_r	now to only log the passed in parameters	09:15
	← kopparam left	09:15
	→ kirin` joined	09:15
	← blubberbop left	09:15
	→ marthinal joined	09:15
	→ kopparam joined	09:15
	← tokik left	09:15
	→ arnaud___ joined	09:15
osse	fopen this, for(i = 0, printf argc that, fclose the other thing	09:15
	→ nob124 joined	09:15
	← nob124 left	09:16
cbreak	you forgot to define i :)	09:16
after_r	int argc, char** argv	09:16
	thats in my main	09:16
cbreak	that's normal.	09:16
	→ mribeirodantas joined	09:16
	← rchavik left	09:16
after_r	char* argv[] is also used	09:17
cbreak	you can get a vector of strings with std::vector<std::string> arguments(argv, argv + argc)	09:17
	→ nob124 joined	09:17
cbreak	those will be nicely separated and you can easily log them	09:17
	← arup_r left	09:17
cbreak	arguments[0] will be the program name	09:17
	← nob124 left	09:17
	→ lb1a joined	09:17
	→ rchavik joined	09:17
cbreak	(i.e. if someone used git-upload-pack to call git)	09:17
	→ arup_r joined	09:18
osse	cbreak: I did that before the fopen :P Besides, for (int i...) isn't alloweed pre-C99 afaik	09:18
	← c74d left	09:18
cbreak	osse: yeah, tragic	09:18
	osse: 15 years ago that might have caused issues	09:18
osse	^_^	09:18
	← supernaut left	09:18
	→ joki joined	09:18
	→ ClarusCogitatio joined	09:18
	→ nob124 joined	09:19
	← nob124 left	09:19
cbreak	even microsoft, the well-known snails in the area of programming language tools have somewhat caught up nowadays	09:19
osse	oh? Do they have a C99-compatible compiler now?	09:19
	→ marcogmonteiro joined	09:19
	← mribeirodantas left	09:19
	← arnaud___ left	09:20
cbreak	don't think so. Just less incompatible.	09:20
	→ intellix joined	09:20
	← kopparam left	09:20
cbreak	they finally got uint32_t and so on	09:20
	← kirin` left	09:20
	→ c74d joined	09:20
	→ ki0 joined	09:20
	→ nob124 joined	09:21
	← nob124 left	09:21
	← Zifre left	09:21
jast	AFAIK for (int foo...;;) has been allowed since forever	09:21
	→ leeN joined	09:22
	← Amandil left	09:22
osse	jast: I get this when running a simple 'gcc foo.c': http://sprunge.us/YGHa :p	09:23
	→ nob124 joined	09:24
	← nob124 left	09:24
LeMike	hello. a colleague copied files via ftp to the server but everything is under git control. I already did "remote add" and "fetch --all" but then I got stuck. How do I "checkout" the master or tell git that the files it sees are already the master ?	09:24
jast	huh, interesting	09:24
	← levity_island left	09:24
cbreak	LeMike: move the files away	09:24
osse	if I s/cc/++/ then ti works just fine	09:24
jast	yeah, but then you have ++, so that doesn't really improve anything ;)	09:25
	→ martinklepsch joined	09:25
LeMike	no cmd for that cbreak ? ok. i clone and move around. thx	09:25
jast	well there's git checkout -f which forcibly overwrites anything that gets in the way	09:25
	→ arnaud___ joined	09:25
	→ harish joined	09:25
	← durre left	09:25
	→ nob124 joined	09:25
	← arnaud___ left	09:25
	← nob124 left	09:25
LeMike	I thought there is something that rebase could do	09:26
	→ kopparam joined	09:26
cbreak	LeMike: then git checkout the branch	09:26
	LeMike: then move them back	09:26
	→ kirin` joined	09:27
	→ nob124 joined	09:28
	← nob124 left	09:28
	← harish left	09:28
	← funfunctor left	09:28
	→ orangestickynote joined	09:28
	→ Evie_Hammond joined	09:29
jast	rebase doesn't deal with uncommitted changes. if it finds any, it aborts.	09:29
	→ harish joined	09:29
	→ ProT-0-TypE joined	09:29
	→ tokik joined	09:29
	→ pierrep joined	09:29
	→ nob124 joined	09:29
	→ functorfun joined	09:30
	functorfun → funfunctor	09:30
	gitinfo set mode: +v	09:30
	← nob124 left	09:30
	→ King_Hual joined	09:30
pierrep	Hello	09:30
gitinfo	pierrep: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	09:30
pierrep	thank you for the good work	09:30
	← backsorry left	09:30
	← CentaurWarchief left	09:30
pierrep	Im working in a company using Mercurial and we want to migrate everything to Git	09:30
	← veebers left	09:30
	→ CentaurWarchief joined	09:30
	← Dreadnaught left	09:31
pierrep	to achieve that I need to make it works with the largest depot that is appromativly 5G of code mixed with data.	09:31
	→ granden joined	09:32
pierrep	The conversion from Mercurial has been done but the first push to the server is kind of tough	09:32
	→ nob124 joined	09:32
pierrep	I have been playing with git config http.postBuffer 99999999999	09:32
	← nob124 left	09:32
	→ ockham joined	09:33
	← orangestickynote left	09:33
pierrep	but the push still failed	09:33
	← kirin` left	09:33
granden	Hi, If I got two bransches, my master-branch and then a temp branch. How can I merge these two, and I want to ignore all changes in the master and make my temp branch the new master. The temp-branch have reverted a few commits.	09:33
pierrep	Would I have better result with ssh+git ?	09:33
	→ nob124 joined	09:33
	← nob124 left	09:34
	← arup_r left	09:34
cbreak	pierrep: git via ssh is normal, but git itself has issues with big files	09:34
	→ EminenceHC joined	09:34
	→ nob124 joined	09:34
cbreak	it'll use a lot of ram on repacking	09:35
	→ Xethron joined	09:35
	← nob124 left	09:35
osse	should be ok as long as it doesn't have more issues than what hg has :P	09:35
	← tokik left	09:35
	→ arup_r joined	09:36
granden	Anyone? Or how do I ignore two commits and totally reverts back, is that even possibly?	09:36
cbreak	granden: just checkout tmp	09:36
	granden: then git merge -s ours master	09:36
	then rename master away and rename tmp to master	09:36
	← harish left	09:36
after_r	it works :)	09:36
cbreak	(or delete master and rename)	09:36
granden	Hmm, commands for that would be? I have been using a gui tool, and It jus makes me confusing now when trying to do stuff using terminal.	09:37
pierrep	cbreak yes my VM already complaigned, Im gonna upload local depot on the remote server and try from there.	09:37
	→ nob124 joined	09:37
	← ProT-0-TypE left	09:37
granden	git checkout temp ; git merge -s ours master ;	09:37
	← nob124 left	09:37
granden	and then rename/delet stuff?	09:37
	→ ProT-0-TypE joined	09:38
osse	granden: after that you can git checkout master; git merge tmp; git branch -d tmp	09:38
cbreak	pierrep: I think man git-repack contains some config parameters you can tune for that	09:38
gitinfo	pierrep: the git-repack manpage is available at http://jk.gs/git-repack.html	09:38
cbreak	granden: the command to check out tmp is git checkout tmp	09:39
	→ nob124 joined	09:39
	← nob124 left	09:39
cbreak	granden: in general, command line commands are made to be somewhat intuitive :D	09:39
	← EminenceHC left	09:39
granden	ok now, I run all those commands, and it says I got two pulls /being beind 2 commits	09:39
	Should I pull or will that restore my old master	09:40
cbreak	granden: try !lol	09:40
gitinfo	granden: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	09:40
	← kyb3r_ left	09:40
cbreak	granden: and show the result to us in a pastebin	09:40
pierrep	cbreak:thanks Im going to take a look	09:40
	→ liamkeily joined	09:40
	→ nob124 joined	09:40
	← nob124 left	09:41
granden	cbreak: http://pastebin.com/s0CZ7sXN	09:42
	→ nob124 joined	09:42
	← nob124 left	09:42
granden	"Your branch is behind 'origin/master' by 2 commits, and can be fast-forwarded. (use "git pull" to update your local branch)	09:43
	"	09:43
	That is what git tells me as well	09:43
cbreak	granden: so, as you can see, origin/master has commits you do not	09:43
granden	Yes	09:43
cbreak	do you want those commits?	09:43
granden	But those are the commits I wanted to get rid of	09:43
cbreak	ok.	09:43
granden	Because now my local copy is what I want	09:43
	→ GODDOG joined	09:43
cbreak	so, git merge -s ours origin/master	09:43
	that'll merge those commits but ignore the changes from those commits	09:44
granden	I am not sure if my bitbucket repo is what I really want	09:44
cbreak	you can also git push -f instead	09:44
	that'll push and overwrite those commits	09:44
	→ nob124 joined	09:44
	← ki0 left	09:44
cbreak	but that's history rewriting	09:44
after_r	osse: except I have to call execv(`original git file`) or else the app calls itself (because im replacing the main git file with my exe)	09:44
	← nob124 left	09:44
granden	cbreak: So recomended way is the first to make a git merge?	09:44
after_r	otherwise.. looks like I did it.. its logging	09:44
cbreak	granden: your choice	09:45
	force pushing is cleaner but very very rude to others	09:45
	← CentaurWarchief left	09:45
cbreak	merging is truer, but leaves traces in history	09:45
	→ CentaurWarchief joined	09:45
	→ ki0 joined	09:45
granden	cbreak: Only me working on this	09:45
	← zapb_ left	09:45
	→ King_Hual` joined	09:45
osse	after_r: you can put your own in /usr/local/bin I suppose	09:45
cbreak	then you have the freedom to chose	09:45
	→ nob124 joined	09:45
	← nob124 left	09:45
cbreak	git push -fu origin master	09:45
	that'll kill the remote history	09:45
granden	thank you	09:46
after_r	osse: do you want the c file?	09:46
	← jrvlima left	09:46
	→ nob124 joined	09:46
osse	sure,w hy not	09:46
	← nob124 left	09:46
granden	cbreak: and osse Thank you!	09:47
after_r	osse: dcc`ing it to you	09:47
granden	Now my work from yesterday is restored :)	09:48
	→ nob124 joined	09:48
	← martinklepsch left	09:48
	← nob124 left	09:48
	← nrsk left	09:48
osse	after_r: I accepted but it failed for some reason	09:48
cbreak	granden: git's neat, isn't it? Also check out man git reflog :D	09:48
gitinfo	granden: the git-reflog manpage is available at http://jk.gs/git-reflog.html	09:48
	← weiyang left	09:48
	← King_Hual left	09:48
	→ dvdchr joined	09:49
	→ King_Hual joined	09:49
after_r	osse: http://pastebin.mozilla.org/7143477	09:49
granden	cbreak: Yeah, really neat :)	09:49
	→ nob124 joined	09:50
	← nob124 left	09:50
	← GODDOG left	09:50
granden	First time really working with a vcs since I tried svn about 8 years ago or so.	09:50
	:)	09:50
	← colorbot left	09:50
	→ zapb_ joined	09:50
	→ linduxed joined	09:51
	→ Manny joined	09:51
granden	but commits is local version controll, and push is like a remote version controlle is that roughly how it is?	09:51
	Or am I really of now?	09:51
cbreak	no, it's like that	09:52
osse	granden: push is how you publish your commits, so to speak	09:52
	→ nob124 joined	09:52
	← nob124 left	09:52
osse	after_r: heh, good thing git executes itself via a hardlink and not a symbolic link ^_^	09:53
	← King_Hual` left	09:53
	← punchagan left	09:53
	→ nob124 joined	09:53
	← Xethron left	09:53
granden	So if I do like 20 commits, and then push. Will it be 20 commits on my bitbucket account as well or will it be only 1 push?	09:54
	osse checks ifthat is actually true	09:54
granden	If I understands things right it should look like 20 commits ?	09:54
osse	yup	09:54
after_r	heh yeh	09:54
	→ punchagan joined	09:54
osse	granden: 20 commits. the act of pushing itself is not part of the history	09:54
	← punchagan left	09:54
	→ punchagan joined	09:54
after_r	but if something was pointing to /usr/bin/git, it would use my new app	09:54
	i think	09:55
granden	osse: Ok, is there any best practice way when to make a commit? I mean If i'm working on 20 different things, whats the normal/prefered way usually wehn you work in a big team	09:55
after_r	anyway it works	09:55
granden	make 20 commits for each change, or one commit when everything is done?	09:55
	when coding there is coding practices to follow, but is there anything similayr /standard propositions when it comes to vcs?	09:56
	→ skylite joined	09:56
	← kcj left	09:56
after_r	I think I could use something like systrace or whatever to log app calls also	09:57
osse	granden: each commit should do something sensible and should be "atomic" to a certain extent. Don't make commits that does many different things at once, but don't make commits that do something seemlingly meaningless without further context either.	09:57
	→ warcuy_ joined	09:57
	← joo-_ left	09:58
granden	osse: So if lets say I'm makeing a blog, one commit for comments/adding/vieweing. One commit for showing the post itself	09:58
	would be a good practice	09:58
	?	09:58
	→ joo-_ joined	09:58
	→ groolot joined	09:58
osse	both of those seem like huge tasks. but sure.	09:59
	more like one commit for settign up the database connection. one commit for adding the function that calculates the "posted n minutes ago" text etc.	09:59
granden	ah, ok.	09:59
	← diegoviola left	10:00
	← skylite_ left	10:00
	→ palcu joined	10:01
	← warcuy_ left	10:02
	← HelperW left	10:02
	→ Xethron joined	10:03
	← Xethron left	10:03
	→ Xethron joined	10:03
	→ EminenceHC joined	10:03
granden	osse: Thanks!	10:03
	← JohnBat26 left	10:03
	→ wald0 joined	10:03
	← D-Boy left	10:05
	→ palcu_ joined	10:05
	→ ecky--ptang-zoob joined	10:05
	→ harish joined	10:05
	→ Daisuke joined	10:06
	→ proq joined	10:06
	← palcu left	10:06
	→ netcarver joined	10:06
	← CentaurWarchief left	10:06
	→ JohnBat26 joined	10:06
	← Daisuke left	10:07
	← after_r left	10:07
	← wald0 left	10:07
	← EminenceHC left	10:07
	→ CentaurWarchief joined	10:08
	→ kirin` joined	10:08
	← daito left	10:08
	→ D-Boy joined	10:09
	robustus → robustus\|Off	10:10
	← BiggFREE left	10:10
	→ arnaud___ joined	10:11
	← kirin` left	10:13
	← unixpro1970 left	10:13
	← proq left	10:14
	→ carpediembaby joined	10:15
	→ rhombus joined	10:16
	← rhombus left	10:17
carpediembaby	Hello, how can i revert the last commit. But I dont want to commit the changes yet, just revert them in my working copy	10:18
j416	carpediembaby: man git-revert	10:18
gitinfo	carpediembaby: the git-revert manpage is available at http://jk.gs/git-revert.html	10:18
	← aidalgol left	10:18
carpediembaby	j416: but this will commit the changes, no?	10:18
j416	carpediembaby: Did you even read what options 'git revert' takes in the link I gave you? --no-commit.	10:19
	← punchagan left	10:19
carpediembaby	j416: I didn't, sorry. I knew about the commit command from before and my impression was that it commits after reverting.	10:19
	→ punchagan joined	10:20
	← punchagan left	10:20
	→ punchagan joined	10:20
	→ kirin` joined	10:20
j416	carpediembaby: you can also use git checkout with a path for the same result.	10:22
	→ endiruna joined	10:22
	→ hever_ joined	10:22
immortal	i have a main folder called main, subfolders in main foldera folderb , how to move filea from foldera to folderb ? when i try "git mv filea folderb" its renamin the file	10:22
	→ punchagan1 joined	10:23
	← Mobutils left	10:24
	→ vtunka joined	10:24
	→ unchaganp joined	10:24
	→ rath joined	10:24
	← hs366 left	10:24
	← kirin` left	10:25
	← punchagan left	10:26
	ohcibi_ → ohcibi	10:27
cbreak	immortal: just move it	10:28
	you don't need to use git if you don't want to	10:28
	if you do want to: git mv a b where a and b are full paths	10:28
	← liamkeily left	10:28
cbreak	or git mv a d/ where d is the directory to put a in	10:29
	→ Brain joined	10:29
	Brain mutilates the other devs on his project with a bloody great swordfish	10:29
Brain	ok, so i finally got to the point where every dev is supposed to have their own independent copy of the project, and if theyre going to make changes, they work on local branches, and i merge them in as kind of a gatekeeper onto a test platform	10:30
	→ unixpro1970 joined	10:30
Brain	previously, we were working directly on the test platform, and stepping on each others toes.	10:30
	← unchaganp left	10:30
Brain	seems at least one dev is still working on the test platform, as i just went to do a merge and one of the files kept changing as i tried to stash it :/	10:30
moritz	Brain: remove login privs? :-)	10:30
	← punchagan1 left	10:31
	← vtunka left	10:31
	→ heftig_ joined	10:31
	← heftig left	10:32
	← fairuz left	10:32
	→ vtunka joined	10:33
immortal	cbreak whatever it try with "git mv file newpath" its just renamin the file	10:34
	← funfunctor left	10:34
	← Polyatomic left	10:34
cbreak	immortal: yeah, that's moving	10:34
	moving and renaming is the same thing	10:34
	immortal: because files from a users perspective are identified by their path	10:34
immortal	how will i get the file out of the folder and put in the new one ?	10:35
cbreak	immortal: relative paths.	10:35
	→ hs366 joined	10:35
cbreak	immortal: the argument to mv is not a name, it's a path	10:35
	← moritzs left	10:35
cbreak	you can also use absolute paths if you want	10:35
immortal	gimme an example pls	10:35
Brain	moritz: i will have to eventually	10:36
	← sarri left	10:36
cbreak	git mv foo/bar.txt bar/foo.exe	10:36
	← pooh22 left	10:36
Brain	moritz: see, the project is written to be windows specific, with php5 (yeah dont ask) and my latest pet project is a branch to take away all the windows-specific shit like "\" in pathnames, drive letters, system() calls to windows specific executables, DCOM (yeah really)	10:36
	robustus\|Off → robustus	10:36
cbreak	git mv immortal/warrior /var/tmp/todelete/	10:37
Brain	so the main server is a windows server and the dev machines are linux machines	10:37
	← CheckDavid left	10:37
cbreak	windows server :O	10:37
	→ sarri joined	10:37
Brain	for some reason theres an allure to just connecting into the windows machine to dev	10:37
	at least for the others	10:37
	← cmn left	10:37
	→ pooh22 joined	10:38
	← gam left	10:38
	→ lindenle joined	10:38
	→ achadwick joined	10:39
Brain	cbreak: feel the HORROR of a php app that spawns an excel.application com object to manipulate spreadsheets and turn them into pdfs...	10:39
	that one was quite hard to find a way around, actually, because getting rid of excel entirely is out of the question :(	10:39
	→ cmn joined	10:39
cbreak	Brain: at work some of my coworkers wrote a Python Web Page with a backend that uses Powerpoint via apple script :D	10:39
	naturally it only runs on OS X	10:40
Brain	lol	10:40
	sounds like the same kind of snake pit i work on	10:40
	a special kind of pain reserved only for systems developers	10:40
cbreak	we're software engineers normally doing C++ development	10:40
	but the managers wanted a web page for project management... and they asked us...	10:40
Brain	oh dear	10:41
cbreak	indeed	10:41
Brain	well, my solution to having to use a windows server due to dcom was a bit convoluted	10:41
	→ liamkeily joined	10:41
Brain	i created a C# windows service that listens on a TCP port, and accepts documents with some metadata headers, processes them, and sends them back down the socket	10:41
	so the calling side only needs to support sockets, rather than a full windows DCOM stack	10:42
cbreak	I think soon our apple script solution will be replaced by some java program that is used directly instead of using powerpoint	10:42
Brain	that way we can remove the dependency on windows entirely, and just have a couple of workhorse machines with this service on, and office	10:42
	→ RagnarDanneskjol joined	10:42
	→ EminenceHC joined	10:42
Brain	we manipulate some pretty complex spreadsheets so unfortunately just replacing office is out of the question :(	10:43
	← lindenle left	10:43
Brain	its amazing how much easier git makes things for us though	10:43
	i can just make a branch and mess with stuff, and if it doesnt work, throw the branch away	10:43
	→ lolmaus joined	10:45
	→ punchaga` joined	10:45
	→ frivoal joined	10:45
lolmaus	My teammate renamed a branch on Github. I've renamed the local branch accordingly, but it still corresponds to the old remote branch. How do i update the local branch to correspond to the renamed remote branch?	10:45
	← punchaga` left	10:45
	→ punchaga` joined	10:45
	punchaga` → punchagan	10:45
	← Walex2 left	10:46
carpediembaby	j416: now i see that git is in the "reverting" state	10:46
	← granden left	10:46
	← Xethron left	10:46
	→ Walex joined	10:46
osse	lolmaus: git branch -u origin/renamed	10:47
	← arnaud___ left	10:47
immortal	cbreak thanks, seems i needed to be in main folder to use that command lol, got it	10:47
cbreak	immortal: the paths need to be valid	10:47
	← EminenceHC left	10:47
	→ cbr__ joined	10:47
lolmaus	osse: hmm, this command does not specify the local branch? Will it affect the current branch?	10:47
cbreak	immortal: if you're somewhere else, you can reach files via ../../blah/file.txt	10:47
	immortal: normal relative paths	10:47
osse	lolmaus: yes	10:47
	→ rsv joined	10:48
lolmaus	osse: thank you	10:48
	→ CheckDavid joined	10:48
immortal	right i forgot that double dot blah	10:48
	← frivoal left	10:48
	→ Xethron joined	10:48
	→ zoso joined	10:48
lolmaus	osse: what is the correct git term for what i called "local branch corresponds to remote branch"?	10:48
osse	lolmaus: the remote branch can be referred to as the local branch's upstream branch	10:49
	← zoso left	10:49
osse	lolmaus: but I don't see anything wrong in how you said it	10:49
	robustus → robustus\|Off	10:49
rsv	i have cloned 2 different git trees in dir1 and dir2. i want to cherry pick a particular commit avaiable in .git inside dir1 into gitree of dir2	10:49
	__me → ome	10:49
	→ zoso joined	10:49
	← zoso left	10:50
	← endiruna left	10:50
osse	rsv: (cd dir1; git format-patch -1 a-particular-commit) \| git am \o/	10:50
	← cbr left	10:50
	cbr__ → cbr	10:50
	→ teran joined	10:50
	→ zoso joined	10:50
lolmaus	osse: is the word "track" used in that context?	10:50
rsv	osse: cant i do git cherry pick	10:50
	← Manny left	10:51
	← zoso left	10:51
osse	lolmaus: yes. the local branch tracks the remote one (I think)	10:51
	rsv: not if they're separate clones.	10:51
	rsv: my thing will do the same	10:52
lolmaus	osse: you rock. ^__^	10:52
osse	lolmaus: correct	10:52
	→ zoso joined	10:52
	← ecky--ptang-zoob left	10:52
rsv	osse: i agree with you. i was thinking of practising cherry-picing	10:52
j416	carpediembaby: what do you want me to do about it?	10:52
	← zoso left	10:52
rsv	like doing it the right way	10:52
	→ ecky--ptang-zoob joined	10:53
	→ zoso joined	10:53
osse	lolmaus: https://www.youtube.com/watch?v=wTw_puqDtms	10:53
	← zoso left	10:53
	← joo-_ left	10:54
	→ Amandil joined	10:54
osse	rsv: then you have have to do something lke; git remote add otherrepo ../dir1; git fetch otherrepo; git cherry-pick a-particular-commit	10:54
	→ ManikM joined	10:55
	→ joo-_ joined	10:55
rsv	osse: thanks man!	10:56
	→ hdon joined	10:56
hdon	hi all :) i've been assuming that the commit message format was nothing more complicated than a string in some familiar encoding, with some first characters given the special privilege of being the conventional synopsis of the full commit message. am i wrong?	10:57
	← joo-_ left	10:57
	robustus\|Off → robustus	10:57
hdon	i ask because when git commit invokes my EDITOR (vim) i entered a short message, then a line feed, and then decided to put each change on a separate line. my vim syntax highlighting then made the second line bright red, as if it had some special function.	10:57
	→ joo-_ joined	10:57
j416	hdon: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html	10:58
	hdon clicks	10:58
	→ ToxicFrog_ joined	10:58
j416	hdon: because there should be a blank line	10:58
	hdon: it marks it red because it breaks convention	10:58
hdon	ohh	10:59
	thanks j416 ! i can't believe i didn't know this... i always just took it on intuition	10:59
	hdon nods	10:59
hdon	thanks j416	10:59
	→ roelmonn_ joined	10:59
	← ToxicFrog left	10:59
j416	yw	10:59
	→ arnaud___ joined	10:59
	← Amandil left	11:00
	→ Neozonz joined	11:01
	→ Raging_Hog joined	11:01
	← roelmonnens left	11:02
	← King_Hual left	11:03
	← joo-_ left	11:03
	→ Amandil joined	11:03
	→ moritzs joined	11:04
	← rsv left	11:04
	← arnaud___ left	11:04
	→ beautifulmind joined	11:04
	→ joo-_ joined	11:05
	← groolot left	11:05
	← Neozonz left	11:05
	← ThomasLocke left	11:05
	← pierrep left	11:06
	← thevishy left	11:07
	→ King_Hual joined	11:08
	→ proq joined	11:09
	← joo-_ left	11:12
	← moritzs left	11:13
	→ Trudko joined	11:13
	→ joo-_ joined	11:13
	← beautifulmind left	11:14
	← Gizburdt left	11:14
	← Amandil left	11:15
	← proq left	11:15
	→ beautifulmind joined	11:15
	→ nrsk joined	11:16
	→ stamina joined	11:16
	← pooh22 left	11:16
	→ Neozonz joined	11:16
	← Neozonz left	11:16
	→ Neozonz joined	11:16
	→ orangestickynote joined	11:18
	← brucelee left	11:18
	→ pooh22 joined	11:19
	← joo-_ left	11:20
	→ joo-_ joined	11:20
	← EdwardIII left	11:20
	→ nonickn_ joined	11:21
	→ toothrot joined	11:21
	→ LBV_User joined	11:22
	← Neozonz left	11:22
	← arup_r left	11:22
	← punchagan left	11:23
	← orangestickynote left	11:23
	← nonickn_ left	11:23
	→ thevishy joined	11:24
	→ mskaesz joined	11:24
	→ icio joined	11:25
	← mkaesz left	11:25
	→ Stummi joined	11:25
	→ RaceCondition joined	11:27
	← Junior left	11:27
	← nrsk left	11:28
	← cmn left	11:28
	→ punchagan joined	11:28
Stummi	Hi, we have a git repository where we just removed some large and often updated binary files from the history (using git filter-brach 'rm -f *.exe' HEAD), however the .git-directory is still unusual large (615MB for 5MB source files). Any ways to fix this, or to take a look into the pack file to see what is tacking up space?	11:28
	← FreezingCold left	11:29
jast	man git-filter-branch has a checklist for shrinking repositories	11:29
gitinfo	the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html	11:29
	← teran left	11:30
	→ cmn joined	11:30
jast	generally if a clone using a network protocol or file:// results in a similarly big repository, the big files are still referenced in other cases; in other cases it's probably still in there because of the reflogs or something like that	11:30
	→ BlaXpirit joined	11:30
	← CentaurWarchief left	11:30
jast	whoops	11:31
	→ CentaurWarchief joined	11:31
jast	correction: "the big files are still referenced in a branch's/tag's history"	11:31
Stummi	okay, thanks	11:32
	← ruukasu left	11:32
	→ bmcorser joined	11:32
	→ Neozonz joined	11:33
	← Neozonz left	11:33
	→ Neozonz joined	11:33
	→ faylite joined	11:33
	→ Gizburdt joined	11:34
	→ FreezingCold joined	11:36
	← Neozonz left	11:37
	← intellix left	11:40
	← icio left	11:40
	← nonickn left	11:41
	→ nonickn_ joined	11:41
	nonickn_ → nonickn	11:41
	← unixpro1970 left	11:41
	→ User458764 joined	11:41
	→ lucha joined	11:42
	← doev left	11:44
	→ arup_r joined	11:46
	→ EminenceHC joined	11:46
	← nonickn left	11:48
	→ nrsk joined	11:48
	← ClarusCogitatio left	11:48
	→ Neozonz joined	11:49
	← ap0c left	11:49
	→ nonickn joined	11:49
	→ ClarusCogitatio joined	11:50
	← flavioberetti left	11:50
	← ManikM left	11:50
	→ ManikM joined	11:51
	← EminenceHC left	11:51
	→ nanobe joined	11:51
	robustus → robustus\|Off	11:52
	← cmn left	11:53
	← galileopy left	11:53
	→ m0ltar joined	11:53
	→ kirin` joined	11:53
	← Neozonz left	11:53
	← dvdchr left	11:54
	→ deepy joined	11:55
	← Textmode left	11:55
deepy	Can I push/pull stash?	11:55
	→ cmn joined	11:55
deepy	nanobe is a spambot sending PMs on join btw	11:55
	→ punchaga` joined	11:55
	← punchaga` left	11:56
LBV_User	deepy: branch, apply your stash and push the branch...	11:57
	→ skylite_ joined	11:57
	← skylite_ left	11:57
	← punchagan left	11:57
	← kirin` left	11:57
	← joo-_ left	11:58
deepy	meh	11:58
	← skylite left	11:58
	→ durre joined	11:59
	→ kukks joined	11:59
	← kukks left	11:59
	→ kukks joined	11:59
	→ CodeShar_ joined	12:01
	← ecky--ptang-zoob left	12:01
	← CodeShark left	12:01
	→ lbv-user joined	12:03
	→ Neozonz joined	12:05
	← LBV_User left	12:05
	← lbv-user left	12:06
	→ LBV_User joined	12:06
	→ jellybean joined	12:07
	→ mizu_no_oto joined	12:07
	→ moritzs joined	12:08
osse	deepy: you can push it	12:09
	git push origin refs/stash:fooname	12:09
	→ punchagan joined	12:09
deepy	I already bit the bullet and made a feature branch, but thanks Ö+=	12:09
	:-)	12:09
	← jellybean left	12:09
	→ lpax joined	12:09
osse	who's Ö+= ?	12:09
	→ thiago_ joined	12:09
	← lpax left	12:09
	→ lpax joined	12:09
	← thiago_ left	12:09
	→ thiago_ joined	12:09
	→ Junior joined	12:10
	← Neozonz left	12:10
	→ Seb joined	12:10
Seb	hi fellows	12:10
deepy	It's what you get when you try to write :-) and you've suddenly changed to Swedish keyboard layout	12:10
Seb	what's the most straightforward way to get the SHA1 of the first commit in a clone ?	12:11
deepy	Or it's a metal O with a handcannon	12:11
	→ proq joined	12:11
	→ abc888 joined	12:11
	← moparisthebest left	12:11
	→ paul424 joined	12:11
	← freimatz left	12:12
	gitinfo set mode: +v	12:12
	→ joo-_ joined	12:12
abc888	testing	12:12
	can't really confirm the spam-on-join thing	12:13
	← abc888 left	12:13
	→ punchagan1 joined	12:13
	→ shigosei joined	12:14
LBV_User	then it may have stopped	12:14
	→ brucelee joined	12:14
	→ mikecmpbll joined	12:15
	→ moparisthebest joined	12:15
	← ferr left	12:15
	← punchagan left	12:15
	← LBV_User left	12:15
	← tmz left	12:15
	← nonickn left	12:15
	← joo-_ left	12:16
	→ LBV_User joined	12:16
	→ joo-_ joined	12:16
	← proq left	12:16
	← moritzs left	12:17
	→ nonickn joined	12:17
	→ tmz joined	12:17
	→ punchagan joined	12:18
	→ mikewintermute joined	12:18
	→ eletuchy joined	12:19
	→ kirin` joined	12:19
	→ galileopy joined	12:19
	← brucelee left	12:19
	← CentaurWarchief left	12:19
	← galileopy left	12:19
	→ CentaurWarchief joined	12:20
	→ galileopy joined	12:20
	← mikewintermute left	12:20
	→ kopparam_ joined	12:20
	← vtunka left	12:20
	→ williangliao joined	12:20
	← williangliao left	12:21
	→ Neozonz joined	12:21
	→ williangliao joined	12:22
	← williangliao left	12:23
	→ williangliao joined	12:23
	← kopparam left	12:23
	→ dsdeiz_ joined	12:24
	← williangliao left	12:24
	← dsdeiz left	12:24
	← durre left	12:25
	→ williangliao joined	12:25
	← arup_r left	12:25
	← kirin` left	12:25
	← williangliao left	12:25
	← Neozonz left	12:25
	→ dangerousdave joined	12:26
	← punchagan1 left	12:26
	→ williangliao joined	12:26
	← User458764 left	12:26
	→ mago_ joined	12:27
	→ martinklepsch joined	12:27
	→ carlton joined	12:29
	← galileopy left	12:29
	gitinfo set mode: +v	12:29
carlton	hey, can someone tell me what to google when i'm trying to open and view versioning history of git repo files?	12:29
tobiasvl	carlton: what do you mean? what do you want to learn from the googling?	12:29
carlton	im missing some kind of keyword here because google is giving me garbage	12:29
tobiasvl	how to read git diffs?	12:29
carlton	i want to find an app	12:30
	a GUI to see code changes	12:30
tobiasvl	!gui	12:30
gitinfo	Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed.	12:30
cbreak	tobiasvl: from top to bottom? :/	12:30
	tobiasvl: they are very similar to unified diffs	12:30
	maybe you understand them better with --color	12:30
carlton	im not asking for help with a gui...	12:30
cbreak	tobiasvl: or --color-words (but that can be confusing)	12:30
tobiasvl	cbreak: oh I know, I'm just trying to understand what carlton is trying to understand	12:30
	carlton: what _are_ you asking for help with? :)	12:31
carlton	what it's called	12:31
cbreak	carlton: check out sourcetree	12:31
tobiasvl	what what's called	12:31
carlton	what to search for to find gui's	12:31
	nvm	12:31
cbreak	carlton: http://git-scm.com/downloads/guis	12:31
	→ martinkl_ joined	12:31
	→ arup_r joined	12:32
cbreak	I heard the github UIs suck	12:32
	← martinklepsch left	12:32
carlton	thanks	12:32
cbreak	but I hate SourceTree the least of all I tried	12:32
	← kopparam_ left	12:32
osse	carlton: I think the term you're looking for is "diff tool"	12:34
	→ orangestickynote joined	12:34
	→ carandraug joined	12:34
carlton	h god	12:34
osse	(maybe)	12:34
carlton	so much bloat	12:34
	yeah osse	12:34
	i just want to see + - lines for files	12:34
	→ boulon1515 joined	12:34
	→ durre joined	12:35
	← linduxed left	12:35
	→ mewm joined	12:35
carlton	ah cool ty osse	12:35
	"git difftool"	12:35
	→ nettoweb joined	12:36
osse	lyou can use git difftool to invoke a difftool of your choice, yes	12:36
	→ Neozonz joined	12:37
	← Neozonz left	12:37
	→ Neozonz joined	12:37
	← psoo left	12:37
osse	meld, beyond compare, kdiff, vimdiff, etc etc et cet c eteetecetcetc /etc/rc.d	12:37
	← arup_r left	12:38
	heftig_ → heftig	12:39
	← orangestickynote left	12:39
	← cagedwisdom left	12:39
	→ cbr__ joined	12:39
	→ psoo joined	12:40
	→ eologolo joined	12:40
	→ lindenle joined	12:40
	← dougsland left	12:40
	← lucha left	12:41
	→ Mitchbones joined	12:41
	← Neozonz left	12:41
	← cbr left	12:42
	cbr__ → cbr	12:42
	→ listochkin joined	12:42
	← martinkl_ left	12:43
	← nrsk left	12:43
	← lindenle left	12:44
	→ arup_r joined	12:45
	← Seb left	12:46
	→ jottr joined	12:48
	→ mkoskar joined	12:48
	→ intellix joined	12:48
	← Gitzilla left	12:49
	→ EminenceHC joined	12:51
	← nilg left	12:51
	→ Neozonz joined	12:53
	← Neozonz left	12:53
	→ Neozonz joined	12:53
	→ philipd joined	12:54
	← philipd left	12:55
	← mewm left	12:55
	← EminenceHC left	12:56
	→ galileopy joined	12:56
	← Neozonz left	12:57
	← paul424 left	12:59
	← dsdeiz_ left	12:59
	← mizu_no_oto left	12:59
	← sarri left	12:59
	← m0ltar left	12:59
	→ cannonball joined	13:00
	→ sarri joined	13:01
	→ fstd_ joined	13:02
	→ moritzs joined	13:02
	← jceb left	13:04
	→ colorbot joined	13:04
	← colorbot left	13:05
	→ m0ltar joined	13:05
	← fstd left	13:05
	fstd_ → fstd	13:05
	← subhojit777 left	13:06
	← rchavik left	13:06
	→ mattstratton joined	13:06
	robustus\|Off → robustus	13:06
	→ lsiv568 joined	13:06
	← mattstratton left	13:06
	→ rchavik joined	13:06
Celelibi	In my master branch I did some commits to solve a problem. But then a second approach in another branch is shorter and more straightforward.	13:07
	→ mattstratton joined	13:07
	← mablae__ left	13:07
	→ shinnya joined	13:07
Celelibi	What's the right method to make the head of "test" the new state of master?	13:07
	→ kadoban joined	13:08
Celelibi	Should I revert the old commits?	13:08
osse	Celelibi: git checkout master; git reset --hard test	13:08
tobiasvl	are your commits local only?	13:08
	← cmn left	13:08
	→ sburgess joined	13:08
	← ManikM left	13:08
Celelibi	No, they're pushed and pulled by others.	13:09
tobiasvl	any ops here? nanobe is a spammer	13:09
	→ Neozonz joined	13:09
	→ ghostlines joined	13:09
	→ hcc23 joined	13:09
	← thiago_ left	13:09
	→ martinklepsch joined	13:10
tobiasvl	Celelibi: then man git-revert	13:10
gitinfo	Celelibi: the git-revert manpage is available at http://jk.gs/git-revert.html	13:10
	→ cmn joined	13:11
	→ govg joined	13:12
	→ AnujSharma joined	13:12
	← liamkeily left	13:12
	→ proq joined	13:12
	← AnujSharma left	13:12
	← FreezingCold left	13:13
	← Neozonz left	13:14
	→ brucelee joined	13:15
	ChanServ set mode: +o	13:15
	osse set mode: +b	13:16
	ChanServ set mode: -o	13:16
	→ kirin` joined	13:16
	← durre left	13:16
	← arup_r left	13:16
osse	hmm... did I do it right	13:16
	← mattstratton left	13:17
osse	oh	13:17
	ChanServ set mode: +o	13:17
	→ jceb joined	13:17
	osse kicked nanobe (nanobe)	13:17
	ChanServ set mode: -o	13:17
	← proq left	13:18
	→ cbr__ joined	13:18
	← toothrot left	13:18
	→ tgunr joined	13:18
	← kirin` left	13:19
	robustus → robustus\|Off	13:19
	→ ruukasu joined	13:20
	← brucelee left	13:20
	← cbr left	13:21
	cbr__ → cbr	13:21
osse	tobiasvl: yaaay	13:21
	→ tristanp joined	13:22
	→ DrSkyLizard joined	13:22
	→ ferr joined	13:22
ferr	How do I download repository with all settings like branches etc	13:23
	← palcu_ left	13:23
	→ thiago_ joined	13:24
	→ looper_ joined	13:24
	→ Milo- joined	13:24
	→ russt joined	13:25
	← russt left	13:25
	→ Neozonz joined	13:25
tobiasvl	osse: thanks! got some porn links by query and stuff	13:27
	ferr: git clone?	13:27
osse	tobiasvl: gimme!	13:27
	Solid1_afk → Solid1	13:27
tobiasvl	nah, you can sext nanobe ;)	13:27
osse	good point. me and him got a thing going now	13:28
Milo-	good evening.. https://github.com/Meelo/gittest - I have an original branch (master) where all whitespaces are tabs.. second branch where all whitespaces have been changed to spaces (style_fix) and a third branch, where I extracted a function (refactor, based on style_fix -branch).. But now I need to rebase/cherry-pick the refactored commit back to "master", but I'm getting a massive whitespace conflict. How should this be done properly?	13:28
	← beautifulmind left	13:28
	← ruukasu left	13:28
	robustus\|Off → robustus	13:29
	→ ruukasu joined	13:29
Milo-	while in branch 'rebased', I'm running the command: git rebase --onto master style_fix rebased	13:29
	or "git cherry-pick c892b7", which also creates the massive conflict	13:29
	← jrnieder left	13:30
tobiasvl	you can't merge style_fix first?	13:30
Milo-	unfortunatelly no.	13:30
	← Neozonz left	13:30
	← solker left	13:30
osse	Milo-: git cannot do whitespace changes like that. you can use format-patch do create a patch w/ commit info and such. then fix the patch and use git am < foo.patch	13:30
	← ruukasu left	13:30
	→ ruukasu joined	13:31
osse	oh boy, now I don't think that'll make it any easier	13:31
Milo-	but the "refactor" commit (c892b7) doesn't actually change whitespaces at all, which makes me think it shouldn't conflict	13:31
	→ BSaboia joined	13:32
	← kukks left	13:32
Milo-	it only applies new code on top of the restyled code.. the diff should still apply on both branches.. unless merge-strategy has a hard time finding where to apply the patch, due to the difference in whitespaces	13:33
	← thiago_ left	13:33
	← ruukasu left	13:33
	← ferr left	13:33
tobiasvl	yeah it's probably that	13:33
	→ ruukasu joined	13:33
Milo-	so creating a patch, and manually changing the whitespaces from spaces back to tabs before applying the patch should do the trick?	13:34
	→ dsdeiz joined	13:36
	← ruukasu left	13:36
	→ ruukasu joined	13:37
osse	Milo-: there is a merge strategy related to whitespace. Can't remember what it's called though	13:38
	→ User458764 joined	13:38
BSaboia	how to push a new branch to a git server? git push --all -u will do it, but what does exactly set-upstream does?	13:38
	← moritzs left	13:38
Milo-	"ignorewhitespace"? :)	13:38
	→ arnaud___ joined	13:40
tobiasvl	BSaboia: set-upstream means that you set your local branch to track the new remote branch	13:40
	BSaboia: git push -u REMOTE BRANCH	13:40
BSaboia	tobiasvl, ok, nice	13:40
	← Trudko left	13:41
BSaboia	so I can assume that doing a git push --all -u with only one branch created is safe? it will leave my master branch intact, right?	13:41
	→ Neozonz joined	13:41
	→ danemacmillan joined	13:41
Milo-	osse: git rebase --ignore-whitespace --onto master style_fix rebased	13:41
	→ BuenGenio joined	13:42
Milo-	that successfully applies the patch, but not sure how it will react when style_fix finally gets merged to master	13:42
	well.. I still have my test branch, so there is a way to find out	13:42
	→ chris_hd joined	13:42
	← joo-_ left	13:42
	← arnaud___ left	13:42
tobiasvl	BSaboia: well, you will push all branches. your local master branch will be intact, but it's also pushed to the remote	13:43
BSaboia	tobiasvl, so git push -u origin branch_name will be the safer bet	13:44
	thanks for your help :)	13:44
	← chris_hd left	13:45
	→ chris__hd joined	13:45
Milo-	okay.. it'll conflict again when master gets style_fix, so that will need to be merged with --ignore-whitespace as well	13:45
	gitinfo set mode: +v	13:45
chris__hd	Hi all, is there a known issue with git svn?	13:46
	← Neozonz left	13:46
chris__hd	Everytime I try to fetch I get: error: git-svn died of signal 11	13:46
	← jottr left	13:46
Milo-	cheers o/	13:46
	← Milo- left	13:47
	→ FreezingCold joined	13:47
	→ kirin` joined	13:47
	→ mizu_no_oto joined	13:48
	← lsiv568 left	13:48
	→ jottr joined	13:49
	→ moritzs joined	13:50
	← bgerber left	13:50
	→ lsiv568 joined	13:50
	→ DanMAbraham joined	13:52
	← awkwardusername left	13:53
	→ ManikM joined	13:53
	← kirin` left	13:53
	← ManikM left	13:53
	← RaceCondition left	13:53
	→ liamkeily joined	13:54
	← CodeShar_ left	13:54
	→ pppp2 joined	13:54
	→ CodeShark joined	13:54
	→ EminenceHC joined	13:54
	→ ManikM joined	13:55
	→ tmcmahon joined	13:55
Brain	so, lets say you have internet access 100% of the time, and its always reliable and fast. so does the repository where you store your git	13:55
	is there any reason really NOT to remotely track all branches you make, for redundancy purposes?	13:55
	im just thinking that if its not remotely tracked the only place that has it is my machine, so if my machine fails, e.g. its disk dies...	13:56
	plus if i disspear on an emergency tomorrow, nobody would be able to pick up on my branch where i left off as its only available to my machine	13:57
	← jceb left	13:57
	→ Neozonz joined	13:57
canton7	define "remotely track"? It sounds like your debating how often to push branches - nothing about tracking :P	13:57
	← dsdeiz left	13:57
	→ bgerber joined	13:58
Brain	canton7: well, by default if i make a branch, its local and cant be pushed right?	13:58
	← tmcmahon left	13:58
canton7	you can push any branch you like, at any time	13:58
Brain	ah, for some reason i thought it wouldnt let me unless i told it i wanted to make it remote	13:58
	or are you saying any attempt to push it to origin makes it remote?	13:59
canton7	'tracking' is a bit of config which 1) appears in 'git branch -vv', 2) is used by @{upstream}, 3) is used by 'git pull' and 'git rebase' by default, 4) is used for pushing if you've set push.default youself	13:59
	(I should set that as a trigger...)	13:59
	← EminenceHC left	13:59
canton7	sure	13:59
	if you push a branch, it's still local	13:59
	it just now exists in another repo as well	13:59
	a 'remote' branch is a branch in another repo	13:59
Brain	ah, ok in that case i misunderstood	14:00
canton7	a 'remote-tracking branch' is a local read-only copy of a branch in a remote repo - these start with e.g. 'origin/'	14:00
	:) I think you're confusing yourself - git's simpler than you're imagining	14:00
Brain	thats true	14:01
	← Kulrak left	14:01
Brain	until recently ive been using cherry-pick to pull stuff across from test branch to live branch	14:01
	because i was thinking that merging the branch would end it, confusing myself with the way its displayed in tortoisegit	14:02
	→ devxom joined	14:02
canton7	yuck tortoisegit	14:02
kadoban	Hehe	14:02
canton7	tbf it might have improved since I used it	14:02
	→ sohail joined	14:02
	← Neozonz left	14:02
Brain	it seems easier to me now just to use the command line on linux rather than deal with tortoise	14:02
canton7	but it made things 100x harder to understand for me - it wasn't until I moved away from it tat I actually started to "get" git	14:02
Brain	well, its ok for conflict resolution, the odd times you get them	14:02
	because its gui merge tools are nice	14:02
canton7	command-line git for windows ("git bash") comes with some half-decent graphical tools	14:03
Brain	well, tortoisegit completely seems to hide the concept of staging areas	14:03
canton7	and knows how to launch all sorts of merge tools	14:03
Brain	it bypasses it, staging everything it knows of	14:03
	unless of course you untick the items when you go to commit	14:03
canton7	yay :)	14:03
kadoban	Yeah, if all you want is merge tools, there's separate ones that git can load for you nicely	14:03
	→ guardian joined	14:03
	← stamina left	14:03
guardian	hello, in my .gitignore I have "foo/" followed by "!foo/*/config.xml", yet foo/bar/config.xml is ignored. Is there something obvious I'm doing wrong?	14:04
	git check-ignore confirms the file is ignored by the "foo/" line of the .gitignore file	14:04
Brain	tried swapping the lines over?	14:04
	→ mellernoia joined	14:05
guardian	same result	14:05
	→ tarkus joined	14:05
Brain	oh well, was worth a try :)	14:05
	its probably because youre ignoring the parent dir that contains config.xml	14:06
	→ jerius joined	14:06
guardian	likely	14:06
tarkus	Q: How to fetch and merge code from 3rd party repo to an orphan branch of your own repo? (git checkout --orphan server; git fetch server; git merge server/master - doesn't work)	14:07
canton7	guardian, you want foo/* and !/foo/*/config.xml probably	14:07
	← kiran left	14:07
canton7	gitignores have a gotcha: only things "directly" considered for ignoring can be unignored. this is for efficiency reasons	14:08
kadoban	guardian: It's not possible to reinclude something if a parent directory of it is excluded.	14:08
	→ acharlieh joined	14:08
canton7	so if you ignore the whole of "foo/", git won't peek inside to see whether to unignore anything	14:08
	kadoban, yes it is	14:08
	ToxicFrog_ → ToxicFrog	14:08
canton7	but if you ignore every file in foo: "foo/*", then you can unignore those files	14:08
	tarkus, what fails there?	14:08
kadoban	canton7: That's not the case I specified, read what I said...	14:09
guardian	foo/* doesn't work	14:09
canton7	it would be better if you defined "parent directly of it is excluded" better - you need to mention that it's possible to exclude everything inside the directory, rather than just the directory itself, if you're going with that explanation	14:09
	→ jceb joined	14:09
	→ sdfvsfgvsdf joined	14:10
kadoban	It's not ambiguous. Admitting you read too quickly isn't going to kill you.	14:10
guardian	but foo// does	14:10
tarkus	canton7, ah no.. it works, there was an error until I did git reset --hard	14:10
canton7	I read it as "it's not possible", which is what you said. It is possible :P	14:10
	yes, I read you too quickly, but I drew the same conclusion that a less git-knowledgable person would :P	14:11
kadoban	Then read the man page, because it's really not.	14:11
	→ ErKa joined	14:11
faylite	Is it possible to edit messages in the commit log?	14:11
canton7	faylite, sure, but if you've pushed them anywhere, you'll be !rewriting public history	14:11
gitinfo	faylite: [!rewrite] 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 -f <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	14:11
canton7	kadoban, I know how gitignore works. The question was "can I do this". The correct answer is "yes". You said "no". That's not helpful :)	14:12
faylite	Thx, need to fix some grammar ^^	14:12
guardian	so I made it work with foo// and !foo/*/config.xml	14:12
gitinfo	foo	14:12
canton7	guardian, sweet	14:12
	and why is that even a trigger?!	14:13
kadoban	canton7: Here's the direct wording of the man page: "It is not possible to re-include a file if a parent directory of that file is excluded." Which is exactly what I said.	14:13
canton7	.trigger_edit foo .	14:13
gitinfo	canton7: Okay.	14:13
	→ jerematic joined	14:13
	← pppp2 left	14:13
canton7	kadoban, which is why I said that if you're going to quote that, at least make it clear that there's a workaround	14:14
	→ proq joined	14:14
	← Junior left	14:15
canton7	.trigger_edit foo -	14:15
gitinfo	canton7: You are not authorised to perform this action (trigger_delete).	14:15
canton7	:(	14:15
kadoban	canton7: Why? I was stating a fact that has precice technical meaning. Contradicting it, as you did, is confusing.	14:15
jast	.priv add canton7 trigger_delete	14:16
gitinfo	jast: Okay.	14:16
canton7	.trigger_edit foo -	14:16
gitinfo	canton7: Okay.	14:16
canton7	thanks! :)	14:16
	→ brucelee joined	14:16
jast	please be careful :)	14:16
canton7	I will!	14:16
jast	oh, actually deleted triggers are versioned, too, these days	14:17
	so be careful, but not as careful as I said before ;)	14:17
canton7	kadoban, yeah but newbies don't care about technical meanings. they care about whether there's a way to achieve what they want	14:17
	← Guest18520 left	14:17
	→ arnaud___ joined	14:17
canton7	jast, hehe, yeah I saw that when reminding myself what the 'delete' value was	14:17
kadoban	canton7: Great, so explain how to work around it. Contradicting a fact isn't the way to go.	14:17
	← devxom left	14:18
canton7	1) I've admitted to skimming your message too fast. 2) like I say, please add helpful stuff alongside your technical facts	14:18
	→ buffal0 joined	14:18
canton7	especially when they give the wrong impression	14:19
	← proq left	14:19
	→ knownasilya joined	14:19
kadoban	Except it doesn't give the wrong impression at all. It gives the precise reason why what he was doing wasn't working.	14:19
	→ freimatz joined	14:20
	→ livingstn joined	14:20
canton7	it sounded like "no, it's not possible"	14:20
	→ GODDOG joined	14:20
jast	just so you know, if you manage to keep this argument over a little bit of wording going for more than 30 minutes there's a medal waiting for you guys	14:20
kadoban	Oh good.	14:20
canton7	come on! we can do this!	14:20
	← brucelee left	14:21
	→ checkItOut joined	14:21
	← faheem left	14:22
	→ setrae joined	14:22
	← shinnya left	14:22
	← PCatinean left	14:22
	→ thedodd joined	14:23
Brain	jast: an arguing over the internet medal? i want it more!	14:24
	canton7 awards himself a medal anyway. stuff you guys!	14:24
	→ Jackneill joined	14:24
Brain	i remember once seeing a pic online that said something like "arguing on the internet is like running in the special olympics... because even if you win..."	14:24
	:p	14:24
	politically incorrect jokes were always the best	14:25
	canton7 cringes	14:26
	← checkItOut left	14:26
	← sburgess left	14:27
	→ msmith_ joined	14:27
	→ Junior joined	14:28
	→ jhwhite joined	14:28
	← arnaud___ left	14:29
	→ Neozonz joined	14:29
	← Neozonz left	14:29
	→ Neozonz joined	14:29
	→ Ehye joined	14:30
	← gua_ould left	14:30
	← Xiti` left	14:30
	→ Xiti joined	14:32
	→ mattstratton joined	14:32
	← ciampix left	14:32
	← intellix left	14:33
	← Neozonz left	14:35
	← Ehye left	14:35
	← BuenGenio left	14:35
	→ AaronMT joined	14:35
	→ Nizumzen joined	14:35
	→ palcu joined	14:35
	→ zmitya joined	14:35
	→ gua_ould joined	14:36
	→ dreiss joined	14:36
	→ JustMozzy joined	14:36
JustMozzy	hey everyone. I have a file that is always confliciting on the same line because it contains a generated number. is there a way to have git ignore this?	14:36
moritz	JustMozzy: you shouldn't commit generated numbers	14:37
canton7	no, there's no way to ignore just a specific file	14:37
	remove the generated number if possible	14:37
moritz	JustMozzy: but you can write a custom merge driver that regenerates the file	14:37
	→ russt joined	14:37
zmitya	Hi Gents,	14:38
JustMozzy	too bad...	14:38
gitinfo	zmitya: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	14:38
	→ RaceCondition joined	14:38
	← palcu left	14:39
	→ hexagoxel joined	14:39
zmitya	I am a newbie to git.	14:39
	What is the best practice to integrate a 3rd party code into our repository ?	14:39
	we wold like to create patches but we would like to apply their (the original) patches as well...	14:39
	→ mkrank joined	14:40
	→ PCatinean joined	14:40
	→ Dougie187 joined	14:40
	← eletuchy left	14:40
	→ pcypher joined	14:40
	← zumba_addict left	14:41
osse	zmitya: is the 3rd party cody by any chance available as a git repo also?	14:42
	→ zumba_addict joined	14:42
	→ polyzen joined	14:42
	→ Sebtoast joined	14:42
	→ astroduck joined	14:43
	→ arnaud___ joined	14:43
	→ subhojit777 joined	14:44
zmitya	osse: yes, basically it is the kamailio project	14:44
	→ linduxed joined	14:44
astroduck	Hi! I am making an Android App, which has 2 different versions for phone and tablet. I was hoping that I can create a single github repo topush both of them but people using Android Studio should be able to checkout each app separately. It this possible?	14:45
	Something like a subgitrepo	14:45
	If that's a word	14:45
	→ Neozonz joined	14:45
	← Neozonz left	14:45
	→ Neozonz joined	14:45
	→ crose joined	14:45
	← moritzs left	14:46
	← zumba_addict left	14:46
	← acharlieh left	14:46
jast	there are several approaches... !subpro	14:46
gitinfo	[!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.	14:46
	→ joo-_ joined	14:46
jast	my personal favourite approach is using submodules, but quite a few people find them too complicated	14:47
zmitya	jast: is that for me ?	14:48
	→ jason237 joined	14:48
	← nour left	14:48
	← mkrank left	14:49
astroduck	jast: Can someone clone a submodule separately withhout cloning the whole project?	14:49
	← freimatz left	14:49
	→ freimatz joined	14:49
	→ mkrank joined	14:49
	← ki0 left	14:49
moritz	yes	14:49
	→ WakiMiko joined	14:50
	← Neozonz left	14:50
jast	zmitya: well, it's for you and for astroduck, seeing as you asked almost the same question :)	14:50
	→ ki0 joined	14:51
jast	astroduck: btw it's possible to have different files on different branches within a single repo, that may be another option for you	14:51
	→ cbr__ joined	14:51
jast	cloning separately gets more difficult then, though	14:51
	→ acharlieh joined	14:52
zmitya	jast: :)	14:52
astroduck	jast: An orphan branch would be better than a normal one in this case, right?	14:52
	← arnaud___ left	14:53
kadoban	astroduck: It depends how different the branches are	14:53
jast	yeah. technically an orphan branch is not particularly unnormal, it's just that it doesn't share any history with existing branches	14:53
	→ davividal joined	14:53
	← michael_mbp left	14:53
	→ jargon joined	14:53
	← scriptThis left	14:53
	→ daedeloth joined	14:54
	← cbr left	14:54
	cbr__ → cbr	14:54
	→ intellix joined	14:54
	→ eletuchy joined	14:54
	→ shawndumas joined	14:55
	→ michael_mbp joined	14:56
	→ iamjarvo joined	14:56
	→ raffe joined	14:56
	→ LucasTT joined	14:56
	← thedodd left	14:57
	← irqq left	14:57
	← jargon left	14:57
astroduck	I'll ask which one of the 2 options I should use on #android-dev. Thanks for your help guys :)	14:58
	→ doev joined	14:59
	→ Neozonz joined	15:01
	← Neozonz left	15:01
	→ Neozonz joined	15:01
	→ thedodd joined	15:01
	→ Gamecubic joined	15:01
	→ Juxtapositional joined	15:01
	→ MarkyC joined	15:02
	→ MrSavage joined	15:02
hexafluoride	what to do after rewriting an entire repo?	15:02
	hint: Updates were rejected because the remote contains work that you do	15:02
	hint: not have locally. This is usually caused by another repository pushing	15:03
_ikke_	hexafluoride: Are you the only one working on that repo?	15:04
	← doev left	15:04
hexafluoride	no	15:04
	but I am the author of it	15:04
	it's not like an entire rewrite	15:04
	but a reorganization	15:04
	→ AnujSharma joined	15:05
	→ GODDOG_ joined	15:05
	← AnujSharma left	15:05
_ikke_	You need to clearly communicate to others working on it that you have rewritten history and what they should do	15:05
	← GODDOG left	15:06
	← Neozonz left	15:06
	→ EminenceHC joined	15:06
	← GODDOG_ left	15:06
	→ kiran joined	15:07
	→ wrouesnel joined	15:08
	← tristanp left	15:09
	← albel727 left	15:09
	→ tristanp joined	15:09
	→ axl_ joined	15:09
	→ msmith__ joined	15:09
	← lpax left	15:09
	← williangliao left	15:10
	← dangerousdave left	15:10
	← osfe left	15:10
	← lsiv568 left	15:10
	→ osfe joined	15:11
	← EminenceHC left	15:11
	← thedodd left	15:11
	← hs366 left	15:12
	→ thedodd joined	15:12
	→ lsiv568 joined	15:12
	→ denete joined	15:12
	→ kirin` joined	15:13
	← msmith_ left	15:13
	→ enitiz joined	15:13
	← rath left	15:14
	← thedodd left	15:14
	→ vtunka joined	15:15
	→ tier joined	15:15
	→ proq joined	15:15
	→ brucelee joined	15:17
	← kirin` left	15:17
	← gua_ould left	15:18
	→ steele joined	15:18
	→ Daisuke joined	15:18
	→ gua_ould joined	15:18
	→ orangestickynote joined	15:18
	← orangestickynote left	15:19
	← rchavik left	15:19
	→ orangestickynote joined	15:19
	← LeMike left	15:20
	← orangestickynote left	15:20
	← axl_ left	15:20
	→ axl_ joined	15:21
	← proq left	15:21
	← ilhami left	15:22
	← brucelee left	15:22
	← wrouesnel left	15:23
	← vtunka left	15:24
	← sinkensabe left	15:24
	← punchagan left	15:24
	← cmn left	15:24
	← carlton left	15:25
	← ErKa left	15:25
	← ki0 left	15:26
	← dreiss left	15:26
	→ ki0 joined	15:26
	← flaguy48 left	15:26
	→ moritzs joined	15:27
	→ cmn joined	15:27
	robustus → robustus\|Off	15:28
	← Daisuke left	15:29
	← chris__hd left	15:29
	→ f00dWorksta joined	15:30
	→ thedodd joined	15:30
	→ punchagan joined	15:30
	← DrSkyLizard left	15:31
	→ cbr__ joined	15:31
f00dWorksta	Is there a way to undo a commit without reverting the files?	15:31
luto	!reset	15:31
gitinfo	A good resource explaining git-reset is http://git-scm.com/2011/07/11/reset.html	15:31
kadoban	!revert	15:31
gitinfo	That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?	15:31
luto	oh wait	15:31
	no	15:31
	← pandeiro left	15:31
kadoban	f00dWorksta: Is one of those what you want by chance?	15:31
luto	listen to kadoban and ignore me :D	15:31
	← sohail left	15:32
luto	I should sleep more lol	15:32
kadoban	Heh, pretty easy to get the wrong trigger	15:32
	← kpease left	15:32
	→ checkItOut joined	15:33
f00dWorksta	kadoban: I want to make it as if I never executed a commit, but keep my files as it is right now	15:33
	← cbr left	15:33
	cbr__ → cbr	15:33
	← eologolo left	15:33
f00dWorksta	kadoban: so I guess c) is the closest one?	15:33
kadoban	f00dWorksta: Yeah, that should be option C	15:33
luto	f00dWorksta: no	15:33
	no it isn't	15:34
	→ eologolo joined	15:34
luto	c) is --hard, that kills your files	15:34
f00dWorksta	luto: :O	15:34
kadoban	c) is --soft :)	15:34
luto	my first !reset was right, it seems!	15:34
gitinfo	A good resource explaining git-reset is http://git-scm.com/2011/07/11/reset.html	15:34
luto	bllaargh	15:34
f00dWorksta	lol	15:34
luto	okay, going to sleep now	15:34
	lol	15:34
f00dWorksta	please do :P	15:34
luto	sorry	15:34
kadoban	Hehe	15:34
	← moritzs left	15:34
	← MarkyC left	15:35
	← gua_ould left	15:35
	→ MarkyC joined	15:35
f00dWorksta	kadoban: does the reset discard my commit?	15:36
kadoban	f00dWorksta: Yes. You can back it up if you want, like make another branch that refers to it or something	15:36
	(Which is a pretty good idea in general when you're doing this stuff. The reflog can usually help you avoid losing work if you screw one of these commands up, but it tends to be confusing if you're already unsure what's going on)	15:37
	← Mitchbones left	15:39
	← checkItOut left	15:39
	→ EminenceHC joined	15:39
	← EminenceHC left	15:39
	← Macaveli left	15:39
	→ EminenceHC joined	15:39
	← JustMozzy left	15:39
	→ kermit joined	15:40
	→ dsdeiz joined	15:41
luto	f00dWorksta: !backup s also help ;)	15:42
gitinfo	f00dWorksta: Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups	15:42
	→ flarn joined	15:43
	→ ciampix joined	15:43
	→ flaguy48 joined	15:43
	← flaguy48 left	15:43
	→ kirin` joined	15:43
	← CustosLimen left	15:43
	← pcypher left	15:43
	→ flaguy48 joined	15:44
	← flaguy48 left	15:44
	← enitiz left	15:44
	→ mixandgo joined	15:44
	← zapb_ left	15:45
	→ flaguy48 joined	15:45
	← flaguy48 left	15:45
	→ kukks joined	15:45
	← kukks left	15:45
	→ kukks joined	15:45
	→ vtunka joined	15:45
Celelibi	When I checkout a tag, am I in detached mode?	15:46
	→ settermjd joined	15:46
	→ flaguy48 joined	15:46
	← flaguy48 left	15:46
	→ sinkensabe joined	15:46
	→ lindenle joined	15:47
	→ flaguy48 joined	15:47
	← flaguy48 left	15:47
	← mizu_no_oto left	15:47
bremner	yes	15:48
canton7	Celelibi, yes	15:48
	→ flaguy48 joined	15:48
hexafluoride	apparently, yes	15:48
	← flaguy48 left	15:48
	← kirin` left	15:49
	daurnimator1 → daurnimator	15:49
	→ zapb_ joined	15:49
	→ flaguy48 joined	15:49
canton7	tags can't be modified. if you could check one out, you'd assume that committing would modify it. therefore they can't be checked out	15:50
	← flaguy48 left	15:50
canton7	likewise remote-tracking branches	15:50
	→ _0x1d3 joined	15:50
f00dWorksta	luto: thx	15:50
	← Junior left	15:50
	→ flaguy48 joined	15:51
	← flaguy48 left	15:51
	← FreezingCold left	15:52
	→ flaguy48 joined	15:52
	← flaguy48 left	15:52
Celelibi	I can still git checkout tag	15:52
canton7	it detaches your HEAD though	15:52
	so you haven't checked out the tag, really :P	15:53
Celelibi	yes	15:53
	→ flaguy48 joined	15:53
	← flaguy48 left	15:53
	→ teran joined	15:54
	← ManikM left	15:54
	→ flaguy48 joined	15:54
	→ ManikM joined	15:54
	← flaguy48 left	15:54
	→ moritzs joined	15:55
	→ dfanjul joined	15:55
	→ flaguy48 joined	15:55
	← flaguy48 left	15:55
	→ flaguy48 joined	15:56
	→ facundor joined	15:57
	→ awkwardusername joined	15:57
	← nettoweb left	15:57
	→ smccarthy joined	15:58
	→ Skapadapaduu joined	15:59
	mozzarel1 → mozzarella	15:59
	← teran left	15:59
	← mixandgo left	16:00
	robustus\|Off → robustus	16:00
	← ManikM left	16:01
	← roelmonn_ left	16:01
	→ mixandgo joined	16:02
	→ Asiajey joined	16:02
	← acolson left	16:03
billy_ran_away	Hi, if I have a git repo and I want to add only a couple of files from another git repo but want to be update them what is the best course of action? I'm thinking git submodule and then symlinking the few files I want to the directory I want them in (but not want the others from the added submodule repo)	16:03
	← iamjarvo left	16:03
	← Xethron left	16:04
billy_ran_away	This was for chef receipes and I just discovered knife	16:05
	Gonna try that out	16:05
	→ thiago_ joined	16:05
	← Sebtoast left	16:06
	← lolmaus left	16:06
	Solid1 → Solid1_afk	16:07
	→ nrsk joined	16:08
	→ teran joined	16:09
	→ ehmatthes joined	16:09
	→ cfxd joined	16:09
	→ apfel joined	16:10
Celelibi	Why does git describe show only one of the two tags that match the current commit?	16:10
	→ tyreld joined	16:11
	← mkrank left	16:11
	→ gua_ould joined	16:11
	← dfanjul left	16:11
	→ beneggett joined	16:12
	→ nfk joined	16:12
	→ mizu_no_oto joined	16:12
	← b1nar1_ left	16:12
	→ FreezingCold joined	16:12
	← beneggett left	16:12
	← teran left	16:14
	robustus → robustus\|Off	16:14
	→ str joined	16:14
	← settermjd left	16:17
	→ proq joined	16:17
	→ kpease joined	16:17
	→ brucelee joined	16:18
	→ Neozonz joined	16:18
	← Neozonz left	16:18
	→ Neozonz joined	16:18
	→ Neozonz\|Disc joined	16:18
	← Neozonz\|Disc left	16:18
	→ Neozonz\|Disc joined	16:18
	→ Neozonz\|Disc2 joined	16:18
	← Gizburdt left	16:19
	← Neozonz\|Disc left	16:19
	← govg left	16:19
	← Neozonz left	16:19
	→ pcypher joined	16:19
	→ kirin` joined	16:19
	thiago_ → thiago	16:19
	→ dangerousdave joined	16:20
	← JohnBat26 left	16:20
	← dangerousdave left	16:20
	← dsdeiz left	16:20
	→ joelm joined	16:21
	← kermit left	16:21
	→ b1nar1 joined	16:22
	→ kermit joined	16:22
	→ nettoweb joined	16:22
	← nettoweb left	16:22
	← RaceCondition left	16:22
	→ nettoweb joined	16:22
	→ imkmf joined	16:22
	← proq left	16:22
	→ dangerousdave joined	16:23
apfel	hi there, we used aegis in the past as our version control + review tool + test framework + automatik build system, my question is now, is something like this avalible for git but without the need to use a browser, we like to benfit from our unix tools and environment, so it would be nice to get the needed informations via cli, like the build output. The review process should be also completle be avalible via comamndline, because we	16:23
	like to use custom skripts and other things to make life easier. So, is something like this avalible for git?	16:23
osse	Is only one of them an annotated tag?	16:23
	← brucelee left	16:23
	← kermit left	16:23
osse	Oops. Scroll fail	16:23
	Wait, no it wasn't	16:23
	→ warcuy joined	16:24
osse	Celelibi: see above?	16:24
	s/?/./	16:24
	→ decompiled joined	16:24
	← dangerousdave left	16:24
	← kirin` left	16:24
	← decompiled left	16:25
	→ kirin` joined	16:25
	→ proq joined	16:25
	→ Neozonz\|Disc joined	16:26
	← Neozonz\|Disc left	16:26
	→ Neozonz\|Disc joined	16:26
	← FreezingCold left	16:27
	mostlybadfly → jade_jolie	16:27
	jade_jolie → mostlybadfly	16:27
	← MrSavage left	16:28
	← martinklepsch left	16:28
	← lb1a left	16:28
	→ martinklepsch joined	16:29
	← Neozonz\|Disc left	16:29
	← Neozonz\|Disc2 left	16:30
	← moritzs left	16:30
	← gua_ould left	16:30
	← kirin` left	16:30
	→ kirin` joined	16:31
	→ anaran joined	16:31
Celelibi	osse: no, there are two tags for the same commit.	16:32
	← jagob left	16:33
Celelibi	(BTW, I solved my problem by using the previous commit.)	16:33
	← cbr left	16:33
	← TomyWork left	16:33
	→ DaveD_PDX joined	16:34
	→ _Atom_ joined	16:35
	← kirin` left	16:36
	← warcuy left	16:37
	← sinkensabe left	16:38
	← galileopy left	16:38
	→ beneggett joined	16:39
osse	Celelibi: tags can both be annotated and "light weight". I was wondering if you had one of each	16:39
	← Brain left	16:39
	← martinklepsch left	16:40
	← pcypher left	16:40
	→ regedit joined	16:40
	← lsiv568 left	16:41
	→ mpistone joined	16:42
	→ arnaud___ joined	16:42
	← SebastianFlyte left	16:43
	← d33tah left	16:43
	→ Ankhers joined	16:43
	denete → denete_food	16:43
Neptu	hej	16:43
	← WakiMiko left	16:43
	→ d33tah joined	16:44
	→ WakiMiko joined	16:44
Neptu	what are this HEAD:refs/heads/shared/branch .... what all this slashes mean?	16:44
	→ zumba_addict joined	16:45
	→ petersr joined	16:45
qsuscs	!refspec	16:45
gitinfo	[!refspecs] Refspecs are used by fetch/push to specify which refs to transmit where. They have the form "source:destination". They can be prefixed with a "+" to force the update, possibly displacing existing history. More info: http://jk.gs/git-fetch.html or http://i.qkme.me/3tke7r.jpg	16:45
	← zmitya left	16:45
qsuscs	^ Neptu	16:45
	→ aspiers joined	16:46
	→ SebastianFlyte joined	16:46
	→ Noldorin joined	16:46
	← vtunka left	16:46
	→ grindmodeon joined	16:46
	← CentaurWarchief left	16:46
	→ red_horned_rihno joined	16:46
mpistone	I want to manage deployment to staging and production servers from an internal dashboard (e.g. I need to deploy to API and webserver simultaneously but both have to pass their own tests first), thinking I'll do it by giving that internal server ssh access to all the other servers, then have it ssh in and execute a git pull/checkout from inside of the production server.. a bit concerned about security but not sure how else to aut	16:46
	omate this, and am I reinventing a wheel?	16:46
qsuscs	mpistone: !deploy	16:47
gitinfo	mpistone: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html	16:47
	→ tranzfuse joined	16:47
	→ teran joined	16:48
	← grindmodeon left	16:49
	→ rubyonrailed joined	16:49
	→ ilhami joined	16:49
	→ grindmodeon joined	16:49
	← cfxd left	16:50
	← red_horned_rihno left	16:50
	← alorence left	16:50
	← proq left	16:50
	→ shpoont joined	16:50
	→ fandi joined	16:51
	← JanC left	16:51
	← daedeloth left	16:51
	← ehmatthes left	16:51
	→ zackiv31 joined	16:52
	← zumba_addict left	16:52
	→ nour joined	16:52
	→ orangestickynote joined	16:54
	→ moritzs joined	16:55
	← anaran left	16:56
	Solid1_afk → Solid1	16:56
	← l0x3py left	16:57
	← danjordan left	16:57
	→ kirin` joined	16:57
	→ btree joined	16:57
	→ danjordan joined	16:58
	→ lsiv568 joined	16:59
	← btree left	16:59
	← seschwar left	16:59
	← jnavila left	16:59
	→ chiromante joined	16:59
	→ ManikM joined	16:59
	← mlechner left	16:59
	← lsiv568 left	17:00
	→ steveoh joined	17:01
steveoh	hi i'm having an issue with git format-patch	17:01
	where --minimal doesn't make any changes	17:01
	← Raging_Hog left	17:02
steveoh	currently the patch file has 3 lines before the first change and 3 lines after the last change	17:02
	which are too many	17:02
	to get these patches applied i've had to edit the patch to be more minimal	17:02
	← kirin` left	17:02
jast	this is called context and is pretty much a normal feature of unified diffs	17:03
steveoh	sure but it makes it so the patch is rejected	17:03
jast	sure, removing context allows the patch to be applied to more things... but it also makes it much more likely that the patch is applied to the wrong lines	17:03
steveoh	can the context be 1 or 2 lines instead of 3	17:03
	do dev's not have control	17:03
	← orangestickynote left	17:03
jast	see the -U option	17:03
steveoh	ahhhh!!!!	17:04
	→ orangestickynote joined	17:04
steveoh	i was blinded by minimal and the other diff algorithms	17:04
jast	yeah, they minimize in other ways :)	17:04
	→ JanC joined	17:04
steveoh	thanks	17:05
	← awkwardusername left	17:05
	→ mihaicris joined	17:05
	→ irqq joined	17:05
	→ anaran joined	17:06
	← steveoh left	17:08
	← ghostlines left	17:08
	→ steveoh joined	17:08
	← chiromante left	17:08
	← danjordan left	17:08
steveoh	jast: do you know of a way to make a patch into a pull request on github	17:08
	→ lpax joined	17:08
	→ ErKa joined	17:09
steveoh	without forking/applying explicitly	17:09
	→ danjordan joined	17:09
	← orangestickynote left	17:09
	← moritzs left	17:09
soerenb	i don't think github provides an interface for such a work-flow. for a github pull-request you need github	17:10
	→ martinklepsch joined	17:10
steveoh	i would use it if they did	17:12
	→ zumba_addict joined	17:12
	→ jagob joined	17:12
	← kukks left	17:13
	→ iamjarvo joined	17:13
	→ DrinkMachine joined	17:13
	→ Uber-Ich joined	17:14
	→ MrSavage joined	17:15
	← teran left	17:16
Neptu	qsuscs, thanks!	17:16
	← steveoh left	17:17
	← tier left	17:18
	→ brucelee joined	17:19
	→ in_deep_thought joined	17:20
	← nonickn left	17:20
	← raffe left	17:20
	← flarn left	17:21
	← Tuna-Fish left	17:21
	← User458764 left	17:21
	← tvw left	17:21
	→ tvw joined	17:21
	→ rewire joined	17:22
	→ maestrojed joined	17:22
	→ n-st joined	17:23
	← brucelee left	17:24
	→ kirin` joined	17:25
	→ Sasazuka joined	17:25
	← Sasazuka left	17:25
	→ Sasazuka joined	17:25
	← kirin` left	17:27
	← axl_ left	17:29
	→ akushner joined	17:30
	→ unixpro1970 joined	17:30
	→ Sendoushi joined	17:30
	← m0ltar left	17:30
	→ imachuchu joined	17:30
	← mixandgo left	17:30
	→ sohail joined	17:31
	→ mixandgo joined	17:31
	← Evie_Hammond left	17:31
	← psoo left	17:31
	← listochkin left	17:31
	denete_food → denete	17:31
	← liamkeily left	17:32
	→ listochkin joined	17:32
	← thedodd left	17:32
	→ Tuna-Fish joined	17:32
	← ErKa left	17:32
	← listochkin left	17:32
	→ jeffmjack joined	17:32
	→ listochkin joined	17:33
	← shigosei left	17:33
	→ govg joined	17:33
	← joo-_ left	17:33
	→ lifeforms joined	17:34
	← jceb left	17:34
	← mskaesz left	17:34
	← mikecmpbll left	17:35
lifeforms	what do you guys[m/f] do to delete a feature branch? I never seem to get rid of cruft in my .git/config, what am I doing wrong? http://lf.ms/deletebranch.txt	17:35
	→ devotchka joined	17:36
devotchka	When I run `git status` I see the same files staged and unstaged. How is that happening?	17:37
lifeforms	devotchka: likely, you first staged them, and then changed them again, you can re-add them to stage your new changes	17:37
grawity	devotchka: they have _some_ changes staged, but not all	17:37
	since the staging area has a full copy of the files prepared for the commit, not merely a staged/unstaged marker	17:38
	← martinklepsch left	17:38
grawity	(e.g. you can use tools like `git add -p` to stage only selected changes)	17:38
devotchka	Interesting	17:38
grawity	in a way, that's kind of the whole point of having the staging area	17:38
	← ilhami left	17:38
grawity	(instead of just limiting commits to either whole repo or specific files like `hg commit file1 file2`)	17:39
	← sohail left	17:39
devotchka	I'm scripting out 'git add .' I wonder if the file is still being written too	17:39
	← hever_ left	17:39
grawity	well, `git diff` and check – if it's diffable	17:39
lifeforms	with 'git diff' you should see the changes	17:39
devotchka	Okay, let me take a look. Thanks :)	17:39
grawity	regular shows you the differences between working files and staging area; --cached shows you the staged changes (between staging area and HEAD); and `git diff HEAD` combines the two (between working files and HEAD)	17:40
	← cmn left	17:40
	→ cmn joined	17:40
	→ dreiss joined	17:42
	← beneggett left	17:42
	← ciampix left	17:42
	→ martinklepsch joined	17:43
	← Zarthus left	17:44
	← LucasTT left	17:45
	→ paddymahoney joined	17:45
	← mattstratton left	17:46
	→ sburgess joined	17:46
	→ Baluse joined	17:46
Baluse	http://raw.pro-chan.com/Raw/t/674_1382207920	17:46
	← ruukasu left	17:46
kadoban	!ops	17:47
gitinfo	[!topsecret] If your situation is so secret that you can't tell us how to !reproduce it, there's really not much we can do. Perhaps you need to find or buy support you can trust? There are people with clearances even on #git but they may not want to identify themselves. However, you are protected by the biggest secret of all: We just don't care.	17:47
	→ Blaguvest joined	17:47
	ChanServ set mode: +o	17:47
	← shanee left	17:47
	bremner set mode: +q	17:47
	Solid1 → Solid1_afk	17:47
	→ LucasTT joined	17:47
bremner	well. let's just call that offtopic and move on.	17:47
	→ Zarthus joined	17:48
	← LucasTT left	17:48
	bremner set mode: +b	17:48
	bremner kicked Baluse (kthanxbye)	17:48
	→ LucasTT joined	17:48
	ChanServ set mode: -o	17:49
	→ jrnieder joined	17:50
	→ kirin` joined	17:50
Neptu	hej every time i want to push i need to do: git push origin HEAD:refs/heads/shared/branch_test is it possible to "bind" to the remote repo so I do not need to write this every time I push from an specific branch to the specific remote branch?	17:50
	← unixpro1970 left	17:51
	→ Kicer86 joined	17:51
	← intellix left	17:51
	→ tier joined	17:52
kadoban	Neptu: Well, you can set an upstream on a branch...i'm not sure what that other stuff is in particular though.	17:53
	→ Mitchbones joined	17:53
soerenb	and set push.default to some sensible value that fits your workflow	17:53
	← dreiss left	17:53
	→ pantsman- joined	17:54
	→ diegoviola joined	17:54
	← ManikM left	17:54
	→ ManikM joined	17:54
	→ beneggett joined	17:54
	→ jb55 joined	17:54
	→ pcypher joined	17:54
Neptu	soerenb, can the push default be defined per branch?	17:54
soerenb	don't think so	17:55
	← kirin` left	17:55
soerenb	wouldn't even make sense, IMHO	17:55
	→ Socapex joined	17:55
kadoban	Neptu: upstream and such can be, if that's what you mean. The push default just defines git's behavior of what gets pushed when you don't specify anything, pretty much.	17:55
jrnieder	Neptu:' [branch "foo"] pushremote = bar' in .git/config	17:55
	← nettoweb left	17:56
	gitinfo set mode: +v	17:56
	→ lsiv568 joined	17:56
	→ mnml joined	17:56
	← sburgess left	17:56
jrnieder	Neptu: see man git-config, especially push.default from there (which explains how to configure what argumentless push does in general)	17:57
gitinfo	Neptu: the git-config manpage is available at http://jk.gs/git-config.html	17:57
	→ ruukasu joined	17:57
	← tristanp left	17:57
Socapex	Hello, quick question. Is there an option for git blame to be less verbose? Right now I can hardly see the changes since it displays a full path, long date, time and other information I do not need. Thank you very much	17:57
Neptu	what you think is correct for a branch use the push.default or upstream	17:57
	i have no experience in any of them so i donno which one fits better for this	17:58
kadoban	Neptu: They do totally different things. You should look up the details, and ask if you're still not sure.	17:58
Neptu	for me is make git push on a branch and send it remotely to the specific branch	17:58
	kadoban, reading	17:58
	→ Gizburdt joined	17:58
	→ oghran joined	17:58
Neptu	fetch source is equal to the push destination	17:59
oghran	i have three commits ready to be pushed but one of them has a file too large for github, which i’ve removed in the third commit.	17:59
	how do I not push the second commit? or fix this another way.	17:59
grawity	oghran: use `git rebase` to remove either the file from that commit, or the commit itself	17:59
Socapex	git blame -c --date=short answers my question, though it is still quite large, I can actually see something	18:00
kadoban	Yeah, git blame doesn't seem to be as configurable in terms of output as some other commands. There's a few switches to turn some things off though I guess.	18:01
	← jwmann left	18:01
	← basiclaser_ left	18:01
	→ jwmann joined	18:02
	← Gizburdt left	18:02
	← aswen left	18:02
Socapex	kadoban: Yes, change the really wide tabs to like, a few spaces would help alot imho	18:02
	← jwmann left	18:02
	→ Vivekananda_y510 joined	18:02
	← _Atom_ left	18:03
oghran	thanks grawity i think im just going to remove .git and start again :)	18:03
grawity	I...	18:03
kadoban	oghran: You should try to fix it, you'll learn more that way	18:03
	← mpistone left	18:03
	→ tristanp joined	18:03
	→ Gizburdt joined	18:04
	← hexafluoride left	18:04
kadoban	You can always just nuke it after if it gets messed up if you're already willing to do that.	18:04
oghran	honestly its late, its been a long day, and just want my code checked in.	18:04
kadoban	Fair enough	18:04
grawity	git rebase --onto <badcommit>^ <badcommit>	18:06
	← shawndumas left	18:06
	→ dreiss joined	18:07
	→ kermit joined	18:07
	← achadwick left	18:08
	→ ecky--ptang-zoob joined	18:08
	← beneggett left	18:08
	← Sendoushi left	18:09
	Vampire0_ → Vampire0	18:09
	→ shawndumas joined	18:09
	← DrinkMachine left	18:09
	← in_deep_thought left	18:10
	→ Mobutils joined	18:10
	← iamjarvo left	18:10
	→ FreezingCold joined	18:11
	→ levity_island joined	18:12
	← mizu_no_oto left	18:12
	← adhawkins left	18:12
	← astroduck left	18:14
	← _0x1d3 left	18:15
	→ beneggett joined	18:15
	→ astroduck joined	18:15
	→ it0a joined	18:16
	→ adhawkins joined	18:16
	← listochkin left	18:17
	← ki0 left	18:17
	← kermit left	18:17
	→ d0liver joined	18:17
	← FreezingCold left	18:18
	→ mattstratton joined	18:19
	← paddymahoney left	18:19
	→ brucelee joined	18:20
	→ michelangelo joined	18:20
	← Walex left	18:21
	← subhojit777 left	18:21
	→ L8D joined	18:22
L8D	how can I diff the stage to HEAD?	18:22
	so I can see what I'm about to commit	18:22
	← Juxtapositional left	18:22
	→ ascarter joined	18:22
	→ khmarbaise joined	18:23
	→ a_le joined	18:23
	← f00dWorksta left	18:23
	→ kirin` joined	18:23
	← Gizburdt left	18:23
qsuscs	git diff --cached	18:23
L8D	found it	18:23
	oh thanks	18:23
	← donmichelangelo left	18:24
Neptu	ive been trying for a while but i cannot setup the upstream correctly it gets accepted but when i do git push feels is pushed to master instead	18:24
	← brucelee left	18:24
	← nnyk_ left	18:24
	← aspiers left	18:24
	→ in_deep_thought joined	18:25
	← pcypher left	18:25
	→ m0ltar joined	18:25
	→ liamkeily joined	18:25
	→ Gizburdt joined	18:26
	← oghran left	18:26
	→ blubberbop joined	18:26
	→ JohnBat26 joined	18:26
	← liamkeily left	18:26
	← hexagoxel left	18:26
	→ brownbathrobe joined	18:27
	← grindmodeon left	18:29
	← kirin` left	18:29
	→ RaceCondition joined	18:29
d0liver	ey guys, I'm walking my way through a big merge and finding a lot of cases where one side of the merge actually only contains changes to a subset of what's shown on the HEAD side but the whole thing shows up because the other side had changes to the stuff being shown on the HEAD side. This is fine, but it would be nice to get some perspective on which things on the HEAD side were changes made by HEAD and which ones are just there because of c	18:29
	<d0liver> hanges on the other side. Hope that's not super confusing. It's easier to visualize. Anyway, I've been using git diff $(git merge-base HEAD..MERGE_HEAD)..HEAD -- file/path to show changes made to file/path since the common ancestor so that I can tell which stuff is actually different. Does anyone know of a less verbose way to do that?	18:29
	The usual thing to do is this: git config --global merge.conflictstyle diff3 but that requires you to actually inspect each side to see how they differ from the common ancestor. Would be nice to just get a diff for big changes	18:30
Neptu	can it be that set-url to push messes with the upstream??	18:30
	← astroduck left	18:30
Neptu	git remote set-url --push ??	18:30
	← carpediembaby left	18:30
	← ProT-0-TypE left	18:31
	→ mizu_no_oto joined	18:31
	→ nonickn joined	18:31
	← Gizburdt left	18:32
	→ purak joined	18:33
d0liver	Neptu, what are you trying to do exactly?	18:33
	→ baweaver joined	18:33
	← baweaver left	18:33
	→ baweaver joined	18:33
Neptu	i want a branch to be able to git push and git pull without specify the long remote branch	18:33
	← baweaver left	18:34
Neptu	im trying to use upstream for that and seems to set but i have aswell a git remote set-url --push rule on my system	18:34
	→ baweaver joined	18:34
	← shawndumas left	18:34
Neptu	so when i pull the branch it actually goes refs/for/master/	18:34
	→ m8 joined	18:34
Neptu	so seems the remote --seturl is ovewritting the upstream	18:35
	→ CentaurWarchief joined	18:35
Neptu	nad i though all this configurations were per branch	18:35
	not global to the repo	18:35
	→ ProT-0-TypE joined	18:35
Neptu	so a little bit of a mess i whould like to pull push each branch into the remote branch on the central server so acts as backup	18:36
	wihout having to specify on evey pull all the line..	18:36
	donno if you get my point	18:36
	→ paddymahoney joined	18:37
	← dreiss left	18:37
	→ shawndumas joined	18:37
	← kiran left	18:37
d0liver	Hmm, so if you do something like git push -u branch remote then branch will be setup to track that remote and will automatically push/pull there. Remotes can have different urls for pull and push.	18:38
	You can alter all of this by hand in .git/config	18:38
	← anaran left	18:38
	← str left	18:39
	→ str joined	18:39
	→ nettoweb joined	18:39
	→ clauswitt joined	18:40
	← Gamecubic left	18:40
	→ tranzfus_ joined	18:40
	← baweaver left	18:40
	→ grindmodeon joined	18:40
	→ Gamecubic joined	18:40
	← freimatz left	18:40
skelterjohn	is there an easy way to reset the contents of a single file to a previous revision?	18:42
d0liver	skelterjohn, git checkout	18:42
	→ thibaultcha joined	18:42
skelterjohn	d0liver: that's what i thought, it's telling me "pathspec 'thefile' did not match any file(s) known to git."	18:42
	which seems like a clear error message	18:43
	but i really feel like git knows about that file	18:43
	← akushner left	18:43
skelterjohn	at both HEAD and the revision I want to reset to	18:43
d0liver	skelterjohn, It checks out from the cache by default	18:43
	so you would need to do git checkout HEAD:file/path	18:43
	→ akushner joined	18:43
	← grindmodeon left	18:43
skelterjohn	or, REV:file/path, since i want an earlier version?	18:43
d0liver	Yeah	18:43
	← clauswitt left	18:43
d0liver	*stage/index	18:43
	not cache	18:43
	dunno what happened there	18:44
kadoban	Is that syntaxt valid? The usual is 'git checkout someref -- somefile'	18:44
skelterjohn	same issue though	18:44
	i think something else is off that i don't realize	18:44
	→ clauswitt joined	18:44
d0liver	nah, kadoban is right	18:44
skelterjohn	someref -- somefile and someref:somefile give the same message	18:44
d0liver	it's git checkout <commit> <file>	18:44
	lol	18:44
	I mess that one up all the time actually	18:44
	← tranzfuse left	18:44
kadoban	skelterjohn: The file has to exist as of that commit...and it's relative to where you are	18:44
	→ listochkin joined	18:45
skelterjohn	right, i really feel like both tohse are being handled correctly, but the error certainly indicates that they're not	18:45
	so i'll see if something got out of whack with my mental state of the repo	18:45
	→ FreezingCold joined	18:45
	→ leopardb joined	18:46
	← marcogmonteiro left	18:46
	← mkoskar left	18:47
	← Novitsh_ left	18:47
	→ CustosLimen joined	18:48
skelterjohn	ok, yeah, i introduced this file with the most recent rev	18:48
	← in_deep_thought left	18:50
	← crose left	18:50
	← RaceCondition left	18:52
	← brownbathrobe left	18:52
	← nonickn left	18:52
	→ in_deep_thought joined	18:53
	→ RaceCondition joined	18:54
	← israelpattison left	18:55
	→ brucelee joined	18:56
	→ israelpattison joined	18:56
	← arnaud___ left	18:57
	← RaceCondition left	18:57
	→ t0th_-_ joined	18:57
	→ hahuang65 joined	18:58
	→ nonickn joined	18:59
	→ pcypher joined	18:59
	→ MarkyC_ joined	19:00
	→ mkoskar joined	19:00
	← ascarter left	19:01
	→ mikecmpbll joined	19:01
	→ kirin` joined	19:01
	← ruukasu left	19:02
	← MarkyC left	19:02
	→ scriptThis joined	19:02
	MarkyC_ → MarkyC	19:02
	→ cagedwisdom joined	19:03
	← Rixius left	19:04
	← shawndumas left	19:05
	→ ghostlines joined	19:05
	← ghostlines left	19:05
	→ crose joined	19:06
	→ RaceCondition joined	19:06
	→ ghostlines joined	19:06
	→ ruukasu joined	19:07
	← kirin` left	19:07
	→ liamkeily joined	19:08
	← tranzfus_ left	19:08
	← beneggett left	19:09
	← robbyoconnor left	19:10
	→ beneggett joined	19:10
	→ kballou joined	19:11
	→ codetroll joined	19:11
	← d0liver left	19:12
	← ntio left	19:12
	→ m0viefreak joined	19:12
	← paddymahoney left	19:12
	← ruukasu left	19:13
	→ ntio joined	19:14
	j416 → noshi	19:15
	← ntio left	19:15
	← pcypher left	19:15
	→ ntio joined	19:15
	→ iamjarvo joined	19:17
	→ Sonderblade joined	19:17
	← clauswitt left	19:17
	← elcheckito left	19:21
	→ baweaver joined	19:22
	noshi → j416	19:22
	→ kirin` joined	19:22
	← nonickn left	19:23
	→ moritzs joined	19:23
	← MattMaker left	19:24
	→ Plenoge joined	19:24
	← Plenoge left	19:24
	→ Gizburdt joined	19:24
	← RaceCondition left	19:26
	→ jottr_ joined	19:26
	← in_deep_thought left	19:27
	← mutex left	19:27
	j416 → j416_	19:27
	← kirin` left	19:27
	→ in_deep_thought joined	19:27
	← Gizburdt left	19:27
	← St_Marx left	19:28
	j416_ → j416	19:28
	← jonathanwallace left	19:28
	→ Gizburdt joined	19:28
	← JohnBat26 left	19:28
	→ mutex joined	19:28
	← moritzs left	19:29
	→ veebers joined	19:29
	→ aidalgol joined	19:29
	→ nettoweb_ joined	19:30
	← jottr left	19:30
	→ MattMaker joined	19:30
	← levity_island left	19:31
	← Socapex left	19:33
	← nettoweb left	19:33
	→ puff joined	19:34
	→ ruukasu joined	19:34
	← beneggett left	19:35
	→ beneggett joined	19:35
	→ kirin` joined	19:35
	→ jceb joined	19:35
puff	good afternoon.	19:36
	I'm newish at git and trying to sort out some thigns.	19:36
	← muhaha03__ left	19:36
	→ nnyk_ joined	19:36
	→ St_Marx joined	19:36
	→ moritzs joined	19:37
	← ghostlines left	19:40
	← DanMAbraham left	19:40
	← kirin` left	19:40
Eugene	!ask	19:40
gitinfo	Yes, it's okay to ask questions here.... in fact, you just asked one! ;-) Pretty much any question is fine. We're not terribly picky, but we might be asleep. Please be patient and you should get an answer soon.	19:40
	→ moritzschaefer joined	19:42
PerlJam	Eugene: What's the cube root of 243?	19:43
	;)	19:43
	→ paul424 joined	19:43
Eugene	7?	19:43
	No, that's 343	19:43
	.search cube root of 243	19:43
gitinfo	.search: nothing found.	19:44
Eugene	Useless bot.	19:44
	← iamjarvo left	19:44
	→ alexh_ joined	19:45
	→ ghostlines joined	19:45
	→ pcypher joined	19:46
	→ tier_ joined	19:46
	← carandraug left	19:48
	← crose left	19:49
	← tier left	19:49
	→ oriba joined	19:49
	← kballou left	19:50
	← pcypher left	19:51
	→ Patch joined	19:51
	← EminenceHC left	19:52
	→ chiromante joined	19:53
	← ManikM left	19:54
	→ ManikM joined	19:54
	→ corni joined	19:56
	← davividal left	19:56
	→ sinkensabe joined	19:56
	→ Aeterne joined	19:57
puff	Is "git remote" working with data in a clone's .git or is it working with data in ~/.gitconfig?	19:57
	← in_deep_thought left	19:57
qsuscs	puff: .git/config	19:58
	robustus\|Off → robustus	19:58
	→ crumpler joined	19:59
	← scriptThis left	20:00
	→ crose joined	20:01
	← kriks left	20:02
	← tier_ left	20:02
	→ ErKa joined	20:02
	→ Evie_Hammond joined	20:02
	→ tier joined	20:02
	→ in_deep_thought joined	20:03
	→ hexagoxel joined	20:04
	← nrsk left	20:04
	← Aeterne left	20:05
	→ Sebtoast joined	20:05
	← mellernoia left	20:06
	← ghostlines left	20:06
	← keller left	20:06
	← jceb left	20:08
	→ nrsk joined	20:08
	← ruukasu left	20:09
	→ WaReZ joined	20:10
	→ carandraug joined	20:10
	← oriba left	20:10
	→ tonyj joined	20:11
	→ alvaro_o joined	20:11
	→ sq-one joined	20:13
	→ iamjarvo joined	20:13
	← iamjarvo left	20:13
	→ iamjarvo joined	20:14
	← ecky--ptang-zoob left	20:15
	→ mr-id joined	20:15
	→ ecky--ptang-zoob joined	20:15
	← govg left	20:15
	← shpoont left	20:16
	→ sheperson joined	20:17
	→ kirin` joined	20:19
	← mr-id left	20:19
	→ settermjd joined	20:20
	→ EminenceHC joined	20:21
	← kirin` left	20:23
	→ ferr joined	20:24
	→ ropav joined	20:24
	← Uber-Ich left	20:25
	→ mdhopkins joined	20:26
	← sinkensabe left	20:26
	← EminenceHC left	20:26
	→ afhammad joined	20:27
	← msmith__ left	20:27
	robustus → robustus\|Off	20:28
	← petersr left	20:29
	→ Walex joined	20:30
	← in_deep_thought left	20:30
	← mihaicris left	20:30
	← Nizumzen left	20:30
	← Mitchbones left	20:31
	→ mihaicris joined	20:31
	→ ghostlines joined	20:31
	← Asiajey left	20:31
	← mizu_no_oto left	20:31
	← LBV_User left	20:31
	← mihaicris left	20:32
	← lifeforms left	20:34
	→ intellix joined	20:35
	→ govg joined	20:36
	← Tuna-Fish left	20:36
	→ Tuna-Fish joined	20:36
	← MrSavage left	20:37
	← jhwhite left	20:38
	→ tranzfuse joined	20:39
	→ in_deep_thought joined	20:39
	← jerius left	20:39
	→ jerius joined	20:40
	→ Juxtapositional joined	20:40
webframp	I've had several developers report issues with files showing as modified when they switch between branches. any suggestions for what could be causing that?	20:40
	→ mizu_no_oto joined	20:41
ScottE	webframp: sure - modifications to the files, probably	20:42
	→ User458764 joined	20:43
webframp	ScottE: heh. except it's not. switching from a branch with a clean state, no changes, back to master	20:44
	results in what looks like modifications, but git diff basically shows every line changed as if normalization is being applied	20:44
	→ hs366 joined	20:45
	→ DaisyTheCow joined	20:45
	← DaisyTheCow left	20:45
	→ sohail joined	20:47
	→ pcypher joined	20:47
	← Jackneill left	20:48
webframp	I'm assuming something is not right with .gitattributes and windows	20:48
	but not sure	20:48
	→ beastd joined	20:48
ScottE	webframp: maybe someone is reformatting files with DOS newlines, or some other silly thing	20:49
	→ maletor joined	20:49
webframp	that's what I think, somewhere	20:49
ScottE	And if so, that does count as a modification	20:49
	Because the file is... well... changed	20:49
	← mnml left	20:50
	← pcypher left	20:51
	→ axl_ joined	20:51
	← magic_ left	20:52
	→ Trindaz joined	20:52
	← nnyk_ left	20:53
Trindaz	how do I constrain diff output so that it's only between certain lines	20:53
	→ magic_ joined	20:53
	← CentaurWarchief left	20:54
	beastd remembers some bad effects because IIRC Windows Git sets defaults to Convert-to-DOS line breaks	20:54
	← mixandgo left	20:54
beastd	I stumbled over it at a coworkers PC. A shell script refused to work (correctly?). But I hardly remember any details :(	20:55
	← chiromante left	20:55
	← jrnieder left	20:57
	← ferr left	20:59
	→ EminenceHC joined	21:00
	← jb55 left	21:00
	← tvw left	21:00
	→ jb55 joined	21:00
	← tier left	21:01
	← tranzfuse left	21:02
	← jb55 left	21:02
	← sheperson left	21:02
	→ jb55 joined	21:02
	→ tier joined	21:02
	→ tranzfuse joined	21:03
	→ upene joined	21:03
	→ basiclaser_ joined	21:03
	→ kballou joined	21:04
	gitinfo set mode: +v	21:04
basiclaser_	hey manz if im working on branch a, on file a, then commit, make a new branch 'b' from master, create file b, commit then switch back to branch a, should branch a report that file b has been modified? Thats what im seeing, but im not sure why	21:04
	could i be the result of a text editor with file b open whilst i checkout branch A again?	21:05
	← nettoweb_ left	21:05
	→ mixandgo joined	21:05
	→ SonikBoom joined	21:06
	→ _leb joined	21:07
	← tranzfuse left	21:08
	→ Scriptonaut joined	21:08
	← tier left	21:09
Scriptonaut	shouldn't git reset --hard bring me back to my last commit?	21:09
	→ xlinkz0 joined	21:09
	← simpleuser left	21:09
	→ skylite_ joined	21:09
	→ tier joined	21:09
Scriptonaut	how can I restore my last commit	21:09
	← lsiv568 left	21:10
	← nour left	21:10
	← m0ltar left	21:10
Scriptonaut	git reset --hard isn't destroying my local changes	21:10
xlinkz0	you mean your new files?	21:11
	→ dsdeiz joined	21:11
Scriptonaut	yes	21:11
	it says: HEAD is now at 958f67f updated .gitignore	21:12
xlinkz0	not sure how you remove those except manually but all your tracked files should be back to where they were	21:12
Scriptonaut	when I do: git reset --hard. But when I git status, it shows all these files I made today	21:12
	← ProT-0-TypE left	21:12
	→ JohnBat26 joined	21:12
	→ ProT-0-TypE joined	21:13
xlinkz0	Scriptonaut: http://stackoverflow.com/questions/4327708/git-reset-hard-head-leaves-untracked-files-behind	21:13
	← mattcen left	21:16
	← Guest66430 left	21:18
	→ arnaud___ joined	21:18
	→ dreiss joined	21:18
moritz	Scriptonaut: then you haven't 'git add'ed them	21:18
	Scriptonaut: 'git clean' will remove them	21:18
	← leeN left	21:18
	→ MadLamb_ joined	21:18
Scriptonaut	ah, I manually removed them, but thanks for the command, that will come in useful	21:18
	→ mattcen_ joined	21:18
kadoban	Scriptonaut: Are you specifying HEAD? I don't know what reset defaults to when you don't specify a commit, can't seem to find it in the manpage.	21:18
Scriptonaut	I did	21:19
	I figured that git reset --hard HEAD would also clean all the unadded files	21:19
	mattcen_ → mattcen	21:19
	→ jrnieder joined	21:20
	← PCatinean left	21:20
	← Gizburdt left	21:20
	→ jontmorehouse joined	21:20
	→ StyXman joined	21:20
	→ snuffeluffegus joined	21:21
	→ functorfun joined	21:21
	functorfun → funfunctor	21:21
	← denete left	21:21
	← dreiss left	21:21
StyXman	there's a project which is unmantained. in that project there's a file of which I would like to keep the history in my own repo. how can I extract the commits/patchs relevant to that file and then import into my own repo?	21:22
	→ shawndumas joined	21:22
	→ dreiss joined	21:22
	← settermjd left	21:23
	← govg left	21:23
webframp	StyXman: sounds like a job for filter-branch	21:23
kadoban	StyXman: Clone a copy of the repo, filter-branch away everything else, bring it into your repo (add it as a remote, and the merge or whatever it in)	21:23
xlinkz0	there isn't any way to get back uncommitted changes after a reset --hard?	21:24
	→ GeoAleyPerMer joined	21:25
	← MarkyC left	21:25
	← FilipNortic left	21:25
PerlJam	xlinkz0: not unless you've copied them somewhere else or stashed them.	21:25
	← ropav left	21:25
xlinkz0	:(	21:25
	thanks	21:25
osse	or if you added them at some point	21:25
	← ypks left	21:26
xlinkz0	i have them remotely.. just going to be a pain to get them all back	21:26
	→ ypcs joined	21:26
StyXman	webframpm kadoban: ack both	21:26
puff	The git pull manpage says: Default values for <repository> and <branch> are read from the "remote" and "merge" configuration for the current branch as set by git-branch[1] --track.	21:26
	→ tesaf joined	21:27
	→ _Atom_ joined	21:27
	← tarkus left	21:27
puff	So if I'm reading that right, then the repository parameter defaults to whatever you set with "git remote set-url repoURL"	21:27
	← jottr_ left	21:27
	→ nettoweb joined	21:27
	← _Atom_ left	21:27
osse	for that specific repo, yes. you can have several	21:28
	← nettoweb left	21:28
	→ Kulrak joined	21:28
	← Kulrak left	21:28
	→ Kulrak joined	21:28
puff	Several repos?	21:28
osse	yep	21:28
	where you cloned from and your fork in github for example	21:28
puff	Right, cool.	21:28
	← GeoAleyPerMer left	21:28
	→ nettoweb joined	21:29
puff	And the second half means that the branch parameter defaults to whatever you set with "git branch --track branchname"	21:29
	← nettoweb left	21:29
puff	What do those settings default to if you didn't explicitly invoke "git remote set-url" or "git branch --track"?	21:29
	← dreiss left	21:29
	→ levity_island joined	21:29
	← listochkin left	21:30
	→ nettoweb joined	21:30
osse	puff: did you clone your repo?	21:30
	or did you start from scratch?	21:30
puff	Yes.	21:30
	Well, I have one of each.	21:30
	On github.	21:30
osse	puff: then it's origin and origin/master	21:30
	(probably)	21:30
	in a clone you get a master that tracks origin/master. and origin is the URL you cloned from	21:31
puff	One cloned from an existing repo at github, one created and then pushed to github.	21:31
osse	in the one created from scratch there is no default configuration	21:31
	→ dreiss joined	21:31
	→ Ace joined	21:32
	← hdon left	21:32
puff	Can you clarify what you meant when you said "you get a master that tracks origin/master"?	21:33
	← Ace left	21:33
puff	It feels like every time I ask a question there are three new special terms in the answer :-).	21:33
qsuscs	puff: http://pics.nase-bohren.de/version-control.jpg for extra confusion	21:34
	← StyXman left	21:34
osse	puff: origin is the "nickname" Git gives the repo you cloned from. It is what Git calls "a remote"	21:34
qsuscs	(don’t worry. i don’t understand half of that stuff, yet i understand git—i think so, at least.)	21:34
	← akushner left	21:35
osse	puff: origin/master is a reference to the master branch as it is in the repo called origin.	21:35
	so far so good?	21:35
	← carandraug left	21:36
	← mkoskar left	21:37
	→ tpollard joined	21:37
	← skylite_ left	21:37
	← iamjarvo left	21:38
	→ nettoweb_ joined	21:39
	← nettoweb_ left	21:39
	→ Xethron joined	21:39
	← Xethron left	21:39
	→ Xethron joined	21:39
	← marthinal left	21:39
	← mizu_no_oto left	21:39
	→ nettoweb_ joined	21:39
	← nettoweb left	21:41
	→ DeathIncarnate joined	21:41
	→ mkoskar joined	21:41
	← dreiss left	21:41
	→ boombatower joined	21:42
	→ Reskp joined	21:43
	← jontmorehouse left	21:43
	← xlinkz0 left	21:43
	← RagnarDanneskjol left	21:44
	← nrsk left	21:44
	← JohnBat26 left	21:45
	← sohail left	21:45
	→ imkmf_ joined	21:45
	← tier left	21:45
	← akiva left	21:45
guardian	I know there's been a force push on a repository. Bare remote repository has reflog enabled, however sshing into remote and doing 'git reflog branchname' lists sha1s but there's no trace of "forced-update"	21:45
	→ psoo joined	21:46
	→ lsiv568 joined	21:46
	→ tvw joined	21:47
	← imkmf left	21:47
	→ pcypher joined	21:48
	→ akiva joined	21:48
	← Juxtapositional left	21:49
brucelee	i git pulled a repo and branched off [master] to [branchA]	21:49
	← pantsman- left	21:49
	← aidalgol left	21:49
brucelee	made a bunch of changes to branchA, but a bunch of changes occured to origin master as well	21:49
	how do i sync the branchA with origin master	21:49
	i dont want to deviate too much from it	21:50
	← levity_island left	21:50
brucelee	how do i know if i do a git pull, where its actually syncing with	21:50
qsuscs	brucelee: !sync	21:50
gitinfo	brucelee: [!fork_sync] You can read a nice guide on how to update your fork with the upstream repository here: https://help.github.com/articles/syncing-a-fork	21:50
qsuscs	hm, nope.	21:50
	that’s the wrong one.	21:50
	brucelee: use either man git merge or man git rebase	21:50
gitinfo	brucelee: the git-merge manpage is available at http://jk.gs/git-merge.html	21:50
	brucelee: the git-rebase manpage is available at http://jk.gs/git-rebase.html	21:50
	→ aidalgol joined	21:51
brucelee	ok thanks	21:51
	← mdhopkins left	21:52
	← pcypher left	21:52
	← Trindaz left	21:52
brucelee	from looking at the diagram, looks like git rebase master will do the trick, but first i need to perform a gitpull on master right?	21:52
	→ jottr_ joined	21:52
	→ warcuy joined	21:52
	← alexh_ left	21:52
brucelee	how do i do it straight from "origin master"	21:52
	without having to do a git pull on master	21:52
puff	osse: So far, so good.	21:53
basiclaser_	hey manz if im working on branch a, on file a, then commit, make a new branch 'b' from master, create file b, commit then switch back to branch a, should branch a report that file b has been modified? Thats what im seeing, but im not sure why	21:53
qsuscs	brucelee: git fetch origin; git rebase origin/master	21:53
	← lsiv568 left	21:53
	→ ropav joined	21:53
	← martinklepsch left	21:53
qsuscs	basiclaser_: !float	21:53
gitinfo	basiclaser_: If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there. If the files you changed differ between branches, the checkout will fail. In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.	21:53
puff	osse: I was told that the "git remote" output is essentially a list of aliases/shortcuts/names for URLs. Are there special connonations/meanings attached to words like "origin", and is that functional (i.e. built into git, like HEAD is) or just by convention?	21:54
	← irqq left	21:54
	← ManikM left	21:54
	→ Manny_ joined	21:54
brucelee	qsuscs: ok thanks	21:54
	qsuscs: how do i tell where "origin" is	21:54
	is that "upstream"	21:54
	?	21:54
qsuscs	brucelee: if you just did git cloone $URL, the location where you called from is origin	21:55
brucelee	and what does the git phrase "upstream" mean	21:55
	→ jontmorehouse joined	21:55
	→ kirin` joined	21:55
	→ ap0c joined	21:56
	← ap0c left	21:56
	→ ap0c joined	21:56
brucelee	im not sure what kind of phrase it is, whether git, or svn, or just general source management lingo	21:56
qsuscs	brucelee: the remote branch the local branch is tracking, i.e. master usually tracks origin/master	21:56
	→ ilhami joined	21:56
brucelee	ah ok	21:56
	← akiva left	21:57
	← ilhami left	21:57
	→ ilhami joined	21:57
	robustus\|Off → robustus	21:58
	→ FilipNortic joined	21:58
	← hs366 left	21:58
	→ akiva joined	21:58
	← afhammad left	21:59
	← upene left	21:59
	→ upene joined	21:59
	→ martinklepsch joined	22:00
	→ listochkin joined	22:00
	→ tier joined	22:01
	← kirin` left	22:01
brucelee	can someone walk me through this merge really quick? i tried git rebase master from a branch	22:01
	→ kirin` joined	22:01
brucelee	theres a merge conflict with one of the files	22:01
	← cannonball left	22:01
brucelee	i opened that file, deleted the weird arrows and stuff and changed it to how the file SHOULD look	22:02
osse	puff: some commands default to origin if no configuration says otherwise (eg. git fetch), but those are the only ones I know	22:02
brucelee	what do i do at this point?	22:02
	← ropav left	22:02
	→ Nizumzen joined	22:02
puff	osse: Ok, thanks.	22:02
qsuscs	brucelee: !eek	22:02
gitinfo	brucelee: [!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	22:02
	← FilipNortic left	22:02
	→ CentaurWarchief joined	22:03
	← tier left	22:03
brucelee	thanks qsuscs	22:03
osse	puff: when you clone you get a master branch. that will by default "track" origin/master (reminder: the master branch at the origin repo). What this means is that 'git status' will tell you if you are ahead or behind etc	22:03
	→ tranzfuse joined	22:03
	→ ruukasu joined	22:04
puff	osse: Cool.	22:04
	← nikow left	22:05
	→ pheaver joined	22:05
puff	And "master", is that convention or hardcoded?	22:05
osse	somewhere in between	22:05
puff	Hm. Thansk.	22:05
	Thanks.	22:05
	→ ropav joined	22:06
	← srcerer left	22:06
	→ srcerer_ joined	22:06
	← psoo left	22:06
osse	puff: in the weird state where you have just run git init but have not created any commits and have an empty repository, master is assumed. nowhere else afaik	22:06
	← it0a left	22:06
basiclaser_	qsuscs: oh ok thanks, thats not exactly what i meant	22:06
	← jmverges left	22:06
	→ Consuela joined	22:07
puff	Well, let's put it this way... where does the string "master" come from? I.e. does the user enter it, or is a default value from somewhere?	22:07
	← warcuy left	22:07
qsuscs	puff: the latter	22:07
	puff: but you can change it if you like	22:07
	← Ankhers left	22:07
basiclaser_	I mean i have two separate branches. In each im making separate changes on different files. Both branches are based off master, but branch A is complaining about branch B's changes	22:08
	← bmcorser left	22:08
	← tranzfuse left	22:08
qsuscs	basiclaser_: !repro	22:09
gitinfo	basiclaser_: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will raise the odds of getting your problem fixed from about 30% to about 90%.	22:09
	→ ciampix joined	22:09
	→ FilipNortic joined	22:09
	→ iamjarvo joined	22:09
	← tristanp left	22:09
	robustus → robustus\|Off	22:10
	← jagob left	22:10
	← King_Hual left	22:10
	→ levity_island joined	22:11
	← sq-one left	22:11
osse	puff: for teh lulz I grepped the source for the string master and there were only two hits that were of interest. what happens when you clone and what happens when you init	22:11
	← listochkin left	22:12
	→ robbyoconnor joined	22:12
puff	osse: Cool, thanks.	22:12
	← liamkeily left	22:13
	← thibaultcha left	22:13
puff	What would be the equivalent set of operations to manually clone a repo?	22:13
	← beastd left	22:13
	→ bitfury joined	22:13
puff	E.g. first you create a subdirectory, cd into it, git init, then you'd have to add the remote repo as an origin, set the branch to master, do a git pull?	22:14
	← upene left	22:15
bitfury	hey guys, so I'm using a gitblit groovy plugin to trigger a jenkins job when there's a commit which is working fine but it's also triggering a build everytime tagging takes place.. any way of disabling this?	22:15
	← kirin` left	22:15
	← nettoweb_ left	22:16
puff	I suspect that a lot of the difficulty in learning git is that the extra ease-of-use commands obscure what's really going on...	22:16
	The git clone man page says: After the clone, a plain git fetch without arguments will update all the remote-tracking branches, and a git pull without arguments will in addition merge the remote master branch into the current master branch, if any (this is untrue when "--single-branch" is given; see below).	22:17
	← AaronMT left	22:17
puff	Am I correct in reading that as recommending that you do a git pull after doing a git clone?	22:18
	← buffal0 left	22:18
	← FilipNortic left	22:18
	→ listochkin joined	22:18
osse	puff: git init; git remote add origin <URL>; git fetch origin; git checkout -b master origin/master	22:19
	immediately after clone you're up-to-date anyway	22:19
	← ghostlines left	22:20
	← levity_island left	22:21
	→ chartractegg joined	22:21
	← tesaf left	22:21
	→ imkmf joined	22:21
brucelee	qsuscs, so i made the changes, added the file, and committed, and now what?	22:21
	← Xethron left	22:21
	← mattstratton left	22:21
	← imkmf_ left	22:21
	← beneggett left	22:21
	← CustosLimen left	22:21
	→ beneggett joined	22:22
brucelee	git status is still saying rebase in progress; onto XXXXX	22:22
puff	osse: thank you.	22:22
brucelee	all conflicts fixed: run "git rebase --continue"	22:22
	← WaReZ left	22:23
brucelee	i tried doing a rebase master from a branch, and it said there were merge issues	22:24
	← thiago left	22:24
brucelee	i opened the file that had merge issues and editted it, then git add, and git commit	22:24
	so now do i do a git rebase --continue?	22:24
	because that doesnt do anything	22:24
	it says "No changes - did you forgoet to use 'git add'?	22:24
	← snuffeluffegus left	22:26
	← mixandgo left	22:27
	← chartractegg left	22:27
	→ boombatower_ joined	22:28
	→ liamkeily joined	22:28
	← danemacmillan left	22:28
	→ thiago joined	22:28
	← boombatower left	22:29
	← funfunctor left	22:29
	boombatower_ → boombatower	22:29
osse	puff: the important thing to realize is that pull = fetch + merge	22:30
	← baweaver left	22:30
osse	if you want to do that, then it's fine.	22:30
	→ FroMaster joined	22:30
	→ s8321414 joined	22:30
	→ dreiss joined	22:31
puff	osse: Gotcher.	22:31
	← listochkin left	22:31
puff	osse: It's starting to make sense to me now, I think I just need to get a sense of what's really going on under the covers.	22:31
	Neat: http://www.gitguys.com/topics/the-git-directory/	22:31
	→ Idealien joined	22:32
puff	Though the diagram left out the index.	22:32
	← mkoskar left	22:32
	← khmarbaise left	22:32
	← unreal left	22:32
	← rewire left	22:33
	→ Pyrogerg joined	22:33
	← crose left	22:34
FroMaster	Howdy, I'm working on a project to help my group start using source control for our IT Scripts. I'm struggling to figure out the right way (since there's probably 50+ ways) to go about it. I want to create a central repo call it 'corp/scripts' that would be our master set of scripts. I'd like each user to have their own fork? that they work on and	22:34
	can keep track of their local changes.	22:34
	← axl_ left	22:34
	→ boombatower_ joined	22:34
	← boombatower_ left	22:34
	→ boombatower_ joined	22:34
FroMaster	If the 'corp/scripts' repo changes they can pull down the latest. if there is a bug in the 'corp/scripts' repo they can make a pull request to update it.	22:34
	← boombatower left	22:35
	boombatower_ → boombatower	22:35
FroMaster	Am I approaching this the right way?	22:35
	← s00pcan left	22:36
	→ axl_ joined	22:36
	→ _Atom_ joined	22:36
	← Idealien left	22:37
	→ kirin` joined	22:37
thiago	FroMaster: yes	22:37
	→ Idealien joined	22:38
	→ govg joined	22:38
FroMaster	So 'forking' is the right approach to give each one their own sandbox but also allow then to get/pull changes from the master as it gets updated over time?	22:38
thiago	yes	22:38
	I don't like the name "forking", but that's the process you described	22:39
	→ ascarter joined	22:39
thiago	you're only branching	22:39
FroMaster	Ah. I guess I need to know the difference between branching and forking	22:39
	→ bburky joined	22:40
	→ Not_Whatever joined	22:40
	→ freeman42 joined	22:41
thiago	before Github, "forking" was "branching with no plans to ever merge again"	22:41
	← dsdeiz left	22:41
thiago	that is, a permanent split	22:41
	GitHub overloaded the term to mean "clone" and "branch"	22:41
FroMaster	That makes more sense now.	22:41
	← shawndumas left	22:42
	→ mizu_no_oto joined	22:42
FroMaster	Trying to get non-developers to start using git is a bit of a steep learning curve	22:42
	→ warcuy joined	22:42
brucelee	if you guys know a specific commit #	22:42
	whats the quickest way to see what that commit # is	22:42
	← jerius left	22:42
brucelee	like what changes are involved	22:43
osse	brucelee: git show <that #>	22:43
brucelee	osse: awesome thanks!	22:43
	← Idealien left	22:44
	→ neonixcoder joined	22:45
	→ kukks joined	22:45
	→ unreal joined	22:45
	→ ehmatthes joined	22:46
	← livingstn left	22:46
	→ shawndumas joined	22:46
	→ leex_ joined	22:46
	← Scriptonaut left	22:47
	→ jmverges joined	22:48
	← _Atom_ left	22:48
	→ solker joined	22:48
	← warcuy left	22:48
	→ buffal0 joined	22:48
	→ warcuy joined	22:49
	← neonixcoder left	22:49
	← ciampix left	22:49
	→ baweaver joined	22:50
	← arnaud___ left	22:50
	← baweaver left	22:50
	→ baweaver joined	22:51
	← thiago left	22:52
	← ropav left	22:52
	← kirin` left	22:53
	← solker left	22:53
	→ functorfun joined	22:53
	functorfun → funfunctor	22:53
	← nfk left	22:54
	← ruukasu left	22:54
	→ ruukasu joined	22:54
	→ neo2k joined	22:56
	← hcc23 left	22:57
	→ jb55_ joined	22:57
	→ listochkin joined	22:58
	→ neonixcoder joined	22:58
	← m8 left	23:00
	← jb55 left	23:01
	→ pcypher joined	23:01
	← dreiss left	23:02
	srcerer_ → srcerer	23:03
	← jontmorehouse left	23:03
	→ thibaultcha joined	23:04
	→ nnyk_ joined	23:04
	← shawndumas left	23:05
	← Reskp left	23:05
	← sts left	23:06
	← govg left	23:06
	← codetroll left	23:06
	← pcypher left	23:07
	→ kirin` joined	23:07
	→ t4nk958 joined	23:07
	→ pcypher joined	23:08
	← Sebtoast left	23:09
	gitinfo set mode: +v	23:09
t4nk958	Hello, I have been working on a project for a while and I ran "git init" in the project, and commited the project to github. However on contributions, it does not show the correct lines of code, it says 0	23:09
	← purak left	23:09
	→ ropav joined	23:10
	→ shawndumas joined	23:10
	← neonixcoder left	23:11
	← crumpler left	23:11
	← t4nk958 left	23:11
	← kirin` left	23:12
	← pcypher left	23:12
	→ pcypher joined	23:14
	→ jontmorehouse joined	23:14
	← warcuy left	23:14
	← b1nar1 left	23:15
	→ warcuy joined	23:15
	→ CKyle joined	23:15
	→ b1nar1 joined	23:15
	→ armadillu joined	23:16
	← ropav left	23:16
	← armadillu left	23:16
	→ dsdeiz joined	23:16
	→ armadillu joined	23:17
	← duderonomy left	23:17
	→ danemacmillan joined	23:18
	← armadillu left	23:18
	← mizu_no_oto left	23:18
	← BlaXpirit left	23:20
	← ilhami left	23:21
	← duckydan left	23:21
	← Kicer86 left	23:22
	← weyer left	23:23
	→ nb_bez___ joined	23:23
	← przemoc left	23:23
	← b1nar1 left	23:24
	← Skapadapaduu left	23:25
	→ Gitzilla joined	23:25
	← alvaro_o left	23:25
	→ Reskp joined	23:25
	→ Aeterne joined	23:25
	← iamjarvo left	23:26
	→ solker joined	23:26
	← liamkeily left	23:27
	← immortal left	23:27
	← ProT-0-TypE left	23:28
	← _leb left	23:28
	→ malukenho joined	23:28
	→ weyer joined	23:29
	→ tristanp joined	23:29
	← setrae left	23:30
	← steele left	23:32
	→ przemoc joined	23:32
	← axl_ left	23:34
	→ duckydan joined	23:34
	→ levity_island joined	23:35
	→ kermit joined	23:36
	← Consuela left	23:36
	← in_deep_thought left	23:36
	← Dougie187 left	23:36
	← ockham left	23:37
	← smccarthy left	23:37
	← s8321414 left	23:37
	← User458764 left	23:38
	→ s8321414 joined	23:38
	← punchagan left	23:39
	→ User458764 joined	23:39
	← MadLamb_ left	23:40
	→ sheperson joined	23:40
	← przemoc left	23:41
	→ s00pcan joined	23:41
	← Reskp left	23:42
	→ mellernoia joined	23:43
	← Nijikokun left	23:44
	← s8321414 left	23:45
	→ Nijikokun joined	23:45
	← pcypher left	23:45
	← looper_ left	23:46
	← ecky--ptang-zoob left	23:46
	→ ecky--ptang-zoob joined	23:47
	← jb55_ left	23:47
	← Manny_ left	23:47
	← robustus\|Off left	23:47
	← levity_island left	23:47
	→ przemoc joined	23:48
	→ robustus\|Off joined	23:48
	← solker left	23:49
	robustus\|Off → robustus	23:49
	← kballou left	23:49
	← Nijikokun left	23:49
	← jason237 left	23:50
	→ levity_island joined	23:50
	→ Nijikokun joined	23:50
	→ b1nar1 joined	23:51
	→ arnaud___ joined	23:51
	→ ropav joined	23:51
	→ liamkeily joined	23:52
	← intellix left	23:52
	→ tranzfuse joined	23:52
	← corni left	23:53
	→ codetroll joined	23:53
	→ josephferano joined	23:54
	→ pcypher joined	23:54
	← hexagoxel left	23:55
	← martinklepsch left	23:55
	← arnaud___ left	23:55
	→ netcraft joined	23:55
	josephferano → JosephFerano	23:55
	→ amikiri joined	23:56
	→ adespota joined	23:57
	← tranzfuse left	23:57
	← adespota left	23:57
	← beneggett left	23:57
	→ beneggett joined	23:57
	← baweaver left	23:58
	← ropav left	23:58
	→ ropav joined	23:59
	→ jb55 joined	23:59

Logs Search ←Prev date Next date→

Channels Documentation