IRCloggy #git 2013-06-08

Provider of IRC logs since 2005.

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

	2013-06-08
joephilly	I use putty	00:00
EugeneKay	The helper command for talking to ssh remotes	00:00
joephilly	*pageant	00:00
EugeneKay	The equivalent to `ssh`	00:00
joephilly	ah, that explains a lot	00:00
	yeah, gitextensions doesnt deal with it properly then	00:00
EugeneKay	You /can/ use openssh.exe, but it doesn't talk to Pageant.	00:00
	For 99% of things plink drops in just fine; I've never used Gitextensions but it sounds like they figured that out	00:00
	→ ktosiek joined	00:01
	→ GarethAdams joined	00:01
	← infynyxx left	00:01
	→ rdeweerd joined	00:01
joephilly	while i'm here, is there a way to use git gc so that I can just see how many loose objects there aer?	00:01
EugeneKay	man git-fsck	00:02
gitinfo	the git-fsck manpage is available at http://jk.gs/git-fsck.html	00:02
EugeneKay	If you mean "unpacked objects", then don't bother. git will pack/unpack objects as needed.	00:02
DrNick	joephilly: git count-objects -v	00:02
EugeneKay	Too much fiddling about in .git/objects/ WILL lead to insanity.	00:02
	→ freestyl3r joined	00:02
	maslowbeer → brrrrrr_murica	00:02
joephilly	EugeneKay, well every time I let git do its thing, those files seem to be locked so I wanted to just clean ti all up right now	00:03
	← relipse left	00:03
joephilly	oh well, now I know to kill plink next time	00:03
	← abhi0 left	00:04
	→ tinti joined	00:05
	→ mklappst_ joined	00:05
EugeneKay	It /ought/ to exit gracefully after a ssh operation	00:05
	I'd file a bug with gitextensions	00:05
	joephilly has contributed before so maybe I'll just try to fix it	00:06
	← guns left	00:06
	← m_ke left	00:06
	→ revyd joined	00:07
	← mklappstuhl left	00:08
	→ infynyxx joined	00:08
	← DonRichie left	00:09
	← h0v1g left	00:09
	← revyd left	00:09
	→ DonRichie joined	00:09
joephilly	so oddly enough, when I do a pull from this ssh remote, plink doesnt even open	00:10
	← jdunck left	00:10
	→ loganizer joined	00:10
loganizer	msg gitinfi .voice	00:11
	← setmeaway2 left	00:11
	gitinfo set mode: +v	00:11
loganizer		00:11
	Hello everyone	00:11
	→ skorgon joined	00:11
joephilly	hi dad	00:11
loganizer	I am having a problem where git thinks the file i try to do git add on is unmodifyed, even though i just modified it	00:12
	← aendrew left	00:12
	→ etcetera joined	00:12
	← rdeweerd left	00:13
	→ LuxuryMode joined	00:13
	→ JaredMiller joined	00:13
	→ jcromartie joined	00:14
	→ _BJfreeman joined	00:15
	→ hobodave joined	00:15
	← mklappst_ left	00:15
joephilly	when I do git branch -r, is there an easy way to also include the last commit date for the branch?	00:16
	or hell, maybe even sort by that	00:16
	→ lresende_ joined	00:16
	lresende_ → lresende	00:16
	← LuxuryMode left	00:16
	_BJfreeman → BJfreeman	00:17
	← lresende left	00:17
	← loganizer left	00:17
	→ lresende joined	00:17
	← hobodave left	00:17
	→ __carlos joined	00:18
	→ v0n joined	00:18
	→ thiago joined	00:21
	→ _BJfreeman joined	00:22
	→ hwrd\|wor_ joined	00:22
	← hwrd\|work left	00:23
	← v0n left	00:24
	→ lindenle joined	00:24
	← skorgon left	00:24
	← etcetera left	00:24
	← BJfreeman left	00:25
	← freestyl3r left	00:25
	← rednaks left	00:26
	_BJfreeman → BJfreeman	00:26
Kadmos	test	00:26
	← AWinterman left	00:28
	→ radarek joined	00:28
	→ AWinterman joined	00:29
	← AWinterman left	00:29
	← OOPMan left	00:29
	→ AWinterman joined	00:29
	← hahuang65 left	00:30
	→ OOPMan joined	00:31
	→ TheLovinator joined	00:31
	→ dropdrive joined	00:33
	← TheLovinator left	00:33
	← Cykey left	00:33
	→ guns joined	00:34
	← noxd left	00:35
	→ dreiss joined	00:35
	← Jahm left	00:35
	→ lonewulf` joined	00:36
	→ raisen joined	00:36
	← lindenle left	00:36
	→ Jahm joined	00:37
raisen	newbie question.. on my master branch, i want to go back one commit but i want to keep that commit probably in a separate place (branch, tag?) so i can reference to it later	00:37
	and that last commit (which I want to discard) has been already pushed to a centralized server	00:38
	← jayfk left	00:38
	← nerdfiles left	00:38
hagabaka	does sparse_checkout only work with sub directories? Is there a way to checkout only a single file at the top level of a repository?	00:39
	← hwrd\|wor_ left	00:42
	→ AaronMT joined	00:42
	→ hwrd\|work joined	00:42
	→ bytephilia joined	00:43
	→ etcetera joined	00:43
	← radarek left	00:43
	← aartist left	00:43
	→ theCole joined	00:44
	← guampa left	00:46
	← theCole left	00:47
	← w0ng left	00:47
	→ bmac joined	00:48
	← bytephilia left	00:48
	→ BiggFREE joined	00:48
	→ rdeweerd joined	00:48
	← Jahm left	00:49
	← bmac left	00:51
loops	hagabaka: git checkout <filename>	00:51
hagabaka	from a remote repository	00:52
loops	hagabaka: git really isn't meant to be used remotely like svn.	00:52
EugeneKay	raisen - `git branch saveme; git reset --hard HEAD~`	00:53
hagabaka	well there's a new sparse checkout feature, but never mind	00:53
	I tried and it does work with single files	00:53
	← infynyxx left	00:53
loops	is best to just git fetch the remote branch, and then git checkout <remote branch> filename	00:53
	← hsn left	00:53
loops	hagabaka: ah k.. cool	00:54
	← hwrd\|work left	00:54
	← RavenHursT left	00:54
	← towski left	00:55
EugeneKay	raisen - You'll need to `git push -f` to overwrite the branch on the shared server. !rewrite applies	00:55
gitinfo	raisen: [!rewriting_public_history] Rewriting public history is usually bad. Everyone who has pulled the old history have to do work (and you'll have to tell them to). If you must, you can use `git push -f` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	00:55
	← breck7 left	00:55
	→ relipse joined	00:55
	← DrShoggoth left	00:55
	→ Jahm joined	00:56
	→ mribeirodantas joined	00:56
	→ Entomo joined	00:57
	→ hwrd\|work joined	00:58
	→ rednaks joined	01:00
CareBear\	it can't be really bad since it feels so good	01:01
	← BJfreeman left	01:01
	→ DrShoggoth joined	01:01
	→ pandeiro joined	01:03
	→ plumpkin joined	01:04
	← snearch left	01:07
	← bklane left	01:08
raisen	EugeneKay: with git branch and git reset, this would create a new branch and then reset to the changes i want, right? my master branch wouldn't be my main branch anymore?	01:08
EugeneKay	raisen - `git branch foo` crates a new branch foo where you are. It does not switch to it.	01:09
	→ jdunck joined	01:09
	→ _BJfreeman joined	01:09
	→ Jahm_ joined	01:09
raisen	EugeneKay: oh i see. so the new branch would have the commit i want to keep, right?	01:09
EugeneKay	Correct.	01:09
raisen	great, thanks	01:09
	_BJfreeman → BJfreeman	01:10
	← Jahm left	01:10
	Jahm_ → Jahm	01:10
	← dreiss left	01:10
	← hwrd\|work left	01:10
	← rasto left	01:10
	← rdeweerd left	01:11
	← pandeiro left	01:13
	← AaronMT left	01:16
	← Corey left	01:16
	→ Corey joined	01:16
	→ nbouscal joined	01:16
	→ senj joined	01:16
	← rednaks left	01:17
	← oriba_ left	01:18
	→ dreiss joined	01:22
	→ rasto joined	01:23
	← AWinterman left	01:23
	→ infynyxx joined	01:24
	← jefferai left	01:24
	← zizzfizzix left	01:24
	→ dhruvasagar joined	01:24
	← codezombie left	01:25
	→ pandeiro joined	01:26
	→ chichou joined	01:26
	→ Dreamer3 joined	01:27
	← codeful left	01:28
	→ boombatower joined	01:30
	→ intripoon_ joined	01:31
	→ private joined	01:32
	← Alz_ left	01:33
	← infynyxx left	01:33
	← mribeirodantas left	01:33
	← intripoon left	01:33
	→ hwrd\|work joined	01:35
	→ zizzfizzix joined	01:35
	← zizzfizzix left	01:35
	→ zizzfizzix joined	01:35
	→ jefferai joined	01:36
	← akurilin left	01:39
	→ mribeirodantas joined	01:39
	→ v0n joined	01:41
	→ erkules_ joined	01:42
	← phipes left	01:43
	← Davey left	01:45
	← TomyLobo left	01:45
	← erkules left	01:46
	→ vjland joined	01:46
	→ w0ng joined	01:47
	→ Davey joined	01:47
	← DolphinDream left	01:47
	→ huoxito joined	01:47
	← v0n left	01:47
	→ paradigm joined	01:48
	← erkules_ left	01:48
	← BJfreeman left	01:49
	→ _BJfreeman joined	01:50
	→ erkules_ joined	01:50
	→ Cykey joined	01:50
	→ AWinterman joined	01:54
	← AWinterman left	01:54
	→ AWinterman joined	01:54
	← lonewulf` left	01:56
	← akiress left	01:56
	→ lonewulf` joined	01:56
	→ jason237 joined	01:57
	→ tmcmahon joined	02:00
	→ infynyxx joined	02:00
	← jday_ left	02:02
	→ kcj joined	02:03
	← dreiss left	02:04
	← jefferai left	02:04
	← zizzfizzix left	02:04
	← AWinterman left	02:05
	← kpreid left	02:05
	← etcetera left	02:05
	_BJfreeman → BJfreeman	02:06
	← chichou left	02:06
	→ kpreid joined	02:06
	← GarethAdams left	02:06
	→ jday_ joined	02:06
	→ nerdfiles joined	02:07
	← normanrichards left	02:07
	→ phipes joined	02:07
	→ zizzfizzix joined	02:08
	← zizzfizzix left	02:08
	→ zizzfizzix joined	02:08
	← tmcmahon left	02:09
	← nerdfiles left	02:09
	→ jefferai joined	02:09
	→ m_ke joined	02:10
	← aro left	02:11
	→ rdeweerd joined	02:12
	← infynyxx left	02:13
	→ dreiss joined	02:14
	→ s0undt3ch__ joined	02:14
	← rdeweerd left	02:15
	→ flippo joined	02:15
	→ rdeweerd joined	02:16
	→ infynyxx joined	02:17
	flippo → flippo[COL]	02:18
	← jdunck left	02:18
	→ weiyang joined	02:18
	← phipes left	02:18
	← pedahzur left	02:19
	→ angelsl joined	02:20
	← scorphus left	02:20
	← infynyxx left	02:23
	→ lifelike joined	02:24
	← kerrick_ left	02:25
	← Davey left	02:25
	← hwrd\|work left	02:27
	→ Goplat joined	02:28
	→ hwrd\|work joined	02:28
	← s0undt3ch__ left	02:29
	→ WACKKN7 joined	02:31
	→ AWinterman joined	02:31
	← knite left	02:32
	← rasto left	02:33
	→ dsdeiz joined	02:36
	← dhruvasagar left	02:36
	← hwrd\|work left	02:38
	→ jayallen joined	02:40
	← chamunks left	02:42
	→ chamunks joined	02:42
	← AWinterman left	02:42
	← rdeweerd left	02:43
	→ zacts joined	02:45
	→ rdeweerd joined	02:47
	← dsdeiz left	02:47
	← vitorluz left	02:47
	→ dsdeiz joined	02:48
	← avinashrbhat left	02:49
	→ avinashrbhat joined	02:49
	→ echo-area joined	02:53
	← tinti left	02:54
	← Caelum left	02:54
	→ juanmabc joined	02:56
	← rdeweerd left	02:57
	← nbouscal left	02:57
	→ mikepack joined	02:59
	← acidjazz left	03:01
	→ vitorluz joined	03:02
	← donmichelangelo left	03:04
	→ donmichelangelo joined	03:05
	← BSaboia left	03:06
	→ ndngvr joined	03:07
	← chrisshattuck left	03:07
	← relipse left	03:07
	→ lindenle joined	03:07
	← rudak1 left	03:08
	→ AWinterman joined	03:08
	← juanmabc left	03:08
	→ juanmabc joined	03:09
	← ndngvr left	03:09
	→ ndngvr joined	03:10
	← avinashrbhat left	03:10
	→ devoldmx joined	03:10
	← weiyang left	03:10
	→ holybit joined	03:12
	→ Fandekasp joined	03:12
	← devoldmx3 left	03:13
	← mckecndricks left	03:14
	→ pastime joined	03:15
	→ Pengoo joined	03:16
	→ hellopat_ joined	03:16
	→ preflex_ joined	03:18
	← preflex left	03:18
	← AWinterman left	03:18
	← boombatower left	03:18
holybit	Using git to track some $HOME shell files. How do I setup the .gitignore correctly for .ssh files? I want include just about everything except for known_hosts and maybe one other. Close but no cigar so far - https://gist.github.com/holybit/5732554	03:18
	preflex_ → preflex	03:18
EugeneKay	You can gitignore everything, then add -f files you want to track	03:19
	→ avinashrbhat joined	03:19
	← hellopat left	03:19
EugeneKay	Note that we typically do not recommend having ~/.git/, because of the hilarious consequences of stat-ing many GBs of homedir files	03:20
	!vcsh is worth a read	03:20
gitinfo	https://github.com/RichiH/vcsh -- version control shell - manage dotfiles using git's fake bare repos to put more than one working directory into $HOME	03:20
offby1	gitignore 'em all; let -f sort 'em out	03:20
	→ Stoob_ joined	03:20
	→ nbouscal joined	03:20
	→ phipes joined	03:21
	← zacts left	03:22
holybit	vcsh look er … complicated	03:24
	→ nerdfiles joined	03:24
nerdfiles	Greetings.	03:25
holybit	thanks for the tips all, still reading ...	03:25
	→ weiyang joined	03:27
	→ InvidFlower joined	03:29
	← BJfreeman left	03:30
	→ dhruvasagar joined	03:31
	← InvidFlower left	03:32
	→ darinmorrison joined	03:32
	← mmitchell left	03:33
	→ chrisshattuck joined	03:33
	→ rangle joined	03:35
	→ rasto joined	03:37
	← mrballcb left	03:37
	→ relipse joined	03:37
	← weiyang left	03:38
	→ Caelum joined	03:40
	← guns left	03:40
	→ abhi0 joined	03:42
	← chrisshattuck left	03:43
	→ curvedmark joined	03:43
	→ aartist joined	03:43
	→ bytephilia joined	03:44
	← SBoudrias left	03:45
	→ AWinterman joined	03:45
	← juanmabc left	03:45
	→ juanmabc joined	03:45
	← w0ng left	03:46
	← juanmabc left	03:46
	→ juanmabc joined	03:46
	← bytephilia left	03:48
	← juanmabc left	03:49
	→ Davey joined	03:49
	→ juanmabc joined	03:49
	→ knite joined	03:51
	→ longbeach joined	03:53
	← alvaro_o left	03:54
	→ weiyang joined	03:55
	← AWinterman left	03:55
	← darinmorrison left	03:58
	→ takezawa joined	03:58
	→ chrisshattuck joined	04:00
	→ MasterNayru joined	04:00
	← mikepack left	04:00
	→ simesy joined	04:05
	← m0viefreak left	04:06
	→ ryez joined	04:06
	→ AWinterman joined	04:07
	← AWinterman left	04:07
	→ AWinterman joined	04:08
Akuw	when i do "git commit" it open default editor	04:11
	so in the end i write commit	04:11
	is ok?	04:11
	← mencito left	04:12
	← the_cybersphinx left	04:12
	← chamunks left	04:12
	← juanmabc left	04:13
	← AWinterman left	04:13
	→ juanmabc joined	04:13
	→ chamunks joined	04:14
	← diegoviola left	04:14
	→ wwu joined	04:14
	← Cykey left	04:15
wwu	hello there, is this the right channel for git svn ?	04:15
	← juanmabc left	04:15
Akuw	yeah	04:16
	→ juanmabc joined	04:16
	← nbouscal left	04:16
	→ irqq joined	04:18
	→ aendrew joined	04:18
	← Joshi3s` left	04:19
	→ darinmorrison joined	04:25
	← aendrew left	04:25
	→ rchavik joined	04:26
wwu	well i was wondering if i am doing something wrong	04:26
	davidfetter wonders whether one of the w's in wwu stands for "well."	04:26
wwu	i dont have something special, but the sparse-checkout does not really work well with git svn	04:26
	← aartist left	04:27
	← kukks left	04:28
wwu	and the /tags folder get checkout, despite i created the file with : echo "tags/" >> .git/info/sparse-checkout	04:29
	← segher left	04:30
	→ b0rax joined	04:31
	→ segher joined	04:31
	← HelloComputer15 left	04:32
	← knite left	04:34
	→ Tommy[D] joined	04:36
	→ bgerber joined	04:37
	flippo[COL] → flippo	04:37
thiago	wwu: you never check out the tags folder of SVN	04:37
	wwu: because it's not a folder	04:37
	← wwu left	04:37
	← Tommy[D]_ left	04:39
	→ knite joined	04:40
tjbiddle	Has anyone done a SVN -> Git migration without using git svn clone?	04:40
	← Bosox20051 left	04:41
tjbiddle	I have an issue where I can't clone the entire repository because of some old corrupted locked file or something - So i had to checkout trunk, branches, tags, and such separately.	04:41
thiago	tjbiddle: yes	04:41
	using svn2git	04:41
tjbiddle	thiago: Hm, all examples seem to point at the server endpoint: https://github.com/nirvdrum/svn2git	04:43
thiago	that's the wrong svn2git	04:44
tjbiddle	lmao	04:44
thiago	I meant this one: https://www.gitorious.org/svn2git/svn2git/	04:44
	→ bytephilia joined	04:44
	← Noldorin left	04:45
	→ pantsman joined	04:45
	← pantsman left	04:45
	→ pantsman joined	04:45
	← simesy left	04:47
	← Khisanth left	04:48
	→ Khisanth joined	04:48
	← m_ke left	04:48
	← lindenle left	04:49
	← bytephilia left	04:49
	← juanmabc left	04:49
	→ darnir joined	04:50
tjbiddle	thiago: Hm - Alright, cloned in and compiled. Are there any use examples?	04:51
	the Usage: still says "svn2git SVN_URL [options]"	04:52
	← jcromartie left	04:52
	→ devoldmx3 joined	04:53
	← rchavik left	04:55
	← devoldmx left	04:56
	← __carlos left	04:56
	← codon_ left	04:59
	← plumpkin left	05:00
	← darinmorrison left	05:02
	→ hahuang65 joined	05:02
	→ mmlac joined	05:03
	→ mckendricks joined	05:03
thiago	tjbiddle: there are example config files	05:03
tjbiddle	thiago: Ended up just patching together the rest of my script. Looks to be working fine now. Thanks anyways!	05:06
	→ Jackneill joined	05:07
	→ fridim_ joined	05:07
	← Khisanth left	05:08
	← senj left	05:09
	→ simesy joined	05:09
	→ senj joined	05:09
	← simesy left	05:09
	← senj left	05:10
	← hyperair left	05:10
	→ rchavik joined	05:11
	→ hyperair joined	05:12
	→ simesy joined	05:14
	← jday_ left	05:15
	→ nkambo joined	05:15
	← OOPMan left	05:17
	→ tanath joined	05:17
	→ vedant joined	05:18
	← hyperair left	05:18
	← chrisshattuck left	05:18
	← yacks left	05:18
	← avinashrbhat left	05:19
	← abhi0 left	05:20
	← dsdeiz left	05:20
	← madewokherd left	05:21
	→ Cassiel joined	05:23
	→ hyperair joined	05:27
	→ w0ng joined	05:27
	← darnir left	05:28
	← shinnya left	05:29
	→ yacks joined	05:29
	→ darnir joined	05:29
	← Jahm left	05:30
	← tanath left	05:30
	→ Khisanth joined	05:33
	→ orion joined	05:34
	← barneybook left	05:34
	→ jaequery joined	05:35
orion	Hi. I want to merge a particular commit on to my current tree, but I don't want to do a merge commit.	05:36
	Is there a way for me to take the changes made in that commit and patch my current tree with it?	05:37
b0rax	hello all. Total noob here. What is the difference between syncing and publishing?	05:38
	← fridim_ left	05:40
	← jaequery left	05:40
	← brma left	05:41
	← pitzips left	05:41
	← Khisanth left	05:41
	← Bass10 left	05:41
	← dhruvasagar left	05:42
	← simesy left	05:42
	← hahuang65 left	05:43
ryez	orion: git cherry-pick <commit>	05:43
	→ brma joined	05:44
orion	Thank you.	05:44
	→ bytephilia joined	05:45
	→ jpg_ joined	05:45
	← Nicholas_Rishel left	05:45
thiago	b0rax: neither term is used in Git	05:46
	→ hoschi joined	05:46
	→ wwu joined	05:47
b0rax	that reaffirms my noobyness	05:47
	i've been working with github....	05:47
	what is the difference between github and git?	05:48
	jpg_ → jpg	05:49
	← jpg left	05:49
	→ jpg joined	05:49
	← bytephilia left	05:49
tango_	b0rax: github is a hosting solution for git repositories	05:49
	b0rax: I think there is a #github channel for github-specific questions	05:49
thiago	b0rax: git is a tool; github is a website	05:49
	→ ErKa joined	05:50
tango_	my guess would be that syncing is git pulling and publishing is git pushing, but don't take my word for it	05:50
b0rax	wow	05:50
	alright	05:50
thiago	where did you see those terms?	05:51
	→ codon joined	05:51
	→ beneggett joined	05:51
	→ simesy joined	05:51
b0rax	in the github windows app	05:52
	thanks fellas, but before i go - just out of curiosity, why don't you use github?	05:52
	← simesy left	05:52
tango_	I also use github, but I only use it with git in linux, not with its own custom app	05:52
	→ Khisanth joined	05:53
	→ dhruvasagar joined	05:53
rchavik	me too.. the custom app has very limited functionality compared to the git CLI	05:53
	← dhruvasagar left	05:54
ryez	b0rax: are you talking about the terms in GitHub client?	05:54
	→ dhruvasagar joined	05:54
b0rax	yessir	05:54
ryez	if so tango_'s word makes perfect sense	05:54
b0rax	aahhhh	05:55
	thanks	05:55
	my dilemma is that the git CLI just seems to have a steeper learning curve than the github app	05:55
	← kpreid left	05:56
ryez	github means more about the hosting website here	05:56
	← relipse left	05:56
b0rax	oh	05:58
	ok	05:58
	ill head out to the #github channel	05:59
	thanks	05:59
EugeneKay	b0rax - !smartgit	05:59
gitinfo	b0rax: SmartGit is a (commercial) UI for git that is very user-friendly and feature-complete. http://syntevo.com/smartgithg	05:59
b0rax	Eugene thank you so much	05:59
	i will give smartgit a shot	05:59
ryez	CLI or GUI is just a pref, understanding how git works is the point	05:59
b0rax	true	06:00
	i think i have a feel as to how it works, i just seek the functionality at the end of the day.	06:00
	thanks fellas; till the wheels fall off	06:00
	→ saurabh joined	06:00
	← b0rax left	06:00
	→ luc_ joined	06:01
	← dhruvasagar left	06:03
	← knite left	06:03
	← mmlac left	06:05
	→ dhruvasagar joined	06:05
	← w0ng left	06:06
	← saurabh left	06:06
	→ codeful01 joined	06:07
	→ dsdeiz joined	06:07
	← davidfetter left	06:07
	→ barneybook joined	06:08
	→ trusktr joined	06:08
	→ sguselnikov joined	06:09
	← PaulCapestany left	06:10
	← sguselnikov left	06:11
	→ arietis joined	06:12
	← dhruvasagar left	06:12
	→ zacts joined	06:12
	← beneggett left	06:12
	← rchavik left	06:13
	→ dhruvasagar joined	06:13
	← flippo left	06:14
	← orion left	06:21
	← private left	06:21
wwu	i discovered giteye	06:23
	which certainly the best in term of funtionnality	06:23
	← abyss42 left	06:23
	← arietis left	06:23
wwu	but it is a little heavy	06:23
	(swt + customed dev around egit)	06:24
	← ErKa left	06:25
	→ darinmorrison joined	06:27
	← kcj left	06:28
	→ rchavik joined	06:28
	← hellopat_ left	06:29
	← dhruvasagar left	06:35
	→ mmlac joined	06:36
	→ boombatower joined	06:37
	← rasto left	06:39
	→ shruggar joined	06:39
Nevik	eww	06:43
	egit is shit	06:44
	→ avinashrbhat joined	06:44
	← FreezingCold left	06:44
	→ dsdeiz_ joined	06:45
	← dsdeiz left	06:46
	← alexandernst_ left	06:46
	→ nilg` joined	06:47
	← barneybook left	06:47
	→ Kicer86 joined	06:47
	→ alexandernst joined	06:48
	← misco left	06:48
	→ pierre1 joined	06:49
	→ dsdeiz joined	06:50
	← rickruby left	06:50
	← wwu left	06:50
	→ w0ng joined	06:51
	← huoxito left	06:51
	→ wwu joined	06:51
	→ rickruby joined	06:51
	← dsdeiz_ left	06:52
	← darnir left	06:52
	→ rasto joined	06:52
wwu	Nevik, i dont know any ui for git better than than	06:53
Nevik	egit is not a ui	06:53
	and just about any of them is better than egit, because most of them actually work	06:53
	wwu: egit fails to set up remotes properly	06:53
	frequent cause of whining on SO	06:53
	because why would a user ever want to set up a remote for both fetching and pushing at the same time?	06:54
	that's totally not a use-case	06:54
	→ ThomasLocke joined	06:54
	← dreiss left	06:55
Nevik	well, part of egit's failing is the fact that eclipse juno is the worst version in years	06:56
wwu	ha i dont know enough git to understand what you mean, i use it with git-svn	06:56
Nevik	so that's not technically egit's fault	06:56
wwu	in order to avoid code being lost	06:56
Nevik	EugeneKay: nice joke in the topic btw	06:56
	← preflex left	06:57
EugeneKay	They're all repeats at this point	06:57
Nevik	wwu: dont have admin access to the svn repo? (or any other reason not to convert it properly)	06:57
	EugeneKay: i havent seen that one before	06:57
EugeneKay	Don't worry, it'll come around again in about a month and a half	06:57
Nevik	sure	06:57
	← rasto left	06:57
wwu	Nevik, nope and it does not matter :)	06:58
	→ preflex joined	06:58
Nevik	it does	06:58
	a lot	06:58
	because git-svn is just another place where things can break	06:58
	any why use the inferior svn as a substrate instead of diving into the full awesomeness of git	06:59
	as is one of the topic quotes, which will repeat at some point "git-svn: now you have two problems"	06:59
	→ braisarias joined	07:00
	← darinmorrison left	07:01
	← Goplat left	07:02
	← codeful01 left	07:03
	← phipes left	07:03
	→ St_Marx joined	07:03
	→ srji joined	07:04
	← guiambros left	07:04
	→ jceb joined	07:07
	← jpg left	07:11
	← pierre1 left	07:12
	← tjbiddle left	07:15
	→ simesy joined	07:16
	← nilg left	07:17
	← simesy left	07:17
	← rickruby left	07:19
	→ private joined	07:21
cbreak	git svn trades svn problems for git problems	07:25
	the latter are usually much less severe :)	07:25
	← mckendricks left	07:26
	→ Artpicre joined	07:26
	→ rudak1 joined	07:28
	→ dhruvasagar joined	07:28
	→ danicampa901 joined	07:29
	→ yuwang joined	07:31
	→ harobed_ joined	07:33
Nevik	true dat	07:34
	→ _BJfreeman joined	07:36
	→ ErKa joined	07:37
	_BJfreeman → BJfreeman	07:38
specing	you should have converted that SVN repo to git long ago	07:38
	→ daanavitch joined	07:38
	→ subhojit777 joined	07:38
Nevik	specing: as i pointed out with my question; no everyone has the access or permissions to convert a repo fully	07:41
	if your team leader says your team is using svn, there's not always much you can do about it	07:41
	→ rednaks joined	07:42
	→ rasto joined	07:42
	→ chuckharmston joined	07:43
	← Fandekasp left	07:44
	← dhruvasagar left	07:44
	→ bytephilia joined	07:45
	→ Fandekasp joined	07:45
	← chamunks left	07:47
	→ chamunks joined	07:47
	← rednaks left	07:48
	→ wrouesnel joined	07:49
wwu	just for curiosity are there any git committer here ?	07:49
Nevik	wwu: what do you mean	07:49
	"git committer" is anyone who uses git	07:49
	← bytephilia left	07:49
tango_	I suspect he means people that actually contribute to git itself	07:50
Nevik	i think so too, but it would be nice if people could be clear in what they say :>	07:50
	→ tjbiddle joined	07:50
Nevik	ive seen enough people who actually mean something else from what it initially appeared	07:50
	← srji left	07:52
wwu	yea i meant that people to contribute to git	07:53
	← boombatower left	07:53
	→ szx joined	07:53
	← dsdeiz left	07:54
	→ tjbiddle_ joined	07:54
Nevik	wwu: the canonical term is "git developers" ;)	07:54
	← tjbiddle left	07:55
	tjbiddle_ → tjbiddle	07:55
	← harobed_ left	07:55
	← shruggar left	07:56
	→ bodom joined	07:56
	→ kirang89_ joined	07:56
Nevik	i think.... charon is a dev? iirc	07:57
	← jceb left	07:57
wwu	so there are git developers here, good to know :)	07:57
	← kirang89_ left	07:57
Nevik	yeah, some hang around	07:58
	→ TheFuzzball joined	07:58
	→ kirang89_ joined	07:58
	← nkambo left	07:58
	→ nkambo joined	07:59
cbreak	I don't think they'd accept C++ code, which is what I'd contribute :)	07:59
	← tjbiddle left	07:59
cbreak	(Would be such an improvement over the dependency hell + code duplication C they have now though... :)	08:00
	→ tjbiddle joined	08:00
	→ Anders_J joined	08:01
	← madprops left	08:03
Nevik	haha	08:05
whowantstolivefo	hi, i get the following error when i type git push heroku master https://gist.github.com/whowantstolivefo/5734464 how i will fix ?	08:06
EugeneKay	That is a build/deployment error with Ruby or Heroku or somethign like that; not a git problem.	08:07
whowantstolivefo	i didnt get any help at #heroku thats why i've asked :)	08:07
	→ jarek joined	08:07
jarek	Hi	08:07
EugeneKay	We don't speak Heroku.	08:07
	← avinashrbhat left	08:07
jarek	Is it possible to search for specific file name in all possible Git revisions?	08:07
	I know I have committed a file that I need know around one year ago	08:08
	s/know/now	08:08
	→ howlymowly_ joined	08:08
	← brrrrrr_murica left	08:08
jarek	but I don't know the specific date when it was in the repository	08:08
Nevik	whowantstolivefo: well, the error is pretty explicit. you have a dependency problem	08:09
	since i dont know any ruby or heroku, i cant tell you how to go about fixing it though	08:10
EugeneKay	jarek - `git log -- path/to/file.txt`	08:10
whowantstolivefo	i must add ruby 2.0 to my gemfile ?	08:10
	Nevik: i must add ruby 2.0 to my gemfile ?	08:10
EugeneKay	whowantstolivefo - we don't speak Ruby. Sorry. !tryit	08:11
gitinfo	whowantstolivefo: [!tias] Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/1-basic-usage/tias.html may help with git-specific TIAS.	08:11
	← zacts left	08:11
whowantstolivefo	thank you Nevik and EugeneKay	08:11
jarek	EugeneKay: I don't know the full path to file, besides 'git log' doesn't seem to list any paths	08:12
	→ nilg joined	08:12
	→ avinashrbhat joined	08:12
	→ SuperDMP joined	08:14
	← szx left	08:14
	← mribeirodantas left	08:14
	→ hinst joined	08:15
	→ shruggar joined	08:17
	→ OOPMan joined	08:17
EugeneKay	jarek - you're looking to grep for the filename, or a string that was added/removed in a file?	08:17
	← w0ng left	08:17
jarek	EugeneKay: I only recall that the file had the word "rectangle" in its name	08:18
	→ anfab joined	08:18
EugeneKay	Try `git log --all --name-only` and then search for the string	08:19
	Or pipe through grep with context enabled or something	08:19
	(I'm sure there's a prettier way to do it, but the technique escapes me)	08:20
	→ PaulCapestany joined	08:20
	← kenperkins left	08:21
	← trusktr left	08:21
jarek	EugeneKay: thanks, I found it!	08:21
EugeneKay	Tada	08:21
	→ kenperkins joined	08:22
	← avinashrbhat left	08:22
	← ktosiek left	08:23
	← shruggar left	08:24
RichiH	holybit: vcsh is not that complicated	08:24
	holybit: if you tell me what specifically you don't like...	08:24
	← ThiefMaster` left	08:24
	→ ThiefMaster` joined	08:24
RichiH	holybit: vcsh init ssh; vcsh ssh add .ssh/config .ssh/whatever	08:26
	holybit: vcsh ssh commit	08:26
	→ Mode-M joined	08:26
	→ radarek joined	08:27
RichiH	holybit: then, for example, vcsh init mplayer; vcsh mplayer add .mplayer/config .mplayer/gui.config; vcsh mplayer commit	08:27
	etc etc	08:27
	maybe /me should rewrite the README to push that "30 second summary" thing	08:28
Mode-M	hi, is it possible to disable fast-forward merges on a repository level via a .gitXY file or something like that?	08:28
	← cannonball left	08:28
	→ codeful joined	08:28
RichiH	Mode-M: i am pretty sure you can just set that via .goit/config	08:28
Mode-M	RichiH: true, but I would have to make this setting every time I clone the repository. I would like to have it set automatically for every clone.	08:29
Nevik	Mode-M: man git merge or man git config, look for merge.ff option	08:29
gitinfo	Mode-M: the git-merge manpage is available at http://jk.gs/git-merge.html	08:29
	Mode-M: the git-config manpage is available at http://jk.gs/git-config.html	08:29
Nevik	and no, you cannot publish options to other clones	08:30
Mode-M	eg. like the .gitignore does for ignoring files	08:30
	→ avinashrbhat joined	08:30
	→ rickruby joined	08:30
	→ cannonball joined	08:30
Nevik	all config is local-only, partly for security reasons. Mode-M, and some people might not like to have that option	08:30
Mode-M	in my case it is a policy no to use fast-forward merges.	08:31
Nevik	Mode-M: you shouldnt tell your devs what they do with their private branches	08:32
	if you want that kind of policy with shared branches, make it a mandatory part of your workflow	08:32
	if you have people who cant follow that, fire them	08:32
	note also that the option can be overridden on a by-call basis	08:33
	so you could distribute a setup-script inside or in addition to the repo	08:34
	→ arietis joined	08:34
Nevik	to set that option and possibly others for people who work on it	08:34
Mode-M	yeah, if only that would be so easy. :) I will put a big notice for this in the README.txt. everyone how commits ff merge will be fired. hrhr	08:34
	s/how/who/	08:34
	← wwu left	08:34
	← rickruby left	08:35
	← jarek left	08:36
	→ leeN joined	08:36
	← thiago left	08:37
Nevik	Mode-M: git is not made to enforce any kind of policy. there are ways to use hooks to enforce some things, and external tools around git to enforce other stuff	08:38
	← chuckharmston left	08:39
	← anfab left	08:39
Nevik	but in general, the best kind of workflow is where people stick to the guidelines and you dont have to enforce things in the first place	08:39
	← howlymowly_ left	08:39
	→ charliesome joined	08:39
Mode-M	Nevik: the hooks idea is not bad. it would probably work this way.	08:40
Nevik	i dont know if you can detect ff merges reliably with hooks	08:41
	but dont let me stop you from trying :D	08:41
	note also that hooks are local-only; so if you want to enforce something for a whole clone network, they need to be server-side	08:41
Mode-M	i think it would be sufficient to check the commit message therefor. don't know.	08:41
Nevik	which limits you severely in what you can detect	08:41
	← arietis left	08:44
	← lresende left	08:45
	→ rednaks joined	08:46
Nevik	Mode-M: btw, you could circumvent the problem of having to detect or programmatically enforce non-ff merges by using a workflow with integration managers	08:46
	i.e. not letting everyone push to the authoritative repo	08:47
Mode-M	you mean a forking workflow with bare repos for every developer?	08:47
	→ marthinal joined	08:47
Mode-M	yes, that would also solve this issue	08:47
	→ stamina joined	08:48
Nevik	no	08:49
	well	08:49
	it might require that	08:49
	unless you have a LAN setup where the integration manager can pull from the devs' clones directly	08:49
	depending on the size and layout of the project and team(s), that might save you a lot of other trouble, with those kinds of restrictions (no ff merges, etc)	08:50
	→ wwu joined	08:51
Nevik	also, people wouldnt have to worry about making the non-ff merges because that's the integration manager's job	08:51
	in general	08:51
Mode-M	no, i cannot access the others repositories directly. theoretically teams on subsidiaries all over the world have access to the central repository.	08:51
	← kirang89_ left	08:55
	→ kirang89_ joined	08:56
	→ Mamoru joined	08:56
	→ srji joined	08:56
	→ mbroeker joined	08:56
	← mbroeker left	08:57
	→ pygmael joined	08:58
	← PaulCapestany left	08:58
Nevik	Mode-M: then soehing like http://git-scm.com/book/en/Distributed-Git-Distributed-Workflows#Dictator-and-Lieutenants-Workflow might be for you	08:59
	← Kicer86 left	08:59
	← JrCs left	09:00
	→ w0ng joined	09:01
Mode-M	yes, that would work.	09:01
	← radarek left	09:01
Nevik	Mode-M: basically, the idea of it is this:	09:01
	developers make request-to-merge (whatever you call that, pull request, merge request, etc), their responsible integration manager makes a merge (and if applicable, runs the test suite)	09:02
	if the merge works fine (by whatever criteria) it gets accepted and pushed upstream -- or proposed to the integration manager on the next level	09:02
	if it doesnt work, merge gets rejected and the proposer must fix it	09:03
	→ kcj joined	09:03
Nevik	Mode-M: give an appropriate hierarchy for different teams, this also makes it easy for a team to share branches among them without cluttering the central repo with their collab stuff right away	09:04
	← babilen left	09:04
	→ zacts joined	09:04
	→ Guest34243 joined	09:05
	← codeful left	09:06
	→ marhaban joined	09:06
	→ Kicer86 joined	09:06
	← elasticdog left	09:09
	→ aard joined	09:09
Mode-M	at the moment we simply use the git flow workflow. that's why i want to enforce non-ff merges for develop and master branch. i also think combined with a integration manager model or even a more hierarchical model it would be easier to control.	09:12
Nevik	indeed	09:12
	the nvie workflow is rather independent of integration hierarchy/access permissions	09:13
	→ ntus1017 joined	09:13
	→ radarek joined	09:13
	← Etheco left	09:14
	→ martijnHH joined	09:16
	← martijnHH left	09:16
	→ martijnHH joined	09:16
	→ _BJfreeman joined	09:18
	→ elasticdog joined	09:18
	← BJfreeman left	09:18
	← marthinal left	09:18
	_BJfreeman → BJfreeman	09:19
	← Kicer86 left	09:21
	← tjbiddle left	09:23
	→ wobb joined	09:23
	← marhaban left	09:25
	← rednaks left	09:26
	→ Etheco joined	09:27
	← wobb left	09:28
	→ arietis joined	09:34
	← zeroxia left	09:35
	→ rednaks joined	09:35
	→ GarethAdams joined	09:36
	← rasto left	09:36
	← nilg` left	09:36
	→ mihamina joined	09:37
	← mihamina left	09:38
	→ mihamina joined	09:38
SuperDMP	a merge always implies a commit, correct?	09:40
	← BJfreeman left	09:40
	← rednaks left	09:40
SuperDMP	and merge -m "some message" simply overrides the default commit message that would otherwise automatically be provided - is that correct too?	09:41
j416	SuperDMP: yes, unless it is a fast-forward 'merge', in which case it is not a merge but a fast-forward. Nonetheless, 'git merge' accomplishes that'	09:43
	.	09:43
	man git-merge	09:43
gitinfo	the git-merge manpage is available at http://jk.gs/git-merge.html	09:43
	← ntus1017 left	09:43
	← rchavik left	09:44
	← hyperair left	09:44
	← nilg left	09:44
SuperDMP	j416: so a commit's only created when the merge command actually produces a merge operation	09:44
	→ rchavik joined	09:44
SuperDMP	and if a merge operation is produced, it will automatically have a message, that can be overridden with -m	09:45
j416	SuperDMP: yes, unless you specify --no-ff	09:45
	SuperDMP: correct	09:45
SuperDMP	thanks	09:45
	I think --no-ff is beyond the scope of this tutorial for now!	09:46
j416	SuperDMP: a merge commit is like any other commit, except that it has two or more parents (whereas a regular commit has one parent)	09:46
	(or zero parents9	09:46
	)	09:46
	→ bytephilia joined	09:46
	→ jayfk joined	09:46
j416	SuperDMP: shouldn't be beyond scope if you understand the basics: http://vimeo.com/46010208	09:46
EugeneKay	Bat-commit.	09:46
j416	what's that	09:47
SuperDMP	j416: well, I'm writing the docs and running a workshop, so I want to give the simplest possible correct explanations	09:47
j416	aha ok	09:47
	:)	09:48
EugeneKay	A terrible joke.	09:48
j416	that I didn't get.. :/	09:48
EugeneKay	No parents.	09:49
j416	as in batman?	09:49
	→ chuckharmston joined	09:49
RichiH	holybit: https://github.com/RichiH/vcsh/#30-second-howto	09:49
	→ ntus1017 joined	09:49
RichiH	that should be a bit more clear & simple	09:49
EugeneKay	Yeah	09:49
j416	EugeneKay: pretty far-fetched I'd say. But ok. :)	09:50
EugeneKay	I said it was terrible	09:50
	→ rasto joined	09:50
	← bytephilia left	09:51
Nevik	EugeneKay: i actually think it's awesome	09:51
	EugeneKay: if it's not, that should go into the list of topic jokes	09:52
	if it's not in there already*	09:52
j416	RichiH: I actually prefer symlinks into $HOME; it makes it easy to change files; then I can just go to wherever my repo is and commit it at some time	09:53
	← chuckharmston left	09:54
	← rchavik left	09:54
	← chamunks left	09:55
	→ chamunks joined	09:55
	→ hyperair joined	09:56
	← St_Marx left	09:57
	← curvedmark left	09:58
	→ kerrick_ joined	09:58
	← rasto left	10:00
	← jayallen left	10:01
	→ jceb joined	10:02
	← GarethAdams left	10:03
	→ knite joined	10:03
	→ babilen joined	10:04
	→ m8 joined	10:05
	← arietis left	10:07
	→ setmeaway2 joined	10:07
	→ tazle_ joined	10:07
	→ the_cybersphinx joined	10:08
	→ tjbiddle joined	10:08
SuperDMP	do you think my explanation at https://github.com/evildmp/afraid-to-commit/blob/messy-docs/docs/commandlinegit.rst#incorporate-upstream-changes is clear enough for a beginner while being accurate? particularly the note on git pull	10:09
	→ rchavik joined	10:10
	→ aendrew joined	10:10
	← Davey left	10:10
	→ maxmanders joined	10:11
	→ marhaban joined	10:12
	← rchavik left	10:12
	← tjbiddle left	10:12
	→ exoon joined	10:13
	→ rchavik joined	10:13
	← maxmanders left	10:14
	← Adlai left	10:14
	← private left	10:15
	← ErKa left	10:15
	→ jayallen joined	10:15
	← marhaban left	10:17
	→ marhaban joined	10:17
RichiH	j416: fine by me	10:17
	i happen to disagree, but.. :)	10:17
	(also, you are in #git... commit often, commit early)	10:18
	if need be, do it in dev branches and rebase the bits and pieces into useful shape	10:18
	→ harobed joined	10:19
	→ mishok13 joined	10:20
	← raisen left	10:20
	→ Aaronds joined	10:21
	→ mechanicalduck joined	10:21
SuperDMP	RichiH: sorry - was any of that in answer to me?	10:21
	← rudak1 left	10:22
	← weiyang left	10:22
	← DonRichie left	10:23
	→ rudak1 joined	10:23
	← marhaban left	10:23
	→ DonRichie joined	10:25
	← pastime left	10:28
	← chamunks left	10:28
	→ chamunks joined	10:28
j416	RichiH: my config files are structured nicely in a hierarchy; using the symlinks to edit them makes it easier; then I commit whatever changed :)	10:28
	← ntus1017 left	10:29
	← irqq left	10:30
j416	SuperDMP: make sure they don't think github == git; a common misconception as it seems	10:30
	← m8 left	10:31
SuperDMP	j416: yeah, I know - it's directed at Django contribution though and Django uses GitHub	10:31
j416	SuperDMP: and I cannot understand why one would want to use github to pull in changes; sounds a little scary to me	10:32
	SuperDMP: why not use git?	10:32
SuperDMP	j416: where?	10:32
j416	your link.	10:32
	also, I think the concept of forks and clones will confuse your audience	10:33
	fork isn't something that git does, it is simply github's way of saying make a clone	10:34
SuperDMP	j416: true	10:34
RichiH	SuperDMP: no, sorry	10:34
	j416: again, that's fine by me	10:34
j416	SuperDMP: anyway, good luck with the talk!	10:34
SuperDMP	it's worked well once already, so these are some revisions	10:35
RichiH	you will not convince me that fake bares are not vastly superior ;)	10:35
j416	RichiH: sure, just responding to your commands.. :)	10:35
	RichiH: fake bares?	10:35
SuperDMP	thanks for the feedback	10:35
	← stamina left	10:35
j416	RichiH: aha, in your workflow. I see. .... odd. :)	10:35
	fine by you though so it's ok	10:35
	:O	10:36
	← chamunks left	10:36
	→ chamunks joined	10:37
	← luc_ left	10:38
	→ luc_ joined	10:38
	← aendrew left	10:38
	← luc_ left	10:39
	← Cassiel left	10:39
	← holybit left	10:39
	← pantsman left	10:40
	→ marhaban joined	10:40
	→ rasto joined	10:41
	← rasto left	10:46
	→ bytephilia joined	10:46
	← cbreak left	10:48
	→ mikewintermute joined	10:49
	← kerrick_ left	10:49
	← bytephilia left	10:51
	→ rdeweerd joined	10:51
	← echo-area left	10:52
	← chamunks left	10:56
	← kcj left	10:56
	→ chamunks joined	10:56
	→ vitor_ joined	10:57
	→ Cromulent joined	10:59
	← vitorluz left	11:00
	→ cbreak joined	11:00
	← yuwang left	11:01
	→ curvedmark joined	11:01
	← rdeweerd left	11:02
	← Fandekasp left	11:02
	← avinashrbhat left	11:03
	→ cehteh joined	11:04
	→ hellopat joined	11:04
	→ Fandekasp joined	11:04
	← moondoggy left	11:06
	→ pastime joined	11:06
	← pastime left	11:06
	← knite left	11:06
	→ moondoggy joined	11:08
	→ noxd joined	11:08
	→ elixir__ joined	11:08
	→ FernandoBasso joined	11:10
	→ Alz_ joined	11:12
	→ leitz joined	11:13
leitz	If I can anonymous git a repo, and if the id_rsa.pub is the same but using my username fails, where else can I look to trouble-shoot a "permission denied" issue?	11:14
	← mikewintermute left	11:15
	→ Balliad joined	11:18
	← moondoggy left	11:18
	→ moondoggy joined	11:18
	→ Milossh joined	11:19
	← wwu left	11:19
bremner	leitz: how is the remote repo accessed? Is there software like gitolite or a hosting site like github involved?	11:19
	← angelsl left	11:20
	← chamunks left	11:21
	→ skorgon joined	11:23
	← exoon left	11:24
	→ freestyl3r joined	11:25
	→ sgambino joined	11:26
	→ _iron joined	11:26
	← Artpicre left	11:26
	← OOPMan left	11:27
	← cehteh left	11:27
	→ cehteh joined	11:28
	← jayallen left	11:29
	→ rasto joined	11:31
	→ kortti joined	11:34
	→ wwu joined	11:35
	← howlymowly left	11:35
	→ howlymowly joined	11:37
	→ j416 joined	11:37
	→ hobodave joined	11:37
	← howlymowly left	11:38
	← rasto left	11:40
	→ kcj joined	11:41
	→ ntus1017 joined	11:42
	← Balliad left	11:43
	→ arietis joined	11:44
	← wwu left	11:47
	← Cromulent left	11:48
	← ntus1017 left	11:49
	← bitkid left	11:49
	← rchavik left	11:49
	← j416 left	11:49
	→ JrCs joined	11:50
	→ snearch joined	11:50
	→ bitkid joined	11:51
	← hobodave left	11:51
	→ Cromulent joined	11:52
	→ j416 joined	11:52
	← arietis left	11:53
leitz	bremmer, sorry. Went out to cut up stuff for stew. http://pastebin.com/fRr5iX7M	11:54
	← _iron left	11:56
	→ hobodave joined	11:56
	← jayfk left	11:56
	← hobodave left	11:59
	→ m0viefreak joined	12:03
	→ _iron joined	12:03
	→ jcao219 joined	12:03
canton7	leitz, I wasn't aware remote.<name>.user/email was valid...	12:05
cbreak	it's probably not used for anything	12:05
	→ mixel joined	12:07
	← noxd left	12:08
	→ jcromartie joined	12:08
	← spacepluk left	12:09
	→ shruggar joined	12:10
Nevik	git-config manpage doesnt list them	12:10
	so theyre probably silently ignored	12:10
leitz	I'm pretty much a newbie so this is almost definately "operator error". Just trying to find the right error and correct it. :)	12:10
	← shruggar left	12:11
	← martijnHH left	12:11
	→ St_Marx joined	12:11
leitz	Okay, problem solved. Wrong rsa key and a replication lag. Just got my repo. Woot!	12:11
	← errr left	12:12
	← conan left	12:13
	← SuperDMP left	12:15
	← jcromartie left	12:17
	→ spacepluk joined	12:17
	→ errr joined	12:20
	→ rasto joined	12:21
	→ aendrew joined	12:23
	→ TomyLobo joined	12:26
	← rasto left	12:26
	← sgambino left	12:28
	← curvedmark left	12:28
	→ Dave^\| joined	12:29
	← leeN left	12:29
	→ BSaboia joined	12:30
	← jan1337z left	12:32
	→ Joseph__Silber joined	12:34
	→ mitz joined	12:34
	← hyperair left	12:35
	← aendrew left	12:35
	→ pantsman joined	12:35
	← pantsman left	12:35
	→ pantsman joined	12:35
	→ hyperair joined	12:36
	→ dhruvasagar joined	12:36
	→ aendrew joined	12:37
	← Khisanth left	12:37
	← Joseph_Silber left	12:37
	→ pinpin404 joined	12:37
	→ Panicg joined	12:38
	← mixel left	12:40
	← BiggFREE left	12:41
	← bodom left	12:41
	→ Kicer86 joined	12:42
	→ kpreid joined	12:42
	→ eijk_ joined	12:43
	→ mixel joined	12:44
	→ AdrienBrault joined	12:45
	→ D9 joined	12:46
	→ HelloComputer15 joined	12:46
	→ bytephilia joined	12:47
	← hyperair left	12:49
	→ rath joined	12:49
	→ m8 joined	12:50
	→ hyperair joined	12:51
	← bytephilia left	12:51
	← Praise left	12:52
	→ mikewintermute joined	12:54
	→ Praise joined	12:54
	→ Adlai joined	12:57
	→ kukks joined	12:57
	→ exoon joined	12:59
	← elixir__ left	13:00
	→ tmcmahon joined	13:01
	→ denver joined	13:04
	← jceb left	13:05
	← totte left	13:05
	→ stewiee joined	13:08
	← Praise left	13:09
	→ Praise joined	13:09
	→ aendrew_ joined	13:10
	← danicampa901 left	13:10
	← aendrew left	13:11
	aendrew_ → aendrew	13:11
	→ rasto joined	13:11
	→ elixir__ joined	13:11
	← Entomo left	13:11
	← stewiee left	13:12
	→ stewiee joined	13:12
	→ Bass10 joined	13:13
	← dhruvasagar left	13:13
	← stewiee left	13:13
	← Akuw left	13:15
	→ rchavik joined	13:17
	← vedant left	13:18
	→ dreiss joined	13:19
	→ chamunks joined	13:20
	→ pmenich joined	13:22
	← subhojit777 left	13:23
	← rasto left	13:26
	← pmenich left	13:28
	→ Re-L joined	13:28
	→ pitzips joined	13:30
	← tmcmahon left	13:31
	← aendrew left	13:32
	→ donnib joined	13:32
	← Eryn_1983_FL left	13:32
donnib	hi, i am following this guide http://git-scm.com/book/en/Git-and-Other-Systems-Migrating-to-Git to migrate from subversion and i have a minor problem and that is that my subversion branches have spaces and end up in git as %20, what can i do to fix that ?	13:33
cbreak	donnib: is that a problem?	13:33
donnib	in the log i see this 7 = 079f837f3eac5cabd522326723d467e141618542 (refs/remotes/version 1) which looks ok	13:34
cbreak	%20 is what a space looks like in URL Encoding	13:34
donnib	but then it's not a space and is converted to %20	13:34
	cbreak: yes i know	13:34
	i just thought that i could get rid of it, maybe it's the small script that converts the remote to git branches that goes wrong	13:34
	← pitzips left	13:35
donnib	here is how it looks * [new branch] version%201 -> version%201 when i push to server	13:35
	→ hobodave joined	13:36
	→ aendrew joined	13:36
donnib	so in the server (bitbucket) the branch name is version%201 which is not so nice to look at	13:36
	← hobodave left	13:36
	→ jceb joined	13:37
donnib	so my question is whether i can get rid of that and have the nice names back	13:38
	→ phipes joined	13:39
	← Adlai left	13:41
	→ rednaks joined	13:43
	← snearch left	13:43
	← lunarjar left	13:44
	← kemyd left	13:45
	← marhaban left	13:45
	← Stefan_vK left	13:46
	← __main__ left	13:47
cbreak	donnib: you can rename branches as you want	13:47
	(as long as you don't want to commit back to svn)	13:48
donnib	but does git support spaces in branch names ?	13:48
	maybe that's why it doesn't work	13:48
	→ __main__ joined	13:48
	→ lunarjar joined	13:48
donnib	i don't so that should not be an issue	13:49
	→ tinti joined	13:50
	→ kemyd joined	13:51
	→ dhruvasagar joined	13:51
	→ angelsl joined	13:51
	← babilen left	13:54
	← Mode-M left	13:55
	← virrus_home left	13:56
cbreak	donnib: it supports more or less all names that are valid paths	13:56
	→ virrus_home joined	13:56
cbreak	hmm...	13:56
	no... :(	13:56
donnib	hmm ok, i tried renaming from version%201 to "version 1" i got invalid branch name	13:57
	so i guess it does not	13:57
	→ dopie joined	13:58
dopie	how do i delete a branch and everything i changed to go back to the master	13:59
	i want to revert to th master and not have the changes applied	13:59
cbreak	dopie: git branch -d branchname	13:59
	dopie: if you want to switch to the master branch, just git checkout master	14:00
	dopie: reverting has nothing to do with it	14:00
	→ rasto joined	14:01
dopie	ok now im in master and i dont want to commit these changes	14:01
	← jcao219 left	14:01
dopie	ahh got i	14:02
	:)	14:02
	→ Cykey joined	14:02
	← ecube left	14:03
	→ Jahm joined	14:03
	→ RawChid joined	14:04
	← kcj left	14:04
	← eijk_ left	14:04
	→ revele joined	14:05
	→ alexander__b joined	14:05
	→ ping-pong joined	14:06
	← alexander__b left	14:06
	→ alexander__b joined	14:06
	← rvl left	14:07
	→ Mad_Wack joined	14:07
	← n8chur__ left	14:07
	→ Vampire0 joined	14:07
	← homer91 left	14:08
	→ homer91 joined	14:08
	← Mad_Wack left	14:08
	→ node22 joined	14:08
	→ n8chur joined	14:08
	→ rvl joined	14:08
node22	hi	14:08
gitinfo	node22: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	14:08
	← revele left	14:09
cbreak	dopie: you can just git checkout HEAD -- file to throw away uncommitted stuff	14:09
_rgn	i don't think you need "HEAD" there	14:10
	→ jday_ joined	14:11
	← harobed left	14:12
	← hellopat left	14:13
	→ barneybook joined	14:13
cbreak	_rgn: you do	14:15
	otherwise you'd check out from the index and not the newest commit	14:15
	→ Adlai joined	14:16
	→ galaris joined	14:16
	→ ecube joined	14:16
	→ aard__ joined	14:17
	ecube → Guest975	14:17
dopie	thank you cbreak	14:17
	← Guest975 left	14:17
	→ Guest975 joined	14:17
	→ shruggar joined	14:17
_rgn	cbreak: in which case should the result of those command (HEAD or without) be different?	14:17
	← rvl left	14:18
cbreak	_rgn: in the case where the index and the newest commit differ	14:18
	→ rvl joined	14:18
cbreak	(for example if you staged changes already with git add)	14:18
_rgn	i don't know, i don't see any difference	14:18
	→ noxd joined	14:19
	→ martijnHH joined	14:19
_rgn	both checkout -- file and checkout HEAD -- file discard the changes, committed or not	14:19
	i mean staged or not	14:19
	← homer91 left	14:20
	← aard left	14:20
	← mtk0 left	14:20
cbreak	_rgn: no	14:21
	← elixir__ left	14:23
	← St_Marx left	14:24
	→ Aprogas joined	14:24
	← dopie left	14:24
	→ ozette joined	14:25
	→ lamarus joined	14:25
_rgn	ok, then i'm using a funny version of git	14:25
	← rchavik left	14:27
	← mixel left	14:28
	← BSaboia left	14:31
	← donnib left	14:31
	→ kcj joined	14:31
	← FernandoBasso left	14:31
	← Cromulent left	14:32
	← shruggar left	14:36
	← leitz left	14:36
cbreak	no	14:37
	git has always acted as I describe	14:37
	→ destiny joined	14:37
	→ trungqtran joined	14:39
	← Jahm left	14:44
	→ dzonder joined	14:44
	← mihamina left	14:45
	→ nbouscal joined	14:46
	→ Sigma[Mtp] joined	14:47
	→ m0ltar joined	14:49
	→ elixir__ joined	14:49
	→ Dougie187 joined	14:51
	→ kumbayo joined	14:51
	← kcj left	14:51
	→ GarethAdams joined	14:56
	← rasto left	14:57
	← CodeShark left	14:57
	← trungqtran left	15:00
	→ relipse joined	15:01
	← mitz left	15:04
	→ DolphinDream joined	15:05
	→ trungqtran joined	15:05
	→ system64 joined	15:05
	→ mitz joined	15:06
	→ breck7 joined	15:07
	→ GarethAdams\|Work joined	15:08
	→ lresende joined	15:10
DolphinDream	what on earth is this git flow and why would or would not use it ?	15:10
	→ rasto joined	15:11
	→ WAAIK1J joined	15:12
	→ JTAAT68E joined	15:12
	→ Khisanth joined	15:12
	← srji left	15:13
	→ vedranm joined	15:14
	← jceb left	15:14
comps	git flow is a flow of gits	15:14
	→ penk joined	15:15
comps	DolphinDream: you're free to create your own workflow using git, but there are some recommended ones, IIRC !gitflow	15:15
gitinfo	DolphinDream: The description of the gitflow branch workflow model is at http://nvie.com/posts/a-successful-git-branching-model/ while a tool to help implement this workflow is at https://github.com/petervanderdoes/gitflow See http://sethrobertson.github.com/GitBestPractices/#workflow for other workflow suggestions/references	15:15
	→ davidchubbs joined	15:16
	← mitz left	15:16
	→ mitz joined	15:17
	→ Cromulent joined	15:17
	← lamarus left	15:17
DolphinDream	:) i read them both.. i wanted to know why would i use it? like.. why would i trust that git flow finish feature will do the right merging for me? it seems like this would hide/cover normal git operations .	15:18
	→ guiambros joined	15:18
	→ OOPMan joined	15:18
	→ BadDesign joined	15:19
DolphinDream	like.. git flow finish featureA .. if this deletes featureA branch automatically.. maybe i do want to keep the featureA branch	15:19
	→ akiress joined	15:19
comps	umm	15:19
	'git flow' is a command !?!	15:19
DolphinDream	https://github.com/nvie/gitflow	15:20
	→ mtk joined	15:20
DolphinDream	it could be :)	15:20
	← trungqtran left	15:20
	→ ntus1017 joined	15:21
	← rasto left	15:21
comps	meh, better ask the author directly, but I think it's pretty obvious that it's for one particular workflow or type of workflows	15:21
	I mean - I'm still kind of freaked out by 'git notes' and pretty much most post-v1.5 stuff, so I wouldn't probably use it, but if it suits your workflow, why not use it?	15:22
	← system64 left	15:23
	→ trungqtran joined	15:24
	← GarethAdams\|Work left	15:25
	← davidchubbs left	15:25
	→ davidchubbs joined	15:28
	← davidchubbs left	15:29
	← Bass10 left	15:31
	→ shinnya joined	15:34
	→ diegoviola joined	15:36
	← BadDesign left	15:37
	→ pac1 joined	15:38
Dougie187	What's special about an annotated tag?	15:39
	→ srji joined	15:40
DolphinDream	you're right. i'm trying to figure out what is my ideal workflow. git flow may not be a bad start	15:40
	← aendrew left	15:40
	→ quetz joined	15:40
Dougie187	DolphinDream: git flow is actually really nice.	15:40
	It makes things super easy.	15:40
DolphinDream	it does? :) as a beginner i'd rather try to do things the hard way ;) until i get to use super easy methods that typically hide the inner workings of git	15:41
pac1	I have a team clone on gitorious. I've got a clone of the team clone on my local machine. I've committed and pushed four changes to the team clone, but locally, when I checkout on next, it says I am two commits ahead of origin/next. why?	15:42
Dougie187	DolphinDream: well, it makes dealing with the harder things git can teach you easier.	15:42
	DolphinDream: it's not really anything special in terms of how git works, it's just nice to have the layout of branches and stuff	15:42
	← lresende left	15:42
	← mikewintermute left	15:42
DolphinDream	https://github.com/nvie/gitflow has automation on how git flow branches are created / merged etc..	15:43
	sure you can follow the nvie's model and do the git operations yourself.	15:43
	← ntus1017 left	15:44
Dougie187	yeah	15:45
	you don't have to use that.	15:45
	I'm mostly referring to this. http://nvie.com/posts/a-successful-git-branching-model/	15:45
	which is on that github site (i believe).	15:46
	→ marhaban joined	15:46
	→ lresende joined	15:47
	→ rihnapstor joined	15:47
	← rihnapstor left	15:49
	→ InvidFlower joined	15:51
	← trungqtran left	15:51
DolphinDream	same guy	15:51
	→ Dieterbe_ joined	15:52
	← penk left	15:53
	→ hellopat joined	15:53
Dieterbe_	is there a way to use 'git add -p' but have the dif hilight the exact characters/words changed?	15:53
	→ trungqtran joined	15:53
Dieterbe_	i've been looking at git dif and there's the --word-diff option (but that doesn't wrap lines, i want wrapped lines), and apparently can't be used with 'git add -p'	15:53
	→ system64 joined	15:54
	→ curvedmark joined	15:55
comps	Dougie187: an annotated tag is a tag object, as opposed to a simple ref	15:55
Dougie187	Thanks	15:57
	← system64 left	15:57
	← trungqtran left	15:57
	← hellopat left	15:58
	← mitz left	15:58
	← LucasKA left	15:58
	→ LucasKA joined	15:58
	→ rasto joined	16:01
	← tinti left	16:02
	→ ojacobson joined	16:02
	→ pawel_m joined	16:02
	→ mitz joined	16:02
	→ ktosiek joined	16:03
	← Cromulent left	16:05
	← dzonder left	16:07
	← pawel_m left	16:07
	→ Noldorin joined	16:07
	← Sigma[Mtp] left	16:08
	→ pawel_m joined	16:08
	→ sgambino joined	16:09
	← sgambino left	16:11
	← mitz left	16:12
	← GarethAdams left	16:13
	→ avinashrbhat joined	16:14
	→ chrisshattuck joined	16:14
	→ jwmann joined	16:18
	→ Sigma[Mtp] joined	16:22
	→ sq-one joined	16:23
	→ _BJfreeman joined	16:25
	_BJfreeman → BJfreeman	16:26
	← AdrienBrault left	16:27
	← Eremiell left	16:27
	→ Eremiell joined	16:30
	← exoon left	16:32
	→ thiago joined	16:32
	← Adlai left	16:33
	→ jaequery joined	16:34
	← pantsman left	16:35
	← camt left	16:36
	← rasto left	16:37
	→ _BJfreeman joined	16:37
	→ mechanicalduck_ joined	16:38
	→ lamarus joined	16:38
	BJfreeman → Guest81973	16:38
	← Guest81973 left	16:40
	→ Goplat joined	16:40
	→ DOCRukuss joined	16:40
	← DOCRukuss left	16:40
	← mechanicalduck left	16:41
	→ TheDracle joined	16:41
	← _BJfreeman left	16:42
	→ BJfreeman_ joined	16:42
	→ dkpi joined	16:43
	→ jcao219 joined	16:44
	→ ErKa joined	16:44
	→ _BJfreeman joined	16:45
	← BJfreeman_ left	16:46
	_BJfreeman → BJfreeman	16:46
	→ Shusshu joined	16:47
	← Shusshu left	16:47
	BJfreeman → Guest70010	16:47
	← nerdfiles left	16:47
	Sigma[Mtp] → Sigma	16:47
	← melder left	16:49
	→ rasto joined	16:51
	← Guest70010 left	16:51
	← noxd left	16:51
	← lamarus left	16:51
	← jaequery left	16:52
	→ thierryp joined	16:52
	→ twisted` joined	16:53
	pinpin404 → pinage404	16:56
	→ mckendricks joined	16:57
	← marhaban left	16:57
	pinage404 → pinpin404	16:58
	→ CodeShark joined	16:58
	→ abhi0 joined	16:59
	→ _BJfreeman joined	16:59
	_BJfreeman → BJfreeman	17:00
	→ specing joined	17:03
	→ s0undt3ch joined	17:03
	← nbouscal left	17:03
	← CodeShark left	17:03
	klow__ → klow	17:03
	← InvidFlower left	17:05
	→ jnavila joined	17:05
	← charliesome left	17:05
	→ bodom joined	17:06
	→ wwu joined	17:07
	← rasto left	17:08
	→ iveqy joined	17:08
	← wwu left	17:08
	← dhruvasagar left	17:10
	← braisarias left	17:10
	← zivester left	17:11
	→ zivester joined	17:12
	← rudak1 left	17:14
	→ fridim_ joined	17:15
	← m8 left	17:17
	← TheDracle left	17:18
	→ hellopat joined	17:19
	→ braisarias joined	17:19
	← braisarias left	17:20
	→ SBoudrias joined	17:21
	→ braisarias joined	17:21
	→ InvidFlower joined	17:21
	→ camt joined	17:21
	→ mencito joined	17:22
	← curvedmark left	17:22
	← thierryp left	17:24
	→ madewokherd joined	17:26
	→ asteros joined	17:27
	→ mechanicalduck joined	17:27
	← devoldmx3 left	17:28
	← DolphinDream left	17:28
	← mechanicalduck_ left	17:28
	→ dhruvasagar joined	17:28
	→ Eryn_1983_FL joined	17:28
	→ sb10101 joined	17:29
Eryn_1983_FL	hey peeps i need help i deleted a ton of files and renamed some how can i drop all these changes?	17:29
	i got it	17:30
	← abhi0 left	17:30
	← asteros left	17:31
	→ asteros joined	17:31
cbreak	Eryn_1983_FL: like every other change :)	17:34
	git checkout . or git reset --hard HEAD	17:34
	→ mikewintermute joined	17:35
_rgn	heh	17:35
	← D9 left	17:35
	← sb10101 left	17:36
	← zivester left	17:38
	→ orion joined	17:39
orion	Hi. It seems that remotes/upstream/mybranch and the local mybranch have become separated. Does anyone know how to fix this?	17:39
grawity	Merge the upstream changes into your own branch?	17:40
	→ nsanden joined	17:40
Eryn_1983_FL	cbreak: yeah	17:40
orion	git pull upstream mybranch?	17:40
	← gtmanfred left	17:40
	→ D9 joined	17:40
orion	That worked as normal, but it never updated remotes/upstream/mybranch.	17:40
nsanden	im trying to send first big commit to new repo on github but getting "fatal: The remote end hung up unexpectedly" after about an hour of transferring	17:41
cbreak	orion: you can merge, or you can rebase	17:41
	orion: !cs	17:41
gitinfo	orion: "Git for Computer Scientists" is a quick introduction to git internals for people who are not scared by phrases like Directed Acyclic Graph. http://eagain.net/articles/git-for-computer-scientists/ See also !concepts !bottomup	17:41
	→ rasto joined	17:41
orion	Ok, thanks.	17:41
nsanden	i tried suggestion saying "git config http.postBuffer 524288000" but this did not help	17:41
cbreak	nsanden: either your network is slow as hell	17:41
	nsanden: or you committed something idiotically gigantic	17:41
	→ gtmanfred joined	17:41
nsanden	fast network, lot of files but wouldnt say gigantic	17:42
	→ babilen joined	17:42
cbreak	a few megabytes?	17:42
nsanden	no	17:42
cbreak	shouldn't take half an hour	17:42
orion	Is there a command I can use to simply modify remotes/upstream/mybranch?	17:42
nsanden	2 gigs	17:42
orion	Or should I just do it in vim?	17:42
cbreak	orion: yes... git fetch	17:42
	nsanden: now that sounds idiotically humongous	17:42
	→ skfax joined	17:42
	← ojacobson left	17:43
nsanden	lot of images	17:43
cbreak	nsanden: I am not convinced github supports that. and storing lots of images in git is stupid anyway	17:43
	git can't deal well with big binary data	17:43
	orion: you don't sound like you have enough knowledge to mess with git internals... so don't :)	17:43
	← realeyes left	17:44
orion	cbreak: You're right about that.	17:44
skfax	After developing on a branch and modifying some files, I want to work on something unrelated on a different branch. However when switching to another branch the previously modified files are still modified in the new branch. Am I meant to always commit before changing branches? Or does it not matter if I'm working on unrelated files, since I don't add these when committing from the different	17:44
	branch?	17:44
osse	skfax: I suggest either stashing or making a dummy commit that you'll amend later	17:45
	→ zivester joined	17:46
osse	skfax: switching branches with modified files can get messy if you switch to a branch which also modifies the same files. But I think Git will give you a heads-up about that.	17:46
	← asteros left	17:47
skfax	osse: Tried checking docs. What do you mean by a dummy commit / stashing?	17:49
osse	skfax: for stashing: man git-stash	17:49
gitinfo	skfax: the git-stash manpage is available at http://jk.gs/git-stash.html	17:50
	→ elixir joined	17:50
	← elixir__ left	17:50
	→ realeyes joined	17:50
osse	skfax: for dummy commiting, I mean just create a regular commit the normal way, except that you write "PLZ FIX ME" or something in the commit messages. You can then "redo" the commit with git commit --amend	17:51
	skfax: I generally like to stash, but it can get hard to keep track of you end up with many stashes.	17:51
	skfax: in my opinion git-stash is what you want, and it was made for this purpose	17:52
skfax	osse: Cool, thank you for explaining. Yep, stash is what I was looking for	17:52
	← rasto left	17:52
	← mikewintermute left	17:52
	→ R1KRDO joined	17:53
	→ tjbiddle joined	17:54
	← Re-L left	17:56
	← braisarias left	17:56
	→ shruggar joined	17:57
	→ tjbiddle_ joined	17:58
	← elixir left	17:58
	← tjbiddle left	17:59
	tjbiddle_ → tjbiddle	17:59
	→ mikewintermute joined	17:59
	← relipse left	18:01
	→ fobban joined	18:02
	→ braisarias joined	18:03
	→ bitkiller joined	18:03
orion	cbreak: I read that link you sent me. You said I can merge or rebase. My problem is that 'git merge remotes/upstream/mybranch' reports that it is up-to-date, yet 'git show-ref' reports two different commits for 'mybranch' and 'refs/remotes/upstream/mybranch'	18:05
	I never made a local commit to 'mybranch' ever.	18:05
cbreak	orion: you just did, with merge	18:06
	git log --graph HEAD will show you the current branch's history	18:06
	→ fluxdude joined	18:06
	← zivester left	18:06
	→ penk joined	18:06
cbreak	if there is a merge, then it was neccessary because both you and the remote have new commits	18:06
	or because the remote rewrote history	18:06
	→ zivester joined	18:08
	← penk left	18:09
orion	cbreak: A merge never happened.	18:09
	I pulled in a bunch of commits and there was a fast-forward.	18:09
cbreak	orion: then you misinterpreted the output of git and your branch is not ahead of HEAD	18:10
	← Sigma left	18:10
	→ devoldmx joined	18:10
	← mikewintermute left	18:11
orion	How do I interpret the fact that git show-ref reports two different commits for the local and remote branches, even though git pull says that everything is up to date?	18:11
cbreak	orion: did you do what I told you right at the start?	18:11
	run git fetch?	18:11
orion	I did... nothing new.	18:11
cbreak	then pastebin the output of the following commands:	18:11
	git fetch, git ls-remote upstream and git ls-remote .	18:12
	→ Re-L joined	18:13
	→ BSaboia joined	18:13
	→ pierre1 joined	18:14
	→ mikewintermute joined	18:16
orion	Strange -- now everything is correct.	18:16
	cbreak: I am sorry for bothering you. I will do more reading.	18:16
	← dhruvasagar left	18:16
	→ penk joined	18:16
cbreak	git fetch is what updates remote tracking branches	18:16
	→ CHIKO joined	18:16
cbreak	especially after doing something like a direct pull... (which you shouldn't)	18:16
orion	Avoid git-pull?	18:17
cbreak	"git pull" does a "git fetch"	18:17
	but "git pull A B" does not	18:17
orion	Oh!	18:17
	← shennyg left	18:17
orion	That would explain it.	18:17
cbreak	don't do the latter	18:17
orion	Interesting.	18:17
cbreak	just use git pull with correctly configured upstream (see man git push -u)	18:17
gitinfo	the git-push manpage is available at http://jk.gs/git-push.html	18:17
cbreak	and man git-config, search for push.default	18:17
gitinfo	the git-config manpage is available at http://jk.gs/git-config.html	18:17
orion	cbreak: That exactly explains what went wrong, thank you.	18:18
cbreak	... well, the latter is not really relevant here but in general :)	18:18
	→ TheNotary joined	18:19
	→ dhruvasagar joined	18:19
	→ caemir joined	18:19
	← caemir left	18:20
	→ DolphinDream joined	18:21
	→ thierryp joined	18:22
	→ darnir joined	18:23
	← mikewintermute left	18:23
	→ tjbiddle_ joined	18:24
	← thierryp left	18:24
	← tjbiddle left	18:25
	tjbiddle_ → tjbiddle	18:25
	← dhruvasagar left	18:26
	→ relipse joined	18:26
	← CHIKO left	18:26
	→ tinti joined	18:27
	→ Jack_Liao joined	18:28
Eryn_1983_FL	guys is this ok ? http://sprunge.us/ShZQ these two origin are the same git repo but one is for local and one is for remote ,	18:28
	is there a better way of doing it ?	18:28
	← shruggar left	18:28
	pinpin404 → anonyme	18:28
	→ elixir joined	18:29
	adhawkins-away → adhawkins	18:29
	→ momomomomo joined	18:29
cbreak	Eryn_1983_FL: looks wrong.	18:31
Eryn_1983_FL	yeah i figured	18:31
	adhawkins → adhawkins-away	18:31
Eryn_1983_FL	trying to find the right way of doing that	18:32
cbreak	remove the origin2 remote	18:32
	and add it again	18:32
	← dreiss left	18:32
cbreak	it should get its own remote tracking branches	18:32
Eryn_1983_FL	ok	18:32
	does it need its own local directory under ~/ like puppet-remote puppet-local?	18:33
cbreak	git remote add should handle it correctly	18:33
Eryn_1983_FL	k	18:33
cbreak	no idea why it is so broken in your case	18:33
	← jwmann left	18:33
cbreak	Eryn_1983_FL: no idea what puppet is	18:33
	Eryn_1983_FL blames my self	18:33
Eryn_1983_FL	text files mostly	18:33
	→ whowantstolivef1 joined	18:34
cbreak	additional remotes don't need anything but git remote add	18:34
	you can add more or less as many as you want	18:34
	→ Adlai joined	18:36
	← bodom left	18:37
	← skfax left	18:37
	→ nerdfiles joined	18:38
	← InvidFlower left	18:38
	→ mribeirodantas joined	18:39
	← theshadow left	18:39
	→ chrob joined	18:39
Eryn_1983_FL	ok i got it now	18:39
	→ skfax joined	18:39
	← zivester left	18:39
	→ theshadow joined	18:40
	← jnavila left	18:40
Eryn_1983_FL	yup working well	18:40
	→ ELLIOTTCABLE joined	18:41
	← ELLIOTTCABLE left	18:41
	← lresende left	18:41
	→ ELLIOTTCABLE joined	18:42
	→ zivester joined	18:42
	← chrisshattuck left	18:42
	→ chrisshattuck joined	18:43
	← chrisshattuck left	18:43
	← akiress left	18:44
	→ abhi0 joined	18:45
	→ arand joined	18:46
	← MasterNayru left	18:46
	← pdelvo left	18:47
	← angelsl left	18:48
	← TheNotary left	18:50
	← hinst left	18:50
	← mastro left	18:50
	← srji left	18:51
	→ hinst joined	18:51
	→ AWinterman joined	18:52
	→ D9_ joined	18:52
	adhawkins-away → adhawkins	18:53
	← D9 left	18:55
	→ phy1729 joined	18:56
phy1729	Is there a way to make the push.default=simple setting degrade nicely or at least not throw an error for 1.7.10.4 ?	18:57
	← rednaks left	18:57
	← kumbayo left	18:58
	← fluxdude left	18:58
	→ JackWinter2 joined	18:59
	→ PaulCapestany joined	19:00
cbreak	phy1729: by updating to something less prehistoric? :)	19:00
	← sq-one left	19:01
phy1729	cbreak: I wish debain would	19:01
cbreak	or use upstream instead of simple	19:01
	← DolphinDream left	19:01
phy1729	so there's no way to check for support for an option and use it or fallback if there's no support?	19:02
cbreak	sure... if you write a shell script for setting it...	19:02
	← Jack_Liao left	19:03
	→ system64 joined	19:03
phy1729	thanks	19:03
	→ rednaks joined	19:05
	→ asteros joined	19:06
	← wrouesnel left	19:08
	← breck7 left	19:08
	← asteros left	19:08
	← hellopat left	19:09
	← tinti left	19:10
	← kirang89_ left	19:12
	→ JohnBat26 joined	19:13
	→ TheDracle joined	19:13
	→ tjbiddle_ joined	19:14
	← tjbiddle left	19:14
	← JackWinter2 left	19:14
	← AWinterman left	19:15
	→ JackWinter2 joined	19:15
	← zacts left	19:15
	→ knite joined	19:15
	→ srji joined	19:17
	← m0ltar left	19:18
	→ tjbiddle joined	19:18
	← tjbiddle_ left	19:18
	→ donnib joined	19:19
	→ Cromulent joined	19:21
	← D9_ left	19:21
	← braisarias left	19:23
	→ duthils joined	19:24
	→ mikepack joined	19:25
	← Cromulent left	19:26
	→ stamina joined	19:29
	← virrus_home left	19:29
	→ virrus_home joined	19:29
	← knite left	19:31
	← threesome left	19:31
	← Jackneill left	19:33
	→ thierryp joined	19:34
	→ __carlos joined	19:36
	→ hellopat joined	19:36
	→ FernandoBasso joined	19:38
	← rath left	19:38
	adhawkins → adhawkins-away	19:38
	← thierryp left	19:39
	← arand left	19:41
	← BJfreeman left	19:42
	← mmlac left	19:45
	← denver left	19:45
	→ jceb joined	19:46
	→ pmenich joined	19:47
	← chamunks left	19:48
	← pawel_m left	19:49
	← TheDracle left	19:50
	← BSaboia left	19:50
	JackWinter2 → JackWinter	19:52
	→ lacrymology joined	19:52
	← klow left	19:52
	← _iron left	19:54
	→ bvi joined	19:55
	→ JSharpe_ joined	19:56
	← daanavitch left	19:56
	← Noldorin left	19:57
	← JSharpe left	19:57
	← __carlos left	19:57
	← JackWinter left	19:57
	→ JackWinter joined	19:57
	← kpreid left	19:57
	→ jcao219_ joined	19:58
	← jcao219 left	19:58
	→ hellopat_ joined	19:58
	← jcao219_ left	19:58
	→ jcao219_ joined	19:59
	→ bwidmer_ joined	19:59
	→ HerrK joined	19:59
	← Mpenzi left	20:00
	← bgerber left	20:00
	→ phy1729_ joined	20:00
	← hyperair left	20:01
	← hellopat left	20:01
	← meLon left	20:01
	← lonewulf` left	20:01
	← quetz left	20:01
	→ meLon joined	20:01
	→ lb_ joined	20:01
	→ Mpenzi joined	20:02
	→ EvanDotP1o joined	20:03
	→ daanavitch joined	20:03
	→ utahcon_ joined	20:03
	← martijnHH left	20:03
	← ch3mical left	20:03
	→ toky_ joined	20:03
	→ PerlPilot joined	20:04
	→ nerdfiles1 joined	20:04
	ELLIOTTCABLE → ELLIOTTCABLE^	20:04
	→ therealklanni joined	20:04
	→ martijnHH joined	20:04
	← martijnHH left	20:04
	→ martijnHH joined	20:04
	← vmiklos left	20:05
	→ archdori1 joined	20:05
	→ vmiklos joined	20:05
	→ bond`_ joined	20:05
	→ ToothlessGear_ joined	20:05
	→ wanders_ joined	20:05
	→ MacGyver_ joined	20:05
	→ Caelum_ joined	20:05
	→ paradigm_ joined	20:05
	→ petteyg_ joined	20:05
	→ Nickeeh_ joined	20:06
	→ vjland_ joined	20:06
	→ a joined	20:06
	→ johnw_ joined	20:06
	← Soliton left	20:06
	→ babilen_ joined	20:06
	→ Soliton_ joined	20:06
	Soliton_ → Soliton	20:06
	→ njbair_ joined	20:06
	→ Will\|- joined	20:06
	→ rkunde_ joined	20:07
	→ destiny_ joined	20:07
	← mencito left	20:07
	← bipolar left	20:07
	a → Guest96500	20:07
	→ jokajak` joined	20:07
	→ bgerber joined	20:07
	← r0bby left	20:07
	← phy1729 left	20:07
	← paradigm left	20:07
	← fridim_ left	20:07
	← ErKa left	20:07
	← variable left	20:07
	← murr4y left	20:07
	← zorzar left	20:07
	← BeerSerc_ left	20:08
	← arnihr left	20:08
	← Will\| left	20:08
	← ChrisAnn left	20:08
	← beawesomeinstead left	20:08
	← nerdfiles left	20:08
	← utahcon left	20:08
	← toky left	20:08
	← jokajak left	20:08
	← sente_ left	20:08
	← dr_lepper left	20:08
	← Re-L left	20:08
	← orion left	20:08
	← dkpi left	20:08
	← Eremiell left	20:08
	← johnw left	20:08
	← PerlJam left	20:08
	← toothrot left	20:08
	← oddmunds left	20:08
	← gitinfo left	20:08
	← petteyg left	20:08
	← Nickeeh left	20:08
	← ohcibi left	20:08
	← sweet_kid left	20:08
	← kalleth left	20:08
	← AlexanderS left	20:08
	← lyddonb left	20:08
	← edk left	20:08
	← averell left	20:08
	← niki left	20:08
	→ toothr joined	20:08
	→ BeerSerc joined	20:08
	← Drakevr left	20:08
	← zequence left	20:08
	→ kpreid joined	20:08
	← babilen left	20:08
	← rkunde left	20:08
	← destiny left	20:08
	← asakura left	20:08
	→ sente joined	20:08
	→ niki_ joined	20:08
	← njbair left	20:08
	← vjland left	20:08
	← wanders left	20:08
	← MacGyver left	20:08
	← Caelum left	20:08
	← bond` left	20:08
	← catsup left	20:08
	← koki left	20:08
	← Fandekasp left	20:08
	iveqy → 13WAAIL0A	20:08
	→ dr_lepper joined	20:09
	→ gitinfo joined	20:09
	→ ohcibi joined	20:09
	→ sweet_kid joined	20:09
	→ kalleth joined	20:09
	→ SicoAnimal joined	20:09
	→ iivvoo joined	20:09
	→ antihero joined	20:09
	→ meuh joined	20:09
	→ AlexanderS joined	20:09
	→ lyddonb joined	20:09
	→ edk joined	20:09
	→ averell joined	20:09
	barjavel.freenode.net set mode: +o	20:09
	← SBoudrias left	20:09
	→ oddmunds joined	20:09
	← JSharpe_ left	20:09
	← nutron left	20:09
	← odin_ left	20:09
	← duthils left	20:09
	← 13WAAIL0A left	20:09
	← niki_ left	20:09
	→ JSharpe_ joined	20:09
	→ FreezingCold joined	20:09
	← Joefish]off left	20:09
	← dknox left	20:09
	→ _BJfreeman joined	20:09
	→ Eremiell joined	20:09
	← R1KRDO left	20:09
	→ koki joined	20:09
	← Will\|- left	20:09
	→ Olipro joined	20:09
	→ duthils joined	20:09
	→ konundra joined	20:10
	→ dknox joined	20:10
	→ R1KRDO1 joined	20:10
	→ Will\| joined	20:10
	→ pandeiro` joined	20:10
	→ niki joined	20:10
	→ odin_ joined	20:10
	→ variable joined	20:10
	_BJfreeman → BJfreeman	20:10
	← bgerber left	20:10
	→ iveqy_ joined	20:11
	→ bgerber joined	20:11
	→ zequence joined	20:11
	→ mtlatif__ joined	20:11
	→ Chaser joined	20:11
	← R1KRDO1 left	20:12
	← njbair_ left	20:12
	← s0undt3ch left	20:12
	← Praise left	20:12
	← yacks left	20:12
	← Stoob_ left	20:12
	← jjasinski left	20:12
	← Alenah left	20:12
	← leafstorm left	20:12
	← jabular_ left	20:12
	← tjbiddle left	20:12
	→ Joefish]off joined	20:12
	← Mpenzi left	20:12
	→ bipolar joined	20:12
	→ jabular joined	20:12
	→ s0undt3ch joined	20:12
	→ njbair joined	20:12
	→ fridim_ joined	20:12
	→ asakura joined	20:12
	→ nutron\|w joined	20:12
	← gtmanfred left	20:12
	→ Stoob_ joined	20:12
	→ Drakevr joined	20:12
	← Drakevr left	20:12
	→ Drakevr joined	20:12
	→ R1KRDO joined	20:13
	→ leafstorm joined	20:13
	→ yacks joined	20:13
	→ gtmanfred joined	20:13
	← pandeiro left	20:13
	→ Praise joined	20:14
	→ Mpenzi joined	20:14
	→ zorzar joined	20:14
	→ Re-L joined	20:14
	← avinashrbhat left	20:14
	→ dkpi joined	20:14
	→ Alenah joined	20:15
	→ ilteris__ joined	20:15
	← darnir left	20:15
	→ shennyg joined	20:15
	→ myme1 joined	20:15
	→ avinashrbhat joined	20:16
	→ arand joined	20:17
	→ hyperair joined	20:18
	← ilteris_ left	20:18
	← fridim_ left	20:18
	← pmenich left	20:18
	← mikepack left	20:19
	→ breck7 joined	20:19
	→ braisarias joined	20:19
	→ pawel_m joined	20:19
	← a-l-e left	20:19
	→ Cromulent joined	20:19
	→ jswizz8 joined	20:21
jswizz8	!list	20:21
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	20:21
	→ spb joined	20:22
	← jswizz8 left	20:23
	← stamina left	20:24
	← breck7 left	20:24
	→ stamina joined	20:25
	→ fluxdude joined	20:26
	→ Kicer joined	20:28
	→ JStoker_ joined	20:28
	→ mechanicalduck_ joined	20:28
	→ fridim_ joined	20:28
	← Kicer86 left	20:29
	← niax left	20:29
	← JStoker left	20:29
	← webster left	20:29
	← mechanicalduck left	20:30
	← bvi left	20:30
	→ webster joined	20:30
	← webster left	20:31
	← R1KRDO left	20:31
	→ R1KRDO1 joined	20:31
	→ ChanServ joined	20:31
	→ webster joined	20:31
	barjavel.freenode.net set mode: +o	20:31
	← avinashrbhat left	20:31
	← R1KRDO1 left	20:31
	→ R1KRDO joined	20:31
	→ avinashrbhat1 joined	20:31
	← R1KRDO left	20:31
	← ChanServ left	20:32
	← JaredMiller left	20:32
	→ R1KRDO joined	20:32
	→ mikepack joined	20:32
	→ Nikoli joined	20:32
	JStoker_ → Guest25439	20:32
	mechanicalduck_ → mechanicalduck	20:33
	→ niax joined	20:33
	→ doug_carmichael joined	20:34
	→ lonewulf` joined	20:34
Eryn_1983_FL	hey peeps i am almost working right but my .ssh/config keeps messing up if my erin user is uptop git tries to login with that user and if my git user is at top i cant ssh in	20:35
	← Guest25439 left	20:36
	→ Guest25439 joined	20:36
	Guest25439 → JStoker	20:36
cbreak	Eryn_1983_FL: ssh://git@blah.host.net/repo.git	20:37
	the url contains the username	20:37
Eryn_1983_FL	ok	20:38
	i didnt do it like that before, should i manually config the config?	20:38
cbreak	sure... or git remote set-url	20:38
Eryn_1983_FL	cool	20:38
	← mikepack left	20:38
	← fridim_ left	20:38
cbreak	or use a virtual host and configure it in ssh's config... (not recommended)	20:38
	→ mikepack joined	20:39
	← relipse left	20:39
	→ akiress joined	20:39
	← nsanden left	20:40
	← longbeach left	20:41
	→ rasto joined	20:41
	→ pinpin404 joined	20:41
Eryn_1983_FL	mmm	20:41
	Caelum_ → Caelum	20:42
Eryn_1983_FL	got it	20:43
	ssh config was what was screwing me up	20:43
	→ shruggar joined	20:44
	← BJfreeman left	20:44
	← donnib left	20:44
	→ _BJfreeman joined	20:45
	← phy1729_ left	20:45
	→ phy1729 joined	20:45
	→ scorphus joined	20:45
	← phy1729 left	20:46
	→ phy1729 joined	20:46
	← phy1729 left	20:46
	_BJfreeman → BJfreeman	20:46
Eryn_1983_FL	ok how do i specify the port cause that is diff too	20:46
	→ tanath joined	20:46
	→ brooks joined	20:47
vedranm	anyone using git gui (the bundled one)?	20:47
cbreak	Eryn_1983_FL: normal URL notation	20:48
	protocol://user@host:port/path	20:48
Eryn_1983_FL	ok	20:48
	→ donnib joined	20:48
Eryn_1983_FL	i'll do it all in gi then no need for that pesky ssh config	20:48
Mamoru	vedranm: Sure, anything we can help with?	20:48
cbreak	Eryn_1983_FL: man git-clone for details	20:48
gitinfo	Eryn_1983_FL: the git-clone manpage is available at http://jk.gs/git-clone.html	20:48
Eryn_1983_FL	ok	20:48
	→ plumpkin joined	20:49
	→ raisen joined	20:50
brooks	I have a general question about maintaining multiple git repos in a project	20:51
vedranm	Mamoru: yes, I have the following issue	20:52
	upon removing the last remote it spits out some kind of Tk error message	20:52
	related to -label being undefined or so	20:52
	I tried building latest git snapshot but it's the same	20:53
	I'm using debian jessie with tk8.5	20:53
	I tried with tk8.6 from experimental, same thing	20:53
Mamoru	vedranm: Ah, that's a gui I'm not familiar with, sorry. Still.. What's the error exactly? Did you try google?	20:53
brooks	For a project, is it desired to keep multiple repos maintained within a master repo using something like subtree or submodule. Or, should there be a layer above (bash script,etc) to collect the repos for us?	20:53
	→ DolphinDream joined	20:54
vedranm	Mamoru: yeah, nothing special came out	20:54
	Mamoru: this is the error https://gist.github.com/rivanvx/5736544	20:54
	← martijnHH left	20:54
cbreak	brooks: depends	20:55
	submodules is made for maintaining multiple repositories with strong binding	20:55
	each commit in the master knows exactly which commit in the submodule it wants	20:55
	→ devoldmx3 joined	20:55
brooks	At what point is it counter-intuitve to have that strong of a binding?	20:57
	→ irqq joined	20:57
	→ ferdev joined	20:58
	← oojacoboo left	20:58
brooks	Maybe when you arent directly contributing to the project?	20:58
	← devoldmx left	20:59
cbreak	it's not really counter intuitive, it's just a big hassle if you contribute	20:59
	submodules only make sense if you understand what they are made for	21:00
Mamoru	vedranm: It seems that git gui doesn't like multiple remotes without a "fetch =	21:00
	" line.	21:00
	vedranm: http://git.661346.n2.nabble.com/git-gui-chokes-on-multiple-remotes-without-quot-fetch-quot-td7564270.html	21:00
cbreak	(which is mainly tracking external repositories that you depend on)	21:00
	← Milossh left	21:00
vedranm	Mamoru: ah, ok, thx	21:01
brooks	what if you are modularizing your code for multiple projects	21:01
Mamoru	vedranm: Hope that helps	21:01
vedranm	I just need to know I'm not the only one experiencing this	21:01
	Mamoru: it sure does	21:01
brooks	and want modules to have their own repo	21:01
	→ srji_ joined	21:01
vedranm	I use Git in class	21:01
cbreak	brooks: then that code would be like an external dependency I suppose	21:01
vedranm	just need to tell students to keep at least one remote	21:01
cbreak	brooks: but if you use submodules you have to understand how they work, they can be very unintuitive...	21:02
	← irqq left	21:02
vedranm	Mamoru: thx again	21:02
	← radarek left	21:02
cbreak	vedranm: git doesn't need remotes	21:02
	without a remote you just can't fetch & push easily	21:02
vedranm	cbreak: yeah, but git gui seems to dislike removing the last remote	21:03
Mamoru	cbreak: vedranm is using git-gui	21:03
cbreak	ah... gui...	21:03
	← system64 left	21:03
cbreak	I remember... people use those things...	21:03
vedranm	cbreak: yeah, students kinda don't like CLI	21:03
	← momomomomo left	21:03
	→ momomomomo_ joined	21:03
	← jceb left	21:03
cbreak	"SourceTree" is a good one	21:03
vedranm	so when you need to teach VCS you kind of don't want to force it too much at first	21:03
Mamoru	vedranm: I'm just happy they use git-gui and not git gui for windows :p	21:03
	← pinpin404 left	21:03
vedranm	cbreak: doesn't work on linux	21:03
cbreak	hmm...	21:03
	→ __carlos joined	21:04
vedranm	git-cola is a nice one	21:04
	but I found it buggy	21:04
	other two are huge	21:04
	one is eclipse based	21:04
	and the other one is also huge and I didn't like it	21:04
	← srji left	21:04
vedranm	SourceTree or GitHub GUI would be awesome if they were ported to Linux	21:04
Mamoru	vedranm: https://git.wiki.kernel.org/index.php/InterfacesFrontendsAndTools#Graphical_Interfaces	21:04
Eryn_1983_FL	okworks great now using non standard id_rsa key so i had to add it to my /etc/ssh/ssh_config	21:05
	← Re-L left	21:05
Eryn_1983_FL	but not a big deal	21:06
vedranm	thx guys I will take a look	21:06
Mamoru	vedranm: goodluck :)	21:06
	← nkambo left	21:07
	→ knite joined	21:07
cbreak	Eryn_1983_FL: I always use ssh agent	21:10
	so I never had to touch ssh_config for git	21:10
	← Kulrak left	21:10
	→ Dreadnaught joined	21:10
	→ pmenich joined	21:11
	← Dougie187 left	21:11
	← rednaks left	21:11
	← freestyl3r left	21:12
	→ freestyl3r joined	21:12
	→ ozette_ joined	21:12
	← pawel_m left	21:12
	→ rednaks joined	21:12
	← devoldmx3 left	21:13
	→ devoldmx joined	21:13
	← ozette left	21:13
	→ rudak1 joined	21:14
	→ ChrisAnn joined	21:14
	← kenperkins left	21:14
	→ devoldmx3 joined	21:16
	← DolphinDream left	21:16
	→ eijk_ joined	21:17
	← rednaks left	21:17
	← pmenich left	21:17
	← devoldmx left	21:17
	→ jnavila joined	21:17
	→ kenperkins joined	21:18
	← kenperkins left	21:18
	toothr → toothrot	21:19
	→ asteros joined	21:20
	→ Ivoz joined	21:20
	← Dreamer3 left	21:21
	← Ivo left	21:22
	→ electrogeek joined	21:22
Mamoru	btw, vedranm: I'd take SourceTree over GitHub GUI	21:22
	← mishok13 left	21:22
EugeneKay	<3 SmartGit	21:22
	← hoschi left	21:22
	← devoldmx3 left	21:22
bremner	<3 zsh	21:24
	→ Milossh joined	21:26
	← hinst left	21:28
	← codertux left	21:28
	← elixir left	21:30
	← doug_carmichael left	21:30
	← donnib left	21:31
	→ elixir joined	21:32
	← daanavitch left	21:35
	← JohnBat26 left	21:36
	→ daanavitch joined	21:36
	→ codertux joined	21:37
	→ kerrick_ joined	21:37
LucasKA	You could try tig? It's a curses based ui for git. Sorta, happy medium?	21:37
	→ etcetera joined	21:38
	← asteros left	21:38
	→ asteros joined	21:38
	← Aaronds left	21:38
bremner	well, sure, or magit if you are using emacs. But I have the feeling users coming from Windows GUIs won't be too happy with those options.	21:38
	→ milind joined	21:39
	→ hwrd\|work joined	21:39
	← jnavila left	21:39
	← srji_ left	21:40
	→ SBoudrias joined	21:40
	← codertux left	21:41
	→ pinage404 joined	21:42
	→ nsanden joined	21:42
	← etcetera left	21:43
offby1	chuckle	21:43
	pinage404 → pinage404afk	21:44
	pinage404afk → pinage404	21:44
	→ chamunks joined	21:46
	← phipes left	21:47
	→ arnihr joined	21:48
	→ AWinterman joined	21:49
	ryan_turner → ryan_turner_	21:52
	→ pinpin404 joined	21:52
	→ devoldmx joined	21:53
	← scorphus left	21:55
	← Cromulent left	21:56
	← mechanicalduck left	21:56
	← hwrd\|work left	21:56
	→ daanavit_ joined	21:56
	← shruggar left	21:56
	pinpin404 → pinage404afk	21:56
	pinage404afk → pinpin404	21:57
	→ shruggar joined	21:57
	← elixir left	21:57
	ryan_turner_ → ryan_turner	21:59
	← daanavitch left	22:00
	← knittl left	22:02
	→ nbouscal joined	22:03
	→ mmlac joined	22:04
	← tallest_red left	22:04
	→ hwrd\|work joined	22:04
	← daanavit_ left	22:05
	→ tallest_red joined	22:06
	→ thasmo joined	22:07
	← mikepack left	22:11
	→ beawesomeinstead joined	22:11
	← babilen_ left	22:12
	aard__ → aard	22:12
	→ knittl joined	22:13
	← knittl left	22:13
	→ knittl joined	22:13
	→ asedeno joined	22:13
	← pinage404 left	22:13
	← pinpin404 left	22:14
	← Cykey left	22:14
	← nutron\|w left	22:15
	→ nutron joined	22:16
	→ Noldorin joined	22:16
	← Noldorin left	22:16
	johnw_ → johnw	22:16
	→ AWinterm_ joined	22:17
	→ Noldorin joined	22:18
	← AWinterman left	22:20
	← penk left	22:20
	← konundra left	22:21
	← AWinterm_ left	22:21
	← devoldmx left	22:22
	→ AWinterman joined	22:22
	→ fridim_ joined	22:22
	→ pinage404 joined	22:22
	← pinage404 left	22:23
	→ kfogel joined	22:23
	→ SirCmpwn joined	22:24
	← __carlos left	22:24
	→ d2dchat joined	22:25
kfogel	I'm doing a one-time conversion from svn to git. I ran 'git svn clone file://`pwd`/svn-repos/ --no-metadata -A authors-transform.txt --stdlayout temp', but the resulting git repos has only the 'master' branch, even though the SVN repos has "branches/2.x" with plenty of commits along that branch. Anyone know why git didn't clone the branch?	22:26
	← whowantstolivef1 left	22:27
EugeneKay	Because git-svn is a piece of garbage	22:27
	→ pinage404 joined	22:27
EugeneKay	Have you considered an !import ?	22:28
gitinfo	Importing lots of revisions from other VCSes(via git-svn in particular) can take a long time. If this will be a one-time switch you should consider "throwing out" all of your old history and making a simple initial commit from a tarball.	22:28
kfogel	EugeneKay: thanks -- I need the history.	22:28
	→ phipes joined	22:28
kfogel	EugeneKay: also, it's not very many revs, about 200 or so, of a not-big code tree. The entire git-svn run takes like 30 seconds or less.	22:28
	EugeneKay: so I can afford to experiment here until it gets it right :-).	22:28
EugeneKay	I really have no clue how git-svn+branches works	22:29
	So	22:29
	Other than "poorly", which you've discovered	22:29
kfogel	EugeneKay: ... :-) ...	22:29
	→ orion joined	22:29
	→ kenperkins joined	22:29
orion	Hi. How can I git archive the contents of my index, not a particular commit?	22:29
kfogel	EugeneKay: I have to admit I was surprised. A repository's history doesn't get much simpler than this one's. In r135, a branch was made. Then development continued along both trunk and branch. This is not exactly new territory for git, but I guess it is for git-svn!	22:30
grawity	kfogel: Maybe you could `svnadmin dump` the repo, load it into reposurgeon, then write out as a git repo	22:30
kfogel	grawity: worth a try! I didn't know about reposurgeon; will look it up.	22:30
	grawity: http://stackoverflow.com/questions/14017127/converting-svn-repo-to-git-using-reposurgeon	22:31
grawity	Yes, what about it?	22:31
cbreak	kfogel: how does your svn repo layout look like?	22:32
	i.e. if you ls -la the directory you git svn cloned from	22:32
EugeneKay	orion - I forget how to reference the index as a treeish. You could make a stash and then reference THAT	22:32
	But that's hacky.	22:32
cbreak	EugeneKay: I don't think the index exists as tree	22:33
grawity	It can be referenced as such, though	22:33
EugeneKay	Ya, but what's the magic refish?	22:33
	← avinashrbhat1 left	22:33
grawity	ah, no, not the entire index, just files in it – :foo or :0:foo	22:34
	← PaulCapestany left	22:34
EugeneKay	Aha, man git-write-tree	22:34
gitinfo	the git-write-tree manpage is available at http://jk.gs/git-write-tree.html	22:34
kfogel	grawity: was just pointing out that there's a page on doing exactly what you recommended, that's all.	22:34
	cbreak: standard trunks,tags,branches	22:34
EugeneKay	orion - `git archive $(git write-tree)`	22:34
cbreak	kfogel: type git branch -a, what does it show in the clone?	22:35
	← rudak1 left	22:35
orion	EugeneKay: Thank you!	22:35
kfogel	cbreak: you're a genius! Er, it shows this:	22:35
	→ avinashrbhat joined	22:35
kfogel	git branch -a	22:35
	* master	22:35
	remotes/2.x	22:35
	remotes/trunk	22:35
cbreak	no need to spam.	22:35
	← pinage404 left	22:35
cbreak	looks as expected	22:35
orion	EugeneKay: If I gc, will that tree get deleted?	22:35
kfogel	cbreak: I didn't think 3 lines was spam	22:35
EugeneKay	orion - yup.	22:36
cbreak	more than 1 is spam :D	22:36
kfogel	cbreak: I didn't expect them as remotes, that's all. Thanks.	22:36
cbreak	they are remote tracking branches	22:36
	(fake ones)	22:36
orion	Excellent! Thank you.	22:36
kfogel	cbreak: opinions differ on this, but I'll abide by your standard since you're helping me :-)	22:36
cbreak	naturally, you can make a local branch out of each of them	22:36
	ChanServ set mode: +o	22:36
kfogel	cbreak: yup. I haven't used remote tracking branches in git much, but I'll figure that out. Thanks for the tip.	22:37
cbreak	np.	22:37
	EugeneKay changed the topic to: Welcome to #git, home of unofficial support for most things git \| Current stable version: 1.8.3 \| Start here: http://jk.gs/git/ \| Getting "Cannot send to channel" or unable to change nick? /msg gitinfo .voice \| Knock knock. Who's there? Git. Git-who? Sorry, 'who' is not a git command - did you mean 'show'?	22:38
orion	Given a treeish, can I get a list of all the objects that point to it?	22:38
	← mribeirodantas left	22:38
	→ rickruby joined	22:38
EugeneKay	orion - http://stackoverflow.com/questions/223678/which-commit-has-this-blob	22:39
cbreak	orion: man git-ls-tree	22:39
gitinfo	orion: the git-ls-tree manpage is available at http://jk.gs/git-ls-tree.html	22:39
	EugeneKay set mode: -o	22:39
	← anonyme left	22:39
orion	thank you	22:39
EugeneKay	There's also git log's --objects option	22:40
	But that's more for blobs than trees	22:40
	→ pinage404 joined	22:41
	← roto left	22:43
orion	hmm	22:43
	ls-tree shows me the contents of the tree, not what points to it.	22:43
EugeneKay	Yeah, you're wanting to look up the reference backwards	22:44
	See the SO I linked for a starter	22:44
	← nsanden left	22:44
	→ R1KRDO1 joined	22:47
orion	ok	22:47
	→ tjbiddle joined	22:47
	← eijk_ left	22:47
	← R1KRDO left	22:48
	→ relipse joined	22:49
	← ThomasLocke left	22:50
	← abhi0 left	22:50
	← tjbiddle left	22:51
	← pierre1 left	22:52
	← R1KRDO1 left	22:52
	→ alfplayer joined	22:52
	→ tjbiddle joined	22:52
	→ __carlos joined	22:53
	← __carlos left	22:54
	← d2dchat left	22:56
	→ Dougie187 joined	22:56
	← shruggar left	22:56
	→ tjbiddle_ joined	22:57
	← nicedice__ left	22:57
	→ nicedice joined	22:58
	→ rdeweerd joined	22:58
	← tjbiddle left	22:58
	tjbiddle_ → tjbiddle	22:58
	← guiambros left	22:59
	← rdeweerd left	22:59
	→ Joshi3s` joined	23:00
	→ Markvilla joined	23:00
	← Markvilla left	23:01
	← thasmo left	23:01
	→ Markvilla joined	23:01
	→ Davey joined	23:01
	→ breck7 joined	23:02
	← rickruby left	23:03
	→ pierre1 joined	23:05
	← ELLIOTTCABLE^ left	23:08
	→ ELLIOTTCABLE joined	23:08
	← rasto left	23:09
	← nbouscal left	23:10
	→ D9 joined	23:10
	→ pastime joined	23:11
	→ boombatower joined	23:12
	→ orion_ joined	23:15
	← orion left	23:15
	← stamina left	23:16
	→ senj joined	23:17
	pinage404 → pinage404afk	23:17
	pinage404afk → pinage404	23:17
	← AWinterman left	23:18
	→ AWinterman joined	23:19
	← braisarias left	23:20
	→ PaulCapestany joined	23:22
	← senj left	23:22
	→ senj_ joined	23:23
	← brooks left	23:24
	← AWinterman left	23:24
	← hwrd\|work left	23:25
	← Anders_J left	23:26
	pinage404 → zz_pinage404	23:29
	→ tadasZ joined	23:32
	→ martijnHH joined	23:36
	← martijnHH left	23:36
	→ martijnHH joined	23:36
	← HerrK left	23:38
	← mckendricks left	23:39
	← senj_ left	23:39
	← chrob left	23:40
	→ rasto joined	23:41
	← FernandoBasso left	23:41
	→ penk joined	23:41
	← ozette_ left	23:42
	→ mckendricks joined	23:43
	← Milossh left	23:44
	→ Cykey joined	23:45
	← donmichelangelo left	23:45
	→ donmichelangelo joined	23:46
	← theshadow left	23:46
	→ theshadow joined	23:47
	← theshadow left	23:47
	→ devoldmx joined	23:47
	→ konundra joined	23:47
	→ theshadow joined	23:47
	→ ntus1017 joined	23:47
	→ Milossh joined	23:49
	→ etcetera joined	23:50
	→ conan joined	23:51
	← kerrick_ left	23:54
	← nicedice left	23:55
	← dkpi left	23:55
	→ nicedice joined	23:56
	← paradigm_ left	23:57
	→ paradigm_ joined	23:57
	paradigm_ → paradigm	23:57
	← devoldmx left	23:58
	→ devoldmx joined	23:59
	← ktosiek left	23:59

Logs Search ←Prev date Next date→

Channels Documentation