IRCloggy #git 2015-05-27

Provider of IRC logs since 2005.

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

	2015-05-27
	← imachuchu left	00:00
	← Tenobrus left	00:00
	← Bootinbull left	00:00
	→ wlarip joined	00:00
	→ maestrojed joined	00:00
	← scientes left	00:01
	→ pcypher joined	00:02
	→ gambl0re joined	00:02
	← jonmorehouse left	00:03
	→ dsdeiz_ joined	00:03
	← wlarip_ left	00:03
	→ _Atom_ joined	00:05
	← rkazak left	00:05
	← dsdeiz left	00:05
	← nicknikolov left	00:06
	→ Sharker joined	00:07
	← pcypher left	00:07
	→ Abyx joined	00:07
	← zendrix left	00:08
	→ baweaver joined	00:08
	← marek-varro left	00:08
	← michael_mbp left	00:09
	← akiva left	00:10
	→ toothrot joined	00:10
	→ edux joined	00:10
	→ glassx- joined	00:11
	← glassx- left	00:11
	→ mellernoia joined	00:11
	← Sharker left	00:12
	→ michael_mbp joined	00:12
	← shabazy left	00:12
	→ grepper joined	00:12
	← GT4066 left	00:13
	← Abyx left	00:14
	← highcup left	00:14
	→ ErKa joined	00:14
	variable → function	00:14
	← edux left	00:15
	← eVRiAL left	00:17
	← jolda left	00:17
	→ scientes joined	00:18
	← scientes left	00:18
	→ scientes joined	00:18
	← stantonk_ left	00:19
	← harish left	00:19
	→ hiptobecubic joined	00:21
	← s8321414 left	00:22
	← panda81 left	00:23
	← robustus left	00:24
	→ robustus\|Off joined	00:24
	robustus\|Off → robustus	00:24
	→ Lyqyd joined	00:26
	→ cbonobo joined	00:29
	← ropav left	00:30
	← thiago left	00:31
	← skylite left	00:31
	→ jamesn0 joined	00:33
	gitinfo set mode: +v	00:33
	→ denete_ joined	00:33
jamesn0	What is the converse of `git reset SHA1`? i.e. reset the working tree to the state as of the given commit, but leave HEAD as it is	00:34
	← nettoweb left	00:34
	← _Atom_ left	00:35
	→ pcypher joined	00:36
	← denete left	00:37
	← denete_ left	00:37
ojacobson	what do you want the staging area to do	00:37
	(if the answer is not "be the same as the work tree" then things are complicateeeed)	00:37
	← ncd\|leeN left	00:38
	→ otter768 joined	00:39
jamesn0	ojacobson: "be the same as the work tree" is what I had in mind :)	00:40
ojacobson	then, git checkout tree-ish -- paths	00:40
	← jmpp left	00:40
	→ jmpp joined	00:40
jamesn0	ojacobson: huh, I guess I expected everything to be unstaged, but that will work just fine, thank you :)	00:41
	← d10n-work left	00:43
	← sfeinste left	00:43
	→ nettoweb joined	00:44
	← otter768 left	00:44
	← nettoweb left	00:45
	← Xiti left	00:47
	→ Baribal__ joined	00:48
	← Grum left	00:48
	← dreiss left	00:49
	← TyrfingMjolnir left	00:50
	→ silviof joined	00:51
	→ Grum joined	00:51
	← Baribal_ left	00:51
	← m0viefreak left	00:52
	→ tristanp joined	00:52
	← maestrojed left	00:53
	← akushner left	00:53
	← baweaver left	00:54
	← CheckDavid left	00:54
	→ bronson joined	00:54
	← Mufkh left	00:57
	→ AustinTheGrey joined	00:58
	← AustinTheGrey left	00:58
	→ lorezzed joined	00:58
	→ Deloi joined	00:58
	← bronson left	00:58
	← Deloi left	00:59
	→ Asiajey joined	00:59
	function → const	00:59
	← cbonobo left	00:59
	← jgardella left	01:00
	← cyphase left	01:00
	→ wlarip_ joined	01:00
	← shinnya left	01:01
	→ Akagi201 joined	01:02
	← cbreak left	01:02
	← tristanp left	01:03
	← codeFiend left	01:04
	← wlarip left	01:04
	← Sasazuka left	01:04
	→ smw_ joined	01:04
	← dsantiago left	01:04
	→ cbreak joined	01:04
	→ eVRiAL joined	01:04
	→ tristanp joined	01:05
	← eVRiAL left	01:05
	→ _Atom_ joined	01:05
	→ cbonobo joined	01:05
	← c0mrad3 left	01:06
	→ leolrrj joined	01:07
	← converge left	01:08
	← refried_ left	01:08
	→ sublimate joined	01:08
	← pcypher left	01:08
	← UukGoblin left	01:10
	→ UukGoblin joined	01:10
	→ watabou joined	01:10
	→ Abyx joined	01:11
	← sublimate left	01:11
	→ edux joined	01:11
	→ sublimate joined	01:12
	→ chrisgeorge_ joined	01:12
	← sublimate left	01:12
	← chrisgeorge_ left	01:13
	→ Nizumzen joined	01:13
	→ ns5 joined	01:13
	→ pm90_ joined	01:14
ns5	when I run "git branch -a", I see "remotes/k9/master". How can I check the details of this, ur.., branch?	01:14
	← chrisgeorge left	01:14
ojacobson	What details are you interested in?	01:14
	→ Xiti joined	01:14
	→ cyphase joined	01:15
ns5	ojacobson: the url of this remote	01:15
ojacobson	git remote -vv	01:15
ns5	ojacobson: how do I setup a branch to track "remotes/k9/master"?	01:16
	← edux left	01:16
	→ CussBot_ joined	01:16
	← CussBot left	01:16
	CussBot_ → CussBot	01:16
	← _Atom_ left	01:17
	← pabens left	01:18
	→ nettoweb joined	01:18
ns5	the remote is https://github.com/k9mail/k-9.git	01:18
	when I run "git show remotes/k9/master", it shows the latest commit is in January, which is obviously wrong. But when I run git pull, nothing is pulled from github	01:19
	→ ehmatthes joined	01:20
	→ maestrojed joined	01:20
ojacobson	'git pull' causes the current branch's upstream remote (if any) to be _fetched_ (the symmetric operation to push) and then for the current branch's upstream branch to be merged	01:20
	so (a) pull is the wrong way to deal with stale remote-tracking branches, because it has side effects on your current branch, and (b) the `k9` remote will only be fetched by pull if it's the upstream remote of the current branch	01:21
	which I suspect isn't the case	01:21
	→ PRIM4T joined	01:21
ojacobson	'git fetch k9' is simpler to reason about. :)	01:21
	← Abyx left	01:21
	← Grum left	01:21
ns5	ojacobson: I want to set up a local branch to track "remote/k9/master"	01:21
ojacobson	So do that. man git-checkout and man git-branch spell out the various ways to configure tracking; you have Choices.	01:22
gitinfo	the git-checkout manpage is available at http://jk.gs/git-checkout.html	01:22
	the git-branch manpage is available at http://jk.gs/git-branch.html	01:22
	→ ap0c joined	01:22
	→ Grum joined	01:23
	→ Abyx joined	01:23
	← nettoweb left	01:23
	→ ribasushi joined	01:24
	→ codeFiend joined	01:24
	← PRIM4T_ left	01:24
ns5	ojacobson: I have another local branch which tracks "origin/k9master", is it possible to directly merge everything in remote/k9/master into "origin/k9master"?	01:24
ojacobson	No; merges happen locally.	01:25
	→ nettoweb joined	01:25
	← leolrrj left	01:26
ns5	ojacobson: thank you for your help	01:26
	→ k_sze[work] joined	01:29
	→ f3lp joined	01:29
	→ pcypher joined	01:29
	→ Sharker joined	01:30
	← ap0c left	01:30
	← cbonobo left	01:31
	← _Vi left	01:32
	→ daito_ joined	01:32
	→ espindola joined	01:33
	← c355E3B left	01:33
	→ delboy1978uk joined	01:33
	← ehmatthes left	01:34
	← Sharker left	01:35
	← pm90_ left	01:35
	← juvenal left	01:36
	→ pm90_ joined	01:36
	→ zotez joined	01:36
	← espindol_ left	01:36
	→ foul_owl joined	01:38
	→ harish joined	01:38
foul_owl	Hi folks. How do I do a clone into a folder if I don't want the destination to be a git repo?	01:38
	← delboy1978uk left	01:39
	← modocache left	01:39
	← nettoweb left	01:39
	→ Goplat joined	01:39
	← c74d left	01:40
	→ nettoweb joined	01:40
	Adlai has been cursed, he now has THREE parallel stashes	01:42
	→ c74d joined	01:42
	← MatthewWilkes left	01:42
	← zotez left	01:44
	→ _Vi joined	01:44
	← pcypher left	01:45
	← Grum left	01:45
	→ Grum joined	01:46
	→ Vampire0_ joined	01:47
	← Abyx left	01:47
	← mellernoia left	01:47
	← espindola left	01:48
	→ pqlr joined	01:48
	← pqlr left	01:48
	→ pcypher joined	01:49
	→ Abyx joined	01:49
	← const left	01:50
	← Vampire0 left	01:50
	← nettoweb left	01:51
	→ juvenal joined	01:52
	→ nettoweb joined	01:52
	← gambler left	01:55
	← kpease left	01:55
	← Abyx left	01:55
	← pcypher left	01:55
	→ fuym joined	01:56
	← fuym left	01:56
	→ Sharker joined	01:57
	→ mizu_no_oto joined	01:57
	→ _Atom_ joined	01:57
	→ variable joined	01:58
	→ Abyx joined	01:58
	← pks left	01:58
	← xckpd7 left	01:59
	← Akagi201 left	02:00
	→ wlarip joined	02:00
	→ xckpd7 joined	02:00
	← codeFiend left	02:00
	← Ryanar left	02:00
	→ pks joined	02:01
	← hacker left	02:01
	→ rubyonrailed joined	02:01
	← BSaboia left	02:02
	← nettoweb left	02:03
	← wlarip_ left	02:03
	→ codebam joined	02:04
	← delinquentme left	02:04
	→ Internet13 joined	02:04
	← Sharker left	02:04
	→ nettoweb joined	02:04
	→ dsantiago joined	02:05
	→ pevx joined	02:05
	← pevx left	02:05
	→ thiago joined	02:05
	→ drewo joined	02:05
	← xckpd7 left	02:05
	→ xckpd7 joined	02:06
	→ gambler joined	02:06
	← duderonomy left	02:08
	← DerisiveLogic left	02:08
	→ codeFiend joined	02:09
	→ ahr3n joined	02:09
	← xckpd7 left	02:11
	→ tristanseifert joined	02:11
	→ rchavik joined	02:11
	← daurnimator left	02:11
	→ bgoad joined	02:11
	← Abyx left	02:11
	→ biqw joined	02:12
	→ xckpd7 joined	02:12
	← yqt left	02:12
	← biqw left	02:13
	→ daurnimator joined	02:13
	→ inve joined	02:13
	→ zumba_addict joined	02:14
	← inve left	02:14
	← tristanp left	02:15
	→ tristanp_ joined	02:15
	→ eskrg joined	02:15
	← mizu_no_oto left	02:15
	← eskrg left	02:16
	← tristanseifert left	02:16
	→ uysel joined	02:16
	→ tristanseifert joined	02:17
	← xckpd7 left	02:17
	← tristanp_ left	02:17
	→ tristanp joined	02:17
	← uysel left	02:17
	→ mizu_no_oto joined	02:17
	← bendangelo left	02:18
	→ Onv joined	02:18
	← Onv left	02:19
	→ Gqqw joined	02:20
	→ pcypher joined	02:20
	← codeFiend left	02:20
	← Gqqw left	02:21
	← rubyonrailed left	02:21
	→ Ipi joined	02:21
	→ xckpd7 joined	02:22
	→ Guest63 joined	02:23
	← Ipi left	02:23
	← Lyqyd left	02:23
	→ Xapvq joined	02:24
	← mizu_no_oto left	02:24
	← nettoweb left	02:24
	→ gamename joined	02:24
	← Xapvq left	02:25
	→ nettoweb joined	02:25
	← gamename left	02:25
	← bgoad left	02:25
	← pcypher left	02:26
	→ yfcd joined	02:26
	→ Es0teric joined	02:26
	→ rubyonrailed joined	02:26
	← yfcd left	02:27
	→ mizu_no_oto joined	02:27
	→ Zqyn joined	02:27
	← Zqyn left	02:28
	→ fmed joined	02:29
	← nettoweb left	02:29
	← fmed left	02:29
	← mizu_no_oto left	02:29
	→ nettoweb joined	02:29
	← xckpd7 left	02:29
	← bitkiller left	02:30
	→ bpaos joined	02:30
	→ xckpd7 joined	02:30
	← bpaos left	02:31
	→ apjc joined	02:31
	← Arsonide left	02:32
	← apjc left	02:32
	→ kaiten02 joined	02:32
	→ Viue joined	02:33
	→ zotez joined	02:33
	→ pcypher joined	02:33
	← Viue left	02:34
	→ ovjj joined	02:35
	← xckpd7 left	02:35
	← nettoweb left	02:35
	← ovjj left	02:36
	← tristanp left	02:36
	→ tristanp joined	02:36
	→ oori joined	02:36
	→ nettoweb joined	02:37
	→ xckpd7 joined	02:37
	← oori left	02:38
	→ rerx joined	02:38
	← pcypher left	02:39
	→ modocache joined	02:39
	← rerx left	02:40
	→ otter768 joined	02:40
	→ Iivs joined	02:40
	← Ceber left	02:41
	← Iivs left	02:41
	→ rburkej joined	02:41
	← xckpd7 left	02:41
	→ Noq joined	02:42
	variable → invariable	02:42
	← Noq left	02:42
	→ Uhjg joined	02:43
	← rburkej left	02:43
	← Uhjg left	02:43
	← modocache left	02:44
	→ cqj joined	02:44
	→ jolda joined	02:44
	← otter768 left	02:44
	← cqj left	02:45
	→ Sharker joined	02:45
	← lindenle left	02:45
	← daito_ left	02:45
	→ Iwa joined	02:45
	← Iwa left	02:46
	← tristanp left	02:46
	→ tristanp joined	02:47
	→ kmifc joined	02:47
	→ chunkyIPA joined	02:47
	← nettoweb left	02:47
	← kmifc left	02:47
	→ Emr joined	02:48
	→ nettoweb joined	02:49
	← Emr left	02:49
	→ mtx_init joined	02:49
	← Sharker left	02:49
	→ Ejfte joined	02:50
	← Ejfte left	02:50
	→ fedexo joined	02:51
	→ Kli joined	02:51
	← Kli left	02:52
	← Nizumzen left	02:52
mtx_init	This may be an odd question but is there a way to use git just for file integrity checking and not for version control?	02:52
	→ Aosn joined	02:53
	← benborges left	02:53
	← Aosn left	02:53
bremner	mtx_init: yes, !annex does that	02:54
gitinfo	mtx_init: git LFS, git-annex and git-media are some solutions to the !binary problem. They work by keeping the blobs outside of the repo, storing a reference to the blob in the repo instead. See http://git.io/git-lfs, http://git-annex.branchable.com and https://github.com/alebedev/git-media	02:54
	→ Ohei joined	02:54
milki	foul_owl: you can use git archive	02:54
	← Ohei left	02:55
	→ vkuk joined	02:55
	← vkuk left	02:56
ojacobson	Adlai: When I find myself in times of trouble, Mother Mary comes to me - speaking of words of wisdom: use a branch.	02:56
	(scansion is for suckers)	02:57
	→ enaan joined	02:57
	← pm90_ left	02:57
	← enaan left	02:57
	← darkbasic left	02:58
mtx_init	bremner: neat thanks	02:58
	→ Tpxiu joined	02:58
	→ oojacoboo joined	02:58
	→ darkbasic joined	02:59
	← Tpxiu left	02:59
	← sdothum left	02:59
	← nettoweb left	02:59
	→ dreiss joined	02:59
	← kaiten02 left	02:59
	→ Lzrc joined	03:00
	→ kaiten02 joined	03:00
	→ wlarip_ joined	03:00
	→ edux joined	03:00
	← Lzrc left	03:00
	← scientes left	03:01
	→ wqxa joined	03:01
	← Err404NotFound left	03:01
	→ nettoweb joined	03:01
	→ Err404NotFound joined	03:01
	→ nnyk_ joined	03:01
	← wqxa left	03:02
	← jamesn0 left	03:02
	→ daito joined	03:02
	→ Lobo joined	03:03
	→ Sharker joined	03:03
	← mtx_init left	03:03
	Lobo → Guest40051	03:03
	← Guest40051 left	03:04
	← wlarip left	03:04
	→ huz joined	03:04
	← fedexo left	03:05
	← edux left	03:05
	→ xckpd7 joined	03:05
	← huz left	03:05
	← nettoweb left	03:05
	← zotez left	03:05
	→ Abyx joined	03:05
	→ Sufi joined	03:06
	← Sufi left	03:07
	→ Aconl joined	03:07
	→ duderonomy joined	03:07
	← Sharker left	03:07
	← Aconl left	03:08
	← tristanp left	03:08
	→ loremipson joined	03:09
	→ tristanp joined	03:09
	← xckpd7 left	03:09
	→ pcypher joined	03:10
	→ kzb joined	03:11
	← kzb left	03:12
	→ Pfqti joined	03:12
	← chunkyIPA left	03:12
	← cavallari left	03:13
	← Pfqti left	03:13
	→ evuu joined	03:14
	← k_sze[work] left	03:14
	← grepper left	03:14
	← evuu left	03:14
	→ kcan joined	03:15
	→ delinquentme joined	03:16
	→ [cust] joined	03:16
	← kcan left	03:16
preaction	there will be an answer... use a branch	03:16
	→ grepper joined	03:17
	→ Vneic joined	03:17
	← Vneic left	03:17
	← BlueProtoman left	03:17
	→ Fliv joined	03:18
	← Fliv left	03:18
	→ scientes joined	03:19
	→ ewqu joined	03:20
	→ xckpd7 joined	03:20
	→ zivester joined	03:20
	← ewqu left	03:21
	→ rubyonra_ joined	03:21
	→ jsmq joined	03:21
	← loremipson left	03:22
	← jsmq left	03:22
	→ delboy1978uk joined	03:22
	→ tdqc joined	03:23
	→ zotez joined	03:23
	← tdqc left	03:23
	→ lyr joined	03:24
	← lyr left	03:24
	→ loremipson joined	03:24
	← rubyonrailed left	03:24
	→ ome joined	03:24
	← ajf- left	03:24
	→ GT4066 joined	03:24
	→ Uuka joined	03:25
	← pcypher left	03:25
	← Uuka left	03:25
	→ Sharker joined	03:25
	← Dougie187 left	03:27
	← Noldorin left	03:27
	→ Axcl joined	03:27
	← Axcl left	03:27
	← tristanp left	03:28
	← drewo left	03:29
	→ Jxqu joined	03:29
	→ zematis joined	03:29
	zematis → Guest15210	03:30
	← Jxqu left	03:30
	← Guest15210 left	03:30
	→ kzeu joined	03:30
	← zotez left	03:30
	← Nikhil_D left	03:31
	→ drewo joined	03:31
	← kzeu left	03:31
	→ Nikhil_D joined	03:31
	← delboy1978uk left	03:31
	→ xpung joined	03:32
	← xpung left	03:32
	→ Tmooh joined	03:33
	← Tmooh left	03:34
	Padawan_ → Padawan	03:34
	→ Aaai joined	03:35
	← Aaai left	03:35
	→ PRIM4T_ joined	03:36
	→ Bczei joined	03:36
	← Bczei left	03:37
	→ Nnmok joined	03:38
	→ tristanp joined	03:39
	← tristanp left	03:39
	← PRIM4T left	03:39
	← Nnmok left	03:40
	→ tristanp joined	03:40
	← drewo left	03:40
	→ pdgos joined	03:40
	← daito left	03:41
	← pdgos left	03:41
	← dougsland left	03:41
	← Es0teric left	03:42
	→ Aseo joined	03:42
	← Aseo left	03:43
	→ Gqor joined	03:44
	← Gqor left	03:44
	← Padawan left	03:45
	← tristanp left	03:45
	→ drewo joined	03:45
	→ lindenle joined	03:46
	→ Padawan joined	03:46
	← michael_mbp left	03:48
	→ mwv joined	03:48
	← mwv left	03:49
	→ Wnue joined	03:49
	← Wnue left	03:50
	← lindenle left	03:50
	→ lahrx joined	03:50
	← lahrx left	03:50
	→ fahadash joined	03:51
	← fahadash left	03:51
	→ fahadash joined	03:51
	← fahadash left	03:51
	→ fahadash joined	03:51
	→ michael_mbp joined	03:51
	← ahr3n left	03:51
	→ Luuaa joined	03:53
	← Luuaa left	03:53
	→ northfurr joined	03:54
	← drewo left	03:54
	→ upfr joined	03:54
	← upfr left	03:54
	→ jauik joined	03:56
	← jauik left	03:56
	→ jgardella joined	03:58
	← scientes left	03:58
	← Abyx left	03:59
	← dreiss left	04:00
	→ wlarip joined	04:00
	→ Saturn812 joined	04:03
	← tristanseifert left	04:03
	→ reim joined	04:03
	→ jason237 joined	04:03
	→ yitzm_ joined	04:04
	← wlarip_ left	04:04
	→ Abyx joined	04:04
	← yitzm_ left	04:05
	→ gfixler1 joined	04:07
	← MattMaker left	04:09
	← darkbasic left	04:09
	→ MattMaker joined	04:09
	→ darkbasic joined	04:09
	← _Atom_ left	04:09
	→ daito joined	04:12
	← reim left	04:12
	→ Arsonide joined	04:14
	→ scottschecter joined	04:17
	→ waveclaw joined	04:17
	← Guest63 left	04:17
	→ elik joined	04:18
	→ scientes joined	04:18
	← scientes left	04:18
	→ scientes joined	04:18
	← scientes left	04:18
	→ scientes joined	04:19
	← scientes left	04:19
	→ scientes joined	04:20
	← madewokherd left	04:20
	→ ckruczek joined	04:20
	← daito left	04:20
	← scientes left	04:21
	gitinfo set mode: +v	04:21
	← PRIM4T_ left	04:21
	→ scientes joined	04:21
	← scientes left	04:22
	→ darkbasic_ joined	04:22
	← darkbasic left	04:22
	→ scientes joined	04:22
	← scientes left	04:23
	→ scientes joined	04:23
	→ snow_ru joined	04:24
	← scientes left	04:24
	← kaiten02 left	04:24
	→ kaiten02_ joined	04:24
	← jolda left	04:24
	→ scientes joined	04:25
	→ reim joined	04:25
	← scientes left	04:25
	← MattMaker left	04:25
	→ MattMaker joined	04:25
	← howitdo left	04:25
	→ scientes joined	04:26
	→ zotez joined	04:26
	← scientes left	04:26
	→ scientes joined	04:27
	← scientes left	04:28
	→ scientes joined	04:28
	← scientes left	04:29
	→ modocache joined	04:29
	→ skcin7__ joined	04:29
	→ scientes joined	04:29
	→ Vadimus joined	04:30
	← scientes left	04:30
	→ scientes joined	04:30
	← oojacoboo left	04:30
	← zotez left	04:31
	→ drewo joined	04:32
	← modocache left	04:33
	→ ashokrajar joined	04:34
	← jgardella left	04:36
	→ klj joined	04:37
	→ Ceber joined	04:37
foul_owl	milki: Thanks!	04:38
	← knownasilya left	04:40
	→ codeFiend joined	04:40
	→ otter768 joined	04:41
	← Vadimus left	04:42
	→ daito joined	04:43
	← vixterra left	04:45
	← otter768 left	04:45
	← MattMaker left	04:46
	→ o84wb76g joined	04:46
	→ vixterra joined	04:46
	← darkbasic_ left	04:49
	→ edux joined	04:49
	→ darkbasic joined	04:49
	→ kp666 joined	04:49
	→ zematis joined	04:50
	← kp666 left	04:50
	→ kp666 joined	04:50
	← o84wb76g left	04:51
	← hiptobecubic left	04:52
	← edux left	04:53
	→ TyrfingMjolnir joined	04:53
	→ flavius joined	04:57
	→ lab_ joined	04:57
	c74d → Guest7878	04:58
	→ c74d3 joined	04:58
	← Guest7878 left	04:59
	c74d3 → c74d	05:00
	→ wlarip_ joined	05:00
	← ewong left	05:00
	→ zotez joined	05:03
	← wlarip left	05:03
	→ Trow joined	05:03
	→ nightspades joined	05:04
	→ ewong joined	05:04
	→ howitdo joined	05:04
	→ jonmorehouse joined	05:05
	→ effi joined	05:05
	→ dsdeiz joined	05:08
	← dsdeiz_ left	05:08
	→ MechtiIde joined	05:09
	← lewellyn left	05:11
	→ Raging_Hog joined	05:12
	← effi left	05:12
	← Raging_Hog left	05:12
	← drewo left	05:13
	→ delboy1978uk joined	05:14
	→ hydraidm801 joined	05:16
	→ dreiss joined	05:16
hydraidm801	I have a django project I want to upload to my github	05:16
	← TinkerTyper left	05:16
hydraidm801	when I type git remote add origin https://github.com/wbeyda/spawncamping-tribble.git it says I don't have permission	05:17
	→ TinkerTyper joined	05:18
kadoban	hydraidm801: What's the /exact/ error?	05:18
	→ pantsman- joined	05:18
	← cssko left	05:18
	← zivester left	05:20
	← delboy1978uk left	05:20
	← nightspades left	05:20
	← FreezingCold left	05:21
	← watabou left	05:21
	→ DrNick joined	05:22
hydraidm801	no error Im just bad at git	05:23
	→ cvanball joined	05:23
hydraidm801	i did git push and now it looks like we were all good	05:24
	→ nightspades joined	05:24
	→ lillian joined	05:24
	← ashokrajar left	05:24
	← Abyx left	05:24
	→ drewo joined	05:25
lillian	when i git pull i get "Automatic merge failed; fix conflicts and then commit the result." i know that one file changed on the server and it was a minor change and i haven't touched it	05:26
	<i haven't touched it locally"	05:26
grug	open it up and have a look for the conflicting parts	05:27
	because you're making assertions that git is saying otherwise	05:27
	hint: i bet git is right ;)	05:27
lillian	no	05:27
	i know it's changed	05:28
	← zematis left	05:28
lillian	i want it to overwrite the file because as i mentioned i haven't touched it	05:28
	i don't want to go in and paste the contents from github lol	05:28
	→ Abyx joined	05:29
	→ a-l-e joined	05:29
lillian	i figured it out	05:30
	← lillian left	05:30
	→ Sonarpulse joined	05:30
Sonarpulse	so I have a normal checkout on another computer	05:30
	how can i push -f to it so it automatially checks out what I push ?	05:31
	→ zematis joined	05:31
	← jrajav left	05:32
	→ Dragooon joined	05:32
grug	Sonarpulse: could you please rephrase your question	05:32
Sonarpulse	sure	05:33
	i have two clones (not "checkouts", sorry)	05:33
	not --mirror or anything like that	05:33
grug	that's not a question :P	05:34
Sonarpulse	and i'd like to push from one to the other	05:34
	← Gamecubic left	05:34
Sonarpulse	have have the other's working copy updated accordingly	05:35
	[sorry for splitting over multiple lines]	05:35
	→ moretti joined	05:35
mgedmin	it's possible; I cannot say if it's a good idea ;)	05:35
	google for "push to deploy"	05:35
Sonarpulse	mk	05:35
mgedmin	git 2.3 got explicit support for this and 2.4 improved it somewhat	05:35
	← MechtiIde left	05:36
Sonarpulse	I am not deploying a webserve thank god :)	05:36
	→ symmetric joined	05:36
	← codeFiend left	05:37
	← flavius left	05:37
	← hydraidm801 left	05:37
	← JanC left	05:38
	← pantsman- left	05:39
	← tyreld left	05:39
	→ ehmatthes joined	05:39
	→ modocache joined	05:41
	← dreiss left	05:41
	→ pheaver joined	05:41
	← symmetric left	05:42
	→ dc5ala joined	05:42
	← loremipson left	05:42
	→ Unbeerable joined	05:42
	→ symetric joined	05:44
	← drewo left	05:45
	→ mariuscc joined	05:45
	← modocache left	05:45
	→ drewo joined	05:46
	← snow_ru left	05:46
	→ snow_ru joined	05:47
	← boombatower left	05:48
	← Trow left	05:50
	→ edux joined	05:50
	← cvanball left	05:51
	→ JanC joined	05:52
	← jonmorehouse left	05:52
	← snow_ru left	05:54
	← edux left	05:54
	← hahuang65 left	05:54
wagle	what do i read to find out how tracking the log of a file that is "git mv"d?	05:54
	← drewo left	05:55
	→ snow_ru joined	05:55
wagle	hmm.. might have answered my own question	05:55
	← tpollard left	05:56
	→ dling joined	05:56
	→ aaw joined	05:57
	→ ManikM joined	05:57
	← Grum left	05:58
	← zarubin left	05:58
	→ eshy_ joined	05:58
	← Abyx left	05:58
wagle	in 2011	05:58
	hahaha	05:58
	→ Grum joined	05:59
	← DrNick left	05:59
	→ ashokrajar joined	05:59
	→ SmashingX joined	06:00
	→ wlarip joined	06:00
	← symetric left	06:01
	→ ashokraj_ joined	06:01
	← eshy_ left	06:01
	→ Jetchisel joined	06:02
	← maestrojed left	06:02
	→ eshy joined	06:03
	← wlarip_ left	06:04
	← eshy left	06:04
	← ashokrajar left	06:04
	→ eshy joined	06:04
	→ DrNick joined	06:05
	→ Abyx joined	06:05
	← ashokraj_ left	06:06
	← MasterPiece left	06:06
	← pheaver left	06:07
MLM	Is there a way to copy all tracked files? I want to backup a project and normally I would just copy paste the directory but I want it to respect the `.gitignore`	06:09
	→ codeFiend joined	06:10
	← a-l-e left	06:10
wagle	git archive?	06:11
	MLM ^^^	06:11
MLM	wagle: Thank you, an archive will work although I was thinking just moving raw files. Looking into `git archive` atm	06:12
	→ raymond joined	06:12
	→ effi joined	06:12
	→ cbreak-work joined	06:13
	← invariable left	06:13
	→ flowinho joined	06:14
	→ PCatinean joined	06:15
MLM	How do I include uncommited changes/files in the archive?	06:15
	← SmashingX left	06:16
wagle	dunno offhand, might be a way	06:16
	← Bass10 left	06:16
wagle	the stash might be a way, making a commit to a new branch..	06:17
	← ErKa left	06:18
	← Floatingman left	06:19
	← ranchodev left	06:19
	→ Raging_Hog joined	06:20
	← darkbasic left	06:21
	→ darkbasic joined	06:21
	← effi left	06:21
	→ sinkensabe joined	06:23
wagle	i'd make it a commit to a new branch, just so i have a record	06:23
	→ acolson joined	06:23
thiago	MLM: track them by making a commit, then use git push for the backup	06:23
	→ roelmonnens joined	06:24
wagle	sunds good to me	06:24
	sounds	06:24
	← snow_ru left	06:25
MLM	:/ - A workable solution but when working on my own repo, I don't like to create arbitrary branches for storage or commit unfinished work to master	06:25
thiago	then don't commit to master	06:25
	→ snow_ru joined	06:25
thiago	create a throw-away branch	06:25
	← Jetchisel left	06:26
MLM	I think making a commit and and then using that for `git archive` would work. Then just rebase when I want to push	06:26
	← Baribal__ left	06:26
	→ jceb joined	06:26
thiago	use git push for backup, not archive	06:27
MLM	So just have a random branch listed with unfinished work?	06:27
thiago	yes	06:27
	or a non-branch ref	06:28
	→ cmartin0 joined	06:28
MLM	non-branch ref? Can't find anything on that	06:29
	← northfurr left	06:29
	← cmartin0 left	06:29
	→ cmartin0 joined	06:29
cmartin0	when I run git pull in terminial I am prompted to write a comment. why is this happening? it didn't a day ago.	06:29
thiago	MLM: you need plumbing to do that. Using git update-ref.	06:30
	cmartin0: have you upgraded Git in the last 24 hours?	06:30
	← CEnnis91 left	06:30
	→ freimatz joined	06:31
cmartin0	thiago: don't think so	06:31
thiago	cmartin0: are you collaborating with more people on that remote?	06:31
cmartin0	thiago: yes	06:32
thiago	cmartin0: then the difference is that someone has pushed stuff you hadn't yet pulled while you also made progress	06:32
	→ leprechau joined	06:32
thiago	cmartin0: if you'd run git status, it would have told you that your branch and your upstream had diverged	06:32
	→ D30 joined	06:33
	→ Floatingman joined	06:33
cmartin0	thiago: hmmm. i ran status then pull... status said Your branch is up-to-date with 'origin/master'.	06:33
D30	hello all, i just want to clarrify.. is git when installed on ubuntu machines by default uses gnutls instead of openssl?	06:33
thiago	cmartin0: that's because you ran it after pull	06:33
	cmartin0: to see it, you need to run it after fetch, before pull or merge	06:34
	→ Gizburdt joined	06:34
thiago	D30: are you on Ubuntu?	06:34
cmartin0	thiago: what is the need for fetch. cant you just pull all the time?	06:34
thiago	cmartin0: you can	06:34
D30	im using mac, but some of my peers uses ubuntu	06:34
thiago	cmartin0: but you asked why	06:34
	D30: well, I'm not on Ubuntu either, so I can't tell you	06:34
	→ blahdodo joined	06:34
	→ wicope joined	06:34
thiago	D30: try asking in #ubuntu or checking their package sources	06:34
D30	ok thiago	06:35
cmartin0	thiago: so fetch then pull if I don't want to write a message for master merge	06:35
thiago	cmartin0: no	06:35
	cmartin0: if you don't want to write a commit message, don't make new commits	06:35
	cmartin0: or don't let other people make commits	06:35
	cmartin0: or make sure only one of you is working at any time; everyone else is waiting	06:35
cmartin0	...	06:36
	→ rzeka joined	06:36
thiago	cmartin0: if two people make new commits at the same time, the first one gets to push to the repository without pulling	06:37
	→ Gama11 joined	06:37
thiago	cmartin0: the other will need to pull and write the merge message	06:37
	← rchavik left	06:37
thiago	or I can teach you about rebase	06:37
	→ katherine joined	06:37
	→ rchavik joined	06:37
	← zematis left	06:38
	→ effi joined	06:38
	← Asiajey left	06:38
cmartin0	thiago: this is the repo, https://github.com/cs362sp15/projects. everyone just has a directory that they work in.	06:38
thiago	where they work in is irrelevant, if they work in the same repo	06:39
cmartin0	thiago: (note the rever)	06:39
	→ Alienpruts joined	06:39
	← lab_ left	06:39
	← Abyx left	06:40
	→ ThomasLocke joined	06:40
	→ Wulf joined	06:40
	← daurnimator left	06:40
	→ jagob joined	06:40
	← cvbcvb left	06:40
Wulf	hi	06:40
	thiago wouldn't be able to spot a rever even with one right on his face	06:41
thiago	or, for that matter, my neck	06:41
	→ otter768 joined	06:42
Wulf	I'm looking for a tool for reviewing / quality checking code changes so that the developer of the change can improve things before commiting to master branch. Any recommendations?	06:42
cmartin0	thiago: thanks for the help.	06:42
	→ tumulte joined	06:42
	→ rsmarshall joined	06:43
preaction	Wulf: that would be "a senior developer"	06:43
	← scientes left	06:43
	→ daurnimator joined	06:43
grug	preaction: there are plenty of things you can use before sending it to a senior for a review	06:43
	← darkbasic left	06:43
Wulf	preaction: yep. The senior developer may sit on the other side of the world. How do they communicate effectively to talk about the change? ;-)	06:43
preaction	Wulf: e-mail	06:44
	← gopar left	06:44
preaction	grug: i've yet to meet a linter i've actually liked	06:44
	→ darkbasic joined	06:45
	← rubyonra_ left	06:45
cmartin0	thiago: I was using egit inside of eclipse and it was 'out of sync' so to speak. I can use egit now with no issues. thanks.	06:46
	← Saturn812 left	06:46
	← otter768 left	06:46
	← nightspades left	06:46
	→ Abyx joined	06:47
thiago	Wulf: lots of projects use Gerrit	06:49
	→ Error404NotFound joined	06:49
Wulf	thiago: just found this one; it's written in Java :-(	06:49
preaction	we've got a Gitbucket install	06:49
	← Err404NotFound left	06:50
thiago	Wulf: yes	06:50
	← t-mart_ left	06:50
	→ ashokrajar joined	06:51
	→ hahuang65 joined	06:51
	→ ashokraj_ joined	06:54
	→ Darcidride joined	06:54
	→ Mo joined	06:54
	→ ErKa joined	06:56
	← bucketh3ad left	06:56
	← hahuang65 left	06:56
	← f3lp left	06:56
	→ jnavila joined	06:56
	→ gua_ould joined	06:57
	← ashokrajar left	06:57
	← effi left	06:57
	→ ashokrajar joined	06:58
	→ lab_ joined	06:58
	← aaw left	06:58
	← rchavik left	06:58
	← ashokrajar left	06:58
	← guampa left	06:59
	← ashokraj_ left	07:00
	→ wlarip_ joined	07:00
	→ gdrc joined	07:01
	← clarkpan left	07:01
	→ ril joined	07:01
	→ guampa joined	07:01
	→ Pathfinder joined	07:02
	→ settermjd joined	07:02
	← fahadash left	07:02
	← ehmatthes left	07:03
	→ delboy1978uk joined	07:03
	← wlarip left	07:04
	→ Jackneill joined	07:05
BinGOs	.version	07:05
	gitinfo changed the topic to: Welcome to #git, the place for git help and aging rock stars \| Current stable version: 2.4.2 \| Start here: http://jk.gs/git \| Getting "cannot send to channel"? /msg gitinfo .voice \| Gits N' Roses: Now with more git cherry-pop, git freebase, and starring git Slash!	07:05
	→ beckyconning_ joined	07:06
	→ avvs joined	07:06
	← codeFiend left	07:07
	← avvs left	07:07
	→ avvs_ joined	07:07
	← delboy1978uk left	07:08
	← avvs_ left	07:09
	→ Vaur joined	07:10
	→ avvs joined	07:12
	→ loremipson joined	07:13
	← daito left	07:13
	← Vaur left	07:13
	→ zack_s_ joined	07:13
	→ avvs_ joined	07:13
	→ Vaur- joined	07:14
	← avvs_ left	07:14
	gitinfo set mode: +v	07:14
Vaur-	Hi	07:14
gitinfo	Vaur-: 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.	07:14
Vaur-	I'm having issue with a remote repository on a distant file system	07:14
	→ Sceorem joined	07:14
Vaur-	when I pull it with the path it works	07:14
	but when I pull it using remote it doesnt	07:15
	http://paste.debian.net/184442/	07:15
	erf	07:15
	derp	07:15
	← ril left	07:15
Vaur-	I found the issue	07:15
	← Sceorem left	07:15
Vaur-	please ignore that	07:15
	→ Sceorem joined	07:16
	→ arup_r joined	07:16
	→ nilg joined	07:16
	→ christech2 joined	07:16
	← Xiti left	07:17
Kartagis	Vaur-: was it because you were not using the remote-name?	07:18
	aka origin	07:18
	← avvs left	07:19
	→ underhillj joined	07:19
	← underhillj left	07:19
	← loremipson left	07:19
	→ bonswouar joined	07:19
	← User458764 left	07:22
	→ Hounddog joined	07:23
	← Abyx left	07:23
	→ User458764 joined	07:24
	→ DerisiveLogic joined	07:24
Vaur-	Kartagis: nah, I just made a mistake in the url	07:25
	you can call remotes any way you like	07:25
	origin is just the default name	07:25
	Vaur- → Vaur	07:26
	← michael_mbp left	07:26
	← johtso_ left	07:27
	→ daito joined	07:27
	→ gox39 joined	07:27
	→ TomyWork joined	07:28
	→ ashokrajar joined	07:28
	→ avvs joined	07:28
	→ Abyx joined	07:29
	→ michael_mbp joined	07:29
Kartagis	I know	07:29
	→ modocache joined	07:30
	→ johtso_ joined	07:30
	→ The_Theramist joined	07:31
	← darkbasic left	07:32
	→ darkbasic joined	07:32
	← reim left	07:32
	← ashokrajar left	07:33
	→ forsil joined	07:34
	→ thepreacher joined	07:34
	← modocache left	07:34
	→ ashokrajar joined	07:35
	← forsil left	07:35
	← jceb left	07:35
	← skcin7__ left	07:36
	→ dreiss joined	07:37
	→ forsil joined	07:37
	→ gauke joined	07:38
	→ edux joined	07:38
	→ reim joined	07:38
	→ ashokraj_ joined	07:39
	→ v45h_ joined	07:39
	← arup_r left	07:39
	← reim left	07:40
	→ morois joined	07:41
	→ rchavik joined	07:41
	← ashokrajar left	07:41
	→ ashokrajar joined	07:41
	→ reim joined	07:42
	→ rendar joined	07:42
	→ ronskisika joined	07:42
	← Raging_Hog left	07:42
	← edux left	07:43
	→ GPrime joined	07:43
	← avvs left	07:44
	← reim left	07:44
	← ashokraj_ left	07:44
	→ Spriz joined	07:44
	← Abyx left	07:44
	→ reim joined	07:45
	→ ntwari joined	07:45
	← darkbasic left	07:45
	← morois left	07:46
	→ ashokraj_ joined	07:46
	← snow_ru left	07:48
	← gauke left	07:48
	→ ki0 joined	07:48
	→ darkbasic joined	07:49
	→ snow_ru joined	07:49
	← ashokrajar left	07:49
	← Goplat left	07:49
	→ ashokrajar joined	07:50
	← delinquentme left	07:50
	→ jceb joined	07:51
	→ intellix joined	07:52
	→ ashokra__ joined	07:53
	← ashokraj_ left	07:53
	→ shmoon joined	07:53
	→ freestyl3r joined	07:53
	← dreiss left	07:54
shmoon	hi	07:54
	i want to understand update-ref, the git-scm manual seems complicated to me, is there a nice article explaining it ?	07:54
	→ mikecmpbll joined	07:54
	→ effi joined	07:54
	← ManikM left	07:54
	→ genbattle joined	07:54
	→ ManikM joined	07:55
	→ frank99f1 joined	07:55
_ikke_	It's a low-level tool, I don't think there are any end-user articles for	07:55
Seveas	shmoon: why do you want to understand it? It's a piece of plumbing that you almost never use.	07:55
_ikke_	man git update-ref	07:55
gitinfo	the git-update-ref manpage is available at http://jk.gs/git-update-ref.html	07:55
	← frank99f1 left	07:56
	→ Balliad joined	07:56
	← ns5 left	07:56
shmoon	i was asked in an interview how to remove the first commit	07:56
	← ashokrajar left	07:56
shmoon	i said delete .git folder, but the correct answer was git update-ref HEAD or something	07:56
	so thought would try to understand it	07:56
ethanol	a very important skill to posses if you want to be able to do your job	07:56
kadoban	Remove the first commit from what?	07:57
Seveas	rubbish interview question.	07:57
shmoon	first commit as in, git init -> git add . -> git commit -am 'inittial commit' -> remove that commit	07:57
jast	rubbish or not, it's actually quite simple, depending on which way you think about refs	07:57
	→ m0nkmaster joined	07:57
shmoon	you can rollback a commit using git reset --hard commit_sha - i knew that one, but it doesn't work for the first commit	07:57
	← katherine left	07:57
	→ howlymowly joined	07:57
jast	refs (e.g. branches, tags, ...) point to specific commits	07:58
shmoon	ya I don't know much about refs (references?) I think, so will study on that now.	07:58
jast	update-ref allows you to change a ref so that it points to a different specific commit	07:58
	← nixter1029 left	07:58
Seveas	update-ref doesn't help you with this either.	07:58
jast	what will probably help most is this: !gcs	07:58
gitinfo	[!concepts] "Git Concepts Simplified" explains the basic structures used by git, which is very helpful for understanding its concepts. http://gitolite.com/gcs.html	07:58
	→ BlaXpirit joined	07:58
jast	because all this stuff is strongly related to git's structures	07:58
shmoon	thanks I'll go through that	07:58
jast	it's got lots of pictures ;)	07:58
ethanol	shmoon: git revert HEAD	07:59
shmoon	oh awesome	07:59
ethanol	:<	07:59
_ikke_	That does something different though	07:59
	← michael_mbp left	07:59
	ethanol shrugs	07:59
_ikke_	the first commit is still there	07:59
shmoon	that creates another commit ethanol	07:59
	(just tested)	08:00
ethanol	it preserves history	08:00
	→ michael_mbp joined	08:00
	→ maasha joined	08:00
shmoon	ya preservesby creating another	08:00
ethanol	so?	08:00
jast	the question was about not preserving history	08:00
	→ wlarip joined	08:00
ethanol	the question was retarded	08:00
_ikke_	In that case, you can just ammend the commit	08:00
ethanol	so I interpret that as open to other suggestions	08:00
maasha	How do I resolve merge conflict? https://gist.github.com/maasha/aab52f7e7755d3e21ac6	08:00
jast	doesn't mean it can't be answered	08:00
	it's an "interview question"	08:00
Seveas	it's a rubbish question	08:00
ethanol	well in that case rm -rf .git also works	08:01
	so	08:01
jast	interview questions on this level of stupid usually don't respond well to getting reinterpreted with sanity :)	08:01
	→ delboy1978uk joined	08:01
	→ daito_ joined	08:01
jast	might as well try and learn something from them :)	08:01
Seveas	maasha: !eek	08:01
gitinfo	maasha: [!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	08:01
ethanol	don't see how rm -rf .git was not a valid answer	08:01
jast	of course it is	08:01
ethanol	not for them he said	08:01
Seveas	Slapping the interviewer would be a right answer here :)	08:01
jast	but people who ask these kinds of questions are usually looking for one specific answer and everything else is "wrong"	08:01
ethanol	only one road leads to rome, am I right?	08:02
shmoon	yeah	08:02
maasha	Seveas: yeah, I know I should be safe when all I have done is basically lots and lots of commits	08:02
	→ King_Hual joined	08:02
shmoon	then he said without deleting that folder	08:02
	i.e., by using a git command	08:02
	I forgot the command but it was something like git update-refs -m HEAD	08:02
jast	and that's still not the only way to do it	08:02
maasha	Seveas: I'll have a read and watch the video (and then I may return here :o).	08:02
shmoon	hm anyway I'll read up	08:02
	→ ashokrajar joined	08:03
shmoon	if there's some end user simplified article on update-refs that'd be great :)	08:03
Seveas	I'd find a different job :)	08:03
kadoban	shmoon: I honestly wouldn't even bother. It's not an important command to know, it's plumbing.	08:03
	← wlarip_ left	08:04
_ikke_	It's not even a complicated command	08:04
	← forsil left	08:04
	← effi left	08:04
	← lab_ left	08:04
	→ Wiched joined	08:04
	→ nixter1029 joined	08:04
	← Errorical left	08:04
	← thiago left	08:05
	Wiched → Guest15186	08:05
	← daito left	08:05
	→ Haris joined	08:05
Haris	hello all	08:05
	→ Errorical joined	08:06
Haris	is there a way to automate git pull ... after push has been done. both the git server where push are going, and the server where the auto-pull is needed are on separate boxes	08:06
	← ashokra__ left	08:06
Seveas	hi!	08:06
	→ basiclaser joined	08:06
Haris	on the day for deployment, when many commits/push / pulls are going on, its a hassle to do git pull manually each time	08:06
Seveas	Looks like you're looking for !deploy	08:06
gitinfo	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	08:06
tobiasvl	Haris: automating git pull is a bad idea, because it merges	08:06
	← genbattle left	08:07
	→ arup_r joined	08:07
	→ hahuang65 joined	08:07
Haris	I'll ignore that for this specific case	08:08
	the bad idea, merges part	08:08
Seveas	Ignore at your own peril.	08:08
	Doesn't make it any less true.	08:08
Haris	obviously	08:08
	→ granthatcher joined	08:09
	→ encod3 joined	08:09
	→ greggynapalm joined	08:10
	→ effi joined	08:11
	← hahuang65 left	08:11
	← ashokrajar left	08:11
	→ petersr joined	08:12
	← nnyk_ left	08:12
	→ ashokrajar joined	08:13
	← petersr left	08:13
zack_s_	I use git svn; I have done some refactoring file name changes and moving of file (always used git mv; always did moving of files in for one commit, bevore changing the content)	08:14
	I did this on a branch	08:14
	then I merged everything back to the master trunk: "git merge --no-ff local/my_branch"	08:15
	and when I do now a checkout with svn, my file history seems to be gone	08:15
	what can be the reason for that? what can I do about it to fix it?	08:15
	→ loremipson joined	08:15
	→ MechtiIde joined	08:16
	→ AndreSomers joined	08:16
	→ hagabaka joined	08:16
	← kadoban left	08:16
	← MechtiIde left	08:16
	→ kurkale6ka joined	08:17
	→ marcogmonteiro joined	08:19
Seveas	zack_s_: I don't know much about git-svn, but svn hates branches. Try rebasing your branch and merging with --ff-only	08:20
	← loremipson left	08:20
maasha	Seveas: thanks, turned out to be a truly minor problem. Resolved now and merge complete.	08:20
	→ Takle joined	08:21
	→ rath joined	08:21
zack_s_	Seveas: thats what I did	08:21
	← jceb left	08:21
	← christech2 left	08:22
	ethanol → alcohol	08:22
	→ crestbook joined	08:25
	→ hans_s joined	08:25
	← happy-dude left	08:26
	→ christech2 joined	08:27
	← arup_r left	08:28
Haris	this is a demo/QA box, for which I need to automate git pull after every git push. I don't care if everything blows. The idea is, for the code to be avaialble for QA, as fast as possible .. after each push. I don't need/want to do the pull manually each time a minor bug is fixed or 1-3 lines of code is changed	08:28
zack_s_	it seems to be that after a "git mv" the history is gone	08:28
Haris	that needs a request coming to me, which is .. tedius or .. cumbersome .. if you know what I mean	08:29
alcohol	Haris: don't you have jenkins/teamcity/insertanyotherCItool ?	08:29
	← ashokrajar left	08:30
	→ edmund joined	08:30
	→ MattMaker joined	08:31
	← effi left	08:33
edmund	hello! hopefully a quick question: what is the .git/logs directory for? (it looks a bit like .git/refs)	08:33
	← maasha left	08:34
	→ jceb joined	08:34
	→ ambodi joined	08:34
	← MattMaker left	08:36
	← Darcidride left	08:39
	← dc5ala left	08:39
	→ aboccia joined	08:40
SicoWork	edmund: I believe that is information for use by the git reflog command	08:41
alcohol	!gcs might know ?	08:41
gitinfo	[!concepts] "Git Concepts Simplified" explains the basic structures used by git, which is very helpful for understanding its concepts. http://gitolite.com/gcs.html	08:41
jast	yes, .git/logs is for reflogs	08:42
	man git-reflog for details and stuff	08:42
gitinfo	the git-reflog manpage is available at http://jk.gs/git-reflog.html	08:42
	→ otter768 joined	08:43
	→ genbattle joined	08:43
Seveas	zack_s_: you said --no-ff, which is the opposite of --ff-only :)	08:43
	← christech2 left	08:44
edmund	SicoWork: that seems reasonable	08:45
zack_s_	Seveas: I did it like here: http://stackoverflow.com/questions/190431/is-git-svn-dcommit-after-merging-in-git-dangerous#answer-4238528	08:45
edmund	the reason i ask is i'm converting a svn repository using "git svn" and all the tags and branches are there in .git/logs/refs/remotes, but not in .git/refs	08:46
	← absk007 left	08:47
	← CustosL1men left	08:47
	← otter768 left	08:47
zack_s_	using fast forward leads to a broken state in git repository here, why should I use --ff-only?	08:47
	→ nicknikolov joined	08:47
	edmund is tempted just to copy them into .git/refs and hope nothing breaks	08:48
steven	do it.	08:49
	I dont know what this convo is about but manually copying stuff is always good :)	08:49
edmund	manually deleting stuff is even more fun	08:49
Haris	is teamcity windows based ?	08:49
	can it run on linux, if its a web app ?	08:50
	← joo-_ left	08:50
	→ pooh22 joined	08:51
	← GT4066 left	08:51
	→ nfk joined	08:51
	← m0nkmaster left	08:51
	→ Darcidride joined	08:51
	→ hardenedapple joined	08:52
Haris	is there a linux version of teamcity ?	08:52
canton7	Haris, it's java: it runs on anything	08:52
	both the build server and the build agents	08:52
Haris	its giving me an .exe for download on the download page	08:53
canton7	did you try clicking on the 'linux' tab? ;)	08:53
Haris	well, I'm on windows, but I need it for linux	08:53
	my! bad	08:53
	→ nnyk_ joined	08:54
	→ jost joined	08:54
	← daito_ left	08:55
	← Spriz left	08:56
	→ pabens joined	08:57
	→ ArchRogem joined	08:57
	← Obfuscate left	08:59
	→ daito joined	08:59
Haris	can teamcity do stuff on distributed boxes	08:59
	→ Spriz joined	09:00
	→ wlarip_ joined	09:00
Haris	run from one box, pull from git on another box, build java code on another box, deploy java build to another box, etc etc	09:00
	← GPrime left	09:01
	← UukGoblin left	09:02
	→ UukGoblin joined	09:02
	← sparetire_ left	09:02
canton7	Haris, it can have multiple build agents, which are the machines which actually run the builds. When a build is scheduled, a free agent is chosen to run it, provided that that agent is compatible	09:02
Haris	aha! the master/server / agent scenario	09:03
canton7	if "pull from git" means cloning the repository in order to perform the build: that's done either on the build server, or on the build agent performing the build	09:03
Haris	I'v seen this with CDP	09:03
	I knew of capistrano	09:04
	← wlarip left	09:04
canton7	a build can depend on artefacts from another build. So you can have a windows build agent build, say, a shared library, which a mac build agent then uses as part of its build process	09:04
	→ anahumar joined	09:04
	← jceb left	09:05
Haris	got it	09:05
canton7	but TeamCity isn't a deployment tool. It produces build artefacts, but it's not its job to deploy them. It will let you download them, but it doesn't know how to ssh into your production server and deploy your .war for instance	09:05
alcohol	I don't know. that's what we used to do with jenkins.	09:06
	→ GPrime joined	09:06
alcohol	a test job triggered a deployment job.	09:06
	a succesful test job that is.	09:06
canton7	ok, you can have a deployment script run as one of your build steps: that's fine	09:06
rrva	in what scenarios will 'git submodule foreach --recursive 'git clean -ffdx && git checkout . ; git clean -ffdx' not be enough to wipe my workspace?	09:06
	do I sometimes need to add git reset --hard ?	09:06
canton7	but that's your writing a script and getting TC to invoke it: that isn't TC knowing how to do deployments	09:06
	← ManikM left	09:07
Haris	yep. I gathered that	09:07
alcohol	pretty sure TC doesn't know how to do anything until you tell it how to do it :\|	09:07
Haris	that's np	09:07
	I can write triggers for events	09:08
	← oiu left	09:08
anahumar	guys this maybe an offtopic but I need some opinion about it...	09:09
	← teran left	09:09
	← ErKa left	09:09
canton7	alcohol, there are plenty of different built-in build runners and test runners for various project types	09:09
anahumar	how to search for bunch of projects with as many developers as possible in a specific period of time?	09:09
	← D-Boy left	09:09
anahumar	e.g. 5 OS projects with common 50 developers among them	09:09
alcohol	canton7: but you still need to go through the minimal steps of at least creating a job and enabling some triggers and stuff.	09:09
canton7	alcohol, sure	09:09
	→ icedwater joined	09:10
	← BtbN left	09:11
	→ BtbN joined	09:11
	→ m0nkmaster joined	09:12
	← granthatcher left	09:12
	← m0nkmaster left	09:13
	→ jceb joined	09:13
	→ granthatcher joined	09:14
	→ Jackneill_ joined	09:14
	← crestbook left	09:15
	→ D-Boy joined	09:15
	← Jackneill left	09:16
	→ CustosL1men joined	09:16
	→ loremipson joined	09:16
	← edmund left	09:17
	→ arup_r joined	09:17
	→ modocache joined	09:19
	← loremipson left	09:21
	← The_Theramist left	09:21
	→ The_Theramist joined	09:22
	← daito left	09:22
	← modocache left	09:23
	→ joo-_ joined	09:26
	← TinkerTyper left	09:27
	← Takle left	09:27
	→ edux joined	09:27
	← harish left	09:27
	← Pathfinder left	09:28
	← neanderslob left	09:28
	← The_Theramist left	09:29
	→ TinkerTyper joined	09:30
	→ mezod joined	09:30
	← mquin left	09:31
	→ mquin joined	09:31
	← jwest left	09:31
	→ jwest joined	09:31
	← edux left	09:32
	← thepreacher left	09:32
	→ cdown_ joined	09:32
	→ crestbook joined	09:33
	← nicknikolov left	09:34
	→ nicknikolov joined	09:35
	← crestbook left	09:35
	← mquin left	09:35
	→ Saturn812 joined	09:35
	→ mquin joined	09:36
	→ Darcidride_ joined	09:37
	← nicknikolov left	09:37
	→ shaunoo joined	09:37
	→ nicknikolov joined	09:37
	← lorezzed left	09:39
	← sinkensabe left	09:40
	← Darcidride left	09:40
	→ Takle joined	09:40
	← mquin left	09:40
	→ Pathfinder joined	09:41
	→ mquin joined	09:41
	← cdown_ left	09:41
	← Darcidride_ left	09:44
	→ leeN joined	09:45
	← Pathfinder left	09:46
	← mquin left	09:46
	→ mquin joined	09:47
	→ sinkensabe joined	09:48
	← mostlybadfly left	09:48
	→ Pathfinder joined	09:50
	← mquin left	09:51
	→ lindenle joined	09:51
	→ mquin joined	09:51
	← bonswouar left	09:51
	→ bonswouar joined	09:52
	← in3xes left	09:53
	← zotez left	09:54
	→ Nick-S joined	09:55
	← lindenle left	09:55
	→ hahuang65 joined	09:56
	→ Darcidride_ joined	09:56
	→ effi joined	09:56
	→ darkbasic_ joined	09:57
	← darkbasic left	09:58
	→ sdothum joined	09:58
	→ lromanowski joined	09:59
	→ wlarip joined	10:00
	← hahuang65 left	10:00
	← lromanowski left	10:01
	← effi left	10:01
	→ lro joined	10:02
	→ shwaiil joined	10:03
shwaiil	hi	10:03
	← Pathfinder left	10:03
	← anahumar left	10:04
shwaiil	Q: I was working on the wrong branch and did some commits (branchA). I've created a new branch from this now (branchB). I'd like to delete all the commits from branchA ?	10:04
	← D30 left	10:04
	← wlarip_ left	10:04
tobiasvl	shwaiil: !revert	10:05
gitinfo	shwaiil: 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]?	10:05
tobiasvl	shwaiil: you probably want the last one there, should be safe in your case.	10:06
	→ in3xes joined	10:06
	→ ambodi_ joined	10:06
	→ damirm joined	10:07
	← ambodi left	10:07
	← damirm left	10:07
	→ ParanoidNemo joined	10:07
shwaiil	tobiasvl: thanks! I guess in this case the answer is git reset --hard XXX and then pushing this will delete any commits from XXX forward ?	10:08
	→ teran joined	10:08
tobiasvl	correct. XXX will not be deleted, and will be the new HEAD	10:08
	← Gitzilla left	10:08
tobiasvl	or rather, the new branch	10:08
	→ lab_ joined	10:09
shwaiil	tobiasvl: ok, makes sense. why do you say branch ? I'm checking out branchA, reset --hard XXXX, so shouldn't it be called head ?	10:09
tobiasvl	yes, branchA will be reset to point to XXX, as will HEAD	10:10
	since branchA is checked out (HEAD points to branchA)	10:10
Haris	is there a way to non-interactively give password to git pull	10:10
	from a bash script	10:10
alcohol	put it in the url	10:10
shwaiil	sounds good to me, thank you!	10:10
Haris	where in the URL	10:10
	→ stamina joined	10:10
alcohol	ssh://user:password@server/path/to/repo	10:11
	→ teran_ joined	10:11
Haris	aha!	10:11
alcohol	but that isn't very secure	10:11
Haris	that's ok	10:11
alcohol	I figured you'd say that :p	10:11
Haris	I'll take care of that part	10:11
	=)	10:11
tobiasvl	SSH keys are probably a better solution	10:11
canton7	^ many times over	10:11
Haris	with git pull ?	10:12
alcohol	yes	10:12
	git pull uses keys	10:12
Haris	how ?	10:12
tobiasvl	with anything over SSH :P	10:12
alcohol	Haris: https://help.github.com/articles/generating-ssh-keys/	10:12
	← teran left	10:13
	→ t-mart joined	10:13
	← Jackneill_ left	10:13
	← ambodi_ left	10:13
Haris	that's where this tutorial is lacking. it focuses on generating keys, rather than telling how to use them	10:13
	← cdown left	10:13
	← sdothum left	10:14
Haris	I already know how to generate keys, or how to set them up. but how to use them with git ?	10:14
tobiasvl	that should work automagically	10:14
	if you've added the keys to the server and to your ssh-agent	10:15
	→ sdothum joined	10:15
	→ Obfuscate joined	10:16
	→ xrogaan joined	10:16
	← RaceCondition left	10:16
	→ Pathfinder joined	10:17
	← Guest15186 left	10:18
	→ stef_ joined	10:19
	← echo-area left	10:19
	→ marcosscriven joined	10:20
	→ MattMaker joined	10:20
	gitinfo set mode: +v	10:21
stef_	hi everyone. I was trying to remove a file from my git history because at some point I commited a huge version. However the git filter-branch command returns me an error	10:21
	git filter-branch --force --index-filter 'git rm --cached -f --ignore-unmatch tests/protein_folding_results.mat' --prune-empty --tag-name-filter cat -- --all Rewrite 3106e6ce8e29ab9209b058d5f953c67619af8c37 (107/904)fatal: empty ident <> not allowed could not write rewritten commit rm: cannot remove `/shared/sdoerr/Work/htmd/.git-rewrite': Directory not empty	10:21
	← Sceorem left	10:21
stef_	woops, forgot to remove all my info :D oh well	10:21
	so is there a way to bypass or fix this error so I can finally clean my git history?	10:22
	→ kukks joined	10:22
	← kukks left	10:22
	→ kukks joined	10:22
mgedmin	you need to fix the bogus empty ident	10:22
stef_	okay but how do I do that?	10:22
mgedmin	something like git filter-branch --env-filter 'if [ -z "$GIT_AUTHOR_EMAIL" ]; then GIT_AUTHOR_EMAIL=your-email@example.com; fi'	10:24
	→ mostlybadfly joined	10:24
	→ quazimodo joined	10:24
quazimodo	guys	10:24
	i just did	10:24
	git push origin develop	10:24
	+ 5468244...f403827 develop -> origin/develop (forced update)	10:24
	... i never said do a forced update!	10:25
	← MattMaker left	10:25
	→ ambodi joined	10:25
Haris	is there a way to not use ssh-agent. just use some argument to git command to to make it work	10:26
	→ Sceorem joined	10:26
mgedmin	SSH_AUTH_SOCK= git ... # note the space after the =	10:26
quazimodo	I think i've wired up my repo to push develop to something else	10:26
	→ Wiched joined	10:26
stef_	@mgedmin git filter-branch --env-filter 'if [ -z "$GIT_AUTHOR_EMAIL" ]; then GIT_AUTHOR_EMAIL=mymail@haha.com; fi' Rewrite 3106e6ce8e29ab9209b058d5f953c67619af8c37 (107/854)fatal: empty ident [email@hidden.address] not allowed could not write rewritten commit	10:26
quazimodo	i noticed that develop's not chinging when i push to it, unless i do git push origin develop:develop	10:27
	Wiched → Guest17537	10:27
osse	quazimodo: what does git branch -vv say for the develop branch	10:27
mgedmin	stef_, I didn't expect that! perhaps you also need to set GIT_AUTHOR_NAME for those commits?	10:27
Haris	mgedmin: ? I don't quite understand	10:27
mgedmin	Haris, the SSH_AUTH_SOCK tells ssh how to talk to the ssh-agent; if you clear that environment variable, ssh won't use the agent	10:28
quazimodo	osse: a second before you said that I actually changed the upstream for develop	10:28
Haris	I don't have that env var on this box	10:29
	for root	10:29
osse	quazimodo: ahh, praise lord gaben	10:29
mgedmin	then you're not using ssh-agent	10:29
	← DerisiveLogic left	10:29
Haris	that's preferable	10:29
	← snow_ru left	10:29
mgedmin	you want root to be able to access a repo over ssh?	10:29
quazimodo	develop 2bb080a [origin/develop: ahead 1, behind 5] Broken	10:29
	git push origin develop	10:29
	+ f403827...2bb080a develop -> origin/develop (forced update)	10:29
	→ snow_ru joined	10:29
quazimodo	wadafuq	10:30
Haris	no. I want root or nrpe to run a shell script, which will change into another unix user account, to run git pull	10:30
mgedmin	one way is to generate ssh keys for root (/root/.ssh/id_rsa etc.) and put them in in the authorized_keys on the git server	10:30
osse	quazimodo: that is reasonable	10:30
quazimodo	i look at gitk, origin/develop hasn't moved	10:30
mgedmin	the unix account that is doing the git pull needs to have its own ssh key	10:30
	(or you could rely on ssh agent forwarding and setting up SSH_AUTH_SOCK correctly)	10:30
	(but let's not get into that)	10:30
Haris	having keys is not the issue. running what git command to specify which key to be used, is the Q	10:30
quazimodo	git push origin develop:develop	10:31
	! [rejected] develop -> develop (non-fast-forward	10:31
jantje	hi	10:31
osse	quazimodo: if the push had gone through then the 5 commits it claims you are behind would be lost. that is why the push is rejected	10:31
quazimodo	ok, so git push origin develop is clearly not pushing to origin/develop branch	10:31
	weird as!	10:31
mgedmin	Haris, why is the key not ~/.ssh/id_*?	10:31
jantje	Is there a way to rebranch a remote branch without having to fetch it first?	10:31
tobiasvl	quazimodo: no, that pushes develop branch to origin. man git push	10:31
gitinfo	quazimodo: the git-push manpage is available at http://jk.gs/git-push.html	10:31
quazimodo	osse: yeah but when i do git push origin develop, it says that it did a forced update (which it hasn't)	10:31
mgedmin	Haris, AFAIU you can write a wrapper script that runs ssh -i /path/to/key "$@", and then set GIT_SSH=/path/to/your/wrapper	10:32
osse	quazimodo: no it doesn't. it says 'rejected' right there	10:32
quazimodo	osse look	10:32
	i'll do it again	10:32
	→ anahumar joined	10:32
quazimodo	$ git push origin develop	10:33
	+ a008bc8...96e73d8 develop -> origin/develop (forced update)	10:33
	Why does that say forced update?? I never dida forced update?!	10:33
osse	that is weird	10:33
mgedmin	Haris, another (better maybe?) option is to create ~/.ssh/config that specifies the right IdentityFile (where ~ is the home directory of the user account that runs git pull)	10:34
quazimodo	here's where it gets weird	10:34
	$ git push origin develop:develop	10:34
	! [rejected] develop -> develop (non-fast-forward)	10:34
	expected behaviour, but ONLY if i say develop:develop	10:34
osse	quazimodo: I think I get it	10:34
	quazimodo: what does 'git config remote.origin.push' say ?	10:34
quazimodo	I think my git's pushing my local develop to some other remote branch	10:34
	+refs/heads/:refs/remotes/origin/	10:34
osse	quazimodo: that + at the beginning is not default	10:35
	quazimodo: the + means force is allowed	10:35
quazimodo	0_o	10:35
osse	it's as if you run push -f every time	10:35
	← granthatcher left	10:35
quazimodo	hrm	10:36
Haris	check your shell aliases/functions	10:36
quazimodo	fetch = +refs ....	10:36
	what does that mean	10:36
mgedmin	Haris, oh, git 2.3 also got support for GIT_SSH_COMMAND: http://stackoverflow.com/a/27607760/110151	10:36
osse	quazimodo: that is default. it means forced updates are allowed when you fetch	10:36
_ikke_	if you do develop:develop, you override the default refspec, that's why it doesn't force then	10:36
Haris	I'm on 1.6 or 7 I believe.	10:36
	hold please	10:36
quazimodo	ok	10:36
	osse: so here's the thing	10:36
	i removed that line, now it's not doing the forced updates	10:36
	but the weirdest partof it was	10:36
	→ johnson318 joined	10:37
mgedmin	Haris, well, I gave you four options, three of which should work with git 1.6	10:37
quazimodo	it was forcing up, then nothingwas catually visibly changing	10:37
	→ Err404NotFound joined	10:37
	← Error404NotFound left	10:37
Haris	=)	10:37
	I'm just trying to gulp them	10:37
quazimodo	so, i presume that +refs/heads/:refs/remotes/origin/ isn't actually legal	10:37
mgedmin	or was it five options?	10:37
quazimodo	probably it had to be like +refs/heads/develop:refs/remotes/origin/develop ?	10:37
_ikke_	quazimodo: That's the default fetch refspec there	10:37
	→ ambodi_ joined	10:38
quazimodo	_ikke_: yeah, so it's not valid for push is it?	10:38
osse	quazimodo: oh I get it. you don't push to the branch named 'develop' on the other side. you push to the branch named 'origin/develop' on the other side. the whole thing is fucekd	10:38
	← encod3 left	10:38
quazimodo	hrm	10:38
	i don't know when/how i put that there	10:38
	but imust have	10:38
_ikke_	quazimodo: Well, I think it is valid	10:38
quazimodo	OR one of my coworker fuckasses did	10:38
	→ encod3 joined	10:38
	→ granthatcher joined	10:38
_ikke_	quazimodo: If it wasn't valid, git wouldn't allow you to push at all	10:38
osse	maybe some third party tool did	10:38
quazimodo	maybe	10:39
osse	maybe not	10:39
quazimodo	_ikke_: it doesn't do the expected	10:39
	well, depends who expects	10:39
_ikke_	quazimodo: Unexpected != invalid	10:40
	It does exactly what is specified	10:40
	← ambodi left	10:40
	→ granthatcher_ joined	10:41
	← intellix left	10:42
Haris	I have one confusion	10:43
	one only	10:43
	← granthatcher left	10:43
stef_	hey mgedmin. After fixing the mail and username I try to push but it tells me that it failed to push due to non-fast-forward updates	10:43
	→ otter768 joined	10:44
quazimodo	Haris: lucky boy	10:44
osse	Haris: why is the speed of light so low?	10:44
stef_	it tells me to pull to merge remote changes. but if I pull it just reverts back to an empty mail	10:44
osse	stef_: push -f	10:44
Haris	I'v setup the pub keys as authorized. how do I specify which key the git pull command will be using with the url	10:44
stef_	ok	10:44
Haris	will it be in the command or in the ~/.ssh/config ?	10:44
mgedmin	stef_, filter-branch is for seriously rewriting history; that's why you need push -f	10:44
	→ harish joined	10:45
mgedmin	(and everyone who has that branch checked out will feel PAIN)	10:45
osse	Haris: the latter	10:45
Haris	aha!	10:45
mgedmin	Haris, up to you!	10:45
Haris	I'm just not able to understand how to put it in the command. I'm checking out how to set it up in ~/.ssh/config	10:46
mgedmin	http://stackoverflow.com/questions/14220929/git-clone-with-custom-ssh-using-git-ssh-error has examples	10:46
Haris	aha!	10:46
	← genbattle left	10:46
	→ cdown joined	10:47
	← otter768 left	10:48
	→ delinquentme joined	10:49
	← nnyk_ left	10:49
	→ DerisiveLogic joined	10:50
	→ zotez joined	10:50
	→ skylite joined	10:51
	→ shabazy joined	10:51
	→ jayeshsolanki joined	10:51
	← anahumar left	10:53
	← delinquentme left	10:54
	← TinkerTyper left	10:54
	← basiclaser left	10:54
	→ dsdeiz_ joined	10:55
	← zotez left	10:55
	← dsdeiz left	10:57
	← Dragooon left	10:57
	← jost left	11:00
	→ TinkerTyper joined	11:00
	→ clarkpan joined	11:00
	→ wlarip_ joined	11:00
	← cyphase left	11:00
	← kukks left	11:01
	← shwaiil left	11:01
	← dsdeiz_ left	11:02
	→ mahtennek joined	11:03
	← wlarip left	11:03
	→ mizu_no_oto joined	11:04
	← clarkpan left	11:04
yitzm	I need a few tips on how to set up proper version-controlled environment for a team of PHP web developers on a Linux-based server. Would this be an appropriate channel for this type of questions?	11:04
	← ArchRogem left	11:04
Mo	Hi. Talking with BtbN on #gentoo.de.... Is is the a kind of opposite to bare-repo? Like having a --depth 1 clone without .git/ ? clone --depth 1 has an empty git log, so most information in .git/ is a duplicate of the checkout. Or from another point of view: Using git as a better rsync replacement? Or does the delta mechanism on sync need the .git/ ?	11:05
jast	yes... deltas require existing objects	11:06
	→ skullcrasher joined	11:06
Vaur	yitzm: it's as good as any, do you have specific question or just a general one ?	11:07
jast	if you don't need deltaing, you can use 'git archive' with the --remote option to fetch files without all the metadata, but that has to be enabled/supported on the server side	11:07
	→ modocache joined	11:07
	→ c355E3B joined	11:08
osse	making sures the deltas are small (say, epsilon) is alpha and omega for the next beta	11:08
	→ hacker joined	11:08
Mo	jast: But that is a tarball at the end, I can't do compact delta pull on such a git archive?	11:08
	← mizu_no_oto left	11:08
	→ elsevero joined	11:08
jast	you can't do a 'compact pull' without metadata, period	11:08
	→ kukks joined	11:09
	← keller left	11:09
Mo	I see. So compared to rsync, using git with .git metadata locally this is the price to pay for having compact fast delta synchronization.	11:09
yitzm	yeah, how do you set up source control environment for a team of developers when portion of the source code is stored in database (a cms system)?	11:10
iveqy	yitzm: !gitlab !gitolite	11:10
gitinfo	yitzm: Gitlab is Git hosting similar to Github, but for your own server or on gitlab.com, giving you unlimited free private repositories: http://gitlab.com/	11:10
	yitzm: Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/	11:10
	← daurnimator left	11:10
iveqy	yitzm: you've code in the database?	11:10
jast	Mo: yes, and since metadata is a definite requirement for resolving conflicts, it seems like a no-brainer for the things git is designed for :}	11:11
	← robustus left	11:11
Mo	jast: I know it is not the thing git is designed for, but having git --depth 1 doesn't have conflicts and already throwing away most of git's features.	11:12
	→ ssarah joined	11:12
yitzm	thanks, i'll check it out (i.e, gitlab and gitolite).	11:12
jast	I meant conflicts in a more general sense, e.g. being able to tell whether a file was locally modified	11:12
	← modocache left	11:12
osse	Seveas: ping	11:12
jast	yitzm: versioning content in databases is a fairly complex topic	11:13
Mo	jast: There is no local mod, as we use git for syncing the Gentoo package tree, instead of rsync, because git is faster. I just thought how to avoid duplicate data.	11:13
osse	Seveas: it's cool. I found out	11:13
	← joo-_ left	11:13
jast	yeah, I'm talking about the more general case	11:13
	yeah... git is faster because it can use metadata :)	11:13
	→ joo-_ joined	11:13
	→ daurnimator joined	11:14
jast	have you looked at unison?	11:14
	I'm not actually sure how well that performs	11:14
	but it shares properties with both rsync and git	11:14
	→ nettoweb joined	11:14
Seveas	osse: sorry, dealing with IX'es being flaky	11:14
Mo	jast: Currently Gentoo Portage needs the plain data of the "checkout", otherwise I think about having a --bare-repo . But eventually migrating Portage to use a bare repo to fetch the plain data would slow down the thing. Currently I use squashfs for the plain directory tree already so speed it up.	11:14
	→ cyphase joined	11:15
	→ robustus joined	11:15
Mo	I know unison quite well, but development has stopped. I use it for parts of my $HOME where I need to sync only the latest revision.	11:15
	→ edux joined	11:16
jast	I'm not actually aware of a way to get the performance of git without the metadata	11:16
	← delboy1978uk left	11:16
jast	I don't actually know how good git's support for fetching into shallow repositories is, but I'd imagine if it supports that in the first place, it'd be much less efficient than with a non-shallow repository	11:16
yitzm	one more thing: the production version of the system should only have a subset of the source files stored in the development environment. like, certain tools for testing etc. should not be present in the production version. which mechanism should we implement to install only a subset of source files into the production version?	11:17
	→ nasso joined	11:17
jast	well I guess if the protocol has a depth attribute of some kind, it could work at least, though with some trade-offs	11:18
	← nicknikolov left	11:18
jast	yitzm: for that question the overall procedure for deployment is relevant. if deployment works by grabbing a copy of the repository and then copying files over, a solution would be to alter that	11:19
	... "copy files over" into "copy some files over"	11:19
Mo	jast: just thinking... if .git/ would use no compression and has not even deltas for a --depth 1 then a checkout could actually be hardlinked to it, no?	11:19
Vaur	yitzm: I've never done something like this, but I guess I would do three branches: one for production, one for developpement and one for testing	11:19
jast	Mo: no... git objects have a header containing, at the very least, information about the object's type	11:19
Vaur	testing would contains the tools you want to test	11:20
	← edux left	11:20
Vaur	so you merge the modification you made in developpement with testing and do your test	11:20
	→ wanders joined	11:21
Vaur	once the tests are all ok, you would need to merge the branch developpement into production	11:21
	all modification of the code should be done into the branch developpement	11:21
yitzm	jast, vaur: you mean like, for example, keeping some kind of a meta file with the list of all files which should go into the production version and have some script copy stuff over based on this list. is that the idea?	11:22
Mo	jast: Which urls have the best performance in pull? git:// better than http(s):// ? There is not gits:// only ssh:// which means kind of gitssh:// ?	11:22
Vaur	yitzm: no, I'm talking about the branch feature of git	11:23
jast	yitzm: for instance. you might go a completely different way instead: have the testing-specific stuff in a separate repository, and kind of blend them together in the development environment	11:23
	← ambodi_ left	11:23
jast	what Vaur suggested is an option, too, but with that you'll have to do a lot more merging than normal	11:23
Vaur	https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging	11:23
	← Pathfinder left	11:23
	→ rnsanchez joined	11:23
	→ ambodi joined	11:23
	← Saturn812 left	11:24
Vaur	branch are amazing, I love them :D	11:24
jast	Mo: there isn't that much of a difference. for the small difference there is, arguably git:// has the lowest overhead because it doesn't have to worry about ssh and http stuff.	11:24
	← nettoweb left	11:25
yitzm	Vaur, jast: oh, I see. But a separate repository must be in a separate directory, no? What if I have testing-specific stuff in the same directory as the main code?	11:25
Vaur	yitzm: branch works all in the same repository	11:25
	it's git that take care of switching your files when you switch branches	11:25
	← Arsonide left	11:27
	→ Arsonide joined	11:27
	← ambodi left	11:28
	→ reim_ joined	11:28
	→ michelangelo joined	11:28
	→ tomog999_ joined	11:29
	← Jeff__ left	11:29
yitzm	you mean if i have files f1 and f2 in the same directory i can have branch b1 containing both files while branch b2 will contain only f1 and not f2? is that right?	11:29
	→ bhldev_ joined	11:29
	← tomog999 left	11:30
	→ parcs joined	11:30
	→ KennyRay_ joined	11:30
	→ PaulePan1er joined	11:31
	→ geekthattweaks_ joined	11:31
	→ Keel joined	11:31
	→ xrsanet_ joined	11:31
	→ pigeon_ joined	11:31
	→ Kneiva_ joined	11:32
	→ comps_ joined	11:32
	→ wolog_ joined	11:32
	→ dropdriv1 joined	11:32
bremner	sure, if you want.	11:32
	← donmichelangelo left	11:32
bremner	but when you checkout b2, only f1 will be in your working tree	11:33
	→ cust_ joined	11:33
Hello71	how do I move a change (i.e. "portion of diff") from one commit to another?	11:33
	→ dameloo joined	11:34
	→ salamanderrake_ joined	11:35
	← KennyRayFL left	11:36
	← tzero left	11:36
	← PaulePanter left	11:36
	← Ravana left	11:36
	← pigeon left	11:36
	← xrsanet left	11:36
	← hardenedapple left	11:36
	← reim left	11:36
	← [cust] left	11:36
	← skapunker left	11:36
	← Kneiva left	11:36
	← dropdrive left	11:36
	← wolog left	11:36
	← Vaur left	11:36
	← harish left	11:36
	← flowinho left	11:36
	← kriskropd left	11:36
	← geekthattweaks left	11:36
	← salamanderrake left	11:36
	← comps left	11:36
	→ Kobaz joined	11:36
	→ Peuc joined	11:36
	→ Freeaqingme joined	11:36
	→ Ravana joined	11:37
	Freeaqingme → Guest42642	11:37
	→ niax joined	11:37
	→ harish joined	11:37
	→ Vaur joined	11:37
	→ Brando753 joined	11:37
	→ icedp joined	11:38
	→ hardenedapple joined	11:38
	→ skapunker joined	11:38
	→ tzero joined	11:38
	→ lyang0 joined	11:39
stef_	I am still failing at deleteing the history of a file	11:39
Hello71	meh, I guess i'll use edit rebase and do it manually since it's a small change	11:39
stef_	[username@machine htmd]$ git filter-branch -f --env-filter 'if [ -z "$GIT_AUTHOR_EMAIL" ]; then GIT_AUTHOR_EMAIL=username@machine.url.com; GIT_AUTHOR_NAME=username; fi' Rewrite 0665817ca2e1a78aa43a884378547685ddd78afc (856/856) WARNING: Ref 'refs/heads/release-1.0' is unchanged	11:39
	[username@machine htmd]$ git filter-branch --force --index-filter 'git rm --cached -f --ignore-unmatch tests/fileToDelete.mat' --prune-empty --tag-name-filter cat -- --all Rewrite 3106e6ce8e2	11:39
	→ kriskropd joined	11:39
stef_	Rewrite 3106e6ce8e29ab9209b058d5f953c67619af8c37 (107/1694)fatal: empty ident <> not allowed could not write rewritten commit	11:40
	How is there still an empty ident if I just fixed it one command before?	11:41
	gitinfo set mode: +v	11:41
yitzm	but then, i i make modifications in f1 how do i make sure they get to both branches?	11:41
	→ pcypher joined	11:41
Vaur	yitzm: you need to merge branches	11:41
mgedmin	stef_, add '-- -all' to the end of the 1st git filter-branch	11:42
	er, --all	11:42
stef_	aha, I'll try that	11:42
Vaur	by merging all the modification made in one branches will be applied into the other	11:42
yitzm	i didn't get the last sentence: what do you mean, modifications will be applied into another branch. does it happen automatically, or do i have to merge branches manually all the time?	11:43
	← marcosscriven left	11:43
Vaur	yitzm: you have to merge them	11:43
	← wicope left	11:44
Vaur	git merge otherbranch	11:44
	and git will take care of the rest	11:44
	← pcypher left	11:44
Vaur	and if it cant it will ask you to help him	11:44
	→ hahuang65 joined	11:44
	→ LBV_User joined	11:44
	→ moreirapontocom joined	11:45
	→ effi joined	11:45
stef_	mgedmin, woohoo! I made it past the error. Thanks!	11:45
	oh waitha haha	11:46
	nope, crashed a bit later :D	11:46
	→ dEPy joined	11:46
Haris	ok, so if I have ~/.ssh/id_rsa, and I run git clone, it will auto use my key to authenticate, if my key is setup on the git box ?	11:48
	or git pull	11:48
	← snow_ru left	11:48
stef_	mgedmin, could you take a look at this pastebin? I don't want to spam the whole output here. http://pastebin.com/u5MgdEy2	11:48
	thanks :)	11:48
_ikke_	Haris: It is used for all ssh operations	11:49
	← hahuang65 left	11:49
	→ curiousmansi__ joined	11:49
	→ snow_ru joined	11:49
	→ refried_ joined	11:49
Haris	regardless ?	11:49
	I mean the shell knows to look at ~/.ssh/id_rsa file	11:49
	out-of-the-box ?	11:49
_ikke_	The shell has nothing to do with it	11:50
Haris	if it exists	11:50
	I mean ssh	11:50
	← effi left	11:50
	→ leolrrj joined	11:50
tobiasvl	if ssh-agent is running, then yes, it will be used for all ssh operations	11:50
yitzm	so, practially speaking. in the beginning i create a git repository with the f1 file in it. let's call it 'production'. then, i break off a branch off of it, -- let's call it devl -- and add the f2 file to it. Then, what? Let's say I work in the development branch, modify f1 and what to merge it to production. If I do 'git merge production', the f2 file will get there too, won't it?	11:50
Haris	nope. no ssh-agent	11:50
_ikke_	tobiasvl: Noo, the agent is not necessary	11:50
tobiasvl	oh ok. hehe.	11:50
_ikke_	that's only for remembering passphrases	11:51
	→ ElChicoNube joined	11:51
Haris	I forgot the passphrase part :P. It will still prompt for pass phrase	11:51
_ikke_	yes, if you have set a passphrase, it needs to ask you for it	11:52
	→ linuxmint joined	11:53
	→ soc42 joined	11:53
	← mezod left	11:53
Vaur	yitzm: that's why I talk about 3 branches	11:53
	mgedmin looks	11:54
Vaur	yitzm: you have your production branches and dev branches which contains the files that are currently or will be in production	11:54
	then you have the test branches which contains files to test	11:54
	→ nicknikolov joined	11:55
mgedmin	stef_, uhh, I'm ... uhhh. okay, okay, I think I had this problem once, with a git-svn created repo or something like that	11:55
	→ crestbook joined	11:55
Vaur	when you are doing developping and you want to test you switch to the test branches	11:55
	you merge with the developpement branches	11:55
	← ronskisika left	11:55
mgedmin	stef_, BTW you probably also want to add --tag-name-filter cat to the 1st filter-branch	11:55
Vaur	importing all modification from the developpement branches into the test one	11:55
	you do your test	11:55
stef_	yes I wanted to try that now	11:55
mgedmin	stef_, and you shouldn't run scary filter-branch commands people on IRC tell you to run without fully understanding them	11:56
Vaur	from the test you see wether or not it's ok	11:56
mgedmin	and you should have a backup	11:56
stef_	hahaha	11:56
	I made a backup of the repository just in case	11:56
mgedmin	stef_, so, I'm guessing there might be a root commit somewhere with that empty ID? git filter-branch skips root commits by default	11:56
Vaur	if it's ok, then you can make it go into production	11:56
mgedmin	IIRC the option to rewrite those is to add --root after the --? I don't remember :	11:56
stef_	oh ok that could be the case	11:56
yitzm	Vaur: got you, thank you very much for your help!	11:56
mgedmin	and the manual page doesn't mention 'root'	11:56
Vaur	by going into the production branch and merging it with the developpement one	11:56
	← leolrrj left	11:57
	→ toralf joined	11:57
Vaur	if the test is not ok, than go back into the developpement branches and do the modification that will fix it	11:57
mgedmin	wait, or maybe I didn't use filter-branch?	11:57
Vaur	and so forth	11:57
mgedmin	maybe I did git rebase -i --root and dropped the empty fake root commit created by git-svn-all-export?	11:57
Vaur	yitzm: no problemes	11:57
mgedmin	I don't remember :/	11:57
stef_	mgedmin I am starting to consider just making a new repo without any history	11:58
	← Takle left	11:58
stef_	and be done with it	11:58
Haris	dameloo <- PM spammer - gratis one	11:58
stef_	@mgedmin but thanks anyways for all the help	11:58
	← fstd left	11:59
	→ fstd joined	11:59
	← Err404NotFound left	11:59
	← refried_ left	11:59
mgedmin	stef_, can you use tig --all or something to find the <> commit? see if it has anything interesting in it? does it have any parents e.g.?	12:00
	→ wlarip joined	12:00
	← jmpp left	12:00
	→ dsdeiz joined	12:00
	← ElChicoNube left	12:01
	→ ehmatthes joined	12:02
	→ ambodi joined	12:03
	→ hit_ joined	12:04
	← wlarip_ left	12:04
	→ Cyclohexane joined	12:04
alcohol	oh dang, I think I just ran into a nice phrase to use in discussions at work	12:04
	"If I agreed with you, we would both be wrong."	12:04
Haris	$ PKEY=~/.ssh/keyfile.pem git clone [email@hidden.address] <- how does git know of PKEY ?	12:04
bremner	alcohol: so you work in an elementary school?	12:05
	← ntwari left	12:05
hit_	Hello guys, Im trying to change the editor to vim by running "git config --global core.editor vim", however Im receiving an error message: "fatal: Out of memory? mmap failed: No existe el dispositivo"	12:05
alcohol	bremner: close enough.	12:05
	→ arussel` joined	12:05
hit_	Im on Debian Wheezy 64bit	12:05
Cyclohexane	I just did "git reset --soft HEAD^" hoping it would remove the commit and let me commit it again (I wanted to change the files) but instead it just seems to have removed it from the log... How do I revert that and do what I originally intended?	12:05
alcohol	bremner: some would qualify more for kindergarden I think	12:05
mgedmin	Haris, read the entire answer, that user puts GIT_SSH into the environment that points to their custom ssh wrapper script	12:05
	that checks $PKEY	12:05
Haris	I mean I haven't ? but its working for me ?	12:06
	→ cvanball joined	12:06
	← darkbasic_ left	12:07
mgedmin	that is a very good question indeed	12:07
	→ darkbasic joined	12:07
Haris	I have no GIT env var, but setting PKEY and running git pull worked	12:07
	→ intellix joined	12:07
Haris	this key didn't have passphrase, so it didn't ask one, and it worked	12:07
	so it didn't ask one = and it didn't ask for	12:08
	→ sgambino joined	12:08
Haris	one	12:08
	← arussel left	12:08
	→ MattMaker joined	12:09
	→ ntwari joined	12:10
mgedmin	but does it fail if you don't set PKEY?	12:10
	→ Dorf joined	12:10
Haris	no	12:10
	it works	12:10
	:P	12:10
	→ tristanseifert joined	12:10
	→ dsdeiz_ joined	12:10
	→ Asiajey joined	12:10
	→ Adib joined	12:11
Haris	I just created a key in ~/.ssh/id_rsa and copied ~/.ssh/id_rsa.pub to GIT-box ~/.ssh/authorized_keys	12:11
mgedmin	that's the standard location for the ssh key and ssh will always find it there	12:11
Haris	and it works, without asking for auth	12:11
	ah ok	12:11
mgedmin	if the key has no passphrase set, that's what's supposed to happen	12:11
	← dsdeiz left	12:12
	→ mkoskar joined	12:12
	← moreirapontocom left	12:13
	← MattMaker left	12:14
	→ moreirapontocom joined	12:14
	← dsdeiz_ left	12:15
	→ mezod joined	12:15
	→ dsdeiz joined	12:16
	→ edux joined	12:17
	→ echo-area joined	12:19
	→ AustinTheGrey joined	12:20
	← AustinTheGrey left	12:20
	← dameloo left	12:21
	← edux left	12:21
	→ hohum joined	12:21
	→ achadwick joined	12:22
	→ modocache joined	12:23
	← ParanoidNemo left	12:25
	← kaiten02_ left	12:25
	→ darkbasic_ joined	12:28
	← modocache left	12:28
	→ dougsland joined	12:28
	→ ReekenX joined	12:28
	← darkbasic left	12:28
	← ewong left	12:29
	→ leolrrj joined	12:30
	→ benborges joined	12:30
	← toralf left	12:31
	← stamina left	12:32
	→ Jetchisel joined	12:32
	→ jrajav joined	12:33
	← cvanball left	12:34
	→ arussel`` joined	12:35
	→ wlarip_ joined	12:35
	→ kaiten02 joined	12:35
	→ fancy42 joined	12:35
fancy42	i'm running a python script on my pre-receive hook. how can i get all commits that are part of that push?	12:36
	→ dstarh joined	12:36
jantje	git rev-list $first $last	12:36
	→ wlarip- joined	12:37
	→ zsoc joined	12:37
	← johnson318 left	12:37
	← wlarip left	12:38
	← arussel` left	12:38
fancy42	what does the dollar sign do?	12:38
	→ mellernoia joined	12:39
	← wlarip_ left	12:39
zsoc	I don't have a question. I'd just like to say that some guys just implemented a git deployment system for a .net project... not testing very thoroughly. When they made the next commit to the dev branch the next morning, they didn't realize (or bother checking) that their wonderful deployment system checked out this HEAD to production. So I have a broken application, in production, with the two dev's signed off for the day and the project lead not in for another h	12:39
	our.	12:39
	→ wlarip joined	12:40
qsuscs	zsoc: !beer	12:40
gitinfo	zsoc: Beer! It's what's for dinner!	12:40
zsoc	What a good idea.	12:41
	← kaiten02 left	12:41
	← wlarip- left	12:41
	← arup_r left	12:43
alcohol	zsoc: git checkout EARLIERREVISION	12:44
	← gambler left	12:44
zsoc	It's not my project. I'm a customer. I have key access to git but not to the server it's deployed on. At least I have no idea if I do, it's a windows box.	12:44
	→ otter768 joined	12:44
zsoc	I can try re-commiting a previously working commit and see if their magical deployment hooks fix it lol	12:44
alcohol	windows.. ewwwie. /me gets out a 10 foot pole	12:45
	alcohol pokes the box	12:45
alcohol	is it alive?	12:45
zsoc	It's a .net project. Honestly it's the reason why it's not my project. I stand from back here and poke it with that thing, just like that actually.	12:45
	→ Texan joined	12:45
alcohol	zsoc: git revert REVISIONTHATBROKEIT	12:45
	why do I keep calling it a revision	12:46
zsoc	sure, but like i said i have no idea what their deployment system is doing.. i don't see logs of any sort. Reverting a commit may very well do nothing but alter the git history	12:46
	likely in fact, i doubt any deployment system they concocted does more than bare minimum... they would have to account for reverting heh	12:46
	← kp666 left	12:46
alcohol	revert is just another new commit	12:47
	which undoes the previous commit	12:47
zsoc	Sure lets give it a go.	12:47
alcohol	a deployment system wouldn't be able to tell that	12:47
	← tristanseifert left	12:47
alcohol	errr, s/previous/mentioned/	12:47
YoungFrog	if you're supposed to commit to that repo, and a previous commit broke the system, I think it's a good move to revert the broken commit, even if it doesn't fix the deployed app.	12:47
alcohol	YoungFrog: well it broke cause it's a development branch it seems, but it got released to production.	12:48
zsoc	well it's a dev repo. The problem is that whatever their shiny new deployment system is doing decided to push it to production for some reason	12:48
	← ckruczek left	12:48
zsoc	I don't care, I'll revert it. It'll be in history heh.	12:48
alcohol	they can revert the revert if they want to keep working on it	12:48
YoungFrog	otoh, 1h isn't that much to wait if you have beer at hand	12:48
alcohol	after fixing their deployment tool that is	12:48
hit_	Any ideas on why I cannot change any git global config variable? I keep receiving the message: "fatal: Out of memory? mmap failed: No existe el dispositivo" when I try	12:48
	← DerisiveLogic left	12:49
alcohol	"when I try" what?	12:49
	what are you trying?	12:49
	← otter768 left	12:49
hit_	git config --global user.name "hit"	12:49
alcohol	uh..	12:49
	→ Siente joined	12:49
	← cyphase left	12:49
	→ newbie1 joined	12:49
alcohol	do you have an alias for git by any chance?	12:49
hit_	nop	12:49
	← mmitchell left	12:50
Siente	hello guys, how can I checkout a file from a previous commit?	12:50
hit_	it happens on every command	12:50
alcohol	what if you try 'git' config --global etc	12:50
	those quotes are intentional	12:50
Siente	I want to checkout only 2 files from the previous commit	12:50
hit_	git config --global core.editor vim	12:50
	does the same	12:50
	→ Vadimus joined	12:50
alcohol	try the above	12:50
bremner	or a script wrapping git	12:50
alcohol	with the quotes	12:50
	what does "which git" return ?	12:50
	← newbie1 left	12:50
	→ PRIM4T joined	12:51
hit_	with the quotes show the same error	12:51
	/usr/bin/git	12:51
alcohol	eh	12:51
hit_	thats which git output	12:51
alcohol	and what does /usr/bin/git config --global ...	12:51
	errors too?	12:51
	← stef_ left	12:52
hit_	yep, the same	12:52
alcohol	did you try turning it off and on again? :\|	12:52
	→ FreezingCold joined	12:52
	← curiousmansi__ left	12:52
hit_	turning it off?	12:52
alcohol	the computer	12:52
hit_	oh	12:52
	I'll try	12:52
	→ bitkiller joined	12:52
	← hit_ left	12:52
alcohol	unless you're on windows, I doubt that will fix anything	12:53
Vaur	his mmap was failing which means he run out of space, memory or disk, dont know which one	12:53
qsuscs	well, if some other process ate all their memory …	12:53
	→ lindenle joined	12:53
YoungFrog	well, the error message says that a device is missing. it might mean git tries to access a device that went away. Perhaps network filesystem ?	12:53
qsuscs	but "No existe el dispositivo", wtf is dispositivo?	12:54
Vaur	alcohol: if it's just his that doesnt have enough space it should fix it	12:54
alcohol	my mexican isn't so good	12:54
YoungFrog	I think it's "device"	12:54
	→ DerisiveLogic joined	12:54
Vaur	qsuscs: device	12:54
	might be a disk issue	12:54
qsuscs	ahh	12:54
YoungFrog	if he doesn't have enough space, maybe it'll just mean he won't be able to reboot ;)	12:54
qsuscs	yeah, the spanish i learnt was not really computer-centric	12:55
	← Nick-S left	12:55
alcohol	cerveza	12:55
	most important word	12:55
	→ hit_ joined	12:55
Vaur	YoungFrog: well linux is really good at working even if there isn't enough space	12:55
	→ tristanp joined	12:55
	← reim_ left	12:55
Vaur	trust me :p	12:55
hit_	alcohol: didnt work	12:55
alcohol	hit_: df -h ?	12:55
bremner	hit_: try running under strace	12:55
alcohol	hit_: free -m ?	12:55
	→ mizu_no_oto joined	12:56
qsuscs	or as i once described it, “i could probably write ten pages about the sitation of a moroccan immigrant in spain, but i couldn’t order a sandwich in a tapas bar without insulting the mother of the guy at the counter”	12:56
hit_	http://pastebin.com/qnccNc13	12:56
	http://pastebin.com/prCbkB7g	12:56
	← zumba_addict left	12:56
hit_	bremner: whats strace?	12:56
	← leolrrj left	12:57
alcohol	looks healthy enough	12:57
	← lindenle left	12:58
alcohol	hit_: it's like.. debugging	12:58
	but you have to install it first, probably	12:58
	I don't think that's a default package on most systems	12:58
	→ modocache joined	12:58
YoungFrog	short story: prepend "strace " to the command line and redirect output to a file.	12:58
zsoc	Oh god. This is priceless. So the autodeployment is only on the DEV branch. It's merged with master, but only hooks on dev commits. So master commits don't deploy, but dev commits do. To production.	12:58
hit_	is there any global config file I can write directly? I have try with ~/gitconfig but it is ignoring it	12:58
	→ Takle joined	12:58
alcohol	zsoc: that sounds sane. buy them cake.	12:58
	hit_: ~/.gitconfig	12:59
YoungFrog	hit_: should be ~/.gitconfig	12:59
hit_	yes	12:59
	i mean that	12:59
	sorry, typo	12:59
alcohol	alternatively, try git config --global -e	12:59
	← parcs left	12:59
alcohol	or git config --local -e	12:59
	→ sfeinste joined	12:59
	→ jerius joined	12:59
alcohol	see if local contains variables that could overrule global	12:59
	→ wlarip_ joined	13:00
YoungFrog	there's a FILES section in man git config	13:00
gitinfo	the git-config manpage is available at http://jk.gs/git-config.html	13:00
	→ Bass10 joined	13:00
	← jerius left	13:01
	→ RaceCondition joined	13:02
hit_	oh its solved now, I had a bad folder	13:02
yitzm	in order to version-contol code stored in MySQL database, i was thinking of doing a mysqldump of relevant tables and version-controlling the resulting text files. does this look feasible, or is it a crazy idea?	13:02
hit_	I had a folder called .gitconfig too, thats why it cannot write	13:02
	haahaa	13:02
	← bsanford left	13:02
hit_	thanks guys	13:03
Vaur	14:56:47 hit_ \| bremner: whats strace?	13:03
yitzm	+ any other suggestions?	13:03
	→ Saturn812 joined	13:03
Vaur	strace is a program that allow you to see every system call made by a program	13:03
	→ jost joined	13:03
Vaur	it also show the given parameter iirc	13:03
alcohol	having a folder named .gitconfig caused that mmap error?	13:03
	dafuq	13:03
YoungFrog	yeah +1 for the nice error message	13:04
Vaur	alcohol: well it makes sense	13:04
hit_	Thanks Vaur, didnt now that	13:04
alcohol	yes and no	13:04
Vaur	alcohol: git tried to open it has a file	13:04
	← wlarip left	13:04
jast	mmapping directories has to fail in some way	13:04
	→ cyphase joined	13:04
alcohol	if there is no sanity checks in git, I guess it would just epicly fail when trying to open it as a file	13:04
	then it makes sense	13:04
	but then I ask, why are there no sanity checks? :<	13:04
jast	and we need to conserve error codes to save the planet :}	13:04
Vaur	guess there is a check that is missing	13:05
jast	alcohol: probably because It Works(tm)	13:05
	→ happy-dude joined	13:05
alcohol	jast: works on my computer(tm) is better	13:05
jast	WFM	13:05
alcohol	anyway, I guess there will be a fix soon(tm), amirite?	13:05
	→ knownasilya joined	13:06
	← Spriz left	13:06
	wlarip_ → wlarip	13:06
jast	almost as soon as someone submits a patch!	13:07
Vaur	it works here	13:07
	no issues	13:07
	guess he is on a older version	13:08
	→ Spriz joined	13:08
Vaur	hit_: can you do this commande:	13:08
	git --version	13:08
hit_	git version 1.9.1	13:08
alcohol	ah	13:08
Vaur	hummm	13:08
jast	I get a cryptic error, too, when trying to set config	13:08
alcohol	git version 2.4.1	13:08
	i win	13:08
	→ Pathfinder joined	13:08
Vaur	git version 1.7.10.4	13:08
jast	(2.3.0 rc0)	13:09
	jast updates...	13:09
	← bannakaffalatta left	13:09
Vaur	hit_: I would suggest to see if there is already a bug report for that issue and if not make one	13:09
jast	what is this "bug report" you speak of	13:09
alcohol	so I guess it was introduced some time _after_ 1.7.x ?	13:09
	Vaur: assuming you do not get an error	13:10
	jast: it's like mailing lists. or news groups. they're kind of obscure.	13:10
hit_	Vaur: I'm really noob on git, how can I do that?	13:10
jast	look at the mailing list archives and a send a mail if nothing comes up. !list	13:11
gitinfo	[!mailing_list] The mailing list can be reached via [email@hidden.address] You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://j.mp/gitlist	13:11
hit_	ok	13:11
	← hacker left	13:11
alcohol	weird, 2.4.1 does not error when I mkdir ~/.gitconfig	13:11
	or should the .gitconfig directory be inside a repo?	13:12
jast	no	13:12
hit_	I had only a folder called .gitconfig, no file	13:12
jast	the error only happens when you try to write config	13:12
alcohol	i have no file	13:12
hit_	and I edited before with vim	13:12
jast	git config --global user.name foo	13:12
	← Vadimus left	13:12
alcohol	ah ok, that errors	13:13
	I thought you said all git commands threw an error though	13:13
Vaur	vaur@vaur:~$ git config --global user.name "vaur"	13:13
	fatal: Out of memory? mmap failed: Aucun p?riph?rique de ce type	13:13
	fatal: Out of memory? mmap failed: Aucun p?riph?rique de ce type	13:13
	→ daviorocha joined	13:13
jast	I dunno what others said. I said nothing. ;)	13:13
Vaur	I was mistaken	13:13
alcohol	no sorry, that was hit_	13:13
Vaur	it's also in my version	13:13
alcohol	fatal: Out of memory? mmap failed: No such device	13:13
Vaur	alcohol: yeah I made the same assumption	13:14
	← Jetchisel left	13:14
alcohol	yeah ok	13:14
	hit_: just report it to that list above, reproduce steps, etc	13:14
hit_	yep, im on it	13:15
alcohol	!perror 128	13:15
	aww	13:15
	← Siente left	13:17
	→ Jeff__ joined	13:17
	→ tvw joined	13:17
	→ bsanford joined	13:17
	→ Nizumzen joined	13:18
	← dEPy left	13:18
	→ ajf- joined	13:18
	→ zematis joined	13:18
	→ ashokrajar joined	13:18
	→ curiousmansi joined	13:19
	→ martin- joined	13:20
	→ zivester joined	13:20
jast	.strerror 128	13:21
	← gitinfo left	13:21
jast	whoops ;)	13:21
	← jrajav left	13:21
	← intellix left	13:21
	← skylite left	13:21
	← rchavik left	13:21
	← klj left	13:21
	→ skylite joined	13:22
	→ gitinfo joined	13:23
	ChanServ set mode: +o	13:23
	← crestbook left	13:23
	→ jwhisnant joined	13:23
	← gitinfo left	13:25
	← Spriz left	13:25
	→ gitinfo joined	13:26
	ChanServ set mode: +o	13:26
	← gitinfo left	13:26
	← gambl0re left	13:26
YoungFrog	jast: what did you to do that poor bot ?	13:26
	jast whistles innocently	13:27
	→ gitinfo joined	13:27
	ChanServ set mode: +o	13:27
	→ weiyang joined	13:28
	← weiyang left	13:28
jast	.strerror 128	13:28
gitinfo	strerror(128): Key has been revoked	13:28
jast	I present to you: the least useful feature ever added to gitinfo!	13:28
	← sarri left	13:28
osse	.strerror(69)	13:28
gitinfo	strerror(69): Srmount error	13:28
osse	mount error hee hee hee	13:29
alcohol	wat	13:29
	→ weiyang joined	13:29
	← weiyang left	13:29
osse	.strerror(0)	13:29
gitinfo	strerror(0):	13:29
	→ m0ltar joined	13:29
jast	.strerror 1	13:29
gitinfo	strerror(1): Operation not permitted	13:29
	→ weiyang joined	13:29
	→ sublimate joined	13:29
	→ sarri joined	13:30
	→ denete joined	13:30
	← weiyang left	13:30
jast	btw 0 is not a valid errno	13:30
	→ weiyang joined	13:30
	← weiyang left	13:30
	← Bass10 left	13:31
	→ weiyang joined	13:31
	→ hahuang65 joined	13:33
	→ zumba_addict joined	13:34
	→ delboy1978uk joined	13:34
	← martin- left	13:34
	← jceb left	13:34
	→ crestbook joined	13:34
	→ darkbasic joined	13:34
	→ cbonobo joined	13:35
	← zumba_addict left	13:35
	→ Gamecubic joined	13:35
	→ zumba_ad_ joined	13:35
	← darkbasic_ left	13:36
	→ codeFiend joined	13:36
	→ charginghawk joined	13:37
charginghawk	how can I get info about a remote repo?	13:37
	I want to know more about it before I clone it	13:37
	→ Es0teric joined	13:37
	← netj left	13:37
osse	what info ?	13:37
	→ ncd\|leeN joined	13:37
charginghawk	size, number of files	13:37
	→ Spacew00t joined	13:38
	→ netj joined	13:38
	→ intellix joined	13:38
charginghawk	maybe a clone dry run	13:38
	← hahuang65 left	13:38
	← Darcidride_ left	13:38
osse	i don't think git can tell you that off the bat	13:38
	→ Darcidride_ joined	13:38
	→ scaceres joined	13:39
	→ leolrrj joined	13:40
	← RaceCondition left	13:40
charginghawk	git fetch has a dry run option, can I use that instead of clone?	13:40
	← nixter1029 left	13:40
	← zumba_ad_ left	13:40
	→ zumba_addict joined	13:40
scaceres	is there a way I can push to a remote repository using HTTP and skip the username/password interactive prompt ?	13:41
osse	if you init first	13:41
	← leeN left	13:41
scaceres	like passing the user:pass pair inside the git push command, for example.	13:41
osse	scaceres: man git-credential	13:41
gitinfo	scaceres: the git-credential manpage is available at http://jk.gs/git-credential.html	13:41
	→ BlaXpirit-UA joined	13:41
	← zumba_addict left	13:41
	→ AaronMT joined	13:41
	← ashokrajar left	13:42
	→ IrishPrime joined	13:42
	→ anahumar joined	13:42
	→ pm90_ joined	13:43
	← curiousmansi left	13:43
	← linuxmint left	13:43
	← sdothum left	13:43
	→ f3lp joined	13:43
	→ ewong joined	13:43
scaceres	that's exactly what I needed, thanks!	13:43
	← scaceres left	13:43
	→ interrobangd joined	13:44
	← BlaXpirit left	13:44
anahumar	how to search for project with this critiria .... 5 or more projects with more than 10 common developers and in a period of 6 to 12 months?	13:44
charginghawk	so yeah, the answer to my question is to run git init, and then git fetch --dry-run git://example.com/repo.git	13:44
anahumar	are there other channels to ask such thing than github?	13:45
charginghawk	thanks +osse!	13:45
	← ReekenX left	13:45
	← delboy1978uk left	13:45
	→ ReekenX joined	13:45
	→ chitopunk joined	13:46
	← paulweb515 left	13:46
	→ dreiss joined	13:47
	→ pm90__ joined	13:47
	← leolrrj left	13:47
	← pm90_ left	13:48
	← sublimate left	13:48
	→ CEnnis91 joined	13:48
	→ jceb joined	13:49
	→ cbruegge joined	13:49
	→ leolrrj joined	13:49
	→ Muhannad joined	13:50
	← skylite left	13:51
	← Haris left	13:52
	← gox39 left	13:53
	→ Haris joined	13:53
	← Pathfinder left	13:55
	← _Vi left	13:55
	→ endiruna joined	13:55
	← cbruegge left	13:56
	→ cbruegge joined	13:56
	→ Spriz joined	13:57
	→ AMERICAN_PSYCHO joined	13:57
	→ MattMaker joined	13:58
	→ edux joined	13:59
	← denete left	14:00
	← rzeka left	14:00
	← pm90__ left	14:00
	→ denete joined	14:00
	→ wlarip_ joined	14:00
	→ marcusdei joined	14:00
	→ pm90_ joined	14:00
	→ t4nk485 joined	14:02
	← MattMaker left	14:02
	→ thiago joined	14:02
	← jceb left	14:02
	← Tuna-Fish left	14:02
	→ bannakaffalatta joined	14:03
	← wlarip left	14:04
	← vixterra left	14:04
	← bsanford left	14:05
	→ sublimate joined	14:06
	← DerisiveLogic left	14:06
	← marcusdei left	14:06
	← t4nk485 left	14:06
	→ rfreeman_w joined	14:06
	→ northfurr joined	14:07
rfreeman_w	hi, when there is a gpg signed commit by me, and later I rebase someone's else work, then it seems my signature from my commit can be removed	14:07
	gitinfo set mode: +v	14:07
rfreeman_w	hi, when there is a gpg signed commit by me, and later I rebase someone's else work, then it seems my signature from my commit can be removed	14:07
	I guess it's because I did signed my commit in context of if it's old parent, not of the new parent that appeared/changed with rebase	14:08
	should I then re-sign all my commits/	14:08
	or what? is there a proper way to automate this? what is your workflow	14:08
preyalone	In Git Flow, do you bump develop's minor version (e.g., in pom.xml files) as soon as you create the release candidate? Or do you keep develop's version number the same until rc is finished and tagged?	14:09
	→ DerisiveLogic joined	14:09
	→ dEPy joined	14:09
	→ postsneakernet joined	14:09
	→ converge joined	14:09
	→ delboy1978uk joined	14:10
	← rsmarshall left	14:10
	← zivester left	14:11
	→ zadock joined	14:11
	← nasso left	14:12
	→ zvz joined	14:13
	→ Tuna-Fish joined	14:13
zvz	Newbie question. I want to use git to maintain my dotfiles across three different systems (OpenBSD, Linux, and OSX). Most of the files' contents should be about the same, but many will have small variations. I want to keep the "same" parts of them in sync while maintaining the OS-specific differences. What's the best place in the Git documentation to start looking?	14:15
	← pks left	14:15
Eugene	zvz - !configfiles	14:15
gitinfo	zvz: It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas	14:15
	wlarip_ → wlarip	14:16
	→ Kicer86 joined	14:16
	→ drosophil joined	14:16
	→ oiu joined	14:17
	← Tuna-Fish left	14:17
	gitinfo set mode: +v	14:17
	→ Tuna-Fish joined	14:17
	→ bsanford joined	14:17
	→ Abyx joined	14:17
	→ jceb joined	14:18
	← Nizumzen left	14:18
	← zematis left	14:18
	→ drfoo joined	14:18
drosophil	Hello. When i choose "raw" in gitweb, i get Content-Type: text/html; charset=ISO-8859-1 . How to fix charset?	14:19
zvz	thanks, I'll look into it	14:19
	← drfoo left	14:19
	← jayeshsolanki left	14:19
	→ darkbasic_ joined	14:20
	← DerisiveLogic left	14:21
	→ Pseudocrat joined	14:21
	← darkbasic left	14:21
	→ drfoo joined	14:21
	→ DerisiveLogic joined	14:22
	← dEPy left	14:22
	→ elementalest joined	14:22
	← bgerber left	14:24
	→ jolda joined	14:24
	→ Wiched joined	14:25
	→ rubyonrailed joined	14:25
	← mahtennek left	14:25
	Wiched → Guest16452	14:25
Eugene	drosophil - github has been providing "raw" as that Content-Type for a while as a XSS preventative; AFAIK there's no way to change those settings as a client	14:25
	Best I can suggest is to obtain the repo proper, rather than getting a specific file. man git-archive or git-clone	14:26
gitinfo	the git-archive manpage is available at http://jk.gs/git-archive.html	14:26
	← interrobangd left	14:26
	← moretti left	14:26
	→ Raging_Hog joined	14:26
Eugene	(pretty sure github supports remote archive usage)	14:26
	→ nardev joined	14:27
	← Jeff__ left	14:27
	→ bgerber joined	14:27
	→ refried_ joined	14:27
	→ klj joined	14:28
Eugene	Nope, I'm a liar. THey don't. :-(	14:28
	→ darkbasic joined	14:29
	← darkbasic left	14:29
drosophil	i want to watch html file in browser so obtaining the whole repo is not an option	14:29
	← darkbasic_ left	14:29
	← crestbook left	14:30
Seveas	Eugene: there's a thirdparty thing that serves these raw files with "correct" content-type	14:30
Eugene	Sounds exciting	14:30
	→ highcup joined	14:30
Seveas	yes, if only I could remember it's name/url	14:30
	→ darkbasic joined	14:30
	→ jrajav joined	14:30
Seveas	ah, rawgit.com	14:30
osse	Seveas: about what I wanted help with earlier: the answer is "FEBO". not sure you want to hear the question :p	14:30
Seveas	osse: given how disgusting the answer is, no, I do not want to know the question.	14:31
	← mkoskar left	14:32
osse	:D	14:32
	← refried_ left	14:32
	→ txomon\|home joined	14:32
	→ jmpp joined	14:32
	← Adib left	14:32
	← zackiv31 left	14:32
	→ Jeff__ joined	14:33
	← rath left	14:33
	→ gambl0re joined	14:33
yitzm	version control for code stored in database: dump the relevant tables and git the resulting text file -- is this feasible?	14:34
	← howlymowly left	14:35
	← bannakaffalatta left	14:35
RichiH	yitzm: if you have re-omport sorted, why not	14:35
iveqy	yitzm: I'm really curious, why do you have source code in your database?	14:35
RichiH	not pretty, but...	14:35
Seveas	iveqy: stored procedures?	14:36
iveqy	yitzm: and it's almost feasible, the question is if you can import into your database again, and if you can solve a conflict	14:36
	Seveas: true, didn't thought of that one.	14:36
	I'm a bit surprised that noone has been able to do a good version control for databases. It's a quite hard problem	14:37
Eugene	They have. It's called "a database"	14:37
iveqy	Eugene: that does not solve the problem of having code using a specific version of the database schema	14:38
	→ howlymowly joined	14:39
	← drfoo left	14:39
PerlJam	iveqy: http://sqitch.org/ (I dunno if you'd call that "good")	14:39
	← codeFiend left	14:40
	← synthmeat left	14:41
	← causasui left	14:41
	→ _Vi joined	14:41
	← weiyang left	14:42
	← sinkensabe left	14:42
	→ wicope joined	14:42
	→ synthmeat joined	14:43
	→ livingstn joined	14:43
	→ hiptobecubic joined	14:43
	→ lpapp joined	14:43
lpapp	hi, what was the command again to ignore files with git? (not .gitignore)	14:44
	← zvz left	14:44
	← converge left	14:44
lpapp	because the file is supposed to be changed from time to time, but NOT by me and so I would like to completely ignore it.	14:44
	I know that I used to use a long command for this.	14:44
	but I cannot recall it.	14:44
Eugene	lpapp - !configfiles	14:44
gitinfo	lpapp: It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas	14:44
Eugene	the update-index one	14:45
lpapp	that does not give me the command	14:45
Eugene	Yes it does; bother to read	14:45
lpapp	basically the reason why I have to ignore it because it is updated by the buildsystem	14:45
	→ otter768 joined	14:45
lpapp	and it is always in the way of git push and pull	14:45
iveqy	PerlJam: thanks	14:45
Eugene	That's because you shouldn't commit build products	14:46
	→ zackiv31 joined	14:46
	→ krisdavey joined	14:46
iveqy	PerlJam: I will look it up, I've implemented my own systems too many times now	14:46
	← Haris left	14:46
yitzm	iveqy: we have code in the database, because that's how the CMS which we use is implemented. sorry.	14:46
lpapp	Eugene: I read that already, and I am telling you that I cannot see the command in there which I used for this.	14:46
	→ codeFiend joined	14:46
	→ Noldorin joined	14:46
	→ drfoo joined	14:46
lpapp	Eugene: well, my boss disagrees, but that is not even the point.	14:47
Eugene	lpapp - 4. Not recommended: If all of the previous suggestions won't work for some reason, look at the "assume unchanged" section in man git-update-index. Anyone who's tried this normally ends up hating it.	14:47
gitinfo	lpapp: the git-update-index manpage is available at http://jk.gs/git-update-index.html	14:47
lpapp	also, this is not a build product	14:47
	→ dEPy joined	14:47
lpapp	it contains the proper versioning	14:47
Seveas	lpapp: you want git rm build.product	14:47
	if the build system updates it, it's a build product :)	14:47
lpapp	but with a development build, it just appends some dirty version to distinguish.	14:47
Eugene	Reading, it's hard	14:47
	← Padawan left	14:47
lpapp	so it is in the repository, but it is getting in the way, hence the ignoring.	14:47
	and there used to be a command for this.	14:47
	→ converge joined	14:48
lpapp	I loved it rather than hate, actually.	14:48
	→ Padawan joined	14:48
	← nikio_ left	14:48
lpapp	since this way so awesomely removing that file from my workflow.	14:48
	was*	14:48
	→ ShooterMG joined	14:48
	← elsevero left	14:48
lpapp	while not hurting the author's feeling about this solution.	14:48
	his*	14:48
	→ Cata\|Work joined	14:48
	→ crestbook joined	14:49
Seveas	heh, that word. I don't think it means what you think it does.	14:49
	← otter768 left	14:50
lpapp	there was some stack overflow page from where I just copied and pasted the command ...	14:50
	(and it just worked - tm)	14:50
Eugene	Well, if you figure out the command that isn't the command that we're telling you it is, good for you	14:50
	← crestbook left	14:50
Eugene	But I don't think we care much more ;-)	14:50
lpapp	you may not and that is fine.	14:50
	perhaps others will.	14:50
	← m0ltar left	14:51
	← Raging_Hog left	14:51
lpapp	might be this one: http://stackoverflow.com/a/10773497	14:51
	→ nikio_ joined	14:51
ThiefMaster	if building your application updates a file that under version control i'd say something is wrong ;)	14:51
iveqy	lpapp: ?? that was the command Eugene told you about, yes?	14:51
	← PCatinean left	14:51
Eugene	Yup, because reading is hard.	14:52
	But that's none of my business	14:52
lpapp	ThiefMaster: not a discussion for today	14:52
	iveqy: I have not seen the exact command that I was looking for.	14:52
Seveas	git outta my dreams, git into my car	14:52
lpapp	(yes, parameter is important as it makes it copy/pastable)	14:52
Eugene	<Eugene> lpapp - 4. Not recommended: If all of the previous suggestions won't work for some reason, look at the "assume unchanged" section in man git-update-index. Anyone who's tried this normally ends up hating it.	14:52
gitinfo	the git-update-index manpage is available at http://jk.gs/git-update-index.html	14:52
Eugene	Reaaaaaaaaaad	14:53
lpapp	why?	14:53
Jeff__	how do i clone from a git server (not github)?	14:53
	ChanServ set mode: +o	14:53
lpapp	copy/paste is simpler and it just works	14:53
	← lpapp left	14:53
Seveas	Jeff__: git clone url-of-repo-here	14:53
	Eugene set mode: +q	14:53
iveqy	:( Why does it even make me upset? Just copy paste without knowing what something does is just bad	14:53
Jeff__	git clone ssh://username@repo.ip.add.ress/thing.git?	14:54
Seveas	iveqy: because you still have faith in humanity	14:54
Eugene	Sigh, some people	14:54
Seveas	Jeff__: /path/to/thing.git, but essentially yeah	14:54
	→ rzeka joined	14:54
	→ Bootinbull joined	14:54
	Eugene changed the topic to: Welcome to #git, the place for git help and amateur arborists \| Current stable version: 2.4.2 \| Start here: http://jk.gs/git \| Getting "cannot send to channel"? /msg gitinfo .voice \| Nurture your git-twigs and they will grow into a full branch	14:54
iveqy	Seveas: true... Maybe I should loose faith, or fix humanity. Let's see which comes first	14:54
	Eugene kicked Eugene (I WANT TO KILL SOMETHING)	14:54
	→ Eugene joined	14:54
	← rzeka left	14:54
	← Spriz left	14:55
	← northfurr left	14:56
Seveas	branch by branch, row by row, gonna make this repo grow. All it takes is to clone a remote and a few hopeful commits.	14:57
	(bonus point for those who recognize the mangled song)	14:57
	← vivekananda left	14:58
Jeff__	is it `git clone ssh://username@10.101.10.10/project`, or `git clone ssh://username@10.101.10.10/project.git`	14:58
	because neither work	14:58
	says "Please make sure you have the correct access rights and the repo exists"	14:58
	→ d10n-work joined	14:59
Seveas	Jeff__: where on the filesystem is the repo?	14:59
Jeff__	on a server	14:59
Seveas	where on the filesystem of that server	14:59
jast	that URL assumes the repo lives at the root level on the server	15:00
	→ wlarip_ joined	15:00
jast	... unless there is special magic on the server to magically fix the URL	15:00
	← roelmonnens left	15:00
Jeff__	ahh	15:01
	needed vpn	15:01
	i think should work now	15:01
	← ambodi left	15:01
	← sublimate left	15:02
	→ djszapi joined	15:02
	→ sublimate joined	15:02
	← Spacew00t left	15:02
	→ ambodi joined	15:02
	← darkbasic left	15:02
	→ darkbasic joined	15:03
jast	lpapp may have been talking about sparse checkouts...	15:03
	← acolson left	15:03
jast	needs multiple commands to set up that way, though	15:03
	← gua_ould left	15:03
	← wlarip left	15:04
	← djszapi left	15:05
	→ stantonk joined	15:05
	← ambodi left	15:07
	← jagob left	15:07
	PaulePan1er → PaulePanter	15:08
Seveas	lpapp is now pm'ing me as 'djszapi', asking which word I meant :)	15:09
	→ jagob joined	15:09
	← converge left	15:12
	→ fe771n joined	15:12
	→ ki0_ joined	15:13
	→ converge joined	15:13
	← fe771n left	15:14
	← cbreak-work left	15:14
	→ redmoss joined	15:14
redmoss	Heyo, I want to cherry-pick a commit from another branch onto mine. The commit has changes in different files that won't conflict, accept for one file where it will. Can I allow the cherry-pick to accept my version where there's conflicts?	15:14
thiago	Seveas: he uses those two nicknames	15:14
	→ Spacew00t joined	15:14
	→ ParanoidNemo joined	15:15
	→ subhojit777 joined	15:15
	← pabens left	15:15
Seveas	thiago: for some reason he thought I'd be more approving of his crazy ideas in PM. Well, he's wiser now.	15:15
	← jceb left	15:15
	← howitdo left	15:15
	← Sceorem left	15:16
	→ tyreld joined	15:16
	→ bronson joined	15:16
thiago	Seveas: I once had laszlo on /ignore for a year	15:16
	← ki0 left	15:16
	← ki0_ left	15:17
Seveas	I don't /ignore, why miss out on the fun? :)	15:17
bremner	this word fun. I do not think it means what you think it means.	15:18
Seveas	:D	15:18
	My name is Inigo Montoya, you reverted my commits, prepare to die.	15:18
thiago	:-)	15:19
	→ loremipson joined	15:20
Seveas	It's been too long since I saw that movie	15:20
	This requires an urgent fix.	15:20
Ionic	hasta la rebase, baby?	15:20
	← nardev left	15:20
	← BlaXpirit-UA left	15:20
Seveas	Mrs. Robinson, you're trying to merge, aren't you?	15:21
	← bronson left	15:21
	→ howitdo joined	15:21
	← joo-_ left	15:23
	→ nnyk_ joined	15:23
	← ntwari left	15:24
	→ pheaver joined	15:25
	→ ashokrajar joined	15:25
	← moreirapontocom left	15:25
	→ moreirapontocom joined	15:26
	→ TheMoonMaster joined	15:26
	← dreiss left	15:27
	→ kpease joined	15:27
	→ jceb joined	15:28
	← Darcidride_ left	15:28
	← dsdeiz left	15:29
	→ pks joined	15:30
anahumar	how to search for project with this critiria .... 5 or more projects with more than 10 common developers and in a period of 6 to 12 months?	15:30
	← pheaver left	15:30
	→ shinnya joined	15:30
_ikke_	I guess this is a #github question?	15:30
PerlJam	anahumar: I'm thinking you want #github	15:31
	→ paulweb515 joined	15:31
	→ dreiss joined	15:32
	← kpease left	15:32
	→ kpease joined	15:33
	← kpease left	15:33
	← Padawan left	15:33
	→ Padawan_ joined	15:33
	→ kpease joined	15:33
	← redmoss left	15:34
	← kpease left	15:35
	→ zematis joined	15:35
	→ chrisgeorge joined	15:35
	← paulweb515 left	15:35
	← Gizburdt left	15:36
	← qpdb left	15:37
	→ qpdb_ joined	15:37
	→ dj3000 joined	15:39
	→ variable joined	15:40
	→ Dougie187 joined	15:40
	← ashokrajar left	15:41
	→ dfaught joined	15:41
	→ ashokrajar joined	15:41
	← Balliad left	15:43
	← Takle left	15:43
	← heroux left	15:44
	← fancy42 left	15:45
	← Jeff__ left	15:45
	← achadwick left	15:45
	→ effi joined	15:45
	← ParanoidNemo left	15:46
	→ achadwick joined	15:46
	→ MattMaker joined	15:46
	→ Dragooon joined	15:47
	← ehmatthes left	15:47
	→ kpease joined	15:47
	→ lindenle joined	15:48
	← joki left	15:48
	← FreezingCold left	15:49
	← dfaught left	15:49
	→ dfaught joined	15:50
	→ gamename joined	15:50
	→ paulweb515 joined	15:51
	→ Takle joined	15:51
	→ zotez joined	15:51
	← DerisiveLogic left	15:51
	← MattMaker left	15:51
	→ zumba_addict joined	15:54
	→ DerisiveLogic joined	15:54
	→ joki joined	15:54
	← effi left	15:54
	← Sonarpulse left	15:54
	→ _Atom_ joined	15:55
	← zack_s_ left	15:55
	→ jayeshsolanki joined	15:55
	← zotez left	15:56
	← cbruegge left	15:56
	→ ril joined	15:56
	→ FreezingCold joined	15:57
	← b_rare left	15:57
	← gfixler1 left	15:58
	← jnavila left	15:58
	→ o84wb76g joined	15:58
	→ wlarip joined	16:00
	→ ErKa joined	16:00
	← Spacew00t left	16:01
	→ c0mrad3 joined	16:02
	← o84wb76g left	16:02
	← dfaught left	16:03
	→ MinetestForFun joined	16:03
	→ m0ltar joined	16:03
	→ dfaught joined	16:03
	→ effi joined	16:03
	← wlarip_ left	16:04
	→ zendrix joined	16:04
	← sublimate left	16:05
	→ eVRiAL joined	16:05
	← GPrime left	16:05
	← KennyRay_ left	16:05
	← dEPy left	16:05
	← soc42 left	16:06
	→ BSaboia joined	16:07
	→ Spacew00t joined	16:07
	← variable left	16:07
	← PRIM4T left	16:09
	→ maestrojed joined	16:09
	→ Squarism joined	16:10
	→ KennyRayFL joined	16:10
	→ a-l-e joined	16:10
Squarism	Hey.. how do i revert one commit that ive pushed? Its ok if its a "reversal commmit"	16:11
	← zadock left	16:11
Squarism	noone else have committed during this time	16:11
	→ akushner joined	16:11
	← Asiajey left	16:11
_ikke_	git revert $commit	16:12
	That creates the 'reversal' commit	16:12
	→ Asiajey joined	16:12
	← thiago left	16:12
	→ imachuchu joined	16:12
	← dreiss left	16:13
	← charginghawk left	16:13
	→ ki0 joined	16:13
	→ darkbasic_ joined	16:14
Squarism	_ikke_, where "$commit" is the id?	16:14
	← effi left	16:14
	← darkbasic left	16:15
	← Alienpruts left	16:15
	← KennyRayFL left	16:15
_ikke_	yes	16:15
	← yitzm left	16:15
	→ effi joined	16:16
	← dstarh left	16:18
	← ki0 left	16:18
	→ Bruno_ joined	16:18
	← ajf- left	16:18
	← zematis left	16:20
	→ garbageyard joined	16:20
	← darkbasic_ left	16:20
	← converge left	16:20
	→ darkbasic joined	16:20
	← hans_s left	16:21
	← BSaboia left	16:21
	→ sbogg joined	16:22
	← effi left	16:22
	← garbageyard left	16:22
	→ gopar joined	16:22
	→ Vadimus joined	16:23
	→ Sasazuka joined	16:23
	← Mixologic left	16:24
	← meLon left	16:25
	← akushner left	16:26
	→ crose joined	16:27
	← bonswouar left	16:27
	→ bonswouar joined	16:27
	← bonswouar left	16:28
	← freimatz left	16:28
	← tumulte left	16:29
	→ effi joined	16:31
	→ ehynds joined	16:32
	→ Trow joined	16:32
	→ forsil joined	16:32
	→ zematis joined	16:32
	→ converge joined	16:33
	← converge left	16:33
	→ converge joined	16:33
	← converge left	16:33
	→ kadoban joined	16:33
	→ converge joined	16:33
	← mikecmpbll left	16:35
	← codeFiend left	16:35
	→ charginghawk joined	16:35
	→ petersr joined	16:36
	→ dstarh joined	16:36
	→ pcypher joined	16:37
	← petersr left	16:37
	← EminenceHC left	16:38
	← dfaught left	16:38
	→ katherin_ joined	16:38
	→ dfaught joined	16:39
	gitinfo set mode: +v	16:39
lab_	hi, I am running "git log --graph --simplify-by-decoration -prety"..." branche_1 branch_2; would also like to give commit (which is not the head of a branch) and get the graph plus that commit. Is there a way to do it? simplify-by-decoration seems to make it impossible althoug the doc says otherwise.	16:40
	← jceb left	16:41
	→ cvanball joined	16:41
	→ KennyRayFL joined	16:41
	← achadwick left	16:41
	→ vivekananda joined	16:42
	← dfaught left	16:42
	← delboy1978uk left	16:42
	→ dfaught joined	16:43
_ikke_	lab_: You mean this part: " Note that extra commits can be shown to give a meaningful history."	16:43
	?	16:43
	→ victortyau joined	16:43
	← Hounddog left	16:43
	→ PRIM4T joined	16:44
	→ angular_mike_ joined	16:44
	← stantonk left	16:44
	→ James_Epp joined	16:44
lab_	_ikke_: yes, I understand that it means "automatically selected" to show a meaningful graph but is there also a way to adda commit	16:44
	← victortyau left	16:45
	← TomyWork left	16:45
	→ scientes joined	16:45
	← scientes left	16:45
	→ scientes joined	16:45
James_Epp	Super new to git. Super confused, too! I have a folder I did my initial commit with. I modified some files and decided I don't want the changes. I do 'git checkout -- *; git status;' and it shows two modified directories. Why?	16:45
_ikke_	lab_: Don't think so	16:45
	→ sublimate joined	16:46
_ikke_	James_Epp: In what directory were you when you did that?	16:46
	← scientes left	16:46
lab_	_ikke_: any way to do it with plumbing?	16:46
	→ otter768 joined	16:46
	← forsil left	16:46
	→ scientes joined	16:46
	→ MattMaker joined	16:46
	← scientes left	16:47
	← jayeshsolanki left	16:47
	← granthatcher_ left	16:47
	→ haliax joined	16:47
	→ scientes joined	16:47
_ikke_	I can't think of something that also shows the graph	16:48
	→ stantonk joined	16:48
lab_	OK, thanks, I'll write some perl to do that	16:48
	← effi left	16:49
qsuscs	Seveas: you fight like a dairy farmer	16:49
	→ reim joined	16:49
	← otter768 left	16:51
	→ C3LL joined	16:52
	← C3LL left	16:52
James_Epp	_ikke_: same folder as .git	16:52
	_ikke_: Does that matter? Why?	16:52
	→ skylite joined	16:52
	legumbre_ → legumbre	16:52
	→ ntwari joined	16:53
	→ akiva joined	16:53
	← ril left	16:53
	← Squarism left	16:53
	← zendrix left	16:54
_ikke_	It does matter, because your shell expands the *, if you were in a subdir, it would only checkout the files / dirs in the subdir	16:55
	← encod3 left	16:55
	→ ItSANgo joined	16:55
_ikke_	James_Epp: What does git status return?	16:55
	→ marc_v92 joined	16:56
	← ItSANgo_ left	16:56
	← ntwari left	16:56
	← Roy78 left	16:56
	→ pheaver joined	16:56
	← sublimate left	16:56
	→ effi joined	16:57
	← mezod left	16:58
	→ mjuszczak joined	16:58
	← lab_ left	16:58
James_Epp	_ikke_: I'm on a crappy windows system so my term doesn't have copy paste. "modified: undionly.dsk (modified content)" and "modified: undionly,kpxe (modified content)" THanks for the help!	16:59
	_ikke_: Where undionly.dsk and undionly.kpxe and directories	16:59
_ikke_	James_Epp: Those are submodules	17:00
James_Epp	I apologize?	17:00
_ikke_	James_Epp: git repositories within your repository	17:00
	→ wlarip_ joined	17:00
James_Epp	_ikke_: you're probably right about that. this is a super old directory I'm trying to clean up and practice git with.	17:00
	→ zendrix joined	17:01
	← CustosL1men left	17:01
	← Takle left	17:01
James_Epp	_ikke_: Yup, they each have .git folders. So how do I deal with (recursive??) git reps?	17:01
	→ m0viefreak joined	17:01
	← haliax left	17:02
	→ thiago joined	17:02
	← skullcrasher left	17:03
James_Epp	You know what, forget it. I'm just going to delete everything and move on with my life.	17:03
	← wlarip left	17:04
	→ BennyPlayboy joined	17:04
	← BennyPlayboy left	17:05
	← howlymowly left	17:05
	← TyrfingMjolnir left	17:05
	← drbean left	17:05
	→ drbean_ joined	17:05
	← crose left	17:06
	→ BennyPlayboy joined	17:06
	→ TyrfingMjolnir joined	17:06
	← Padawan_ left	17:07
	← nnyk_ left	17:07
	← Tuna-Fish left	17:07
	← shinnya left	17:07
	← BennyPlayboy left	17:08
	→ eletuchy joined	17:08
	→ BennyPlayboy joined	17:08
	← BennyPlayboy left	17:08
	← scientes left	17:09
	→ sublimate joined	17:09
	← intellix left	17:09
	← Dorf left	17:10
	→ jceb joined	17:10
	← settermjd left	17:11
	→ durham joined	17:11
	← FreezingCold left	17:11
Vaur	19:01:12 James_Epp \| _ikke_: Yup, they each have .git folders. So how do I deal with (recursive??) git reps?	17:12
	that's actually a good question	17:12
qsuscs	Vaur: !subrepos	17:12
gitinfo	Vaur: [!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.	17:12
James_Epp	Vaur: Googling "subrepos" and "git" would have gotten me all I needed.	17:12
Vaur	I've messed around with them but never properly setup one	17:12
	← kurkale6ka left	17:13
	Vampire0_ → Vampire0	17:13
Vaur	yeah I know how to search on google dont worry :p	17:13
	→ cavallari joined	17:14
James_Epp	I wasn't referring to you, just that I didn't want to go through that much work for that old a project :D	17:14
	→ ki0 joined	17:14
Vaur	James_Epp: that's precisly because it's old that you should care for it, no ?	17:14
	that would be some nice skills to have	17:15
	← sublimate left	17:15
Vaur	"how to properly manage multi git project over the years"	17:15
	← _Atom_ left	17:15
James_Epp	Vaur: No. It's literally an outdated git-hosted project and one file I made long ago which is saved elsewhere and easily googled.	17:15
	→ BennyPlayboy joined	17:15
Vaur	James_Epp: pull your update repository into the old one ! :p	17:16
	→ fr33domlover joined	17:16
	← BennyPlayboy left	17:16
	→ Padawan_ joined	17:16
	→ BennyPlayboy joined	17:16
	→ axl_ joined	17:17
	← BennyPlayboy left	17:17
_ikke_	James_Epp: Those submodules have changed content	17:17
	→ BennyPlayboy joined	17:17
_ikke_	you have to go in each submodule and decide what to do there	17:17
	← greggynapalm left	17:17
	← ki0 left	17:20
	→ ashirus joined	17:20
	→ Tuna-Fish joined	17:20
	← scottschecter left	17:20
	← pcypher left	17:20
	← michael_mbp left	17:22
	→ codeFiend joined	17:22
	→ HSaka joined	17:23
	← tobyx left	17:23
HSaka	Hello, I made a release version of my git prosject and I´m going to submit it to my teacher. I noticed there is a hige difference between the size of the files. The one I got from release is 27KB, while the only who I still use for coding is 27MB. Did I do something wrong ?	17:24
	→ mkoskar joined	17:24
	→ michael_mbp joined	17:25
	← effi left	17:25
	← shabazy left	17:25
elik	I want to autocommit a file on a regular basis (autosave -> autocommit), but I don't want to pollute my master branch with all those commit. I wanted to commit on a separate branch, but there is no way of doing so without checking out the branch, which opens a world of troubles	17:25
	← marcogmonteiro left	17:26
	← sfeinste left	17:26
qsuscs	elik: exactly. don’t do this.	17:26
	→ shabazy joined	17:27
	← zematis left	17:27
	→ tobyx joined	17:28
	→ ItSANgo_ joined	17:28
	← ItSANgo left	17:28
	← modocache left	17:29
elik	qsuscs: it sounded like a better solution than having a script targz the whole thing every so often	17:29
	← dougsland left	17:29
	→ modocache joined	17:29
	→ Lisk joined	17:29
qsuscs	elik: if you want not to lose that file, you could add it to git’s storage with man git hash-object	17:29
gitinfo	elik: the git-hash-object manpage is available at http://jk.gs/git-hash-object.html	17:29
Lisk	Is there an easy way to setup git to ignore any file larger than, say, 1 MB (?)	17:29
	← modocache left	17:30
_ikke_	Lisk: Only with things like pre-commit hooks, there is ignore interface that looks at file size	17:30
	Lisk: There is a topic on the mailing list about that	17:31
	← mjuszczak left	17:31
Lisk	cool, thanks _ikke_. I haven't used hooks before, but I'll look into it.	17:31
	→ meLon joined	17:32
	→ crose joined	17:33
	→ rishi joined	17:33
	→ nightspades joined	17:34
	→ modocache joined	17:34
	← crose left	17:34
	← tvw left	17:35
	← snow_ru left	17:35
	→ snow_ru joined	17:35
	→ effi joined	17:36
	← cvanball left	17:36
	→ crose joined	17:37
	→ zotez joined	17:37
	← anahumar left	17:37
	→ bannakaffalatta joined	17:37
HSaka	Hello, I made a release version of my git prosject and I´m going to submit it to my teacher. I noticed there is a hige difference between the size of the files. The one I got from release is 27KB, while the only who I still use for coding is 27MB. Did I do something wrong ? Anyone : ) ?	17:38
	→ madewokherd joined	17:38
	→ Gizburdt joined	17:38
	← moreirapontocom left	17:39
	→ mtakkman joined	17:39
	→ pcypher joined	17:39
elik	qsuscs: the thing is, it's not just a file I want to save. I want to track a files' history, through incremental edits. This file changes rapidly, and a small mistake can mess up the file and go unnoticed for a while. I was hoping to be able to catch the misstep and be able to solve it with git tools (revert, rebase, etc)	17:39
	→ moreirapontocom joined	17:40
	← snow_ru left	17:40
	→ jonmorehouse joined	17:40
elik	qsuscs: as far as I can see, git-hash-object only hashes the file, without recording any metadata	17:40
	→ snow_ru joined	17:40
	← AMERICAN_PSYCHO left	17:40
	→ zematis joined	17:41
	← teran_ left	17:42
	← zotez left	17:42
	→ m8 joined	17:42
	← drfoo left	17:43
	→ nour_ joined	17:45
cavallari	Did anyone already created a git server on koding?	17:45
	koding.com?	17:45
	← Sammy8806 left	17:46
bremner	HSaka: what do you mean by a "release version"? a zip/tar file?	17:47
HSaka	bremner, yes i mean zip/tar file	17:47
bremner	HSaka: so look at the contents, and see what large files are there?	17:48
	← rubyonrailed left	17:48
HSaka	okey.	17:49
	← nightspades left	17:50
	→ sdothum joined	17:50
	← snow_ru left	17:50
	→ snow_ru joined	17:51
	← snow_ru left	17:51
	← jonmorehouse left	17:52
	→ snow_ru joined	17:52
	→ relipse joined	17:52
	→ encod3 joined	17:52
	→ mikecmpbll joined	17:52
	← encod3 left	17:53
	→ asti joined	17:54
asti	hello. I renamed my branch. When I do git status, it tell me:	17:54
	Local: new-name	17:54
	Remote: old-name	17:55
	now, if I push my commits, what will happen? will the new or the old branch be used?	17:55
ojacobson	depends on how you spell 'git push', really	17:55
	→ bronson joined	17:56
	→ Dorf joined	17:56
asti	ojacobson, "git push origin new-name"	17:56
ojacobson	that will copy your local 'new-name' branch to origin's 'new-name' branch	17:56
asti	so everything will look fine?	17:57
	← effi left	17:58
	← ThomasLocke left	17:59
	→ fnam joined	17:59
	→ effi joined	17:59
	→ baweaver joined	17:59
	→ joo-_ joined	17:59
	← jrajav left	18:00
	→ wlarip joined	18:00
	← fnam left	18:01
	← baweaver left	18:01
	→ POQDavid joined	18:02
	→ jrajav joined	18:02
	→ Aja joined	18:03
	← wlarip_ left	18:04
	→ cagedwisdom joined	18:04
	← mtakkman left	18:05
POQDavid	Hi	18:05
gitinfo	POQDavid: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	18:05
POQDavid	i was wondering how clone or fork a remote git to github?	18:06
	→ NoImNotNineVolt joined	18:07
	← mostlybadfly left	18:08
NoImNotNineVolt	"Already up-to-date" when trying to merge a feature branch into the development branch, despite git diff agreeing that there are extensive changes between the two branches.	18:08
	→ mostlybadfly joined	18:09
	← jason237 left	18:09
NoImNotNineVolt	both branches have all changes committed and pushed.	18:09
	← Aja left	18:09
	→ dougsland joined	18:09
ojacobson	'feature' is an ancestor of 'development' already	18:10
	the "extensive differences" in that scenario would be all of the changes on development subsequent to feature's emrge	18:10
	merge	18:10
	← cebor left	18:11
	→ cebor joined	18:11
	→ ubpo joined	18:11
NoImNotNineVolt	but many commits have been made to feature. i'm looking at development and those changes are not there.	18:11
	← ubpo left	18:12
POQDavid	like i have git url that it's not on github and i want to make fork or clone of it in github how it's done?	18:12
	← subhojit777 left	18:12
	→ Zupoman joined	18:13
	← Zupoman left	18:13
	→ Zupoman joined	18:13
	→ Odxe joined	18:13
	← salamanderrake_ left	18:13
NoImNotNineVolt	indeed, this feature was previously merged into development 3 weeks ago, before any significant changes were made. the bulk of the changes have been made in the past week.	18:14
	is there a way to merge it again? :P	18:14
	→ salamanderrake joined	18:15
	← zendrix left	18:15
	→ mjuszczak joined	18:15
	→ drfoo joined	18:15
	← drfoo left	18:16
NoImNotNineVolt	actually no, that's not true. that was a different branch. disregard.	18:16
	← codeFiend left	18:21
	→ shinnya joined	18:21
	→ chrisgeo joined	18:21
	→ GarethAdams joined	18:21
	→ flipp joined	18:22
	← effi left	18:23
	→ nnyk_ joined	18:23
NoImNotNineVolt	this is basic gitflow. i've never run across this problem before.	18:23
	← snow_ru left	18:24
	→ rubyonrailed joined	18:24
NoImNotNineVolt	i'm really, really hoping i won't have to manually "merge" into development, by hand, by cloning both branches and then copying changes from one to the other.	18:24
	← chrisgeorge left	18:25
	← cdown left	18:25
NoImNotNineVolt	because even cvs never made me do that :\|	18:26
	← relipse left	18:26
	← bronson left	18:26
	→ sentriz joined	18:26
	→ Hestil joined	18:26
	→ bronson joined	18:27
	← leolrrj left	18:28
	← modocache left	18:29
	→ lpapp joined	18:29
	← lpapp left	18:29
	→ guest8574 joined	18:30
	→ effi joined	18:31
	→ codeFiend joined	18:31
	→ cfgmgr joined	18:31
NoImNotNineVolt	yaaay, just cloned a new dev branch and played with that til it worked. thanks.	18:31
	← NoImNotNineVolt left	18:31
	← nnyk_ left	18:32
	gitinfo set mode: +v	18:32
guest8574	I have this 4 terabyte Seagate NAS. Is there a way for me to set up a git server on it, or does that require an OS?	18:32
	→ jds joined	18:32
	← grepper left	18:32
	→ Padawan joined	18:34
	→ baweaver joined	18:34
	← Padawan_ left	18:35
	← endiruna left	18:35
	← Odxe left	18:36
	→ basiclaser joined	18:36
	→ gjlpu joined	18:38
	← chitopunk left	18:39
	← baweaver left	18:40
	← gjlpu left	18:40
cavallari	Did anyone already created a bare git in koding.com?	18:41
	← Muhannad left	18:41
	← mjuszczak left	18:43
	→ jojovem joined	18:43
	→ drewo joined	18:44
	→ EminenceHC joined	18:45
	← mizu_no_oto left	18:46
	← DrNick left	18:46
	→ otter768 joined	18:47
	Guest42642 → Freeaqingme	18:47
	← Abyx left	18:47
	→ Abyx joined	18:48
	→ fqhh joined	18:48
	→ zendrix joined	18:48
	← Hestil left	18:48
	← howitdo left	18:49
	← pcypher left	18:51
	← otter768 left	18:52
osse	guest8574: does it have an SSH or a HTTP server?	18:53
	→ DrNick joined	18:53
	← woodruffw left	18:53
	← Mo left	18:53
	→ woodruffw joined	18:53
	→ akushner joined	18:54
	← effi left	18:55
	→ bob14 joined	18:55
	→ jost__ joined	18:55
	→ modocache joined	18:56
	← pm90_ left	18:57
	→ bendangelo joined	18:58
	← jost left	18:59
	← jrajav left	19:00
	→ wlarip_ joined	19:00
	→ cvanball joined	19:00
	← _Vi left	19:00
	← guest8574 left	19:01
	→ effi joined	19:01
	→ hans_s joined	19:02
	→ cavallar1 joined	19:02
	→ joel_falcou joined	19:03
	→ endiruna joined	19:04
	← woodruffw left	19:04
	← wlarip left	19:04
	← fqhh left	19:04
	→ Balliad joined	19:05
	→ woodruffw joined	19:05
	← converge left	19:05
	→ howitdo joined	19:05
	← Cata\|Work left	19:07
	→ elsevero joined	19:07
	← jceb left	19:09
	← DerisiveLogic left	19:09
	← effi left	19:09
	→ ievi joined	19:09
	← stantonk left	19:10
	← bb010g left	19:10
	→ effi joined	19:10
	→ stantonk joined	19:10
	→ chrisgeorge joined	19:10
	← endiruna left	19:11
	→ Jeff__ joined	19:11
	→ endiruna joined	19:11
	→ rockfruit joined	19:11
	→ Cata\|Work joined	19:12
	← chrisgeorge left	19:12
	→ converge joined	19:12
	→ ashokraj_ joined	19:13
	← chrisgeo left	19:13
	← ashokrajar left	19:15
	← paulweb515 left	19:16
	← zematis left	19:17
	→ jason237 joined	19:17
	→ nphard_ joined	19:18
	← nphard_ left	19:18
	← jolda left	19:18
	→ xXx_GAY_POO_xXx joined	19:18
	→ jolda joined	19:19
	← cvanball left	19:19
	→ greggynapalm joined	19:20
	← rockfruit left	19:20
	→ sq-one joined	19:22
	→ ashokrajar joined	19:22
	← ievi left	19:23
	← hit_ left	19:23
	→ PragCypher joined	19:23
	comps_ → comps	19:23
	← ome left	19:23
	→ nphard_ joined	19:23
	← stantonk left	19:24
	← bendangelo left	19:24
	← cfgmgr left	19:24
	← c0mrad3 left	19:24
	← ashokraj_ left	19:25
	→ c0mrad3 joined	19:25
	← effi left	19:26
	→ mezod joined	19:26
	← nphard_ left	19:26
	→ ashokraj_ joined	19:26
	← xXx_GAY_POO_xXx left	19:27
	→ nphard_ joined	19:27
	← Gizburdt left	19:28
	← Trow left	19:29
	← ashokrajar left	19:29
	→ ashokrajar joined	19:30
	→ pm90_ joined	19:30
	→ Trow joined	19:30
	← pm90_ left	19:30
	→ zematis joined	19:30
	→ pm90_ joined	19:30
	→ stantonk joined	19:31
	← Trow left	19:31
	→ Trow joined	19:31
	← cavallar1 left	19:31
	← Trow left	19:32
	← ashokraj_ left	19:32
	→ variable joined	19:32
	→ Trow joined	19:32
	→ cvanball joined	19:33
	→ snow_ru joined	19:33
	← moreirapontocom left	19:33
	← Trow left	19:33
	→ moreirapontocom joined	19:34
	→ Trow joined	19:34
c0mrad3	do we have the logs of this channel some where ??	19:34
	← POQDavid left	19:34
	← Trow left	19:35
	→ Trow joined	19:35
	← joel_falcou left	19:35
	→ pcypher joined	19:35
	→ mizu_no_oto joined	19:36
	← Spacew00t left	19:36
	← Trow left	19:36
	← Ademan left	19:36
	→ Trow joined	19:37
	→ darkbasic_ joined	19:37
	← Trow left	19:37
	→ effi joined	19:38
	← MinetestForFun left	19:38
	→ MinetestForFun joined	19:38
	← darkbasic left	19:39
	→ Trow joined	19:39
	→ relipse joined	19:39
	→ Gues_____ joined	19:41
	← zendrix left	19:41
	← Gues_____ left	19:42
	→ xbj joined	19:42
	→ symetric joined	19:43
	→ gregsmit_ joined	19:43
	← eletuchy left	19:43
	← gregsmit_ left	19:43
	→ eletuchy joined	19:43
	← elsevero left	19:44
	→ gregsmit_ joined	19:44
	→ baweaver joined	19:44
	→ bb010g joined	19:47
	gitinfo set mode: +v	19:47
	→ cssko joined	19:47
	wlarip_ → wlarip	19:47
	→ nnyk_ joined	19:47
	← nphard_ left	19:47
	← jwhisnant left	19:47
	→ hacker joined	19:47
	← pcypher left	19:48
	→ grepper joined	19:49
	→ relipse2 joined	19:49
	→ Gizburdt joined	19:50
	← pm90_ left	19:50
	→ zarubin joined	19:50
	← effi left	19:53
	← relipse left	19:53
	→ chitopunk joined	19:53
	→ ixjlyons joined	19:53
	→ boombatower joined	19:54
	← marc_v92 left	19:55
	← ssarah left	19:55
	→ daito_ joined	19:56
	← chitopunk left	19:56
	→ pcypher joined	19:56
	→ chitopunk joined	19:56
	→ Textmode joined	19:57
	← stantonk left	19:57
	→ stantonk joined	19:59
	→ mfmfmfmfmfmf joined	19:59
	→ wlarip_ joined	20:00
	← nour_ left	20:00
	← daito_ left	20:00
	→ jeffmjack joined	20:00
	← ixjlyons left	20:00
	→ systmkor joined	20:01
	→ zendrix joined	20:01
	→ elsevero joined	20:04
	← wlarip left	20:04
	→ effi joined	20:05
	← loremipson left	20:05
	→ hahuang65 joined	20:06
	→ ixjlyons joined	20:07
	→ nphard joined	20:08
	→ dreiss joined	20:08
	→ refried_ joined	20:09
	← gregsmit_ left	20:10
	→ Spacew00t joined	20:11
	→ paulweb515 joined	20:11
	← woodruffw left	20:12
	→ moretti joined	20:13
	← stantonk left	20:13
	→ _Atom_ joined	20:14
	→ nnyk joined	20:14
	← nnyk_ left	20:15
	← moretti left	20:15
	→ Sieigeie joined	20:15
	← _Atom_ left	20:15
	→ moretti joined	20:15
	→ stantonk joined	20:15
	← skylite left	20:16
	← bob14 left	20:16
	[Brain] → Brain	20:16
	← Dougie187 left	20:16
	Brain → Brain_	20:17
	Brain_ → DesktopBrain	20:17
	← xbj left	20:17
	← in3xes left	20:17
	→ chandlerbing joined	20:17
	← nphard left	20:18
	← krisdavey left	20:20
	→ jceb joined	20:20
qsuscs	c0mrad3: !logs	20:21
gitinfo	c0mrad3: [!irclog] Public logs of #git are kept at: http://colabti.org/irclogger/irclogger_log/git or look at stats for the last 30 days: http://itvends.com/irc/git.html or since Jan 1, 2012: http://itvends.com/irc/git-all.html	20:21
	← Jeff__ left	20:21
	← zarubin left	20:21
	← gambl0re left	20:21
c0mrad3	thanks for the info qsuscs	20:22
	→ lab_ joined	20:23
	← converge left	20:24
	← Sieigeie left	20:24
	← akiva left	20:24
	→ Efnp joined	20:26
	← MinetestForFun left	20:26
	← Kicer86 left	20:26
	← Asiajey left	20:26
	← zendrix left	20:27
	← darkbasic_ left	20:27
	→ converge joined	20:28
	→ zendrix joined	20:28
	→ eletuchy_ joined	20:28
	→ ahr3n joined	20:28
	← effi left	20:28
	→ darkbasic joined	20:29
	← eletuchy_ left	20:29
	→ nphard joined	20:29
	← eletuchy left	20:29
	→ eletuchy_ joined	20:29
	← ashokrajar left	20:29
	→ ashokrajar joined	20:30
	← bannakaffalatta left	20:30
	→ liamkeily joined	20:31
	← stantonk left	20:31
	→ bob14 joined	20:31
	← foul_owl left	20:31
	← jceb left	20:32
	→ Pyrogerg joined	20:32
	← nphard left	20:32
	← pheaver left	20:32
	→ effi joined	20:33
	→ jgornick joined	20:33
	→ nphard joined	20:33
	← ixjlyons left	20:33
	← Pyrogerg left	20:33
	→ ozymandias joined	20:33
	→ heroux joined	20:34
	→ Pyrogerg joined	20:34
	→ bendangelo joined	20:34
	← m8 left	20:34
	→ dustinm joined	20:34
	→ nightspades joined	20:34
	← nphard left	20:35
	→ _Vi joined	20:35
	← chitopunk left	20:36
	→ chitopunk joined	20:36
	→ eka joined	20:37
	→ zotez joined	20:37
	→ nphard joined	20:38
	← edux left	20:38
	← cvanball left	20:38
	→ zack6849 joined	20:38
	← zack6849 left	20:38
	→ zack6849 joined	20:38
	← baweaver left	20:38
	→ edux joined	20:38
	→ ki0 joined	20:38
	← Efnp left	20:38
	→ woodruffw joined	20:39
	← denete left	20:39
	← Cata\|Work left	20:39
	← elsevero left	20:39
	→ denete joined	20:39
	← eka left	20:39
	← sq-one left	20:40
	→ linuxboytoo joined	20:40
	← nphard left	20:40
	→ eka joined	20:41
	← moreirapontocom left	20:41
	Vaur → Vaur-	20:41
	→ neanderslob joined	20:42
	→ baweaver joined	20:42
	← edux left	20:43
	← heroux left	20:43
	← zotez left	20:43
	← PRIM4T left	20:43
	← greggynapalm left	20:44
	→ scientes joined	20:44
	→ greggynapalm joined	20:44
	← scientes left	20:44
	→ nphard joined	20:45
	→ delight joined	20:45
	→ scientes joined	20:45
	← scientes left	20:45
	→ scientes joined	20:45
	→ pheaver joined	20:45
	← endiruna left	20:46
	← eka left	20:48
	← effi left	20:48
	← Bruno_ left	20:48
	→ eka joined	20:49
	← pcypher left	20:50
	→ SylvieLorxu joined	20:50
	→ mixedCase joined	20:50
	→ loremipson joined	20:50
SylvieLorxu	I've made a first commit, but my author information was set wrong. Is there a way to undo it? I'd normally "git reset HEAD^", make a good commit, and force push, but I can't "git reset HEAD^" after the first commit, it seems	20:50
	→ heroux joined	20:50
Seveas	git commit --amend --reset-author	20:51
	→ ixjlyons joined	20:51
	→ edux joined	20:51
	← loremipson left	20:51
SylvieLorxu	Seveas, Thank you!	20:52
	→ Dougie187 joined	20:52
	← gamename left	20:53
	← converge left	20:53
	→ gamename joined	20:53
	← baweaver left	20:54
	← pheaver left	20:55
	← ki0 left	20:55
	← ehynds left	20:56
	← Vadimus left	20:57
	← Scriptonaut left	20:58
	→ effi joined	20:58
	← James_Epp left	20:59
	← gamename left	20:59
	← greggynapalm left	20:59
	← rubyonrailed left	20:59
	→ greggynapalm joined	21:00
	→ wlarip joined	21:00
	← cavallari left	21:00
	← liamkeily left	21:01
	← Texan left	21:01
	→ gambl0re joined	21:01
	→ ashokraj_ joined	21:03
	← wlarip_ left	21:03
	→ pcypher joined	21:04
	← sgambino left	21:04
	← juvenal left	21:05
	← tom[] left	21:05
	→ pheaver joined	21:05
	← eletuchy_ left	21:06
	← ashokrajar left	21:06
	→ CheckDavid joined	21:07
	← jmpp left	21:07
	→ Eepe joined	21:07
	← Gizburdt left	21:07
	→ endiruna joined	21:08
	← hans_s left	21:08
	← nphard left	21:09
	← mixedCase left	21:10
	← scientes left	21:10
	→ LaptopBrain joined	21:11
	← hardenedapple left	21:12
	→ dsdeiz joined	21:12
	← tristanp left	21:12
	← Cyclohexane left	21:13
	→ converge joined	21:13
	→ hit_ joined	21:15
	← dsantiago left	21:16
	→ peraloh joined	21:16
	→ satanist joined	21:17
	← hahuang65 left	21:17
	→ juvenal joined	21:18
	→ dsantiago joined	21:18
	→ pm90_ joined	21:18
	← dsantiago left	21:18
	← zematis left	21:18
	← jojovem left	21:18
	→ rubyonrailed joined	21:19
	← pm90_ left	21:20
	→ zematis joined	21:20
	→ pm90_ joined	21:20
	← wicope left	21:21
	← ShooterMG left	21:22
	← peraloh left	21:22
	← pcypher left	21:23
	→ liamkeily joined	21:23
	→ baweaver joined	21:26
	← Spacew00t left	21:26
	← TyrfingMjolnir left	21:26
	← edux left	21:27
	→ TyrfingMjolnir joined	21:27
	← cbonobo left	21:27
	← dstarh left	21:28
	→ juvenal_ joined	21:28
	gitinfo set mode: +v	21:29
	← effi left	21:30
satanist	is there a way to disable the accept-language support?	21:30
	← rnsanchez left	21:31
	→ peraloh joined	21:31
	← juvenal left	21:31
	← modocache left	21:32
	← dfaught left	21:32
	← baweaver left	21:33
	→ danielgadd joined	21:33
	→ tpollard joined	21:34
	→ chuchunaku joined	21:34
	← snow_ru left	21:34
converge	I have this system, today the version 2 will be ready, should I reade a new branch for it ? how do you use to use branchs?	21:36
	→ pcypher joined	21:36
	← bob14 left	21:36
	→ Guest26 joined	21:36
	← thiago left	21:36
converge	*create	21:36
	← denete left	21:37
	← greggynapalm left	21:37
	← mostlybadfly left	21:38
	← mfmfmfmfmfmf left	21:38
	← th3fallen left	21:40
	← klj left	21:41
	← a-l-e left	21:41
	→ stantonk joined	21:41
	← jason237 left	21:42
	← staafl left	21:42
	← charginghawk left	21:43
	→ effi joined	21:43
	← peraloh left	21:44
	→ peraloh joined	21:44
	→ cdown joined	21:44
	← Guest26 left	21:44
	← beckyconning_ left	21:44
	→ Guest26 joined	21:44
	→ staafl joined	21:44
	← zumba_addict left	21:44
	← freestyl3r left	21:45
	→ pcypher_ joined	21:45
	← juvenal_ left	21:46
osse	converge: you should mark it with a tag	21:46
	you create/delete tags and branches with git tag and git branch	21:47
	→ juvenal joined	21:47
qsuscs	if you plan to release maintenance versions (like a 2.0.1 while continuing with 2.1.x series), you could create e.g. a maint-2.0 branch	21:47
	→ Ncau joined	21:48
	← pcypher left	21:48
	→ tylerfisher joined	21:48
	← Guest26 left	21:48
	← bgerber left	21:48
	← mezod left	21:48
	← tylerfisher left	21:49
	← stantonk left	21:49
	← gopar left	21:50
converge	osse, qsuscs: the tag thing is pretty cool	21:50
	← Ncau left	21:50
	← rivarun left	21:51
	→ lilbaby joined	21:51
	→ Takle joined	21:51
	← Eepe left	21:51
	→ rivarun joined	21:51
	→ bgerber joined	21:52
	→ qupt joined	21:53
	→ gsingh93 joined	21:53
	← IrishPrime left	21:53
	→ zotez joined	21:53
	← symetric left	21:53
	→ aretecode joined	21:53
	← qupt left	21:54
	→ snow_ru joined	21:54
	← hit_ left	21:55
	← livingstn left	21:55
	→ whphhg joined	21:56
	← zematis left	21:56
	← nilg left	21:56
	→ TyrfingMjolnir_ joined	21:56
	→ daito_ joined	21:57
	← effi left	21:57
	→ dfaught joined	21:57
	← TyrfingMjolnir left	21:57
	TyrfingMjolnir_ → TyrfingMjolnir	21:57
	→ Uxo joined	21:57
	→ s8321414 joined	21:58
	← zotez left	21:58
	← asti left	21:58
	← Balliad left	21:59
	← chuchunaku left	21:59
	→ nickniko_ joined	22:00
	→ wlarip_ joined	22:00
	→ beckyconning_ joined	22:00
	← daito_ left	22:01
	← nicknikolov left	22:02
	→ cavallari joined	22:04
	← wlarip left	22:04
	← Uxo left	22:06
	→ eletuchy joined	22:06
	← axl_ left	22:06
	→ sparetire_ joined	22:07
	← whphhg left	22:08
	→ Ijjx joined	22:09
	← raymond left	22:09
	→ zematis joined	22:09
	← satanist left	22:10
	← jolda left	22:10
	→ effi joined	22:10
	→ zumba_addict joined	22:11
	→ raymond joined	22:11
	← eletuchy left	22:11
	← Ijjx left	22:12
	→ bannakaffalatta joined	22:13
	← lilbaby left	22:13
	→ satanist joined	22:15
	← sentriz left	22:15
	← zumba_addict left	22:16
	← ncd\|leeN left	22:16
	← raymond left	22:16
	→ zumba_addict joined	22:16
	→ chuchunaku joined	22:17
	→ Uualj joined	22:17
	← effi left	22:17
cavallari	How can I deploy my website using git??	22:18
qsuscs	!deploy	22:18
gitinfo	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	22:18
	→ tinanoo joined	22:18
cavallari	I´ve created a bare on my server	22:18
	→ baweaver joined	22:19
cavallari	then created a hook	22:19
	but seems that hook is not working	22:19
qsuscs	´ is _not_ the right character at that place. do I’ve or I've, but NEVER do I´ve.	22:19
	← zsoc left	22:20
	→ mostlybadfly joined	22:20
	← HSaka left	22:20
cavallari	qsuscs: are you a bot?	22:20
qsuscs	cavallari: only on mondays	22:20
cavallari	lol hahaha	22:20
	can you help me with git deploy?	22:21
satanist	have you set the x-flag to the hook?	22:21
	→ zumba_ad_ joined	22:21
	← zumba_addict left	22:22
cavallari	yes	22:22
	← dsdeiz left	22:22
	→ northfurr joined	22:22
	← zematis left	22:22
	→ hahuang65 joined	22:23
cavallari	chmod +X hook/post-receive ??	22:23
	← txomon\|home left	22:23
	← LBV_User left	22:23
	← chuchunaku left	22:24
	← peraloh left	22:24
satanist	chmod +x hook/post-receive	22:25
	← duderonomy left	22:26
cavallari	yes, whhat I i did	22:26
	← zackiv31 left	22:26
cavallari	chmod +x hook/post-receive	22:27
satanist	have you used X or x?	22:27
	→ edux joined	22:27
satanist	+X only adds execute-bit if anyone have executebit set	22:28
	← echo-area left	22:28
	→ effi joined	22:28
	← crose left	22:28
cavallari	Used x, lowercase	22:29
	but now I got it working	22:29
	← Zupoman left	22:29
	← rendar left	22:29
	← zumba_ad_ left	22:30
	← dfaught left	22:30
	← katherin_ left	22:31
	→ zumba_addict joined	22:32
	← edux left	22:32
	→ modocache joined	22:33
	← kpease left	22:33
	→ thiago joined	22:33
	← Gama11 left	22:34
	→ gopar joined	22:35
	← nickniko_ left	22:36
cavallari	dont know what it happened but it worked now	22:36
	← SylvieLorxu left	22:37
	← xckpd7 left	22:37
	← madewokherd left	22:37
	← modocache left	22:37
	← joo-_ left	22:37
	← Dorf left	22:38
	← Abyx left	22:38
	→ tomzx joined	22:38
	→ Scriptonaut joined	22:38
	→ anahumar joined	22:38
	→ xckpd7 joined	22:38
anahumar	I forgot the command which generates a unique list of repo authors	22:39
	git log -p	22:39
	git shortlog -p	22:39
	both aren't working	22:39
	← rubyonrailed left	22:39
	← Noldorin left	22:40
	← Pyrogerg left	22:40
	→ Gitzilla joined	22:40
	→ Pyrogerg joined	22:40
grawity	git shortlog -s [-e]	22:40
anahumar	git shortlog -s	22:42
	not really	22:42
	→ WaReZ joined	22:42
Scriptonaut	Hey guys, I somehow made a mess of my git tree. I want master and production to be where origin/production and origin/master are	22:42
	https://gist.github.com/robins35/6989c87b942bbf6478bc	22:42
anahumar	I recall it has something -p	22:42
	→ zackiv31 joined	22:42
Scriptonaut	It somehow is applying "Update support phone #" twice	22:42
grawity	well	22:43
Scriptonaut	or, Revert "Update support phone #"**	22:43
lethosor	anahumar: what does "not really" mean?	22:43
grawity	I'm quite sure `git shortlog -s` does in fact show an unique list of commit authors	22:43
anahumar	yes yes ... that is correct grawity ... shortlog -s	22:43
	← pm90_ left	22:43
	← benborges left	22:43
	← xckpd7 left	22:43
anahumar	thanks	22:43
	← ArmOrAttAk left	22:47
	→ speedy joined	22:47
	→ ArmOrAttAk joined	22:48
	→ otter768 joined	22:49
	← joki left	22:50
	← pcypher_ left	22:51
	← Lisk left	22:52
	← danielgadd left	22:52
	→ Noldorin joined	22:52
	→ danielgadd joined	22:53
	→ nixnerd joined	22:53
	→ stantonk joined	22:54
	← otter768 left	22:54
	← ribasushi left	22:54
	→ xckpd7 joined	22:54
	→ chad joined	22:57
	← bronson left	22:58
	→ ribasushi joined	22:58
	→ daito joined	22:58
	→ duderonomy joined	22:59
nixnerd	If I want to NOT track all hidden files can I add '.*' to the repos .git/info/exclude file?	22:59
qsuscs	yes and no	22:59
nixnerd	And how does this differ from .gitignore?	22:59
	gitinfo set mode: +v	23:00
qsuscs	ignore patterns do not apply to already tracked files	23:00
	→ rkazak joined	23:00
	← knownasilya left	23:00
nixnerd	So I'd need to do that at the START of a project?	23:00
	→ joki joined	23:00
	← eka left	23:00
	→ wlarip joined	23:00
qsuscs	well, you can remove files at any time	23:00
nixnerd	Gotcha.	23:00
	So is this preferable to .gitignore? Or is it a different application?	23:01
qsuscs	.git/info/exclude is more for local customizations, it is not tracked within the project	23:01
	← xckpd7 left	23:01
	← Saturn812 left	23:01
qsuscs	e.g. if only YOU use an editor that makes backup files ending in ~, which you want to ignore of course, but you may not put it into .gitignore	23:01
	they work exactly the same, though i don’t know which one takes precedence if they’re contradictous	23:02
nixnerd	Gotcha. But if more than one person on a team uses Vim and I want ALL of them to not have to deal with .swp files... I should use git ignore?	23:02
	→ xckpd7 joined	23:02
qsuscs	“should”	23:03
	shrug	23:03
	maybe. maybe not. ask 5 people and you’ll get 13 opinions	23:03
nixnerd	Ok. And .gitignore can just go in the project / right?	23:03
	← daito left	23:03
chad	Greetings. I'm attempting to convert my workflow from svn to git with as little changing as possible, and I've cobbled together what I think will be a way to accomplish something I used to do with svn that seems very much outside of the way git is designed to work. Before I commit (no pun intended) to this new system, I'd appreciate it if someone could tell me whether my idea is sane or not.	23:03
qsuscs	it can go anywhere in the project, but only applies in its own directory and directories beneath its one	23:04
	← wlarip_ left	23:04
	← chitopunk left	23:04
nixnerd	Sick. You've been very helpful. Thanks a lot!	23:04
	← nixnerd left	23:04
qsuscs	!next	23:04
gitinfo	Another satisfied customer. NEXT!	23:04
qsuscs	chad: do be prepared to !unlearn	23:04
gitinfo	chad: Users of centralized VCSes will need to unlearn a number of habits in order to learn git. Many commands, such as "checkout" and "revert" bear little in common to those holding the same name in other systems.	23:04
	← rkazak left	23:04
	← effi left	23:04
	← hiptobecubic left	23:04
	→ espindola joined	23:05
chad	What I used to do with svn was deploy my website by simply updating a working copy of a subdirectory of my repsitory in my web server's data directory, with rules on the web server to not serve .svn directories. This seems to not match git well for two reasons: I don't want to copy the whole repository there, and I only want a subdirectory of a working copy. I found solutions to each of those problems independently, but have attempted to	23:05
	→ Jeff__ joined	23:06
qsuscs	chad: your message was cut off: “but have attempted to […]”	23:06
chad	So my thought was that I could put this in a post-receive hook in my main repository: git --git-dir=/var/git/personal-documents.git archive --format=tar HEAD web \| (cd /var/www/www.chadhogg.name/ && tar xf -)	23:06
	sorry, the rest was just "put them together myself."	23:06
qsuscs	you may want to read !deploy	23:07
gitinfo	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	23:07
	← Dragooon left	23:07
qsuscs	also, man githooks and !hook_pitfalls	23:07
gitinfo	Guidelines for writing hooks: 1. Consume all input (cat >/dev/null if you don't want it). 2. If you use any 'cd', also 'unset GIT_DIR'. 3. Don't git-pull in a hook (or any other script).	23:07
	the githooks manpage is available at http://jk.gs/githooks.html	23:07
	→ eletuchy joined	23:07
chad	thanks, I'll look into it	23:07
	→ dsdeiz joined	23:08
	→ editshare-ericf joined	23:08
	→ effi joined	23:08
	← zendrix left	23:10
	→ echo-area joined	23:11
	← endiruna left	23:11
	← AaronMT left	23:12
	← eletuchy left	23:12
	← xckpd7 left	23:12
	→ Xiti joined	23:12
	← rivarun left	23:12
	→ xckpd7 joined	23:13
	← basiclaser left	23:14
	← Ceber left	23:15
	← wowaname left	23:16
	→ zendrix joined	23:17
	← Uualj left	23:17
	← stantonk left	23:18
	← xckpd7 left	23:18
	→ madewokherd joined	23:19
	→ oimi joined	23:19
	← oimi left	23:20
	← snow_ru left	23:22
	← ahr3n left	23:23
	← Trow left	23:23
	← Takle left	23:23
	→ dsantiago joined	23:24
	→ xckpd7 joined	23:24
	→ Gsham joined	23:24
	→ delinquentme joined	23:24
	← gsingh93 left	23:24
	← zumba_addict left	23:25
	← jagob left	23:26
	← speedy left	23:26
	← cdown left	23:27
	→ cdown joined	23:29
	→ Inea joined	23:29
	← xckpd7 left	23:29
	← oiu left	23:29
	← chandlerbing left	23:29
	→ xckpd7 joined	23:29
	← liamkeily left	23:30
	← thiago left	23:30
	→ oiu joined	23:30
	← LaptopBrain left	23:30
anahumar	guys ... how to find projects with common developer at the same period of time?	23:31
	:-/	23:31
	← cavallari left	23:32
	← Inea left	23:33
	← baweaver left	23:33
	← mizu_no_oto left	23:34
	→ chandlerbing joined	23:34
	→ wowaname joined	23:34
	→ jrajav joined	23:35
	← silviof left	23:36
	← s8321414 left	23:36
	→ Ostsa joined	23:36
	→ HenriettaSalt joined	23:37
	→ s8321414 joined	23:37
	→ snow_ru joined	23:37
	← Ostsa left	23:37
	→ tristanseifert joined	23:37
	← maestrojed left	23:38
	→ thiago joined	23:38
	→ hexagoxel_ joined	23:42
	← shabazy left	23:42
	← jost__ left	23:42
	← chad left	23:43
	→ AustinTheGrey joined	23:44
	→ edux joined	23:44
	→ lilbaby joined	23:44
	← hexagoxel left	23:46
	hexagoxel_ → hexagoxel	23:46
	← nightspades left	23:46
	← juvenal left	23:47
	← jrajav left	23:47
	← cdown left	23:47
	→ Nizumzen joined	23:47
	→ eletuchy joined	23:47
	→ espindol_ joined	23:48
	→ cdown joined	23:48
	→ Toboi joined	23:48
	← edux left	23:49
	→ chad joined	23:49
	gitinfo set mode: +v	23:49
	← effi left	23:49
	← m0ltar left	23:50
	→ edmund5 joined	23:50
	← Toboi left	23:50
	← Gsham left	23:50
	← m1dnight_ left	23:50
	← espindola left	23:50
chad	The pseudo-documentation at http://gitolite.com/deploy.html makes a powerful case for using git-checkout rather than git-archive for deployment (and somewhat less of an argument against doing deployment with git at all)	23:51
	← edmund5 left	23:51
	→ edmund5 joined	23:51
edmund5	hello again! so: i've used "git svn" to convert a repository, which seems to have worked ok, except all the tags and branches are in the reflog instead of being actually there	23:51
	→ oikab joined	23:51
chad	but my requirements include (a) only getting a subtree of the data and (b) not getting the repository, just a "working" copy in which no work will be done	23:52
	→ m0ltar joined	23:52
	→ cbonobo joined	23:52
	← oikab left	23:52
chad	everything I've read indicates that sparse checkouts can only be done into a location that already contains a repository, not an empty directory	23:52
	can anyone confirm or deny this?	23:52
ojacobson	chad: that's accurate. Git fundamentally operates on snapshots of your whole project.	23:52
	→ iemi joined	23:53
ojacobson	(That's the content model of a commit, for example)	23:53
	← iemi left	23:53
	→ nightspades joined	23:54
chad	ok, thanks	23:54
	→ xpii joined	23:54
	→ jason237 joined	23:54
	← xpii left	23:54
chad	I'll try to figure out whether it makes more sense to go back to svn or to divide my repository into several smaller ones	23:54
	→ Eexs joined	23:55
	← c0mrad3 left	23:56
	→ DerisiveLogic joined	23:56
	← Eexs left	23:56
	→ faow joined	23:57
	← drewo left	23:57
	← editshare-ericf left	23:57
	→ bronson joined	23:58
	← fstd left	23:59
qsuscs	svn never makes sense	23:59
	if it’s not related, split the repos	23:59
	→ fstd joined	23:59
qsuscs	if it’s related but seperate … depends.	23:59
	← m0ltar left	23:59

Logs Search ←Prev date Next date→

Channels Documentation