IRCloggy #git 2011-03-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.

	2011-03-08
patrikf	what is foo/?	00:00
	part of the name of your branch, or a remote?	00:00
	← cannonball left	00:00
	← eletuchy_ left	00:00
	← happynoff left	00:01
	→ Slix` joined	00:02
explodes	branch name.	00:02
	git checkout master; git branch -D foo_branch	00:02
	all good!	00:02
	→ amerine joined	00:02
explodes	thanks, also i'm out.	00:03
	← explodes left	00:03
	← wilmoore left	00:04
	← Xorlev left	00:05
	← deuterium left	00:05
	→ kukks joined	00:07
	← sbecker left	00:07
	→ fr0sty\|mobile joined	00:08
	← ericdc left	00:13
Wicked	hmm. crap. imlooking over a one of my projects...i stupidly included a password in a source file then pushed the commit to my gitserver. Im now one commit ahead of that...and im wondering how i can remove just that commit from my git repo?	00:13
engla	Wicked: rebase -i to remove the commit and and force push to overwrite the old branch with the new	00:14
Wicked	hmm.	00:14
	ok	00:14
	→ shennyg joined	00:14
	← Tuller left	00:14
	← acts_as left	00:15
	← radarek left	00:15
	→ acts_as joined	00:16
	← sivy left	00:17
	→ madewokherd joined	00:17
	← dr_ick left	00:20
	→ Pacman` joined	00:21
	→ cutmail joined	00:21
	← al3k left	00:22
	→ amling_home joined	00:23
Wicked	hmm...not sure i understand how this works. i only have one branch and i only want to remove one commit. Doing "git rebase -i master" opens up a text editor with some stuff in it...and at the top it has "noop"	00:23
	im not sure what that means or what i need to choose.	00:23
	← Pacman_Home` left	00:23
ayust	git rebase -i master~1	00:23
	← alastair_ left	00:23
ayust	(if the commit you want to remove is the most recent)	00:24
	if the commit you want to remove isn't the most recent, then	00:24
	git rebase -i xxxxxxxx^	00:24
	where xxxxxxx is the sha of the commit you want to remove	00:24
	← Zenergy`lapp left	00:24
	→ welly_ joined	00:24
Wicked	ah	00:24
	← linusoleander left	00:25
	← nixness left	00:25
ayust	then in the editor that opens, delete the line corresponding to the commit you want to remove	00:25
Wicked	and im assuming trailing ^ is meant to be there?	00:25
ayust	yes	00:25
Wicked	ok	00:25
ayust	it means 'parent of'	00:25
	→ ISF joined	00:25
	← f00li5h left	00:25
Wicked	ah	00:25
	thanks :)	00:25
	← rgl left	00:25
	← mando left	00:25
	→ nixness joined	00:25
	→ nchaimov joined	00:27
Wicked	hmm. of course it didnt just work for me. says could not apply	00:28
	← hjertnes left	00:28
Wicked	hint: after resolving the conflicts, mark the corrected paths	00:28
	hint: with 'git add <paths>' and run 'git rebase --continue'	00:28
	← theycallmeniv left	00:29
Wicked	i dont think i added any new files...	00:29
	→ shyam_iyer joined	00:31
	← squinteye left	00:32
	→ theycallmeniv joined	00:33
fr0sty\|mobile	What does git status say?	00:34
	← eijk_ left	00:34
	← drako left	00:34
fr0sty\|mobile	Wicked: you probably want to abort the rebase, do it again and change 'pick' to 'edit" for the bad commit.	00:35
	→ f00li5h joined	00:35
Wicked	hmm	00:35
	→ eletuchy joined	00:35
fr0sty\|mobile	Rebase will stop there and you can remove the password from the commit (leaving the other changes)	00:35
Wicked	let me see...reading a bit more about all this.	00:35
fr0sty\|mobile	Then git rebase --continue	00:35
	I'm guessing there was more than just adding the password in the commit you dropped.	00:36
Wicked	yea	00:37
	its been a while so im not exactly sure what	00:37
	← cbx33 left	00:37
Wicked	but i think using the edit will work...doing a test now	00:37
	→ jmil joined	00:37
	→ Tuller joined	00:39
	← f00li5h left	00:40
	← kenichi left	00:40
	← jrmuizel left	00:40
Wicked	bah.	00:41
	thats still not working.	00:41
	i rebased and chose to edit....removed the password from the file	00:42
	it would not let me --continue so i tried to do git add src/changed/file	00:42
	then continue	00:42
	still saying could not apply	00:42
	→ Kobaz joined	00:44
	← Slix` left	00:44
Kobaz	Your branch is ahead of 'origin/master' by 3 commits. how would i see which commits are missing from origin/master	00:44
DrNick	git diff origin/master..master	00:44
	← intralanman left	00:44
Kobaz	ah, makes sense	00:44
engla	Kobaz: git log origin/master..	00:44
DrNick	or git log	00:44
	← __name__ left	00:45
	← adamm left	00:45
	← mikedeezle left	00:46
	← cutmail left	00:46
	→ GeertB joined	00:47
Kobaz	yeah the log was what i was interested in mostly, nifty	00:47
	→ f00li5h joined	00:47
	→ bdiu joined	00:48
	← rendar left	00:49
	→ Squarism joined	00:49
	← SimonP86 left	00:50
	→ optikfluffel joined	00:50
	← gusnan left	00:50
	→ cutmail joined	00:51
	← abstrakt left	00:52
	← shiba_yu36 left	00:52
	← f00li5h left	00:53
Wicked	bah. nothing i do is working	00:54
	ive wasted so much time today on gitweb and this	00:54
	→ Dafted joined	00:54
	← theycallmeniv left	00:54
banisterfiend	Wicked: ok, take a deep breath. Believe in yourself, and try again.	00:55
	If you believe in yourself you can do anything	00:55
Wicked	ha. yea. i have been all day...id have broken something already had i not	00:55
	← sterlo left	00:55
	← Tuller left	00:55
	→ kpreid joined	00:55
Wicked	but its at the point of the effort far out weighing the end result.	00:55
	when i do rebase XXXXXX^ then select edit to edit one of the commits....i then edit the file i want to change. then do git commit --amend...then try to git rebase --continue	00:56
	but it wont let me	00:56
	→ f00li5h joined	00:56
Wicked	says file needs update	00:57
	working tree is dirty	00:57
banisterfiend	can you really do a git commit --amend in the middle of a rebase?	00:57
Wicked	i thought that the git commit --amend would fix that	00:57
	thats what it says	00:57
	→ adamm joined	00:57
Wicked	http://pastebin.com/Pq4jfezK	00:58
	maybe i need to do the ammend then edit the file?	00:58
	→ dreiss joined	00:59
Wicked	bah.	00:59
	i have no idea.	00:59
	nothing im trying is working. i think its about time to just say f it	00:59
	→ mosno joined	01:00
	← mosno left	01:00
	→ mosno joined	01:00
engla	banisterfiend: yes	01:01
	→ drako joined	01:01
	← drako left	01:01
	→ drako joined	01:01
Wicked	am i missing a critical step?....i just dont understand why this is not working	01:01
engla	Wicked: did you git add the file before commit --amend?	01:01
Wicked	might be my own stupidity...might be my lack of git knowledge	01:02
	engla, no	01:02
	← cutmail left	01:02
	← BobJelly left	01:02
engla	ok, why not?	01:02
Wicked	im not sure. am i supposed too?	01:02
	sorry if this is complete noob talk	01:03
	i dont know much about git yet.	01:03
engla	you should commit the change you want to make	01:03
	← f00li5h left	01:03
engla	so edit the file then commit that change as --amend	01:03
	which you normally do by issuing git add <filename here> ; git commit --amend	01:03
	before you issue commit, be sure to look at git status	01:04
	banisterfiend → trick	01:04
Wicked	ok so. git rebase -> select edit for the commit -> edit the file -> git add file -> git commit ammend -> git rebase continue?	01:04
engla	Wicked: yes	01:04
	→ cutmail joined	01:04
	← GeertB left	01:05
	← lightcap left	01:05
Wicked	bah. still errors	01:05
fr0sty\|mobile	Don't need the commit, actually...	01:05
	← drako left	01:06
fr0sty\|mobile	--continue will commit what is in the index	01:06
Wicked	http://pastebin.com/Bj3baHf8	01:07
	→ chessguy joined	01:07
	← superflit left	01:07
engla	Wicked: It's perfectly possible that the edit you are doing actually conflicts with the next commit	01:08
	and then you have to manually resolve that conflict	01:08
ayust	fr0sty_: for Edit, I don't believe it does	01:08
Wicked	all i really want to do is fix/remove one commit. my dumbass commited a source file with a password in it. id like to share the repo with people but dont want the password to be in it	01:09
ayust	since edit is designed to work with --amend	01:09
	not to create a new commit	01:09
fr0sty\|mobile	Eh? Rebase makes new commits	01:09
ayust	fr0sty_: yes, but 'edit' commits the commit that was marked for edit	01:09
	and then stops	01:09
	→ linusoleander joined	01:09
ayust	and lets you amend that commit	01:10
engla	Wicked: well history is a string of commits right, and depending on your history, all later commits might depend on the commit you are trying to remove.. In that case you have to adjust them (that's only a small change)	01:10
ayust	'edit' doesn't then make a second commit if you have un-committed changes when you --continue	01:10
	← jarrod_ left	01:10
engla	Wicked: git will only ask you to resolve conflicts when it can't be done automatically	01:10
	→ Remixman joined	01:10
	→ ericdc joined	01:10
	← Swimming_bird left	01:10
Wicked	hmm. not really sure what all that means. im about to just blast this repo away and start a new one....ill lose all the history of it...but it wont contain my password	01:11
	← leavittx_ left	01:11
Wicked	ive already wasted 1-2 more hours then i wanted to with his.	01:11
Kobaz	s/wasted/spent time learning/	01:12
	← bdiu left	01:12
Wicked	well if i figured it out id say learning :)	01:12
	since i didnt. i feel it wasted ;)	01:12
engla	Wicked: you can also just throw away the two latest commits	01:12
	that's less than removing a whole repo	01:13
Wicked	maybe ill just copy the file to a tmp file. remove those 2 commits...then paste it back in lol	01:13
	yea.	01:13
	how can i throw those two commits away?>	01:13
ayust	git reset --soft HEAD~2	01:13
	(soft reset to 2 commits before the current HEAD)	01:14
engla	so you move back your branch two steps. But the changes to the files are still there uncomitted	01:14
	→ wilmoore joined	01:14
engla	so now you can edit those maybe and make one good commit out of it	01:14
Wicked	hmm	01:15
	→ chrisshattuck joined	01:16
	→ johnw joined	01:16
	← nixness left	01:16
	← d0k left	01:17
	→ GeertB joined	01:18
	→ shiba_yu36 joined	01:19
fr0sty\|mobile	Wicked: the Googl.java conflict is likely because you removed the password in that commit.	01:19
	→ Xorlev joined	01:19
	← Xorlev left	01:19
	→ Xorlev joined	01:19
	← smolyn left	01:19
	→ tony_hit joined	01:19
	← alberto56 left	01:19
fr0sty\|mobile	ayust: you are right about 'edit'. I thought it worked like conflict resolution but it ain't so.	01:20
	→ f00li5h joined	01:20
fr0sty\|mobile	Wicked: also, did you perhaps add the GooglTest.java file in one of the recent commits?	01:22
	← Remixman left	01:22
fr0sty\|mobile	That might explain the uncommitted change thing...	01:22
Wicked	i think i achieved what i needed.	01:23
	i did a soft reset...then added...then committed. i no longer see my password	01:23
	→ kermit joined	01:23
Wicked	but git push failed and i had to do a git push --force	01:23
	→ justin_george joined	01:23
	← kermit left	01:23
	→ kermit joined	01:24
	← bitcrumb left	01:24
fr0sty\|mobile	ayust: one nit pick: rebase --continue won't work with a dirty-work tree	01:25
Wicked	well i appreciate your guys's help	01:25
	i was really frustrated	01:25
	← justin-george left	01:25
Wicked	and you guys helped me out :)	01:25
	→ jrmuizel_ joined	01:25
fr0sty\|mobile	And if you have staged changes it commits them	01:26
	← shyam_iyer left	01:26
	→ alberto56 joined	01:26
fr0sty\|mobile	commit --amend that is...	01:26
	← jbwiv left	01:27
	← RaceCondition left	01:27
	→ ymasory joined	01:27
	← subsonic left	01:28
engla	Wicked: yes a forced push is needed when you are "backtracking" history as you were	01:30
	← chrisshattuck left	01:30
	← alberto56 left	01:31
	← amerine left	01:31
	← jfkw left	01:31
	← ereslibre_laptop left	01:31
	← Evious left	01:31
	← MikhX left	01:32
	→ hjertnes joined	01:32
	→ iamjarvo joined	01:33
	← g0bl1n left	01:35
	← fisted_ left	01:36
	← noahcampbell left	01:38
	→ versatiletech joined	01:38
	→ sivy joined	01:39
	← sivy left	01:40
versatiletech	If I do git rm --cached myfile.ext, I push to a central server, and someone else pulls, does it delete their myfile.ext working file or does it just get removed from the index?	01:40
	← flov left	01:40
	→ sivy joined	01:41
	← aah left	01:41
	→ jbwiv joined	01:41
	→ fisted joined	01:41
	→ flov joined	01:42
	← flov left	01:43
	→ varioust joined	01:44
	→ ISF_ joined	01:44
	← optikfluffel left	01:46
	← ISF left	01:47
	← GeertB left	01:47
	→ smolyn joined	01:49
	← linusoleander left	01:50
	→ Yannick_Gagnon joined	01:50
	→ wliao joined	01:50
	→ MikhX joined	01:51
	→ alastair_ joined	01:54
ayust	versatiletech: if they don't have any modifications to the file, it will delete their working file when they merge your changes	01:54
	if they do have modifications, it will show up as a conflict	01:54
versatiletech	ok	01:54
	← welly_ left	01:55
versatiletech	what would happen if they do a git rm --cached myfile.ext BEFORE pulling?	01:55
	→ Zenergy`lapp joined	01:55
versatiletech	would that screw things up?	01:55
	→ Yuffster joined	01:56
	→ ISF__ joined	01:57
	← ISF_ left	01:58
	→ GeertB joined	01:58
	← Wicked left	01:58
	→ t0rc joined	01:59
	← jbwiv left	01:59
ayust	well either way, things wouldn't be "screwed up" - even if Git showed a conflict, it's not like it'd be a hard one to resolve	01:59
	I'm not sure whether Git would auto-merge it or not if both independent rm'd a file, but it wouldn't be a huge problem	01:59
	→ Wicked joined	02:00
	← sechrist left	02:01
	→ sechrist joined	02:01
	← Dafted left	02:01
	→ thedangler joined	02:02
thedangler	does git keep track of things you have cloned? I cloned a repo the other day but I can't find it for the life of me	02:02
	← saysjonathan left	02:02
	← fr0sty\|mobile left	02:03
	← Schmallon left	02:03
	→ optikfluffel joined	02:03
	→ Remixman joined	02:03
trick	thedangler: lol	02:04
	→ cutmail_ joined	02:04
	← cutmail left	02:04
thedangler	trick: I think my server did a backup or something this is so messed up. the locate command doesn't work. So i tried looking through the history like history \| grep git. command doesn't even show up as if i didn't do anything	02:05
	omg, half way through the tutorial i swiched to my local comp. wow.	02:07
	← tewecske left	02:07
	→ panike joined	02:07
ayust	thedangler: hehe	02:10
	→ versatiletech_ joined	02:10
	→ ki__ joined	02:11
	← Vampire0 left	02:11
	→ sivy_ joined	02:12
	← sivy left	02:12
	← optikfluffel left	02:12
	← versatiletech left	02:12
	versatiletech_ → versatiletech	02:12
	→ jbwiv joined	02:13
	→ dr_ick joined	02:13
	→ foocraft joined	02:13
	→ linusoleander joined	02:15
	→ _psychic_ joined	02:16
	→ tsbtmn joined	02:17
	← tsbtmn left	02:17
	→ tsbtmn joined	02:17
	← chessguy left	02:18
	→ guybrush joined	02:18
	← f00li5h left	02:18
	← dr_win left	02:18
	ChanServ set mode: +v	02:20
	← kukks left	02:20
	→ rgr_ joined	02:20
	→ XPS_1645 joined	02:20
guybrush	is there any built in git-tool to archive a git-repo with all its submodules?	02:20
	or do i have to use scripts outside of git	02:20
	← alvaro_o left	02:21
	← justin_george left	02:21
	→ Hypnos joined	02:22
	← warthog9 left	02:22
	← hunmonk left	02:22
ayust	guybrush: scripts, I believe	02:22
guybrush	ayust: thx	02:22
	← AAA_awright left	02:25
	→ Vampire0 joined	02:27
	→ warthog9 joined	02:28
	← Hypnos left	02:28
	→ Hypnos joined	02:28
mizerydearia	gitolite question: If users are having issues connecting or authenticating to a git repo, what log file can I look for issues? I created a repo in which some users are able to connect without issues, but other issues are having problems. I have no idea which log file to look at for info pertaining to errors they are receiving.	02:28
	← XPS_1645 left	02:29
	→ XPS_1645 joined	02:29
	← XPS_1645 left	02:30
	→ ChasBrown joined	02:30
	← ChasBrown left	02:30
	→ ChasZZZBrown joined	02:31
	← jaeckel left	02:31
	→ jaeckel joined	02:31
	← jaeckel left	02:31
	→ jaeckel joined	02:31
bremner	mizerydearia: most such questions are answered https://github.com/sitaramc/gitolite/blob/pu/doc/ssh-troubleshooting.mkd	02:33
	→ AAA_awright joined	02:33
	← cutmail_ left	02:34
	← rgr_ left	02:35
	← Chaser left	02:35
	← _psychic_ left	02:35
	← rgr left	02:37
	→ alvaro_o joined	02:37
	→ rgr joined	02:38
	← pyrony left	02:42
	← ChasZZZBrown left	02:44
	→ f00li5h joined	02:44
	→ ChasZZZBrown joined	02:45
	← jbwiv left	02:46
	→ MikeM_ joined	02:46
	← panike left	02:47
	→ stliu joined	02:47
	← stliu left	02:47
	→ stliu joined	02:47
	→ jbwiv joined	02:48
	→ dmsuperman joined	02:49
dmsuperman	Can you push to a working copy?	02:49
	OR does it have to be to a bare repo	02:49
	then get pulled to a working copy	02:49
	← DrNick left	02:50
	→ cutmail joined	02:52
bremner	dmsuperman: have you read faq non-bare?	02:53
jast	dmsuperman: Pushing to non-bare repositories is discouraged: please see https://git.wiki.kernel.org/index.php/GitFaq#non-bare [automatic message]	02:53
	← MikeM_ left	02:53
dmsuperman	I'm curious for a deployment environment	02:54
	← turbofail left	02:54
dmsuperman	With a stage where possibly changes are pushed to teh stage and then the stage pushes to final, but with a working copy to run on staging	02:54
	← pheaver left	02:55
	ianmcorvidae\|alt → ianmcorvidae	02:55
	→ DrNick joined	02:56
	→ fr0sty\|mobile joined	02:56
	→ Schmallon joined	02:57
	→ Red_Hill_Studios joined	02:57
	→ justin-george joined	02:57
	→ bdiu joined	02:57
	← rgr left	02:58
	→ xxthink joined	02:58
	← engla left	02:58
	→ surikator joined	03:01
	→ rondon joined	03:01
	← alvaro_o left	03:01
	← justin-george left	03:02
	← f00li5h left	03:02
	→ justin-george joined	03:02
	→ pyrony joined	03:03
	← tstclair left	03:06
	ChanServ set mode: +v	03:06
	→ cbreak_work joined	03:06
	← phantomcircuit left	03:06
	→ phantomcircuit joined	03:06
	→ Aaaarg joined	03:07
	← acts_as left	03:09
ChasZZZBrown	Hi all - I have successfully configured cmd line git on Win 7 to use SourceGear Diffmerge as mergetool/diff - but failed utterly to get git gui to do the same... any suggestions?	03:09
	→ alberto56 joined	03:10
	← pyrony left	03:10
	← alberto56 left	03:10
	→ hyperair joined	03:13
	← wilmoore left	03:13
	← Squarism left	03:14
	→ hunmonk joined	03:14
	→ amondracorp joined	03:15
	← hunmonk left	03:15
	→ wilmoore joined	03:15
	← Yannick_Gagnon left	03:17
	→ f00li5h joined	03:17
	← agile left	03:22
	→ FunkyFortune joined	03:22
	← f00li5h left	03:22
	→ flov joined	03:23
	← linusoleander left	03:23
	→ ISF_ec09 joined	03:24
	→ intripoon_ joined	03:25
	← fmilo left	03:26
	← Bass10 left	03:26
	← Schmallon left	03:26
	← ISF__ left	03:26
	→ timepilot joined	03:27
	← intripoon left	03:28
	→ acts_as joined	03:29
	→ juangiordana_ joined	03:32
mizerydearia	bremner, thanks for link	03:33
	← jbwiv left	03:33
	← juangiordana left	03:34
	→ agile joined	03:37
	← jpieper left	03:37
	← Zenergy`lapp left	03:38
	→ marshall joined	03:39
	→ t3i joined	03:39
	→ kfogel joined	03:41
	← scelis left	03:42
	ChanServ set mode: +v	03:42
kfogel	Anyone else have trouble turning off the pager? I've tried core.pager, GITPAGER, --no-pager, everything I and Google can think of; no luck -- it's still paging. Help?	03:42
	← phantomcircuit left	03:43
	→ jfkw joined	03:44
	→ jpieper joined	03:44
kfogel	jpieper: hey	03:45
	→ leo2007 joined	03:46
	← amh345 left	03:47
ChasZZZBrown	dmsuperman: At our shop, we push to a canonical bare repo; and then pull by hand to a non-bare repo for production. Since we use flash, our organization is to have separate source and deploy folders, and then we symlink the deploy folder on the production server to be accessed via http. This is rather inefficient since the source folder is not needed on the production server, but not a big...	03:47
	...deal for us. As noted in the update-hooks doc, it is possible to use hooks to push directly to the non-bare repo (and e.g., automatically git reset master --hard), but in practice it's not a big deal to pull it by hand. Another alternative to consider is to use rsync to move files from the deploy folder of a non-bare repo on your staging area (on whatever server) to your production server.	03:47
	→ amh345 joined	03:49
	← amh345 left	03:49
	→ amh345 joined	03:49
	← bmahe2 left	03:49
	← eletuchy left	03:51
	→ Schmallon joined	03:51
	← phishy left	03:52
	→ QinGW1 joined	03:53
	→ phishy joined	03:53
	← owst left	03:54
	← johnw left	03:54
	← spearce left	03:55
	← QinGW left	03:55
	→ Elfe joined	03:56
	→ jbwiv joined	03:56
	→ RahulT joined	03:56
	→ nbjoerg joined	03:57
nbjoerg	why would fast-import tell me about 2613 commits, but "git log --all \| grep '^commit ' \| wc -l" only return 2588?	03:58
	← versatiletech left	03:58
	← Elfe_ left	03:58
	→ welly_ joined	03:59
	← alastair_ left	03:59
	← welly_ left	03:59
	→ welly_ joined	03:59
	→ alastair_ joined	04:01
	← welly_ left	04:01
mizerydearia	http://privatepaste.com/f190731485 - Top chunk is output of /var/log/auth.log from user who is having issues connecting to gitolite repo. Bottom chunk is output from me successfully accessing repo. I believe the rsa pubkey is correct. What other issue could cause the user having issues to not connect? Also, conf/gitolite.conf is properly configured I believe.	04:01
	→ phantomcircuit joined	04:01
mizerydearia	both myself and the user have the same access level for the particular repo	04:01
	the other user	04:02
	← OOPMan left	04:04
	← timepilot left	04:04
	← ketas-av- left	04:06
	← ec\|detached left	04:06
	← agateau_ left	04:06
	→ cbx33 joined	04:06
	← bdiu left	04:07
	← dreiss left	04:07
	← _1094kms left	04:07
	→ rayners joined	04:07
	← Caius left	04:08
	← ki__ left	04:08
	→ agateau joined	04:08
	→ _1094kms joined	04:08
	← Guest88182 left	04:08
	← segher_ left	04:08
sitaram	mizerydearia: do it from the client side using "ssh -vvv" and you will probably find that the failing client is not even offering a pubkey	04:09
	← marshall left	04:09
	← iAsterisk left	04:09
	→ ISF_ec09_ joined	04:09
	← dr_G left	04:10
	→ fr0sty\|android joined	04:10
	→ ec\|detached joined	04:10
	→ ketas-av joined	04:10
	→ chargingllama joined	04:11
	← ymasory left	04:11
	← ISF_ec09 left	04:12
	→ pcc1 joined	04:12
	← fr0sty\|mobile left	04:13
	→ segher_ joined	04:13
	→ Caius joined	04:13
	→ wolfpython joined	04:13
	← foocraft left	04:15
	→ MmikeMRMA joined	04:15
	→ jmorris joined	04:16
	→ Dafted joined	04:16
	→ sivy joined	04:16
jmorris	I have project: /var/www/project/ I want to fork something on github, that will be user in my project: /var/www/project/thing_i_forked/ is it ok to have a git within a git?	04:17
	user = used*	04:17
	← nbjoerg left	04:17
	← sivy_ left	04:17
kfogel	Anyone else have trouble turning off the pager? I've tried core.pager, GITPAGER, --no-pager, everything I and Google can think of; no luck -- it's still paging. Help?	04:18
	→ heftig joined	04:18
heftig	Can I fetch from a git-instaweb?	04:19
	← Mmike left	04:19
	← sivy left	04:21
	← rondon left	04:21
	→ sivy joined	04:22
	→ OOPMan joined	04:23
heftig	also, can I have instaweb (webrick) bind to :: instead of 0.0.0.0 ?	04:23
fr0sty\|android	jmorris: git within git is not recommended	04:23
	→ serialx joined	04:23
fr0sty\|android	kfogel: what os? What command? What shell?	04:24
ChasZZZBrown	jmorris: If you have a repo /var/www/project/, and you have a git repo in in /var/www/project/someVariant/, then the repo in /var/www/project/ will stop tracking any changes south of /var/www/project/someVariant. Instead it sounds like you want to add a branch to /var/www/project/ named 'someVariant' instead of 'master'.	04:25
	← phishy left	04:25
	← rayners left	04:26
jmorris	ChasZZZBrown: i don't think i could contribute back to the person i forked off of then?	04:28
ChasZZZBrown	jmorris: they would just have to merge your branch (named someVariant) into master. Of course they would need to agree to that! But it sounds like you're more used to SVN - yes?	04:29
fr0sty\|android	jmorris: make a submodule (man git-submodule)	04:29
jast	jmorris: the 'git-submodule' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-submodule.html [automatic message]	04:29
	→ cognominal joined	04:29
jmorris	i have only ever used git	04:30
	jast: thank you for that	04:30
fr0sty\|android	Submodule is just a subcommand. Like log, cherry-pick, etc.	04:31
jmorris	yeah that sounds like what i want	04:31
	← OOPMan left	04:32
ChasZZZBrown	fr0sty: a submodule would be useful to provide, say, a library of additional code; but it wouldn't be useful to provide amendations to existing code (since it would refer to a different tree).	04:32
jmorris	i want to pull in some's repository into an git i already have, but i want to be able to push back into the other persons, with the changes i made	04:33
fr0sty\|android	ChasZZZBrown: he said he wants to fork a github project to use inside of his current project	04:33
	jmorris: you would use it like a library?	04:34
jmorris	i think so	04:34
ChasZZZBrown	He wants to modify potentially existing code in a tree; so I think what he wants is to offer a branch - modifications and additions to the existing code base. If the maintainer likes the changes, he/she can merge/cherrypick the branch.	04:35
jmorris	the person's code i am pulling in, i want to extend it, and be able to send it back to them	04:35
	→ maestrojed joined	04:35
fr0sty\|android	Nothing precludes that from happening in a submodule, ChasZZZBrown	04:35
jmorris	it cant be a branch of my own git though	04:35
	← Hypnos left	04:35
ChasZZZBrown	Why not?	04:35
jmorris	that project is HUGE, what i am pulling in is just a few files	04:35
	← Xorlev left	04:36
fr0sty\|android	A submodule is a complete repo.	04:36
jmorris	why would i want to give him my code, for something that has nothing to do with what i got from him?	04:36
	fr0sty\|android: sounds like its what i need	04:36
fr0sty\|android	It will be the whole other project, though....	04:36
ChasZZZBrown	fr0sty: a submodule is part of the tree structure; no?	04:37
jmorris	i'm more confused now lol	04:37
heftig	its root is part of the parent repo	04:37
Mage	if you have a project comprised of other projects	04:37
	those other projects could be submodules	04:37
	as they'd have their own repositories, history, etc.	04:38
	but they'd still jell with your stuff too	04:38
jmorris	How would branching off of my project, adding his code, be of any use to him? Why would I want to give him my code, and not just his code with changes?	04:38
Mage	(to my understanding)	04:38
	→ posciak joined	04:39
	← trick left	04:39
	← wolfpython left	04:42
ChasZZZBrown	jmorris: Hypothetical example... I have a project made up of many libraries. I collect those libraries as model, view, controller, each their own submodule. You pull the model submodule, and make a new branch 'jmorris/awesome'. You make edits to my code, and then push to the 'jmorris/awesome' branch of the models submodule. I look at your code ('cause you told me it was awesome!) and take...	04:43
	...(cherrypick) almost all of them, and merge them into the master branch of the model submodule. Everyone who considers me the maintainer then pulls those changes. Happiness!	04:43
jmorris	Wouldnt they see all my code in that branch though?	04:43
ChasZZZBrown	jmorris: of course... it's an open source model. If you want to be tidy, you'd squash your commits before pushing (because you might have many intermediate commits that are not of interest toi anyone else), but that's just bookkeeping.	04:45
fr0sty\|android	All the code in the "model" submodule (which would be one directory of your project)	04:45
	Would be seen by the others, but not the rest of your project.	04:45
	→ dreiss joined	04:45
jmorris	that's the killer though, i dont want to branch of, like i was saying	04:45
fr0sty\|android	jmorris: what do you mean "brench off"?	04:46
	What VCS are you used to using?	04:46
jmorris	lol none	04:46
	only git	04:46
	how ChasZZZBrown, i dont want to create a branch from any of my branches with the code i am getting	04:46
ChasZZZBrown	Is brench a verb?	04:46
jmorris	yes	04:47
	my miss spelling is a verb	04:47
heftig	your Ms. is a verb? :p	04:47
fr0sty\|android	jmorris: the link between superproject and submodule is one way (a pointer from the superproject to a commit in the submodule)	04:47
ChasZZZBrown	The whole point of git (or other cvs) is that branches are GOOD not bad	04:48
jmorris	glad you caught that one	04:48
fr0sty\|android	The submodule has no knowledge of the superproject's existence.	04:48
jmorris	i branch all the time	04:48
	→ pheaver joined	04:48
jmorris	but i dont want the person whom i am sending code back to, to see my entire project that has nothing to do with his	04:48
	← Anubisss_ left	04:48
heftig	he won't	04:48
fr0sty\|android	jmorris: look up	04:49
ChasZZZBrown	as fr0sty said submodule is not all module	04:49
jmorris	does it make sense what i'm saying?	04:49
	→ steph021_h joined	04:49
fr0sty\|android	jmorris: do you understand what I just said?	04:50
jmorris	I think I understand what people are saying, but I don't get why I'm getting different answers, and being told branching my own project is the aswer.	04:51
	I want to branch off of this: https://github.com/fakewaffle/sequence, extend it to work as a tree, and give back to him.	04:52
heftig	adding a submodule is not branching your own project	04:52
fr0sty\|android	jmorris: you want to add that repository (or your fork of it) as a submodule in your repository.	04:52
jmorris	ok	04:53
fr0sty\|android	You tree-ify the submodule	04:53
	Then point your project to the new submodule commit and use it.	04:53
jmorris	ok	04:53
	→ Slix` joined	04:54
fr0sty\|android	You also give a pull request from your submodule to the maintainer.	04:54
ChasZZZBrown	fr0sty: I am agreeing	04:54
	← Slix` left	04:54
jmorris	Ok. That sounds like what I was looking for.	04:54
	← kfogel left	04:55
heftig	can I have instaweb (webrick) bind to :: instead of 0.0.0.0 ?	04:55
fr0sty\|android	The manpage gives a decent example I believe: man git-submodule	04:55
jast	the 'git-submodule' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-submodule.html [automatic message]	04:55
fr0sty\|android	Getting familiar with the concept and the mechanism will save you trouble down the road.	04:56
ChasZZZBrown	Submodules are a bit confusing at first... to say the least!	04:57
	→ fUD joined	04:57
fUD	Hi - I've got a case where git svn info doesn't work any longer, nor git svn rebase.	04:58
	git-svn version 1.7.3.4 (svn 1.4.2)	04:58
	← orafu left	04:59
	→ orafu joined	04:59
	→ wolfpython joined	04:59
fr0sty\|android	heftig: beats me, sorry.	05:00
	fUD: what error do you get?	05:00
ChasZZZBrown	To repeat my question of the day - Win 7, SourceGear Diffmerge configured to work sweet with cmd line mergetool/difftol but can't get it to work with git gui - advice?	05:01
fr0sty\|android	ChasZZZBrown: what have you tried?	05:01
	And who had the pager question earlier?	05:02
	→ harshu_ joined	05:02
	← mdel left	05:03
	→ toabctl joined	05:04
	← Adys left	05:04
ChasZZZBrown	fr0sty: In git gui config dialog box, mergetool named same as in config (i.e., diffmerge) but it complains that that is not one of the accepted options (lists standard e,g, meld, etc.)	05:04
	→ LongBeach joined	05:04
	→ trick joined	05:04
ChasZZZBrown	can invoke desired tool in e.g., merge, by simply enterring "git mergetool"	05:05
	at cmd line	05:05
	frustrating!!	05:05
fr0sty\|android	ChasZZZBrown: is your custom mergetool defined globally?	05:06
ChasZZZBrown	fr0sty: yes	05:06
	← Dafted left	05:07
	← ldigas_ left	05:07
ChasZZZBrown	kfogel was earlier pager question; offline now	05:07
fr0sty\|android	thnx	05:07
	← jmil left	05:09
fr0sty\|android	Tried restarting git-gui?	05:09
ChasZZZBrown	yeppers - I suspect that since diffmerge is not supported OOTB, it isn't possible without jiggery-pokery to trick git gui to invoke my script that wraps Diffmerge... maybe?	05:11
	→ sangi joined	05:12
ChasZZZBrown	I'm running 1.7.something...	05:12
fr0sty\|android	Could you hijack a different tools cmd configuration option?	05:12
	← thedangler left	05:13
fUD	fr0sty\|android: I don't get any error as such, just hangs forever	05:14
	← wolfpython left	05:15
	→ Kernton joined	05:17
ChasZZZBrown	So maybe if I setup mergetool meld to invoke exactly what I do for nergetool diffmerge in config... I'll try that...	05:17
	ChanServ set mode: +v	05:17
Kernton	Hi, I keep having the same problem with git and I don't know what to do about it	05:17
	→ mdel joined	05:18
Kernton	My team is all working out of one directory, I'm doing all my work on a sub-directory that no one else is touching...	05:18
fr0sty\|android	I'm full of ideas, not all of them good...	05:18
Kernton	So my pulls/pushs and my teams shouldn't lead to conflicts	05:18
	But for some reason I occasionally get some error about conflicts in a file I've never touched...	05:18
	← frogonwheels left	05:18
	→ Adys joined	05:18
Kernton	And now I can't pull --rebase because of it	05:18
	I've tried doing reset and checkout to just get the OK version of the file, since I know I haven't made any changes	05:19
	And that doesn't fix it	05:19
fr0sty\|android	Kernton: in the same directory?	05:19
Kernton	Not the directory I work in...	05:19
	But in the same git directory yues	05:19
ChasZZZBrown	Kernton: Mixed PC and Mac/Unix workers?	05:20
Kernton	Maybe	05:20
	But I just want a way to tell git "F*** THIS FILE JUST USE WHAT YOU HAVE!" and nothing seems to do that...	05:20
	I just tried to check it out and got "YOURFILE is unmerged"	05:20
	I don't care... I just want your server version!	05:21
	→ TanEk joined	05:21
	← fUD left	05:21
ChasZZZBrown	Sometimes with mixed OS's, what git is complaining about is the diffference between line endings between 'Nix systems and PC systems	05:21
fr0sty\|android	Checkout --theirs file	05:22
Kernton	Hmm that would probably explain it, I think the guy working on this file is mac	05:22
	← t0rc left	05:22
fr0sty\|android	Actually in rebase it would be --ours	05:22
	Either way you should fix the line ending issues...	05:23
Kernton	What's the way to do that?	05:23
ChasZZZBrown	It's a bit of an art vs a science those line ending thingy's - there are settings in git config that control this, but I often have troubles with it.	05:23
	There are settings in the config for autocrlf - but not utterly obvious which are correct	05:24
	← urkud_ left	05:24
Kernton	Hrm sounds nasty... and I have a tenuous enough grip of git as it is...	05:24
	← jmorris left	05:25
ChasZZZBrown	The idea is that the repo should hold the 'canonical' settings - and when you pull/push git should adjust for your local settings.	05:25
	→ hunmonk joined	05:25
Kernton	fr0sty\|android: Do I do the checkout --ours before my rebase or after it stops for the conflict?	05:25
	(I just tried prior and its still having the conflict...)	05:25
fr0sty\|android	After	05:26
	← stliu left	05:27
Kernton	Hrm not working	05:27
	I did that, said "git rebase --continue", and it says "No changes - did you forget to use 'git add'?"	05:27
	→ urkud_ joined	05:27
Kernton	(No, I used "git add THEFILE" after "checkout --ours")	05:28
	git status shows no problems... but my code has also reverted to the version on the server... not what I'm trying to push	05:28
fr0sty\|android	Kernton: git rebase --skip	05:28
	→ Deesl joined	05:28
Kernton	Oooh that looks better	05:28
ChasZZZBrown	go fr0sty go!	05:28
Kernton	:/ ok so that finished... now I tried to push it back to the repository	05:29
ChasZZZBrown	and...?	05:29
Kernton	And it says "Failed to push some refs, non-fast-forward updates were rejected. Merge the remote changes before pushing again"	05:30
	Is that just relics from my failed attempts with this?	05:30
	← ak0rn\|2 left	05:30
Kernton	My latest commit appears in "git log" so I assume it would be safe to delete whatever is causing that issue?	05:31
	→ scelis joined	05:31
	→ ak0rn joined	05:31
Kernton	Git status shows no issues...	05:31
nevyn	Kernton: you commit to the repository.	05:31
fr0sty\|android	Kernton: git remote update && git diff @{u}	05:32
nevyn	Kernton: run git fetch	05:32
	← jfkw left	05:32
nevyn	or git remote update will work too.	05:32
Kernton	fr0sty: do I replace "u" with something? I just entered that whole line and it says: fatal: ambiguous argument '@{u}': unknown revision or path not in the working tree.	05:33
	nevyn: Isn't fetch included with "pull --rebase"?	05:33
ChasZZZBrown	Sounds like you have resolved the problem in you working tree, but you still need to commit those changes before you push	05:34
	← FunkyFortune left	05:34
Kernton	But git status says nothing to commit?	05:34
ChasZZZBrown	git log says...?	05:35
fr0sty\|android	Kernton: how do you push?	05:35
Kernton	ChasZZZ: Shows my latest commit...	05:36
	fr0sty: First, "git pull --rebase github master", then "git push github master"	05:36
fr0sty\|android	The @{u} is shorthand for "upstream branch"	05:36
Kernton	So why wouldn't that work?	05:37
fr0sty\|android	Then git remote update && git log ..github/master	05:37
	Because you have not set it apparently	05:37
Kernton	Blame my team members :P	05:37
fr0sty\|android	Hence why you need to specify a remote and branch when you push/pull	05:37
ChasZZZBrown	Damn them with their incessant changes! :)	05:38
Kernton	Ok that ran ok	05:38
	So now I should be back to normal? Pull --rebase and push with "impunity"?	05:38
fr0sty\|android	No, that's your local config that determines that	05:38
	There was no output from git logankoester	05:38
Kernton	No	05:38
fr0sty\|android	Log?, I mean...	05:38
	Yeah push away...	05:38
Kernton	Wait you mean the && command I ran? No no output	05:39
fr0sty\|android	Give it a go	05:39
Kernton	Nope, same error about non-fast-forward updates	05:39
	→ Dafted joined	05:39
fr0sty\|android	Something's fishy...	05:40
ChasZZZBrown	What happens on a pull now? Could a teammate have pushed during the whole fol-de-rol?	05:40
Kernton	Nope jsut did a pull again and it worked fine	05:40
	← hunmonk left	05:40
fr0sty\|android	Define: fine	05:40
	← sivy left	05:41
Kernton	Well it printed out stuff like this: a couple tiems	05:41
	usage: git merge-base [-a\|--all] <commit> <commit>... -a, --all outputs all common ancestors	05:41
	→ tizzo joined	05:41
Kernton	And then said "Current branch HEAD is up to date"	05:41
	(usually when it prints a bunch of the "usage" lines it won't work...)	05:41
ChasZZZBrown	thinking....	05:42
	→ hunmonk joined	05:43
fr0sty\|android	What command did you run?	05:43
Kernton	For push or pull?	05:43
	→ hunmonk1 joined	05:44
	← hunmonk left	05:44
fr0sty\|android	The one that told you usage info for git-merge-base	05:44
Kernton	git push github master	05:44
fr0sty\|android	Btw, I don't regard commands spitting usage information to run 'fine'	05:44
Kernton	Yeah.. I'm a total github nub sorry	05:45
	But I don't understand what would be wrong with my usage when I always do the same command... and sometimes it says all that and othertimes nada	05:45
fr0sty\|android	Not github's fault, probably...	05:45
ChasZZZBrown	if a pull is successful, and noone has touched the repo since the successful pull, then it is not possible for the result to be 'can't fast forward'.'	05:45
Kernton	(command is "github pull --rebase github master")	05:45
	← Aaaarg left	05:45
	← surikator left	05:45
Kernton	fr0sty: Probably not, but that makes it MY fault :D	05:46
fr0sty\|android	?!	05:46
	Github? Not git?	05:46
	→ wentasah joined	05:46
Kernton	Sorry	05:46
	Er no git	05:46
	Second one is github though	05:46
	← hunmonk1 left	05:47
fr0sty\|android	Well something in your install is fishy	05:47
	Looks like rebase is misbehaving somehow	05:48
Kernton	Work around suggestions? I just want to get this pushed and wash my hands of it...	05:48
	→ surikator joined	05:48
fr0sty\|android	That's what is spitting the usage info...	05:48
Kernton	(Thanks for all your help so far, you and Chaszzz)	05:48
ChasZZZBrown	That would be my guess as well... rebase has rewritten history in a way that the github repo finds confusing...	05:49
Kernton	So how do I clear it and just make things work? :)	05:49
fr0sty\|android	git merge-base HEAD FETCH_HEAD	05:49
Kernton	And now push?	05:50
	Or pull first	05:50
fr0sty\|android	Use that output for git rebase --onto FETCHCHEAD [output from merge-base]	05:51
	FETCH_HEAD, sorry...	05:51
	→ foocraft joined	05:51
Kernton	Current branch HEAD is up to date	05:51
	→ thiago_home joined	05:51
fr0sty\|android	Any line noise before that?	05:51
Kernton	Nope	05:52
fr0sty\|android	Hmm, but the push fails...	05:52
Kernton	Here's the full error...	05:52
	! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'REPOSITORY' To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes before pushing again. See the 'Note about fast-forwards' section of 'git push --help' for details.	05:52
fr0sty\|android	Wait, does git diff ..github/master return anything?	05:52
Kernton	Yeah...	05:52
	Changes in the original trouble file?	05:53
fr0sty\|android	Err git log --oneline github/master, actually	05:53
Kernton	Could the rebase --skip be just igorning the issue it was having, but push won't work because there's unresolved conflicts?	05:53
ChasZZZBrown	If you want to get that nice good feeling, first clone the remote.... so you know that you got /something/....!!!	05:53
fr0sty\|android	Crap, lost the dots: ..github/master	05:53
	bburhans_ → bburhans	05:53
	← chargingllama left	05:53
Kernton	With dots prints nothing...	05:54
	Without prints a bunch of stuff, but not my recent commit that won't push	05:54
	→ chargingllama joined	05:54
fr0sty\|android	What about git log --oneline github/master.. ?	05:54
Kernton	^^, a bunch of stuff, but it doesn't have my latest commit	05:55
	← ljungk left	05:55
Kernton	(as opposed to git log)	05:55
	← stepnem left	05:55
	→ Dafted_ joined	05:56
	→ stepnem joined	05:56
fr0sty\|android	And git fetch github returns ?	05:56
	Also, git --version?	05:56
Kernton	fetch github prints nothing..	05:57
	Version 1.7.0.3	05:57
fr0sty\|android	But git push github master still fails...	05:58
Kernton	Yeah	05:58
ChasZZZBrown	so because fetch prints nothing, your local repo has no conflicts with remote... so what about git merge...?	05:58
Kernton	Oh wait..	05:58
fr0sty\|android	If you look at the github page does it show the same commit as 'git show github/master'?	05:58
Kernton	I just did "git fetch github master" (added master on the end) and it printed something..	05:58
	Let's see if a push works	05:58
	→ hunmonk joined	05:59
Kernton	Nope :/	05:59
	← hunmonk left	05:59
	→ hunmonk joined	05:59
	← Dafted left	05:59
fr0sty\|android	What did it print?	05:59
Kernton	From github.com:repository * branch master -> FETCH_HEAD	05:59
	ChasZZZ: "git merge" then what?	05:59
	← dreiss left	05:59
Kernton	Apparently that's invalid usage...	05:59
	← smolyn left	05:59
fr0sty\|android	Meh, that's normal...	06:00
	← orafu left	06:00
ChasZZZBrown	then git should say "merge awesome" or "merge not awesonme"... which...?	06:00
Kernton	fr0sty: github page shows same commit as git show github/master	06:00
fr0sty\|android	Kernton: chech the github site and compare it to git show github/master	06:00
Kernton	^	06:01
	→ jceb joined	06:01
	→ dreiss joined	06:01
fr0sty\|android	H	06:01
	→ orafu joined	06:01
	← leo2007 left	06:01
	fr0sty\|android is stumped...	06:01
Kernton	ChasZZZ: No I mean is there more to the command? I typed just "git merge" and it wants some other usage	06:01
fr0sty\|android	Look at git log --oneline --graph --decorate --all	06:02
ChasZZZBrown	try "git merge origin master".... (peeps to man page...)	06:02
Kernton	Looks fine... I see the commit on github page, and my latest commits on top of it	06:02
	All in one line	06:02
	← posciak left	06:02
Kernton	With (HEAD) by my latest changes	06:02
	Chas: "git merge master" maybe? Using origin (or in my case, github) wouldn't work	06:03
	← tizzo left	06:03
Kernton	This says Already up-to-date though...	06:03
	← adamm left	06:04
	→ xiangfu joined	06:04
	→ cesario joined	06:04
fr0sty\|android	Kernton: is github/master just below it?	06:04
Kernton	Ah this might be it...	06:04
ChasZZZBrown	Okay - so git thinks master (local) is up to date with master (remote). So - what's the problem?	06:04
Kernton	So there is github/master a few bellow	06:04
	Which coincides with the latest commit	06:05
	← mdel left	06:05
Kernton	But then two commits are apparently duplicated right above (github/master), and above those are my HEAD	06:05
	Is there a way to get back to the github/master commit, then apply my work?	06:06
fr0sty\|android	As long as it is a straight line from github/master to HEAD it should work.	06:06
Kernton	Looks like it	06:06
	What'd be the command for that?	06:06
fr0sty\|android	Git rebase -I github/master will let you change those commits	06:06
	Small i, not I	06:07
	But that shouldn't matter...	06:07
Kernton	It did :P	06:07
fr0sty\|android	The extra commits, that is	06:07
	Not the i	06:07
Kernton	oh	06:07
fr0sty\|android	:-)	06:08
Kernton	So what now? It's opened up rebase mode or something?	06:08
	← mosno left	06:08
	← anathematic left	06:08
	→ tizzo joined	06:09
	→ stliu joined	06:09
	← stliu left	06:09
	→ stliu joined	06:09
	→ smolyn joined	06:09
	← smolyn left	06:10
	← tony_hit left	06:10
Kernton	Oh I'm in VIM it turns out... and have apparently messed something up here too cause now I can't quit...	06:10
	→ tony_hit joined	06:10
ChasZZZBrown	I hate vm.... :)	06:11
Kernton	Ok got out of that, re-doing the rebase command, and then what's next?	06:11
	← maestrojed left	06:12
	← Deesl left	06:13
	→ ThomasLocke joined	06:13
	fr0sty\|android has to run. Back later, maybe.	06:13
	→ Deesl joined	06:13
Kernton	Ok thanks for the help...	06:13
	(Sorry ... makes that sound sarcastic, but really thanks!!)	06:13
	← MikhX left	06:13
	← amondracorp left	06:14
Kernton	Argh. Screw this	06:16
	Just going to checkout again and redo all my work	06:16
	Thanks for the help git :(	06:16
	→ Aaaarg joined	06:16
	← amh345 left	06:16
	← trick left	06:18
Kernton	Thanks again ChasZZZ	06:20
	← Kernton left	06:20
	→ dim_ joined	06:22
	← jceb left	06:22
	← b14ck_ left	06:30
	→ BlindOracle joined	06:30
	→ b14ck joined	06:30
	→ MikhX joined	06:31
	← dim_ left	06:32
	← tizzo left	06:32
	→ dr0id joined	06:32
	← dreiss left	06:37
	→ Chaser joined	06:40
	← hunmonk left	06:40
	← cesario left	06:43
	← ISF_ec09_ left	06:43
	← orafu left	06:44
	← joel_falcou left	06:47
	← thiago_home left	06:48
	→ chrisshattuck joined	06:49
	→ napster_123 joined	06:50
	← toabctl left	06:51
	← ChasZZZBrown left	06:51
	← jrmuizel_ left	06:52
	→ rgr joined	06:52
	← chrisshattuck left	06:52
	→ chrisshattuck_ joined	06:53
	→ mosno joined	06:54
	← chrisshattuck_ left	06:54
	→ chrisshattuck joined	06:54
	← Yuffster left	06:55
	← chrisshattuck left	06:55
	→ chrisshattuck joined	06:55
	→ ilpoldo joined	06:56
	→ dannas joined	06:56
	← chrisshattuck left	06:58
	→ chrisshattuck joined	06:59
	← ec\|detached left	06:59
	→ jankoprowski joined	06:59
	→ elliottcable joined	06:59
	← drothli left	06:59
	← chrisshattuck left	07:00
	→ chrisshattuck_ joined	07:00
	elliottcable → ec\|detached	07:00
	← iamjarvo left	07:00
	ec\|detached → elliottcable	07:00
	← xiangfu left	07:01
	→ QinGW joined	07:01
	→ int3__ joined	07:02
	← harshu_ left	07:03
	→ pratz joined	07:03
	← QinGW1 left	07:03
	← chrisshattuck_ left	07:04
	← phantomcircuit left	07:05
	→ chrisshattuck joined	07:06
	→ dr_win joined	07:06
	→ harshu_ joined	07:07
	→ TrineLocke joined	07:08
	← dr_ick left	07:08
	← dr0id left	07:09
	← Schmallon left	07:10
	← chrisshattuck left	07:12
	← rgr left	07:12
	← madewokherd left	07:15
	← project2501a left	07:15
	← flov left	07:17
	→ zzing joined	07:17
	→ hobodave joined	07:19
	← mosno left	07:19
	← juangiordana_ left	07:20
	← sechrist left	07:22
	→ BlueAidan joined	07:22
	← shennyg left	07:22
	→ rgr joined	07:23
	→ goshawk joined	07:24
	← Mage left	07:24
	→ lightcap joined	07:25
	← codebrainz left	07:25
	← vsayer left	07:26
	→ Guest65612 joined	07:26
	← dr_win left	07:27
	← pheaver left	07:28
	→ reber joined	07:28
reber	hi	07:28
	wich tool that would be more or less like kdesvn for svn please ?	07:30
	git tool	07:30
	← guardian left	07:30
	→ OOPMan joined	07:30
	← Dafted_ left	07:31
	← LouisJB left	07:31
	→ opalka joined	07:33
	← opalka left	07:33
	→ opalka joined	07:33
	→ joel_falcou joined	07:35
	← dekroning left	07:35
	← serialx left	07:36
	→ giallu joined	07:37
	← giallu left	07:37
	→ giallu joined	07:37
	→ saschpe joined	07:38
	← jankoprowski left	07:39
	← RahulT left	07:40
	→ t3i_ joined	07:40
	→ amerine joined	07:41
	← dannas left	07:41
	→ radarek joined	07:41
	← agile left	07:43
	← t3i left	07:43
	t3i_ → t3i	07:43
	→ eletuchy joined	07:43
	← BlueAidan left	07:43
	→ mejla__ joined	07:45
	→ BlueAidan joined	07:45
	→ sechrist joined	07:46
	← radarek left	07:47
	→ ph^ joined	07:48
	← napster_123 left	07:48
	→ sivy joined	07:48
	→ jceb joined	07:48
	← rgr left	07:49
	→ teweWork joined	07:49
	← Chaser left	07:49
	→ rgl joined	07:51
	→ optikfluffel joined	07:52
	→ radarek joined	07:53
	← doener left	07:54
	← int3__ left	07:54
	→ Badiss joined	07:57
	→ agile joined	07:58
	→ troessner joined	07:59
	→ eletuchy_ joined	07:59
	← McMAGIC-- left	08:00
	← acid left	08:01
	→ project2501a joined	08:02
	→ _ollie joined	08:02
	← _ollie left	08:02
	→ leavittx_ joined	08:02
	← Guest65612 left	08:03
	← eletuchy left	08:03
	← heda left	08:05
	→ thiago_home joined	08:05
cebewee	wq	08:05
	thiago_home → thiago_workshop	08:06
	→ napster_123 joined	08:07
	← heftig left	08:07
	← goshawk left	08:07
	← Deesl left	08:07
	→ Deesl joined	08:07
	→ cesario joined	08:08
	← jceb left	08:09
	→ guardian joined	08:09
	→ ljmarkus joined	08:10
	← chargingllama left	08:11
	← emptyflask left	08:12
	← ljmarkus left	08:13
	← amerine left	08:13
	→ tewecske joined	08:14
	→ ExtraSpice joined	08:16
	← cesario left	08:17
	← ExtraSpice left	08:17
	→ borwar joined	08:19
	→ happynoff joined	08:19
	← Textmode left	08:19
borwar	Can't I just copy my local id_rsa.pub file to my dev server, and use it to connect to github.com the same way I do from my local machine?	08:20
	← justin-george left	08:20
nevyn	borwar: no.	08:21
	borwar: you'd need id_rsa not id_dsa.pub	08:21
borwar	nevyn: ahh... let me try	08:21
	→ acid joined	08:22
nevyn	borwar: copying id_rsa.pub to authorised_keys on your server would let you ssh without a password to your dev server.	08:22
	→ ExtraSpice joined	08:22
nevyn	so pub keys go in authorised key files	08:22
	→ orafu joined	08:24
	→ t3i_ joined	08:25
	← MmikeMRMA left	08:25
borwar	nevyn: I seems to be working fine now, thanks.	08:25
	→ simplechat joined	08:26
	← t3i left	08:28
	t3i_ → t3i	08:28
nevyn	borwar: so if you want to be able to ssh to your dev server without using a password copy the .pub file into .ssh/authorized_keys on your server...	08:29
	← happynoff left	08:29
	→ mcmat joined	08:29
	← mcmat left	08:30
	→ rrecio joined	08:30
	← thiago left	08:30
	← gebi left	08:30
	→ dpino joined	08:34
	→ soxofaan joined	08:34
	→ workmad3 joined	08:35
	→ Nonpython joined	08:36
	→ heda joined	08:36
Nonpython	how do I rename a commit with non-losable progress afterwards?	08:37
	← heda left	08:37
	→ koltroll joined	08:38
	→ thiago joined	08:38
	← Predominant left	08:41
	→ t3i_ joined	08:43
	← Buglouse left	08:44
	→ saintdev joined	08:45
	→ bitcrumb joined	08:45
	← t3i left	08:45
	t3i_ → t3i	08:45
	← ceej left	08:46
	← koltroll left	08:46
	← eletuchy_ left	08:46
	← poindontcare left	08:48
saintdev	if do an interactive rebase, is it possible to squash several commits into one, then amend that commit in the one run?	08:48
	or do i need to do it as two interactive rebases?	08:49
	← giallu left	08:52
	→ muep joined	08:54
	→ PigeonFriend joined	08:55
	← workmad3 left	08:56
tango_	saintdev: use fixup for most of them and squash for the last one of the bunch	08:56
	that way git will try squashing them altogether and will allow you to edit the last one	08:56
saintdev	so do fixup, fixup, edit?	08:57
	→ gebi joined	08:57
	← gebi left	08:57
	→ gebi joined	08:57
	→ liquidproof joined	08:58
	← rgl left	08:58
	→ rgl joined	08:58
	→ flov joined	08:59
	← theoros left	08:59
	← borwar left	09:02
saintdev	or guess not. fixup needs a previous commit also :/	09:02
	→ mastroDani joined	09:03
	→ davzie joined	09:04
	→ bentob0x joined	09:05
	→ nonnooo joined	09:06
	→ giallu joined	09:07
	← xerora left	09:08
	→ larsl joined	09:09
	← radarek left	09:09
	→ radarek joined	09:10
	→ deuterium joined	09:10
	→ koltroll joined	09:12
	← niko left	09:12
	← steph021_h left	09:13
	→ niko joined	09:13
	→ ogzy joined	09:17
ogzy	i created a repo and initialized sub repos at my local machine	09:18
	how can i push them to remote	09:18
jaeckel	ogzy: man git-push	09:19
jast	ogzy: the 'git-push' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-push.html [automatic message]	09:19
	← lightcap left	09:20
	← surikator left	09:20
	← mainrain_ left	09:21
	← napster_123 left	09:21
	← jelmer left	09:21
sangi	when i try clone a source of size 200MB from the git repository,which i have set up,Its throwing an error like	09:24
	fatal: Out of memory, malloc failed	09:24
	i understand that the problem is because of the large size of the source	09:24
	but how could i solve it	09:25
	→ jelmer joined	09:29
	← jelmer left	09:29
	→ jelmer joined	09:29
	→ DieMumiee joined	09:30
	→ mainrain joined	09:34
	→ nevyn^ joined	09:35
	→ anderse joined	09:37
	← albel727 left	09:38
	→ albel727_2 joined	09:38
	cbx33 → Guest70482	09:38
	→ cbx33 joined	09:38
	→ mastroWork joined	09:39
	← davzie left	09:39
	← cutmail left	09:43
	← mastroDani left	09:43
	← bauruine left	09:45
	→ davzie joined	09:45
	→ jhuon joined	09:45
	← ormaaj left	09:45
	← tro left	09:46
	→ mikewintermute joined	09:47
	← optikfluffel left	09:48
	→ ormaaj joined	09:48
	→ BooK joined	09:49
	← TanEk left	09:50
	← thiago left	09:51
	→ tro joined	09:52
	← mejla__ left	09:53
	→ achadwick joined	09:54
	← siyb_ left	09:54
	← rrecio left	09:54
	→ siyb joined	09:54
	→ mejla__ joined	09:55
	→ skoop joined	09:55
	→ xiong joined	09:59
	← QinGW left	10:00
	← mastroWork left	10:00
	← leavittx_ left	10:05
	← teweWork left	10:06
	→ henrikbjorn joined	10:06
	← bitcrumb left	10:07
	← ph^ left	10:10
	← koltroll left	10:10
	→ ph^ joined	10:10
	→ ph^_ joined	10:12
	→ curtana joined	10:13
	← ph^ left	10:15
	→ mastroDani joined	10:16
	→ harshu__ joined	10:16
	← harshu_ left	10:17
	→ workmad3 joined	10:18
	← ExtraSpice left	10:20
	→ teweWork joined	10:23
	superacuo → supervacuo	10:23
	← albel727_2 left	10:24
	← scouredimage_ left	10:27
	→ Odd_Bloke joined	10:27
	← gretch left	10:29
	← reber left	10:30
lundtor	cd ..	10:31
	→ mastroWork joined	10:31
	← Odd_Bloke left	10:33
	→ Odd_Bloke joined	10:33
	→ ExtraSpice joined	10:33
	← Odd_Bloke left	10:34
	→ Odd_Bloke joined	10:34
	← mastroDani left	10:35
	← mastroWork left	10:36
	→ dr0id joined	10:39
	→ mastroWork joined	10:41
	← darsk1ez left	10:41
	→ shiba_yu_ joined	10:43
	← shiba_yu36 left	10:43
	← ogzy left	10:45
	→ soxofaan_ joined	10:45
	→ bauruine joined	10:46
	→ rendar joined	10:46
	→ darsk1ez joined	10:47
	← Nickeeh left	10:47
	← soxofaan left	10:49
	→ borwar joined	10:49
	→ Zenith77 joined	10:50
	← wliao left	10:50
	→ stamina_ joined	10:50
	→ trick joined	10:52
	← stliu left	10:55
	← soxofaan_ left	10:56
	→ soxofaan joined	10:56
	→ _Ludwig_ joined	10:57
	← borwar left	10:59
	← tro left	11:01
	← Alagar1 left	11:02
	→ Alagar joined	11:03
	→ ereslibre joined	11:06
	← ereslibre left	11:06
	→ ereslibre joined	11:06
	← tsbtmn left	11:06
	→ tsbtmn joined	11:06
	← tsbtmn left	11:06
	→ tsbtmn joined	11:06
	← harryman200 left	11:07
	→ tro joined	11:08
	← xiong left	11:10
	→ suds joined	11:10
	→ engla joined	11:10
	← engla left	11:10
	→ engla joined	11:10
suds	Greetings All! I'm trying to detach a subdir into a separate git repo by following instructions at http://stackoverflow.com/questions/359424/detach-subdirectory-into-separate-git-repository	11:11
	but all branches are not appearing in the new repo	11:11
	any help please?	11:11
	→ mastro joined	11:11
	→ rcu joined	11:11
	→ thiago joined	11:12
	→ goj joined	11:12
teuf	suds: "EDIT -- For most uses, git filter-branch should have the added parameter -- --all. (Yes that's really dash dash space dash dash all. This needs to be the last parameters for the command.) As Matli discovered, this keeps the project branches and tags included in the the new repo." ?	11:13
	→ koltroll joined	11:15
	← mastroWork left	11:15
	→ cilly joined	11:18
	← cilly left	11:19
	→ cilly joined	11:19
	← mejla__ left	11:20
	← hyperair left	11:20
	← MikhX left	11:21
	ChanServ set mode: +v	11:24
	← koltroll left	11:24
goj	hi	11:24
	→ mastroWork joined	11:25
goj	when I do git branch master --set-upstream origin/otherbranch	11:25
suds	teuf: I've done that but other branches stay as remotes (origin/bug_fix_branch). I wanted bug_fix_branch to be local.	11:25
goj	and then git status	11:25
	→ NotTooDumb3 joined	11:26
goj	it says "Your branch and 'origin/master' have diverged,"	11:26
	comparing it to origin/master, not origin/otherbranch	11:26
	is there anything else I need to set besides --set-upstream	11:26
	→ adaptee joined	11:27
	← teweWork left	11:28
	→ MikhX joined	11:28
	← mastro left	11:28
	← jhuon left	11:30
	→ teweWork joined	11:31
offby1	goj: do you actually have "master" checked out?	11:31
	perhaps you have some other branch checked out, and _its_ upstream is origin/master	11:32
goj	offby1: yes	11:32
	no, it's master	11:32
offby1	goj: could you type "git status", then "git branch -vv", and paste the result somewhere?	11:32
	← anderse left	11:32
	← sangi left	11:33
goj	git branch -vv looks bad:	11:34
	* master 57ba94b [origin/master: ahead 3, behind 2] Added rebar	11:34
	→ j416 joined	11:34
goj	git status as well	11:35
	# On branch master	11:35
	# Your branch and 'origin/master' have diverged,	11:35
	# and have 3 and 2 different commit(s) each, respectively.	11:35
	#	11:35
	nothing to commit (working directory clean)	11:35
	→ sangi joined	11:36
	← rcu left	11:37
	→ dr_win joined	11:37
offby1	the simplest explanation I can think of is that you fat-fingered your --set-upstream command	11:37
goj	% git branch master --set-upstream origin/escalus	11:38
	Branch master set up to track remote branch escalus from origin.	11:38
offby1	from the man page, it looks like you may have gotten the arguments in the wrong order. I'd try "git branch --set-upstream master origin/otherbranch"	11:38
	although if I'm right, the command is clearly lying to you when it says what it's done.	11:39
	goj: you can always edit .git/config to set things up.	11:39
	dr0id → dr00b	11:39
goj	offby1: switching arguments' order didn't help	11:39
	→ gusnan joined	11:40
goj	my .git/config ends with	11:40
	[branch "master"]	11:40
	remote = origin	11:40
	merge = refs/heads/escalus	11:40
	← mikewintermute left	11:40
	→ rcu joined	11:41
	→ genjix joined	11:41
	← EricInBNE left	11:43
offby1	can't explain it.	11:44
	→ d0k joined	11:45
	→ tyteen4a03 joined	11:46
goj	it seems that if there is a branch with corresponding name on remote, it takes precedence over the one specified in branch.<name>.merge option (via --set-upstream)	11:46
	which seems wrong	11:46
	master tries to track origin/master no matter what I set	11:46
	I'll just rename my branch	11:47
	offby1: thanks for your help	11:47
	← davzie left	11:47
	→ mastro joined	11:47
	← shiba_yu_ left	11:48
	→ shiba_yu36 joined	11:48
	← mastroWork left	11:51
	→ davzie joined	11:51
	← gebi left	11:52
	← tony_hit left	11:53
	→ tony_hit joined	11:53
	→ gemmes joined	11:54
	→ rgr joined	11:55
	→ Felicitus joined	11:56
genjix	i've git remote add a new repo... how do i fetch that into a branch locally?	11:56
	i tried git checkout -b remote/branchname localbranch	11:57
	(doesn't work)	11:57
	← ereslibre left	11:57
Felicitus	I've got a submodule which points to a specific commit; how can I update the submodule to the latest remote commit? I tried git submodule update (also with merge option), but I can't get git to update it	11:58
	→ ereslibre joined	12:00
	← ereslibre left	12:00
	→ ereslibre joined	12:00
	→ catphish joined	12:00
catphish	is it possible to stop git prompting for a username and password when it receives a 401?	12:01
	← kpreid left	12:02
	→ RiaGuy joined	12:03
	→ docelic joined	12:04
docelic	Hey folks, how can I see 'git log' from the origin? That is, check any new commits on the origin without doing git pull?	12:05
FauxFaux	git fetch && git log origin/master	12:06
	← urkud_ left	12:06
	→ urkud_ joined	12:07
	← tony_hit left	12:07
genjix	c\	12:08
	→ kurrata joined	12:09
genjix	i did git remote add remote-repo... and git remote shows up the branches there, but git branch -a doesn't show them.	12:12
kurrata	how do i use normally branches? make a copy of my master files and put them under "testing" direcotry and point git that there is testing and start editing files. if it works then say copy changes from "testing" to "master"?	12:12
genjix	how can i make them appear in git branch -a?	12:12
	kurrata: no way. do a basic tutorial on git...	12:13
	git branch blaa	12:13
	← sangi left	12:14
genjix	kurrata: http://www.youtube.com/watch?v=OFkgSjRnay4	12:14
	← urkud_ left	12:14
	← lundtor left	12:15
kurrata	no sound on this machine ;(	12:15
	← GeertB left	12:15
	→ mabrand joined	12:18
offby1	genjix: you need to do "git fetch remote-repo" in order for the branches to appear	12:19
	← mabrand left	12:20
	→ chrisshattuck joined	12:21
	→ gebi joined	12:22
	→ koltroll joined	12:22
	→ phishy joined	12:24
	← chrisshattuck left	12:25
genjix	ahhh thanks offby1! i kept doing repo/branch :p	12:25
	← rcu left	12:27
	→ emptyflask joined	12:28
	→ hyperair joined	12:29
kurrata	hmmm, i think i understood how it works. basically when i make a new branch and switch to it i use old files. and testing records all changes. when i switch to master branch it does diff magic and removes all changes from files. when back to testing another magic to add all the new stuff	12:29
	did i understood right how branches work?	12:30
	→ Yuuhi joined	12:30
thiago_workshop	no	12:30
	when you switch branches, git will check out all files from the commit	12:30
kurrata	;(	12:30
	← shiba_yu36 left	12:31
	← esparkman left	12:32
	← hyperair left	12:33
	← ereslibre left	12:33
	← catphish left	12:33
	← gusnan left	12:33
	← teweWork left	12:33
	← soxofaan left	12:33
	← stamina_ left	12:33
	← Zenith77 left	12:33
	← PigeonFriend left	12:33
	← kurrata left	12:33
	← BlindOracle left	12:33
	← _1094kms left	12:33
	← fisted left	12:33
	← maleknet left	12:33
	← avar left	12:33
	← blast_hardcheese left	12:33
	← btipling_ left	12:33
	← bentkus left	12:33
	← PerlJam left	12:33
	← iravid left	12:33
	← tokkee left	12:33
	← redbrain left	12:34
	← rideh left	12:34
	← Pupeno left	12:34
	← Fissure left	12:34
	← comawhite left	12:34
	← c00kiemon5ter left	12:34
	← Cap_J_L_Picard left	12:34
	← sontek left	12:34
	← paulproteus left	12:34
	← sgronblo_ left	12:34
	← akheron left	12:34
	← siprbaum left	12:34
	→ mastroWork joined	12:35
	→ PerlJam joined	12:36
	→ stamina_ joined	12:36
	← zzing left	12:36
	→ catphish joined	12:36
	→ FunkyFortune joined	12:37
	← dr00b left	12:37
	→ comawhite joined	12:37
	→ fisted joined	12:38
	← mastro left	12:39
	→ t3i_ joined	12:39
	→ jcdny joined	12:39
	→ hyperair joined	12:39
	→ kurrata joined	12:39
	→ ereslibre joined	12:39
	→ gusnan joined	12:39
	→ teweWork joined	12:39
	→ soxofaan joined	12:39
	→ Zenith77 joined	12:39
	→ PigeonFriend joined	12:39
	→ BlindOracle joined	12:39
	→ _1094kms joined	12:39
	→ maleknet joined	12:39
	→ avar joined	12:39
	→ blast_hardcheese joined	12:39
	→ btipling_ joined	12:39
	→ bentkus joined	12:39
	→ iravid joined	12:39
	→ tokkee joined	12:39
	→ redbrain joined	12:39
	→ rideh joined	12:39
	→ Pupeno joined	12:39
	→ Fissure joined	12:39
	→ c00kiemon5ter joined	12:39
	→ Cap_J_L_Picard joined	12:39
	→ sontek joined	12:39
	→ paulproteus joined	12:39
	→ sgronblo_ joined	12:39
	→ akheron joined	12:39
	→ siprbaum joined	12:39
	→ Hypnos joined	12:40
	← t3i left	12:40
	← varioust left	12:42
	→ daviddoria joined	12:42
	← harshu__ left	12:42
daviddoria	I know 'git diff --staged' will show the difference between staged changes and master, but is there a way to show changes between unstaged changes and master?	12:42
	→ harshu joined	12:43
	← gemmes left	12:44
	→ mejla__ joined	12:44
	→ tephe joined	12:45
	← t3i_ left	12:46
	← ph^_ left	12:47
	→ airborn joined	12:50
daviddoria	I see, simply 'git diff' haha	12:50
patrikf	daviddoria: that's actually between working tree and staging area	12:51
	← akheron left	12:52
	→ akheron joined	12:52
	← rgr left	12:53
	← cilly left	12:53
	→ f00li5h joined	12:54
	← akheron left	12:55
	→ akheron joined	12:56
	← gbz left	13:00
	← mastroWork left	13:00
	← gebi left	13:01
	← scelis left	13:01
	→ gbz joined	13:03
	→ madsy joined	13:04
	← BlueAidan left	13:09
	→ cilly joined	13:09
teweWork	how can i get all the tags for a given commit? describe --exact-match only shows one, log --pretty=%d shows branches too and i don't need those	13:10
	→ shiba_yu36 joined	13:10
	→ sebersole joined	13:10
	→ BlueAidan joined	13:11
engla	daviddoria: git diff HEAD	13:12
daviddoria	I see, thakns patrikf and engla!	13:13
	← Remixman left	13:14
	→ Remixman_ joined	13:14
	→ jhuon joined	13:16
	← NotTooDumb3 left	13:18
	→ akher0n joined	13:18
	→ jfkw joined	13:18
	← akher0n left	13:20
	← ereslibre left	13:22
	→ bdiu joined	13:22
offby1	Does "git pull" ever fetch objects that aren't needed for the current branch? To rephrase that: if my remote repo isn't being committed to at the moment, and I type "git pull", and receive some objects from it; if I then check out some other branch and "git pull" again, will I download more objects?	13:24
	I realize I could try this myself :)	13:24
	just curious	13:24
	← Zenith77 left	13:25
trick	offby1: im pretty sure it fetches for all branches but only merges for the current	13:26
	← akheron left	13:26
	→ akheron joined	13:27
offby1	sounds plausible.	13:28
	I just did "git pull" on (what I assume to be) a not-terribly-active branch of Emacs, and it downloaded a surprisingly-large amount of stuff. I was wondering if that stuff might be for other branches.	13:28
trick	wtf are you using emacs for	13:29
	1970s throwback	13:29
	do you wear flares too?	13:29
teweWork	offby1: i think it depends on how your remote is configured	13:29
offby1	Actually, I'm being dense. After my "git pull", it listed a half a dozen branches that got updated, so _obviously_ it downloaded other stuff.	13:29
	→ intralanman joined	13:29
	← joel_falcou left	13:29
offby1	teweWork: it says fetch = +refs/heads/:refs/remotes/origin/ which I assume means "git it all" :-)	13:30
	→ esparkman joined	13:30
Aikar	how do you checkout a specific tag name?	13:30
offby1	Aikar: "git checkout tag-name"	13:30
Aikar	i have master cloned right now	13:30
teweWork	offby1: yes	13:30
offby1	next question :)	13:30
	→ soxofaan_ joined	13:30
	→ anderse joined	13:30
jast	offby1: OTOH if you type "git pull someremote somebranch", it fetches only that branch	13:30
trick	offby1: but it only merges with the current branch right?	13:30
	→ mapreduce joined	13:31
	← Felicitus left	13:31
teweWork	trick: it also depends on configuration i think :)	13:31
mapreduce	I committed files I didn't mean to, and I could do with having the changes how they were before committing.	13:31
trick	tewecske: assume default configuration baby	13:31
	← bdiu left	13:32
trick	mapreduce: git reset --hard HEAD~5	13:32
	mapreduce: git reset --hard HEAD~1	13:32
	even	13:32
	no	13:32
	git reset HEAD	13:32
	← soxofaan left	13:32
	soxofaan_ → soxofaan	13:32
offby1	trick: for my setups, yes, it only merges with the current branch.	13:32
trick	no	13:33
	git reset HEAD~1	13:33
	hahaha	13:33
offby1	I suspect it's not possible to merge any other branch, since there's always the risk of conflict, and there'd be no way to resolve 'em	13:33
trick	dont ask me	13:33
	im ddrunk	13:33
teweWork	offby1: it merges all tracking branchesafaik	13:33
mapreduce	trick: I think I can see where you're going with that.	13:33
	← soxofaan left	13:33
	→ soxofaan joined	13:33
mapreduce	git reset HEAD~1 might do it but I need to know what it's going to do - put the changes in the working copy or what?	13:34
offby1	teweWork: well, surely if I just type "git pull" it only does a merge in my currently-checked-out branch.	13:34
trick	mapreduce: in the working directory yeah	13:34
	mapreduce: --hard will delete them out of the working directory	13:34
	mapreduce: --soft will put them in the index	13:34
mapreduce	Looks like you're right, cool.	13:34
	→ ereslibre joined	13:34
	← jcdny left	13:35
trick	mapreduce: remember: --soft puts them in index, --mixed (or default) puts them in working directory, --hard removes them altoggether	13:35
mapreduce	I don't deliberately use the index anyway, so I won't remember --soft, but thank you.	13:35
	→ IslandUsurper joined	13:36
	← orafu left	13:36
offby1	not the most mnemonic option names.	13:37
trick	well --soft is useful if you wnat to put thigns back to how they were precisely before the commit	13:37
	→ orafu joined	13:37
	← nonnooo left	13:37
	→ Remixman__ joined	13:38
	← Remixman_ left	13:38
	→ tstclair joined	13:39
	← catphish left	13:40
	→ lanthan joined	13:41
	← tyteen4a03 left	13:41
	← simplechat left	13:41
	→ dr_win_ joined	13:43
trick	offby1: what dou think of ruby	13:45
	← dr_win left	13:45
	← ping-pong left	13:45
	→ dekroning joined	13:48
	← soxofaan left	13:49
	→ soxofaan joined	13:50
	→ xiangfu joined	13:51
	← maleknet left	13:52
	← rns left	13:52
	← _Ludwig_ left	13:52
c00kiemon5ter	hey people	13:52
	→ linusoleander joined	13:52
	→ ping-pong joined	13:52
	→ Zenith77 joined	13:53
	← dmsuperman left	13:53
c00kiemon5ter	say I have a repo I have 3 commits (a b c). All good but I notice I'd like to change something that would fit on changeset b. how can I make a change and have it stored as part of b's changeset (ie update b's diff) ?	13:54
	ofc that is local work, not something shared upstream	13:55
genjix	i do git checkout -b remoterepo/branchname and it creates a branch locally called "remoterepo/branchname" ... how can i specify the name?	13:56
	← soxofaan left	13:57
	← xiangfu left	13:57
	→ soxofaan joined	13:57
	← daviddoria left	13:57
	← Hypnos left	13:58
	← ketas-av left	13:58
	→ leavittx_ joined	13:58
IslandUsurper	c00kiemon5ter, I would make a commit on top of c and then do git rebase -i	13:58
	→ ketas-av joined	13:59
	← bauruine left	13:59
	→ bauruine joined	13:59
IslandUsurper	c00kiemon5ter, then switch c and d's lines, and change d to fixup or squash, depending on how you want to use the commit message	13:59
cbreak_work	c00kiemon5ter: git rebase -i the last few commits, and pick "edit" for the one you want to edit is an other way to do it	13:59
	→ maleknet joined	13:59
	→ dyer joined	14:00
	← dyer left	14:00
	→ dyer joined	14:00
cbreak_work	genjix: git checkout -b <inserttargetbranchnamehere>	14:00
	→ znow joined	14:00
cbreak_work	you picked that branchname, so ... if you want an other one, use an other one	14:00
genjix	cbreak_work: it's a remote branch. i did git remote add foo git:// ... then git fetch foo... now I want a particular branch from foo	14:01
znow	Hi! I want to push my app to heroku by git, but everytime I do that, it installs all the "dependices" that are missing, gem's that is... how can I avoid that?	14:01
	cause it installs all the gems everytime I push	14:01
cbreak_work	genjix: doesn't matter what something else is	14:01
	genjix: git checkout -b makes a branch from HEAD (or the specified head) with the name you specify	14:01
genjix	oh thanks cbreak_work	14:01
cbreak_work	you should try git checkout -t	14:02
	(read man page)	14:02
	← emptyflask left	14:02
	→ RaceCondition joined	14:02
genjix	yeah i'm pretty new to git... doing lots of tutorials and watchings vids to understand it	14:02
cbreak_work	vids?!	14:03
	...	14:03
	you should check out the man pages :D	14:03
	← OOPMan left	14:03
znow	Hi! I want to push my app to heroku by git, but everytime I do that, it installs all the "dependices" that are missing, gem's that is... how can I avoid that?	14:03
genjix	znow: yeah we saw but nobody is sure :)	14:04
	maybe ask in #ruby	14:04
znow	oh okay, #ruby? :p	14:04
	what does that have to do with the Git cmd :p	14:04
genjix	you mentioned gem? isn't that a ruby library?	14:04
cbreak_work	znow: git push doesn't do anything with dependencies	14:04
	→ rns joined	14:05
tango_	unless you have a hook that does that	14:05
cbreak_work	znow: and git push doesn't have anything to do with gem, what ever that is	14:05
znow	cbreak_work: well apparently ity does..	14:05
	← Leemp left	14:05
znow	give me a sec, then ill do a screenshot ;)	14:05
	so you can see :p	14:05
cbreak_work	git push only updates refs in the remote repo	14:05
offby1	trick: I've never really used Ruby, so my opinion is purely prejudice. But here it is: Ruby is what you get when Perl and Python collide at an intersection. It has no good reason for existence.	14:05
	→ Pewpewarrows joined	14:05
	→ Leemp joined	14:06
	← FunkyFortune left	14:07
trick	oh ok, but yeah,hehe, it's nothing like that. semantically, in terms of the object model it's nothing like either of them, it's actually closer to being a variant of smalltalk, in fact many smalltalkers view ruby that way,i think kent beck is even quotes as saying "i always knew smalltalk would beat java in the end, i just didnt know it would be called ruby when it did"	14:07
znow	cbreak_work: http://myupload.dk/handleupload/3d5d93caad326bcd25a00d6b81baa06e1299593211	14:07
genjix	offby1: hehe i have the same opinion	14:07
	somewhat weird syntax of ruby... sometimes newlines matter, sometimes they don't.	14:08
cbreak_work	znow: that's not git	14:08
	← soxofaan left	14:08
cbreak_work	znow: that's something else	14:08
znow	O_o why the heck am I in the Git Bash right now?	14:08
cbreak_work	znow: seems it's called Heroku"	14:08
znow	that what happens when you do Git push heroku master	14:08
	→ soxofaan joined	14:08
	→ xiangfu joined	14:08
cbreak_work	do you understand what I am trying to say?	14:08
genjix	znow: this is a ruby problem	14:09
znow	heroku is a gem of RoR, that makes you able to push your app by git, to heroku, and heroku is a hosting platform for Rails apps	14:09
	okay	14:09
cbreak_work	the remote end executes foreign code	14:09
genjix	or whatever to do with the thing you're using	14:09
cbreak_work	after the push	14:09
	that foreign code that is not git does all the stuff you see	14:09
genjix	so sorry we don't know much about it :p	14:09
cbreak_work	it has nothing to do with git	14:09
znow	^^	14:09
cbreak_work	not more than vim has to do with bash	14:09
znow	oh okay, well, still I am in git bash :p	14:09
cbreak_work	so?	14:10
	← Leemp left	14:10
cbreak_work	you can start internet explorer from git bash too.	14:10
	it's a shell	14:10
znow	oh	14:10
	okay	14:10
	← troessner left	14:10
cbreak_work	I will not support you with internet explorer problems	14:10
	you should use firefox instead	14:10
	→ troessner joined	14:10
znow	LOL	14:10
	mate...	14:10
	I am a fighter against IE :p	14:11
	→ Leemp joined	14:11
cbreak_work	do you have direct access to the remote?	14:11
trick	znow: but really, only extremely superficially could you call ruby a mix of python and perl, in reality it's nothing like that. It has extremely clear smalltalk roots, it just was inspired by python/perl syntax (though perhaps more perl than python)	14:11
cbreak_work	shell access?	14:11
	← project2501a left	14:11
cbreak_work	if so, you could look into its hooks	14:11
znow	trick: yeah	14:11
cbreak_work	and delete out that heroku stuff	14:11
	→ acidave joined	14:11
	→ tizzo joined	14:11
genjix	i looked at --track but it seems to be something different	14:12
	http://pastebin.com/4xYAkTLU	14:12
	git checkout -b tcatm/daemon-mode daemon	14:12
cbreak_work	genjix: wrong order	14:12
genjix	ok	14:12
	← Leemp left	14:12
cbreak_work	as I said above	14:12
trick	err that was meant for genjix *	14:12
cbreak_work	-b <branchnameyouwant>	14:12
genjix	hah thanks it works	14:13
cbreak_work	but as I also said	14:13
	check out -t, it's what you want	14:13
	→ Leemp joined	14:13
cbreak_work	it's similar to the command with -b	14:13
	but it picks a default name	14:13
	and also adds tracking meta data	14:13
	so you can pull without special args	14:13
	→ gazoombo joined	14:14
	→ mastroDani joined	14:14
genjix	git checkout -bt tcatm/daemon-mode	14:14
	you're right. thanks	14:14
cbreak_work	not bt	14:14
	-t	14:14
genjix	ok. nice	14:14
	→ owst joined	14:15
genjix	trick: well i don't get what the deal is with languages introducing lots of funky syntax everywhere :p	14:15
	← sketchyd left	14:16
trick	genjix: what funky syntax are you referring to?	14:16
genjix	gets confusing once you need to read someone's code.	14:16
	→ shruggar joined	14:16
	← znow left	14:17
	→ johnkary joined	14:17
	→ GeertB joined	14:17
trick	genjix: personally i dont think @var is any worse than self.var in python, thinkof the @ as just indicating 'self'	14:18
genjix	trick: ruby allows {} or def end for lambda's... the @ or #{sss} for concat in place ?, ! in function names =behin and =end ...	14:18
	→ soxofaan_ joined	14:18
genjix	at a glance def method(self, blaa): self.etc is more obvious than @somevar...	14:18
trick	genjix: nah it doesn't allow def end for lambdas, it allows two kinds of block syntax, {} and do/end, and they have different precedence	14:19
	genjix: it depends which you're used to, once you get used to @var it's very obvious indeed, in fact it attracts the eye immediately and you think 'instance var'	14:19
genjix	good thing about ruby is not needing ()'s for calling functions and implicit execution of functions when passed around.	14:19
trick	genjix: on the other hand 'self.var' could be mistaken for a sel.var' where sel is another object andyou're invoking the var method on it	14:19
genjix	not with code highlighting :p	14:20
	(i actually prefer no prefix like in c++)	14:20
trick	but if ther'es no prefix then that's even worse as you may confuse locals with instance variables	14:20
	← soxofaan left	14:21
	soxofaan_ → soxofaan	14:21
genjix	it's not that bad.	14:21
trick	it's not bad, but it's certainly not better than @var	14:21
	← soxofaan left	14:21
trick	which makes it explicit and obvious	14:21
genjix	because in c++ you always have the class headers easily accessible.	14:21
	→ soxofaan joined	14:21
trick	no, in a C++ IDE you may have the headers accessible	14:22
	not 'c++' itself	14:22
	bbl	14:23
	→ soxofaan_ joined	14:24
	→ anjen joined	14:24
	← anjen left	14:27
	← dyer left	14:28
	← soxofaan left	14:28
	soxofaan_ → soxofaan	14:28
	← trick left	14:28
	→ dyer joined	14:30
	← dyer left	14:30
	→ dyer joined	14:30
	→ ouah joined	14:30
ouah	hi	14:30
	← soxofaan left	14:30
	← linusoleander left	14:30
	→ soxofaan joined	14:30
	← acidave left	14:31
	← jfkw left	14:32
	← Deesl left	14:37
	→ nurey joined	14:38
	→ panike joined	14:38
	→ montylounge joined	14:38
	← adaptee left	14:39
Bisu[Shield]	is there a way to jump up or down 30 or 40 lines with vim?	14:40
	→ iamjarvo joined	14:40
rane_	like 40k?	14:40
	→ mastroWork joined	14:40
	→ rayners joined	14:40
	→ scelis joined	14:40
	→ emptyflask joined	14:42
	← mastroDani left	14:44
	→ Swimming_bird joined	14:44
	← tizzo left	14:44
	→ project2501a joined	14:44
	← Remixman__ left	14:45
	← project2501a left	14:45
	→ Predominant joined	14:45
	← phishy left	14:45
	→ project2501a joined	14:46
	→ wysek joined	14:48
	→ ericbarnes joined	14:49
	→ linusoleander joined	14:50
	← flaguy48 left	14:50
fr0sty_	Bisu[Shield]: 40000j	14:50
	(for down)	14:51
ericbarnes	I am in the process of building a deployment script for a server and need to clone a bunch of repos when a new server is deployed. Because the number of repos will continue to grow would it be best to create one repo with all the others as submodules?	14:51
	Then clone that to pull in the latest from each other repo?	14:51
fr0sty_	(and 40,000 not 40)...	14:51
VladDrac	Bisu[Shield] :30 to go to line 30l 30j to go 30 lines down (not very efficient probably)	14:54
fr0sty_	ericbarnes: you probably just want a control file (or script) to git all of your repositories (unless there is a non-casual relationship between them.)	14:54
	← wilmoore left	14:54
VladDrac	oh wait, that's what fr0sty_ suggested, never mind	14:54
	and rane.. but he's going up :)	14:54
	VladDrac suddenly understands the entire conversation! :)	14:55
	→ wilmoore joined	14:55
ericbarnes	fr0sty_ What I am doing it building an aws ami and when a new instance is created it needs to clone every site that will be on that instance	14:55
ouah	I have a big project in one repositoy I want to split in different repositories. With this model, if I want to go back to a specific commit in the past (for example to retreive a snaphost), how I can go back for all repositories? Check the date of the commit?	14:55
	← BlueAidan left	14:55
	← angelsl left	14:55
	→ flaguy48 joined	14:55
	→ g0bl1n joined	14:55
	→ BlueAidan joined	14:56
	→ Leonebarto joined	14:56
	← wysek left	14:56
fr0sty_	ericbarnes: maybe gitslave would work for you. Either way, coordinating the proper versions of X submodules sounds like a complex and error prone project.	14:56
	← Leonebarto left	14:57
fr0sty_	ericbarnes: submodules are always pegged to a commit and do not auto-advance in any way. so you would need to keep every submodule at the proper location within your superproject.	14:57
	← panike left	14:57
	→ wysek joined	14:57
fr0sty_	which may be a 'feature' where you come from, but I doubt it.	14:57
	ouah: use submodules.	14:57
ericbarnes	Yea sounds like it wouldn't be. Ideally I just want the latest from each one.	14:57
	→ lessthanzero joined	14:58
ericbarnes	The latest from a "production" branch	14:58
ouah	fr0sty_: what are submodules?	14:58
fr0sty_	ericbarnes: gitslave might help.	14:58
	SethRobertson knows all...	14:58
	(regarding gitslave, at least)	14:59
ouah	fr0sty_: I wasn't aware of submodules, I'll check that, thanks	14:59
fr0sty_	ouah: man git-submodule or read that chapter in Pro git (or the git book)	14:59
jast	ouah: the 'git-submodule' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-submodule.html [automatic message]	14:59
	← harshu left	14:59
ouah	thanks	14:59
	→ mastro joined	15:01
	→ cannonball joined	15:02
	← mastroWork left	15:05
	← hyperair left	15:05
	→ theycallmeniv joined	15:05
	→ soxofaan_ joined	15:05
	← henrikbjorn left	15:05
	→ drubies\|mbp joined	15:07
	→ dv310p3r joined	15:07
	← soxofaan left	15:09
	soxofaan_ → soxofaan	15:09
	→ chrisshattuck joined	15:09
	→ mastroWork joined	15:09
	sgronblo_ → sgronblo	15:10
	→ tizzo joined	15:11
	→ drekaus joined	15:11
ouah	fr0sty_: now if I have another big repository made of several projects and one library project. All projects depend on the library project. I also want to split all projects (and the library project) in repositories. How can I keep the synchro of all projects with the library project?	15:12
	Also with git submodule, or is there something more adapted?	15:12
	← mastro left	15:12
	→ jfkw joined	15:13
	← dv310p3r left	15:13
fr0sty_	each project would have the library as a submodule.	15:13
	→ dv310p3r joined	15:13
ouah	ok great, thanks for your help fr0sty_	15:14
	→ beatak joined	15:14
	→ TomyLobo joined	15:15
	→ karpar joined	15:15
	→ mando joined	15:16
	← drekaus left	15:16
	← chrisshattuck left	15:17
	→ mrconnerton joined	15:19
	← montylounge left	15:19
	→ mastro joined	15:19
	← leavittx_ left	15:20
	← wilmoore left	15:20
	→ montylounge joined	15:20
	→ ph^ joined	15:21
	← mrconnerton left	15:21
	→ mando_ joined	15:22
	→ wilmoore joined	15:22
	→ markatto joined	15:22
	← mastroWork left	15:23
	→ smolyn joined	15:24
	← johnkary left	15:24
	← mando left	15:24
	→ oriba joined	15:25
	→ spearce joined	15:26
	← g0bl1n left	15:26
kurrata	i made a mess and have some useless files. can i roll back to my last commit somehow?	15:27
	← radarek left	15:27
	← rns left	15:28
	← opalka left	15:28
kurrata	i have those messed up changes in index	15:28
mhi^	"git reset --hard", I believe :)	15:29
	→ Bass10 joined	15:29
mhi^	(automatically takes HEAD as ref)	15:29
	→ Yuffster joined	15:29
kurrata	mhi^, thanks it removed the mess	15:30
	→ tonthon joined	15:30
	→ emptyflask_work joined	15:30
	← tizzo left	15:30
	← Bass10 left	15:30
	→ excess^ joined	15:30
	← kurrata left	15:30
tonthon	I'd like to have an advice, is git-filter-branch a usable command when working on a project involving many person ?	15:30
	→ ceej joined	15:31
tonthon	I was wondering if playing with the rebase stuff and commit edition may not become a big mess	15:31
	← jkyle left	15:31
	← emptyflask_work left	15:31
	→ soze joined	15:31
	→ Bass10 joined	15:31
	→ rajeshsr joined	15:31
	← Bass10 left	15:33
	→ accel joined	15:33
accel	is there any support / will there ever be support in git for ?don't checkout the history; only the current HEAD? this is for stuff on netbooks; where I don't want to sore the full history	15:34
	← sivy left	15:34
	← thiago_workshop left	15:34
	ChanServ set mode: +v	15:34
	→ tizzo joined	15:34
	→ sivy joined	15:34
fr0sty_	tonthon: filter-branch is fine, provided you understand the troubles associated with rewriting history.	15:34
mhi^	accel: I don't think so, cause it's not how git works. A git repo will always have the whole history.	15:34
soze	hi, is there any way to change gitweb to spanish for its html output ?	15:35
fr0sty_	accel: you can do a 'shallow' clone, but such things are rather useless.	15:35
	← wentasah left	15:35
accel	is there something to reduce a git repo's size more than git gc?	15:35
fr0sty_	besides a shallow clone is not generally much smaller than a deep one.	15:35
	← soze left	15:35
	→ soze joined	15:35
	→ mastroWork joined	15:35
fr0sty_	accel: how large are the binary files you are storing in your repository?	15:35
accel	what's a shallow clone?	15:35
	GBs	15:35
fr0sty_	man git-clone and look at --depth	15:36
jast	the 'git-clone' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-clone.html [automatic message]	15:36
accel	mainly art work / 3d models	15:36
tonthon	fr0sty_, thanks	15:36
fr0sty_	and don't store GB files in your git repositories, it's stupid.	15:36
accel	not quite TB level	15:36
	hmm	15:36
	→ Schmallon joined	15:36
fr0sty_	it kinda voids the 'git is light and fast' warranty	15:36
PerlJam	fr0sty_: I think part of the problem is that people use git as a deployment tools as well as a revision control system.	15:37
	s/tools/tool/	15:37
	→ balor joined	15:37
accel	yeah; these days	15:37
	I dont' even use rsync/sftp much	15:37
	I just stick it in git	15:37
	then git commit; git push	15:37
	and git pull on another machine	15:37
cbreak_work	accel: git repack can repack the git repo	15:37
balor	is gitolite the One True Way of implementing access control on branches?	15:37
	ChanServ set mode: +v	15:37
cbreak_work	it happens automatically though	15:37
	balor: no.	15:37
	→ cenuij joined	15:38
fr0sty_	balor: on repositories, yes. I'm unsure whether it has branch-level control.	15:38
	← cenuij left	15:38
	→ cenuij joined	15:38
soze	hi, is there any way to change gitweb to spanish for its html output ?	15:38
	← flaguy48 left	15:38
PerlJam	balor: it is A way	15:38
cbreak_work	there's also the hierarchic model of everyone-has-his-own-repo	15:38
balor	PerlJam: Is it recommended?	15:38
PerlJam	balor: sure. I use it.	15:38
cbreak_work	this obviously requires a human for access control	15:38
	→ grizz_ joined	15:38
cbreak_work	but it's way more flexible than gitolite	15:38
	more expensive too	15:38
	I think linux uses it	15:39
balor	cbreak_work: So a human gate-keeper	15:39
	← mastro left	15:39
	→ jkyle joined	15:39
balor	PerlJam: Do you have an automated way of doing it?	15:39
	← davzie left	15:39
PerlJam	balor: no.	15:39
balor	PerlJam: Thanks	15:40
	← soxofaan left	15:40
	→ soxofaan joined	15:41
	← grizz_ left	15:41
	← nurey left	15:41
	→ darragh joined	15:42
	→ nonnooo joined	15:42
	← anderse left	15:43
mhi^	When having 2 'edits' on the stash, stash@{0} and stash@{1}, .git/refs/stash seems to always only reference the most current push, stash@{0}. Where are stash@{1} and above saved? (Background: I want to hack my prompt to show me the number of edits on the stash.)	15:44
	→ JP-Dery joined	15:44
	→ rns joined	15:44
	← Schmallon left	15:45
	→ soxofaan_ joined	15:46
cbreak_work	mhi^: how about instrumentalizing git stash list?	15:46
	→ FunkyFortune joined	15:48
	← soze left	15:48
	← soxofaan left	15:49
	soxofaan_ → soxofaan	15:49
	← soxofaan left	15:50
	→ soxofaan joined	15:50
	→ flaguy48 joined	15:50
mhi^	Well, I guess that would work too.. I just wondered. :)	15:50
	→ mastro joined	15:51
	→ webPragmatist joined	15:51
	→ justin-george joined	15:51
	← karpar left	15:51
webPragmatist	can you turn your current copy into a branch ?	15:51
	→ lattera joined	15:51
	← orafu left	15:52
	→ davzie joined	15:52
	→ alvaro_o joined	15:52
	→ orafu joined	15:52
	← owst left	15:52
	← hobodave left	15:52
	← alvaro_o left	15:52
	→ nd___ joined	15:53
	→ Remixman joined	15:54
mhi^	webPragmatist: "git checkout -b test", where 'test' is the new branch name	15:54
webPragmatist	ah so it's not going to overwrite what i have?	15:54
	← mastroWork left	15:54
mhi^	it "copies" the current index to 'test' and your master will be in a clean state afterwards	15:55
PerlJam	webPragmatist: git doesn't destroy information except under extreme duress.	15:55
webPragmatist	thanks	15:55
	→ adamm joined	15:55
	← nd__ left	15:56
cbreak_work	it doesn't copy the current index to test	15:57
	→ Heran joined	15:57
cbreak_work	it copies the current HEAD to test	15:57
	→ nadim joined	15:57
	→ Bass10 joined	15:57
	ChanServ set mode: +v	15:57
Heran	Hello	15:58
	I'm trying to write a pre-commit git hook which will timestamp one of my files	15:58
fr0sty_	Heran: why?	15:59
Heran	however, it isn't working well, since when I do it in the pre-commit hook, it goes that way: get code (A version), add timestamp (A+timestamp=B), commit A version	15:59
	← Bass10 left	15:59
Heran	and I end up with a modified git tree and timestamp from previous commit	16:00
fr0sty_	again, why?	16:00
	← acid left	16:00
Heran	well, I'm using it as some kind of VERSION= string in the program	16:00
	→ Bass10 joined	16:00
	← tonthon left	16:00
Heran	the build date	16:00
	→ Nickeeh joined	16:00
bremner	Heran: but why commit that?	16:00
Heran	because it's displayed in the "About" section of the program and the program won't compile without that?	16:01
	← koltroll left	16:01
fr0sty_	Heran: you can determine that information automatically at compile time.	16:01
	→ jstemmer joined	16:01
	← TomyLobo left	16:02
fr0sty_	besides, commit-time is a terrible VERSION string...	16:02
	→ level09 joined	16:02
level09	how do I track a directory of files without creating .git inside the dir ?	16:02
Heran	compile was a figure of speech, it's a python program ;-)	16:02
	← tstclair left	16:02
bremner	Heran: well, you could use ident gitattributes, which is still horrible, but better than commiting it.	16:03
	← shiba_yu36 left	16:04
	→ chrisshattuck joined	16:04
	→ TomyLobo joined	16:04
	← tizzo left	16:04
Heran	I tried to put that timestamping in post-commit hook (and edit last commit with --amend), but since it's impossible to skip post-commit hook, it gets into an infinite loop	16:04
	→ tizzo joined	16:05
Heran	only solution right now to me seems to write a ./commit.sh which would do the thing... but I wanted to know if I can do it with hooks ;-)	16:05
bremner	we already suggested two other solutions...	16:06
fr0sty_	Heran: no, you can't. and you don't really want to anyways.	16:06
Heran	bremner: you mean ident gitattributes in a hook? or at run-time?	16:06
bremner	Heran: man gitattributes	16:06
jast	Heran: the 'gitattributes' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/gitattributes.html [automatic message]	16:06
bremner	Heran: see also https://git.wiki.kernel.org/index.php/GitFaq#Does_git_have_keyword_expansion.3F	16:07
	→ jds joined	16:07
Heran	bremner: thanks	16:07
	→ Anubisss joined	16:07
Heran	by the way, is datestring really so terrible in one-man no branch small project? i don't think so ;-)	16:07
	→ juangiordana joined	16:08
	← LongBeach left	16:09
bremner	Heran: yes, it makes merging pointlessly difficult	16:09
cbreak_work	git describe? :)	16:09
	→ mastroWork joined	16:09
	→ jmil joined	16:09
	← dekroning left	16:11
	← cilly left	16:12
	→ cillybabe joined	16:12
	→ jrmuizel joined	16:12
	cillybabe → cilly	16:12
	← mastro left	16:13
resixian	is there an easy way to show a log since a tag?	16:13
	→ urkud_ joined	16:13
bremner	git log tag	16:14
resixian	ah, nvm.. i thought ..HEAD was optional	16:14
	← Heran left	16:14
bremner	oh, wait, since.	16:14
cbreak_work	there's git log --since	16:14
resixian	`git log tag` gives me the whole thing, but `git log <tag>..HEAD` works	16:14
	--since does sth wierd	16:15
	← cbreak_work left	16:15
	→ Heran joined	16:15
	ChanServ set mode: +v	16:16
Heran	one more question	16:16
	← skoop left	16:17
	← lanthan left	16:18
Heran	is it possible to make changes in versioned files using hooks at all then? (.gitattributes seem to have a bit limited power of that)	16:19
	← scelis left	16:20
	→ rolfb joined	16:20
Heran	another thing I wanted to do automatically prior to commit is to run pyuic4 on my .ui file from Qtdesigner, so the python code pulled from git repository is already ready to run without the need to run it	16:20
bremner	gitattributes is only changing the checked-out copy	16:20
Heran	however I stumbled at the same problem as with timestamping	16:20
	wow, I wrote it pretty complicated, it should be "so the main program python code pulled from git repository is already ready to run without the need to run pyuic4 to generate .py from .ui"	16:22
resixian	why are diff options on the git log manpage? can i have the log print out a --summary? doesnt seem to do anything	16:22
	→ _psychic_ joined	16:23
	→ myrkraverk joined	16:24
myrkraverk	Hello.	16:24
bremner	Heran: it sounds like you need something like a Makefile	16:24
Heran	yeah, I wrote a makefile\	16:24
myrkraverk	Can I (easily) do git diff against the first version I got when I cloned the repository?	16:24
Heran	and I tried to run it in the same place I timestamped my version string	16:24
	→ booginga joined	16:24
Heran	so the .py would be generated prior to commit, but I couldn't get the result I wanted	16:25
	← RaceCondition left	16:25
Heran	for the same reasons mentioned	16:25
	← theycallmeniv left	16:26
bremner	myrkraverk: does git diff origin/master do what you want?	16:26
resixian	myrkraverk: just do git diff <orginal commit>..HEAD	16:26
	← urkud_ left	16:26
bremner	Heran: in general generated files do not belong in version control	16:26
myrkraverk	bremner, maybe, looking at it.	16:26
bremner	myrkraverk: it depends if you have fetched or pushed since the clone in question	16:27
myrkraverk	I've pushed since the clone.	16:27
	I want a diff against the original clone.	16:27
bremner	myrkraverk: I guess you need to look at git log or gitk to figure out what the commit hash is.	16:28
	← fr0sty\|android left	16:28
myrkraverk	Ok, git log is easy enough to use.	16:28
	I think I have my diff.	16:28
	→ TomyLobo2 joined	16:29
	← TomyLobo left	16:29
	→ TomyWork joined	16:29
	→ panike joined	16:29
	→ g0bl1n joined	16:30
	← chrisshattuck left	16:30
	→ tvon joined	16:30
tvon	Is there a way to write to a mercurial repo with git?	16:31
	← montylounge left	16:31
	← thiago left	16:31
tvon	ffs, nevermind	16:31
	→ chrisshattuck joined	16:32
	jepler- → jepler	16:32
PerlJam	Heran: make a distinction betwee "developers" and "users". It's not onerous for developers to generate a file and they probably already have some automated thing that sets up their environment just like it needs to be (or you can provide something). Users don't care about your repository, they care about the things your repository creates, like "version 1.5" of whatever	16:32
	→ noahcampbell joined	16:33
	→ mastro joined	16:33
	→ steph021_h joined	16:33
PerlJam	Heran: so, the only time you should generate something is when you want to release a new version for your users.	16:33
	→ montylounge joined	16:33
	← TomyLobo2 left	16:34
	→ thiago joined	16:34
	← rajeshsr left	16:34
	→ rajeshsr joined	16:34
	← tizzo left	16:35
	→ OOPMan joined	16:35
	→ gebi joined	16:35
Heran	PerlJam: thanks for that distinction, I'll rethink my approach	16:35
	→ TomyLobo2 joined	16:35
	← tvon left	16:35
	← TomyWork left	16:36
	→ remi_ joined	16:36
	← Heran left	16:36
	→ cmn\|e joined	16:36
	← mastroWork left	16:36
	→ TomyWork joined	16:36
	← _psychic_ left	16:37
	→ _psychic_ joined	16:37
	← lattera left	16:37
	← ouah left	16:37
	→ tjholowaychuk joined	16:37
	→ mcmat joined	16:39
	→ shennyg joined	16:39
	← teweWork left	16:39
	← level09 left	16:39
	→ bdiu joined	16:40
	→ radarek joined	16:40
	← TomyLobo2 left	16:40
	← mcmat left	16:40
	→ TomyLobo2 joined	16:41
	← mejla__ left	16:41
	← TomyWork left	16:41
	→ tizzo joined	16:41
	→ TomyWork joined	16:41
	← cmn left	16:42
	→ RaceCondition joined	16:42
	→ mikewintermute joined	16:43
	→ lattera joined	16:43
	→ koltroll joined	16:45
	← TomyLobo2 left	16:45
	→ Schmallon joined	16:46
	← koltroll left	16:48
	← balor left	16:49
	← suds left	16:49
	→ VirusScan joined	16:49
	← jhuon left	16:49
	← justin-george left	16:50
	← esparkman left	16:52
	→ dreiss joined	16:52
	→ mastroWork joined	16:52
	→ TomyLobo2 joined	16:53
	← smolyn left	16:53
	← TomyWork left	16:53
	→ TomyWork joined	16:53
	→ rseifert joined	16:54
	← tizzo left	16:55
	← bauruine left	16:55
	← TomyLobo2 left	16:55
	← VirusScan left	16:55
	→ TomyLobo2 joined	16:55
	← mastro left	16:56
	← TomyWork left	16:56
	→ acid joined	16:56
	→ TomyWork joined	16:56
	← mastroWork left	16:57
	← giallu left	16:58
	← saschpe left	16:58
	← rgl left	16:58
	→ rgl joined	16:58
	adamholt → adamholt_away	16:59
	adamholt_away → adamholt	16:59
	← jerk left	16:59
	← dreiss left	17:00
	← TomyLobo2 left	17:00
	→ TomyLobo2 joined	17:00
	← chrisshattuck left	17:00
	← TomyWork left	17:00
	← ExtraSpice left	17:00
	← montylounge left	17:01
	→ TomyWork joined	17:01
	→ dreiss joined	17:01
	← xiangfu left	17:02
	→ chrisshattuck joined	17:02
	← flov left	17:03
	→ versatiletech joined	17:03
	→ hobodave joined	17:04
	← TomyLobo2 left	17:05
	← deuterium left	17:05
	→ napster_123 joined	17:06
	→ owst joined	17:06
	← dreiss left	17:06
	→ versatiletech_ joined	17:06
	→ kenichi joined	17:07
	← Zenith77 left	17:07
	← versatiletech left	17:08
	← TML left	17:08
	→ hyperair joined	17:09
	→ _psychic__ joined	17:09
	→ __name__ joined	17:11
	← __name__ left	17:11
	→ __name__ joined	17:11
	→ TML joined	17:11
	← versatiletech_ left	17:11
	→ versatiletech joined	17:11
	→ pheaver joined	17:11
	← rolfb left	17:11
	→ henrikbjorn joined	17:12
	→ Bruce_Wayne joined	17:12
	← _psychic_ left	17:13
	_psychic__ → _psychic_	17:13
	→ TomyLobo2 joined	17:13
	← TomyWork left	17:13
	→ joelr joined	17:13
	→ TomyWork joined	17:13
	→ irc2samus joined	17:13
joelr	good day! how do i check out a remote branch if ls-remotes gives me refs/heads/lucene_solr_3_1	17:14
	this complains that origin/... is not a valid name: git branch --track lucene_solr_3_1 origin/lucene_solr_3_1	17:14
	→ justin-george joined	17:14
	← pheaver left	17:15
FauxFaux	ls-remotes only seems to exist in your head.	17:15
	→ pheaver joined	17:15
	← justin-george left	17:15
joelr	FauxFaux: thanks, i meant git ls-remote	17:16
FauxFaux	git ls-remote origin?	17:16
	→ theycallmeniv joined	17:16
	← chrisshattuck left	17:17
joelr	just 'git ls-remote' works for me	17:17
	git ls-remote	17:17
	From git://github.com/apache/lucene-solr.git	17:17
	aed85e6921ad720d9f45e40fdd79478b759565ee HEAD	17:17
	ec1682e031725424eb9783cedc8d9f45a4b72f02 refs/heads/branch_3x	17:17
	...	17:17
	← TomyLobo2 left	17:17
fr0sty_	where is "lucene_solr_3_1" in that list?	17:18
FauxFaux	Mm, doesn't here. I've never used the command, anyway. Basically, are you sure that repo is called origin? git remote -v	17:18
	→ lightcap joined	17:19
joelr	b06f5b6944853a73bd98c1c289d76622c93d5750 refs/heads/lucene_solr_3_1	17:19
	fr0sty_: ^	17:19
fr0sty_	'git remote' lists 'origin	17:19
	?	17:19
joelr	also	17:20
	b06f5b6944853a73bd98c1c289d76622c93d5750 refs/remotes/lucene_solr_3_1	17:20
	fr0sty_: yes	17:20
	git remote	17:20
	origin	17:20
	← Predominant left	17:21
	→ fission6 joined	17:21
fission6	how to i checkout a remote brnahc	17:21
	→ HG` joined	17:21
	← g0bl1n left	17:22
	← liquidproof left	17:22
	→ _ollie joined	17:22
fr0sty_	what does 'git show origin/lucene_solr_3_1' show you?	17:22
joelr	git show origin/lucene_solr_3_1	17:23
	fatal: ambiguous argument 'origin/lucene_solr_3_1': unknown revision or path not in the working tree.	17:23
	Use '--' to separate paths from revisions	17:23
	← Badiss left	17:23
	→ filosofo joined	17:23
	→ TomyLobo2 joined	17:23
	→ flov joined	17:23
	→ smolyn joined	17:23
	→ amerine joined	17:24
	← TomyWork left	17:24
fr0sty_	joelr: 'git fetch origin'	17:24
	→ Fullmoon joined	17:24
	← lightcap left	17:24
	→ TomyWork joined	17:24
filosofo	I'm using a subtree merge to bring in an external library into the main project.	17:24
fission6	how would i check out a remote branch?	17:24
joelr	fr0sty_: * [new branch] lucene_solr_3_1 -> origin/lucene_solr_3_1	17:25
filosofo	What's the best way to make changes on the main project and push back to the subtree merge?	17:25
	← Bisu[Shield] left	17:25
	← flov left	17:25
joelr	fr0sty_: thanks!	17:25
	works now	17:25
	← joelr left	17:26
	→ montylounge joined	17:26
fission6	fr0sty_: how do i check out the following origin/dev locally and create a branch	17:26
	→ doener joined	17:27
	← versatiletech left	17:27
	→ doomrobo joined	17:28
fr0sty_	git checkout -b mydevbranch origin/dev	17:28
	← TomyLobo2 left	17:28
fr0sty_	fission6: ^	17:28
	→ LiamH joined	17:28
	→ TomyLobo2 joined	17:28
	← TomyWork left	17:28
fission6	okay thanks	17:28
	→ qwp joined	17:28
	→ TomyWork joined	17:29
doomrobo	If I have a project with multiple branches, can I have a master branch to be in sync with all of them so that I can see the project as a whole?	17:29
	← foocraft left	17:29
	← steph021_h left	17:29
doomrobo	or is that the wrong way to use git?	17:29
fr0sty_	doomrobo: not even sure how you would attempt that...	17:30
doomrobo	So I'm doing it wrong	17:30
	→ vitor-br joined	17:30
	← henrikbjorn left	17:30
fr0sty_	you can checkout whatever branch you want to look at it.	17:30
	→ joel_falcou joined	17:30
fr0sty_	you can use gitk (or other visualization tools) to see how branches relate to each other.	17:30
doomrobo	but I what if i want to see all at once just in case, say, I want to back it up.	17:31
fission6	fr0sty_: how do i see what branch is trcking?	17:31
	→ tstclair joined	17:31
fission6	like i have my local branch now but how do i confirm what its tracking remotely	17:31
	→ ubuntu__ joined	17:31
	→ henrikbjorn joined	17:32
fr0sty_	git branch -vv	17:32
	→ Predominant joined	17:32
	← TomyLobo2 left	17:33
	→ Zenith77 joined	17:33
	← doomrobo left	17:33
	→ doomrobo joined	17:33
fr0sty_	doomrobo: that question doesn't make sense.	17:34
	you have it 'all' locally already.	17:34
	→ kylehayes joined	17:34
fr0sty_	if you want to back it up save the .git directory	17:34
fission6	fr0sty_: finally how do i pull new code for the development branch	17:35
fr0sty_	if it is tracking correctly: 'git pull'	17:35
	→ xiong joined	17:35
doomrobo	If I want to start a multi-part project, should I have a master branch or just separate branches for each element?	17:35
fr0sty_	or 'git pull --rebase' if you prefer.	17:35
	multi-part?	17:35
	→ superflit joined	17:35
	→ foocraft joined	17:36
doomrobo	I have a program and a serial generator for said program	17:36
	→ madewokherd joined	17:36
FauxFaux	Seperate branches and seperate repositories are effectively identical, pick whatever, it's trivial to fix later.	17:36
	→ saysjonathan joined	17:37
fission6	thanks fr0sty_	17:37
	← sebersole left	17:37
	→ iAsterisk joined	17:37
	→ ivey joined	17:37
	→ saschpe joined	17:37
	← henrikbjorn left	17:38
	← accel left	17:38
	→ accel joined	17:38
	→ chargingllama joined	17:40
	→ sebersole joined	17:42
	→ jarrod_ joined	17:42
	→ ChUrP joined	17:43
doomrobo	Is it considered bad practice not to have a master branch?	17:44
	← TomyWork left	17:44
fr0sty_	no	17:44
doomrobo	ok, thank you	17:45
fr0sty_	it's convention, but it is optional.	17:45
	→ justin-george joined	17:45
	← doomrobo left	17:45
	→ TomyWork joined	17:45
	← achadwick left	17:46
	← justin-george left	17:46
	← hyperair left	17:46
	→ Buglouse joined	17:46
	→ justin-george joined	17:46
	→ henrikbjorn joined	17:48
	← ilteris left	17:49
	← davzie left	17:49
	← filosofo left	17:49
	→ kipras joined	17:49
	→ dannas joined	17:50
	→ ilteris_ joined	17:50
	← RiaGuy left	17:51
	→ bipolarmaniak joined	17:51
	→ kiffa joined	17:51
	← panike left	17:51
	← kiffa left	17:52
	→ srji joined	17:52
srji	i am searching for a document that describes how i can use git with multiple user accounts and multiple repositories on ONE machine	17:53
	← kipras left	17:54
	← vitor-br left	17:54
fr0sty_	gitolite	17:54
	→ vitor-br joined	17:54
	← gusnan left	17:55
	← soxofaan left	17:55
srji	i dont want a own git server	17:56
fr0sty_	?	17:56
srji	i'm a user, and want access to multiple git repositories with different acounts	17:57
	ChanServ set mode: +v	17:57
srji	i work as freelancer for different companies	17:57
	→ Zephyrus joined	17:57
fr0sty_	set your remote urls correctly.	17:57
	ssh://user1@somehost.com...	17:58
	ssh://user2@anotherhost.com...	17:58
	→ skoop joined	17:58
	← myrkraverk left	17:58
fr0sty_	if you have the same user than do some magic in your .ssh/config to configure users and hosts.	17:58
bipolarmaniak	does anyone know of any reason why (other than perms) `git daemon --base-path=/foo/ /foo/` renders a "'/bar.git' does not appear to be a git repository" error? bar.git exists, is a valid repo, and all commands run as root: e.d git clone git://gitserver/bar.git	17:59
	← _ollie left	17:59
srji	exist a document what these describes?	17:59
bipolarmaniak	oh, and git-daemon-export-ok is in the repo dir	17:59
fr0sty_	srji: man git-clone has a 'GIT_URLS' section describing urls	18:00
jast	srji: the 'git-clone' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-clone.html [automatic message]	18:00
	← guardian left	18:00
fr0sty_	and there are untold numbers of ssh/config tutorials.	18:00
	bipolarmaniak: the absolute path is /foo/bar.git ?	18:00
	← Bruce_Wayne left	18:00
bipolarmaniak	frosty_ yes	18:01
fr0sty_	and /foo and foo/bar are +x for the git-daemon user?	18:01
	← airborn left	18:01
bipolarmaniak	yes again	18:01
	frosty_: itworks with this git clone git://gitserver/foo/bar.git	18:02
	→ kukks joined	18:02
fr0sty_	with base-path set, or not?	18:02
bipolarmaniak	frosty_: either way, the full path works, but base-path is not being honered	18:02
	← workmad3 left	18:03
	← PigeonFriend left	18:04
	→ McMAGIC-- joined	18:05
	← shruggar left	18:06
jast	bipolarmaniak: is that error message output by the daemon (in its own terminal) or by the 'git clone'?	18:07
bipolarmaniak	jast: that's outut on the server/daemon	18:07
	→ Dave^\| joined	18:08
	← Delerius left	18:09
bipolarmaniak	wow, now `git daemon ?-verbose --reuseaddr /foo` produces /foo/bar.git: not in whitelist. the man page says that <directory> whitelist is recursive. :-/	18:09
jast	it should be, unless you are using --strict-paths	18:10
bipolarmaniak	when issuing a `git clone git://gitserver/foo/bar.git`	18:10
	jack: right, and I'm not. I'm on Lucid, btw	18:10
	← acts_as left	18:11
	→ Delerius joined	18:11
	← qwp left	18:12
	← owst left	18:12
	→ owst joined	18:12
	→ ch077179 joined	18:13
	← jelmer left	18:13
	← foocraft left	18:15
	→ TheFox21 joined	18:15
	→ thechistoso joined	18:16
	← thechistoso left	18:17
	→ chrisshattuck joined	18:18
bipolarmaniak	here's teh steps to reproduce:	18:19
	https://gist.github.com/860689	18:19
	tia to anyone willing to take a look	18:19
	→ dreiss joined	18:19
	← owst left	18:19
	→ owst joined	18:19
	→ pyrony joined	18:20
jast	bipolarmaniak: ah... presumably, git-daemon assumes, based on the directory name (bar.git) that it's a bare repository, but you created a non-bare one (i.e. one with a working tree, not typically used for hosting)	18:20
	try cloning from git://example.org/bar.git/.git	18:21
	← curtana left	18:21
bipolarmaniak	ok, i created a bare repo with nochange	18:22
	I'll try that too	18:22
jast	hmm	18:22
	→ mrconnerton joined	18:23
bipolarmaniak	jast: I know,I'm ripping my hair out	18:23
	→ zzing joined	18:24
	← mrconnerton left	18:24
	→ Toastable joined	18:25
	← _psychic_ left	18:26
	→ acts_as joined	18:26
fr0sty_	bipolarmaniak: you are running git-daemon as root?	18:26
	→ _psychic_ joined	18:26
bipolarmaniak	fr0sty_: yea, ATM, for testing	18:27
	now when I try `git clone git://git/root/foo/bar.git` i get '/root/foo/bar.git': not in whitelist	18:28
	server args: --base-path=/root/foo /root/foo/	18:28
	← ereslibre left	18:29
	← dyer left	18:30
bipolarmaniak	I'll try from a different server and see if it makes a difference	18:31
	← lattera left	18:31
	← sechrist left	18:34
	← cylence left	18:34
	→ Bruce_Wayne joined	18:35
	← chrisshattuck left	18:35
	→ jmorris joined	18:37
	← TheFox21 left	18:38
	← Bruce_Wayne left	18:38
	→ Evious joined	18:39
	adamholt → adamholt_away	18:41
	adamholt_away → adamholt	18:42
	← Yuuhi left	18:42
	eco_ → eco	18:42
fr0sty_	bipolarmaniak: have you tried --export-all	18:43
	?	18:43
	← accel left	18:43
	→ tizzo joined	18:44
	→ beyondcreed joined	18:44
	← priidu_ left	18:45
bipolarmaniak	fr0sty: yea. I think it may work this time	18:45
	← crashanddie left	18:47
bipolarmaniak	git daemon --verbose --base-path=/home/me/foo /home/me/foo worked on a different machine	18:47
	← chargingllama left	18:48
bipolarmaniak	I still received whitelist errors until I used the full path above though :-(	18:48
kylehayes	I'm looking for a good solution to "group" multiple repositories under a project	18:49
	Basically so I can branch all the projects at the same time, or merge, etc	18:49
	← MikhX left	18:49
kylehayes	s/projects/modules/	18:49
	→ thiago_workshop joined	18:50
	→ Chaser joined	18:50
	→ TheFox21 joined	18:50
	← lessthanzero left	18:51
	→ lessthanzero joined	18:51
bipolarmaniak	fr0sty_, jast: thanks y'all	18:51
	→ priidu_ joined	18:52
	← TheFox21 left	18:52
	← remi_ left	18:52
	← acts_as left	18:52
	→ TheFox21 joined	18:53
	← tizzo left	18:53
	→ dim joined	18:53
	← owst left	18:54
	← cenuij left	18:54
	→ tizzo joined	18:54
	→ remi joined	18:54
	← remi left	18:54
	→ remi joined	18:54
	← Zenith77 left	18:54
	→ shennyg_ joined	18:55
	→ MikhX joined	18:55
	→ acts_as joined	18:55
	← tjholowaychuk left	18:55
	← nonnooo left	18:56
	→ ax joined	18:57
	← shennyg left	18:57
	shennyg_ → shennyg	18:57
	→ krunkosaurus joined	18:58
krunkosaurus	How do I set git so when I do a "git push" it only pushes commits from my local branch to origin/branch	18:58
	→ elmargol joined	18:59
	← bentob0x left	18:59
	→ mrico joined	18:59
fr0sty_	krunkosaurus: what happens now?	19:03
	← elmargol left	19:03
	→ guardian joined	19:04
cbreak	krunkosaurus: man git-config	19:04
jast	krunkosaurus: the 'git-config' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-config.html [automatic message]	19:04
	← rajeshsr left	19:04
cbreak	look for push.default	19:04
	adamholt → adamholt_away	19:04
	adamholt_away → adamholt	19:05
	→ johnw joined	19:05
cbreak	krunkosaurus: you probably want "current"	19:05
krunkosaurus	sweet	19:05
	right now it tries to push all branches to all remote repos	19:05
	→ elmargol joined	19:06
cbreak	no, matching branches is the default	19:06
ax	i read a blog post about a script for resolving merge issues with a specific file [a rails db/schema.rb file], i'm wondering, what that is called? so i can read up on it more..	19:06
krunkosaurus	cbreak: I have matching set for both push and pull in my ~/.gitconfig	19:06
cbreak	matching is the default	19:06
krunkosaurus	ohh	19:06
cbreak	it means "push all branches that match in names"	19:06
	← Samual left	19:07
	← tizzo left	19:07
	→ theoros joined	19:07
krunkosaurus	thanks cbreak: I believe that did it	19:07
	← dpino left	19:08
	→ sechrist joined	19:08
	→ heda joined	19:09
	← thiago_workshop left	19:10
	→ thiago_workshop joined	19:10
	thiago_workshop → thiago_home	19:10
	ChanServ set mode: +v	19:10
heda	hi all, is there any way to get git status --porcelain to either output the full file path or to output relative paths from the current directory? (it currently outputs from the root)	19:10
	→ amh345 joined	19:10
amh345	i guys, im looking for some newb help on a command. how to a structure git remote add origin ssh://blah@blahblah.com/~git/something.git if i want to use a keypair? i cant get my formatting structure correct.	19:12
fr0sty_	heda just append 'git rev-parse --show-toplevel'	19:12
teuf	amh345: key pair ? ssh public/private key?	19:12
	→ tjholowaychuk joined	19:12
	← Dave^\| left	19:12
	← TomyWork left	19:12
thiago_home	amh345: edit ~/.ssh/config	19:12
	→ Dave^\| joined	19:13
	→ TomyLobo joined	19:13
amh345	teuf: forgive me. im a little confused. right now i can ssh using ssh -i ec2-keypair [email@hidden.address]	19:13
heda	fr0sty_: cheers	19:13
	→ phantomcircuit joined	19:13
cbreak	I'd just add the key to the agent	19:13
	ssh-add key	19:13
	← ubuntu__ left	19:13
	← Dave^\| left	19:13
teuf	amh345: what thiago_home or cbreak say :)	19:13
amh345	ssh -add ec2-keypair ?	19:13
	← dannas left	19:14
	→ Dave^\| joined	19:14
thiago_home	amh345: ssh-add	19:14
	→ Samual joined	19:14
	→ cylence joined	19:14
	→ kristianpaul joined	19:14
	← jmorris left	19:14
amh345	im a little nervous im going to bork my keys again. (and lock myself out), so i want to make sure .hah	19:14
cbreak	you still have your main account	19:15
	or password access, maybe :)	19:15
	← oriba left	19:15
kristianpaul	Hello	19:15
	How i can tell git just show me the commit log for a specific file?	19:15
amh345	i dont know, last time i screwed it all up and had to restart my server instance :)	19:15
rane_	kristianpaul: git log -- path/to/file	19:15
thiago_home	kristianpaul: git log filename	19:15
cbreak	kristianpaul: git log -- filename will filter all commits that affect it	19:15
	→ chrisshattuck joined	19:16
cbreak	add in -C or -M if you want to track renames	19:16
	→ kumbayo joined	19:16
cbreak	or --follow	19:16
	although I never tried that	19:16
kristianpaul	ah, pity, (why i just dint tried..)	19:16
	tks	19:16
	→ Textmode joined	19:16
amh345	hmm ssh -add and ssh -add ec2-keypair just give me an ssh options list.	19:16
thiago_home	amh345: ssh-add	19:16
cbreak	amh345: we actually mean what we write	19:17
amh345	oh, is there no space?	19:17
	→ drizzd joined	19:17
cbreak	no space...	19:17
amh345	ahh	19:17
	i just returned this Identity added: ec2-keypair (ec2-keypair) does that look about right?	19:17
cbreak	if you didn't protect your key, yes	19:17
	(with an encryption password)	19:18
	→ scelis joined	19:18
	← scelis left	19:18
ax	ahh, custom merge driver [answering my own question in case anyone else was wondering]	19:18
amh345	ok, lets see if i can get git working.	19:18
	← zzing left	19:19
	← HG` left	19:20
kristianpaul	Okay,now how i can see the diff history between commits for a certain file?	19:20
amh345	i think it's working guys!	19:20
fr0sty_	git diff commit commit -- file	19:20
	← remi left	19:20
amh345	oh man. it's slooooow	19:21
cbreak	kristianpaul: add a -p to the git log command	19:21
	kristianpaul: as first arg :)	19:21
	→ shennyg_ joined	19:21
	← cylence left	19:22
	→ hunmonk joined	19:23
	→ ISF joined	19:23
	← Predominant left	19:23
	← chrisshattuck left	19:24
hunmonk	our gitweb installation is returning an empty file when the requested file doesn't exist — is there some setting we can tweak to make it return a 404 or the like in these cases?	19:25
	← shennyg left	19:25
	shennyg_ → shennyg	19:25
	→ opalka joined	19:26
	→ Predominant joined	19:26
	← dim left	19:26
	← TheFox21 left	19:26
	→ dim_ joined	19:27
	→ acts_as_ joined	19:27
	→ excess^_ joined	19:27
	← saschpe left	19:27
	← darragh left	19:27
	← iAsterisk left	19:27
	← acts_as left	19:28
	acts_as_ → acts_as	19:28
	→ iAsterisk joined	19:30
	→ flov joined	19:30
	← excess^ left	19:31
	excess^_ → excess^	19:31
	→ ereslibre joined	19:33
ericbarnes	what is the fastest way to get all the files out of a repo? git clone --depth 1? Or is anything else faster? I just need the files and do not care about history.	19:37
heda	hi fr0sty_ could give me an example of that full path...here's what i have at the moment git status --porcelain \| cut -c4- \| xargs stat -f "%m" -t "%x"	19:37
	← ej left	19:37
patrikf	ericbarnes: git archive	19:38
	→ ej joined	19:38
ericbarnes	So that would be the fastest including uncompressing it?	19:39
	→ gregglind joined	19:39
ayust	archive doesnt necessarily compress	19:39
	the default format is 'tar', which is not compression	19:39
	→ bmahe joined	19:40
ayust	git archive HEAD \| tar -C /path/to/folder -x	19:40
	← javaanse_jongens left	19:40
krunkosaurus	If I set default.pull and default.push to current - is there any point in setting upstream tracking?	19:40
	→ esparkman joined	19:40
ericbarnes	excellent thanks	19:40
ayust	will get you the contents of the repo at its HEAD in /path/to/folder	19:40
ericbarnes	what about a branch?	19:40
ayust	krunkosaurus: you'll be informed by git status when you're ahead/behind/diverged	19:40
	ericbarnes: change HEAD to the branch name	19:40
ericbarnes	awesome thanks	19:41
krunkosaurus	ayust: gracious.	19:41
	← FunkyFortune left	19:42
	→ Zenith77 joined	19:43
	← TomyLobo left	19:44
	→ alex__c2022 joined	19:44
	→ javaanse_jongens joined	19:45
	→ setmeaway2 joined	19:46
	← setmeaway left	19:46
ericbarnes	ayust Just noticed that in order to use archive you must already have it cloned. Right?	19:46
ayust	ericbarnes: no	19:46
	you can specify a path to a repository to archive	19:47
	adamholt → adamholt_away	19:47
	adamholt_away → adamholt	19:47
ayust	--remote=github.com/foo/bar	19:47
	for example	19:47
ericbarnes	ahh I missed the remote part :(	19:48
	→ LongBeach joined	19:48
	← nevyn^ left	19:48
	← ilpoldo left	19:48
	← pratz left	19:50
	→ t3i joined	19:50
	→ dyer joined	19:51
	← dyer left	19:51
	→ dyer joined	19:51
	← ch077179 left	19:52
	← henrikbjorn left	19:55
	← OOPMan left	19:55
	← rseifert left	19:56
	→ henrikbjorn joined	19:56
	← JP-Dery left	19:57
	← werdan7 left	19:57
	← henrikbjorn left	19:57
	← tty3 left	19:58
	→ tty1 joined	20:01
	← tty1 left	20:01
	→ tty1 joined	20:01
	→ deuterium joined	20:02
	→ goshawk joined	20:02
	→ henrikbjorn joined	20:03
	← henrikbjorn left	20:04
	→ ch077179 joined	20:05
	→ ki__ joined	20:05
	→ dannas joined	20:06
fr0sty_	heda: add ... \| sed -e s\\|^\\|$(git rev-parse --show-toplevel)/\\| to the end...	20:07
	→ EricInBNE joined	20:07
	→ JP-Dery joined	20:07
fr0sty_	there may be a cleaner approach but that works (for me at least)	20:08
	→ OOPMan joined	20:09
	← goshawk left	20:11
	← ping-pong left	20:12
	→ ping-pong joined	20:14
	→ tizzo joined	20:14
	→ Olytibar joined	20:16
	← noahcampbell left	20:16
	→ codebeaker joined	20:17
Olytibar	Hey guys, how can I use git decentralized, between two people, without a central server?	20:17
	→ noahcampbell joined	20:17
bremner	Olytibar: pull from each other?	20:17
Olytibar	How?	20:18
wereHamster	using.. uhm.. git pull ?	20:18
bremner	Olytibar: do you have ssh access to each other's hosts?	20:18
Olytibar	Ok, is this necessary?	20:19
	← agile left	20:19
	← mrico left	20:20
bremner	well, you can email patches, send bundles on usb sticks, there are many options, but ssh is the most convenient	20:20
	or some fancy http thing that I don't know much about	20:20
codebeaker	very quick query is there a difference between ssh://user@host.com/blah.git and user@host:blah.git ? is one ssh, the other SFTP, SCP?	20:20
wereHamster	Olytibar: you need to have some way of connecting between the computers..	20:21
	→ MattDiPasquale joined	20:21
	→ agile joined	20:21
	← Chillance left	20:21
drizzd	codebeaker: no, the latter is just scp syntax, but it's the same as ssh://	20:21
codebeaker	drizzd: thanks having it out on a mailing list with someone who insisted they were "completely different"	20:21
	→ t3i_ joined	20:21
codebeaker	… the manual was pretty clear, but thanks for the sanity check :)(	20:22
	← dyer left	20:22
	← napster_123 left	20:23
	← fission6 left	20:23
	→ DiGitalX joined	20:24
	← quentusrex left	20:24
	← javaanse_jongens left	20:24
	→ eletuchy joined	20:24
	← agile left	20:24
	→ surikator joined	20:25
	← t3i left	20:25
	t3i_ → t3i	20:25
	→ abetaha joined	20:25
	→ Claviceps joined	20:25
	→ javaanse_jongens joined	20:25
wereHamster	codebeaker: they are! One starts with ssh:// and the other one with user@. Don't you see the difference?	20:26
codebeaker	heh :-D	20:26
	→ lightcap_ joined	20:26
codebeaker	wereHamster: one query on the topic though, does git clone know anything about ssh agents?	20:26
Olytibar	Thank you, we will now use Dropbox to let git communicate with each other.	20:26
	← Olytibar left	20:26
thiago_home	codebeaker: the difference is actually the slash after host.com	20:26
	← lightcap_ left	20:26
thiago_home	codebeaker: the [email@hidden.address] has no slash	20:27
wereHamster	codebeaker: how do you mean know aobut ssh?	20:27
	→ Plouj joined	20:27
codebeaker	about ssh agents ^	20:27
wereHamster	no	20:27
	← mando_ left	20:27
Plouj	forgot how to combine 1st and 2nd commits	20:27
codebeaker	ah, ok - interesting	20:27
	← intripoon_ left	20:27
	→ agile joined	20:27
codebeaker	I need to get it to use my forwarded agent key :(	20:27
	→ goshawk joined	20:27
Plouj	I mean, actual first and second commits since the beginning of history of a given repo	20:27
	→ intripoon joined	20:27
	→ t3i_ joined	20:27
	← deuterium left	20:28
	→ foocraft joined	20:28
	← abetaha left	20:28
	→ m104 joined	20:28
IslandUsurper	Plouj, are you really prepared to change all of the hashes of all of your commits?	20:28
wereHamster	Plouj: rebase starting with the first, select 'edit', then reset --soft HEAD^ && commit and continue with the rebase	20:28
	→ rrjamie joined	20:29
Plouj	thanks	20:29
rrjamie	I have a (delete/foo) conflict after moving stuff around on one branch, and then merging	20:29
	how do I resolve it	20:29
thiago_home	rrjamie: did you mean to ask "how do I make git merge find the renames" ?	20:29
	← t3i left	20:30
rrjamie	thiago_home: or, that would work too ;)	20:30
	t3i_ → t3i	20:30
thiago_home	rrjamie: see man git-config	20:30
jast	rrjamie: the 'git-config' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-config.html [automatic message]	20:30
thiago_home	rrjamie: there are some settings for rename detection	20:30
	rrjamie: if that still fails, then fix manually and then git add the files	20:30
	← Plouj left	20:30
	← vitor-br left	20:31
	→ sako joined	20:32
sako	hey guys, how do i initiailze all submodules in a git repo?	20:33
	i have everything in .gitmodule, but i dont want to go through one by one and do git submodule name update --init	20:33
	→ syphar joined	20:35
codebeaker	sako: check help for submodules, you can init all of them	20:36
	→ nurey joined	20:37
codebeaker	wereHamster; is there any known way to make git-clone care about the ssh agent?	20:37
wereHamster	codebeaker: no. Make ssh care about its agent	20:38
patrikf	codebeaker: if ssh works, git-over-ssh should too.	20:38
	← krunkosaurus left	20:38
wereHamster	then git will, too	20:38
codebeaker	patrikf: thanks, regrettably I can't test SSH (no permissions to login) but I should be able to check out my repo… I'm a project collaborator on github	20:39
	→ sockmonk joined	20:39
	← sockmonk left	20:39
	← doener left	20:39
patrikf	run git with GIT_TRACE=1 and then run the ssh command-line it outputs	20:39
	if it shows the same behaviour, fix your ssh config	20:39
codebeaker	thanks didn't know about GIT_TRACE	20:40
rrjamie	thiago_home: alright, so that failed, but I'm confused as to what my now conflicted tree looks like... where would git put the "deleted" files so I can inspect them and resolve the conflicts?	20:41
wereHamster	rrjamie: into the index	20:41
codebeaker	thanks for the tip, the output doesn't make sense	20:41
thiago_home	rrjamie: in the case of delete/modified conflicts, Git put the file from the branch that didn't delete it into the working dir	20:41
	→ Nilbus joined	20:41
Nilbus	hello	20:42
	→ Tido joined	20:42
thiago_home	rrjamie: you have to find the other copy (the one after moving around), merge the code and git rm the original	20:42
wereHamster	codebeaker: pastebin it?	20:42
codebeaker	i think the problem may be ls-remote… since I don't have permission to get a shell…	20:42
	just looking into it	20:42
patrikf	no, this is how git-over-ssh works.	20:42
	and it has nothing to do with a shell	20:42
codebeaker	ok, np = looks like it was trying to do ssh [email@hidden.address] 'git-upload-pack myproj.git'	20:43
wereHamster	that looks correct	20:43
codebeaker	htm	20:43
	hrm*	20:43
wereHamster	codebeaker: what do you see if you run 'ssh [email@hidden.address] ?	20:44
	→ tiglionabbit joined	20:44
	← nurey left	20:44
codebeaker	Permission denied (publickey)_	20:44
wereHamster	fix your ssh config, or keys	20:44
sako	codebeaker: do you have your ssh-key setup in your github settings?	20:44
codebeaker	yeah, sako it works… but not via this host	20:45
	I need to look at `ssh -vvv [email@hidden.address] and see if it's even bothering to offer my forwarded kay, but I don't know wha tI'm looking for in that outptu	20:45
rrjamie	thiago_home: git status gives "deleted by us: lib/jungle_static", but lib/jungle_static isn't in my working dir (it was moved to jungle/lib/jungle_static)... so I can git rm this imaginary folder, but I can't see how to inspect it	20:46
thiago_home	rrjamie: git shouldn't complain about directories	20:46
	→ chrisshattuck joined	20:46
thiago_home	rrjamie: are you sure it's not a file?	20:46
rrjamie	thiago_home: it's a submodule	20:46
	← justin-george left	20:47
tiglionabbit	I used git svn clone on an svn repository, then I used git clone on the resulting git repository, then ran git svn dcommit no the new repository and this happened: http://friendpaste.com/9OTBwYX0ONsD08p5U0tVl	20:47
thiago_home	rrjamie: it won't checkout then. Just check the SHA-1 of the submodule commit it pointed to.	20:47
ayust	codebeaker: "debug1: identity file <some path here>"	20:47
	← sontek left	20:47
tiglionabbit	how do I fix it?	20:47
ayust	where the path is the one for your key file	20:47
thiago_home	tiglionabbit: don't clone an svn clone	20:47
codebeaker	ayust: but there's no identity file, or is the file in SSH_AUTH_SOCK the real file ?	20:47
	← chrisshattuck left	20:47
thiago_home	tiglionabbit: keep the svn operations in the same repository you did the svn clone from.	20:48
tiglionabbit	=[	20:48
	well	20:48
ayust	codebeaker: you don't have a ".ssh/id_rsa" or similar?	20:48
	← Zephyrus left	20:48
	→ of2vil_ joined	20:48
tiglionabbit	effectively I just want to move this repository to a different machine	20:48
thiago_home	tiglionabbit: then rsync it	20:48
tiglionabbit	ok	20:48
codebeaker	yes on my workstation, but I'm SSHe'd into host (A) trying to reach github as myself	20:48
tiglionabbit	what options should I give to rsync?	20:48
thiago_home	codebeaker: ssh -A othermachine	20:48
codebeaker	(or rather as [email@hidden.address] but using my forwarded key)	20:48
	→ justin-george joined	20:48
thiago_home	tiglionabbit: the options to copy everything	20:48
	← of2vil_ left	20:49
	→ of2vil joined	20:49
of2vil	hello, can anyone tell me how i can tell gitweb do not display a certain repository?	20:49
	→ deuterium joined	20:49
	← tizzo left	20:50
ayust	codebeaker: ok, then look for "debug1: Offering public key: "	20:50
	→ mauke joined	20:50
ayust	and the lines that immediately follow that (if any)	20:51
	→ ISF_ joined	20:51
codebeaker	ayust: yeah, it's not there … my suspicion was that because i'm logged onto host A as `codebeaker` - and trying to reach host C (github) as user `git` - it doesn't offer my keu	20:51
mauke	hi	20:51
	every time I try to use 'git add -p', it says: Can't locate Git.pm in @INC (@INC contains: ...)	20:51
ayust	codebeaker: doubt that's why	20:51
thiago_home	codebeaker: ssh-add -l	20:52
	codebeaker: is the key listed?	20:52
codebeaker	ayust: likewise, the good people of openssh were good enoguhto help me	20:52
thiago_home	mauke: how did you install Git?	20:52
mauke	thiago_home: emerge git	20:52
codebeaker	ayust: "The Agent has no identities"	20:52
thiago_home	mauke: then please ask in your distribution's channel how to install the Perl modules for Git.	20:52
mauke	they are installed	20:52
	sort of	20:52
thiago_home	codebeaker: ssh-add the key then.	20:52
mauke	I'm pretty sure this is because git is trying to use the wrong perl	20:52
codebeaker	which is odd… I was always told (and thought) agent forwarding is working if $SSH_AUTH_SOCK is set, and points to a valid socket	20:52
	← of2vil left	20:52
	← hunmonk left	20:52
	→ hunmonk joined	20:53
mauke	can I configure which perl git uses?	20:53
patrikf	codebeaker: what does ssh-add -l say locally?	20:53
	adamholt → adamholt_away	20:53
codebeaker	the same, actually patrikf	20:53
	adamholt_away → adamholt	20:53
ayust	then your local agent doesnt have the key	20:53
	and you need to add it locally on your workstation	20:53
	before it can be forwarded	20:53
	← ISF left	20:53
codebeaker	ayust: ok, good to know :S	20:54
ayust	forwarding doesn't automatically forward keys off disk	20:54
thiago_home	mauke: you can probably edit the script and change the first line	20:54
ayust	it just hooks the remote ssh-agent up to your local ssh-agent	20:54
codebeaker	ah, I thought forwarding forwarded the key I used to get into the server, into the server's agent	20:54
thiago_home	codebeaker: no	20:54
	codebeaker: forwarding forwards the agent	20:54
	← saintdev left	20:54
codebeaker	thiago_home: thanks!	20:54
mauke	oh, ew	20:54
patrikf	you don't ever give out the private key, that's sort of the whole point	20:54
	← disappearedng left	20:54
codebeaker	ok, so even without logging in again… the intermediate agent has the key now	20:55
	← TrineLocke left	20:55
patrikf	otherwise you could use telnet just as well	20:55
Nugget	telnet is eeeeeeevil!	20:55
thiago_home	mauke: do you really have more than one perl installed?	20:55
	← LongBeach left	20:55
mauke	thiago_home: yes, a system perl and one in my home directory	20:55
codebeaker	ayust: patrikf and thiago_home - between you, you have saved my evening :-D	20:55
mauke	thiago_home: do you know why 'cpan Git' doesn't install Git.pm but App/gh/Git.pm?	20:56
thiago_home	mauke: no idea	20:56
	← skoop left	20:56
	→ eddie_ joined	20:57
	→ hunmonk1 joined	20:57
	← hunmonk left	20:57
	← Dave^\| left	20:58
	← hunmonk1 left	20:58
	→ Dave^\| joined	20:58
mauke	ok, "fixed" it by making a symlink from Git.pm to App/gh/Git.pm	20:58
	→ urkud_ joined	20:58
	← rgl left	20:58
	→ rgl joined	20:58
	→ t3i_ joined	21:00
	← t3i left	21:01
	t3i_ → t3i	21:01
	→ fractastical joined	21:02
	← acts_as left	21:04
	← eddie_ left	21:06
	← bdiu left	21:07
	← Zenith77 left	21:07
	→ ereslibre_laptop joined	21:07
	→ bdiu joined	21:07
	← ChUrP left	21:07
	→ t3i_ joined	21:07
	← Dave^\| left	21:07
	→ Dave^\| joined	21:08
	→ Mage joined	21:08
	→ ilpoldo joined	21:09
	← ereslibre left	21:09
	← t3i left	21:09
	t3i_ → t3i	21:09
	← docelic left	21:10
	← Dave^\| left	21:10
	→ Dave^\| joined	21:10
	→ ISF__ joined	21:10
	← ketas left	21:11
	→ ketas joined	21:11
	→ Platz joined	21:11
	ilteris_ → ilteris	21:12
	← ISF_ left	21:13
	← agile left	21:13
	← irc2samus left	21:13
	← Platz left	21:13
	→ agile joined	21:13
	→ tizzo joined	21:13
	← tizzo left	21:14
	→ owst joined	21:14
	← dannas left	21:14
	→ tizzo joined	21:14
	← tizzo left	21:15
	← Yuffster left	21:17
	← cilly left	21:18
	→ Gunni joined	21:18
	ivey → ivey_off	21:18
	→ MikhX_ joined	21:18
	→ quentusrex joined	21:19
	→ acts_as joined	21:20
	→ hunmonk joined	21:20
	← goshawk left	21:20
	→ s0ber_ joined	21:20
	→ Dr_G joined	21:20
	← priidu_ left	21:21
	→ xerora joined	21:21
	→ abhinay_ joined	21:21
	← s0ber left	21:21
	s0ber_ → s0ber	21:22
	← MikhX left	21:22
	MikhX_ → MikhX	21:22
	→ tizzo joined	21:23
	← abhinay_ left	21:23
	→ abhinay joined	21:23
	→ dyer joined	21:24
	← dyer left	21:24
	→ dyer joined	21:24
	← Dr_G left	21:24
	← larsl left	21:25
	→ kpreid joined	21:25
	→ Dr_G joined	21:26
	← dyer left	21:26
	→ ISF_ec09 joined	21:27
	← Toastable left	21:28
	ivey_off → ivey	21:28
	← Dr_G left	21:29
	← ISF__ left	21:29
	→ nfiniteset joined	21:31
	ivey → ivey_off	21:34
	→ rorist joined	21:34
	→ goshawk joined	21:35
	→ tvw joined	21:38
	→ mmw joined	21:38
	→ whalesalad joined	21:39
	← mithro left	21:40
	← theycallmeniv left	21:40
whalesalad	Hey everyone. I am trying to share a git repo on a server with someone (not the repo, but a checked out instance), we're both in the same 'staff' group but he cannot perform git commands	21:40
ayust	make sure core.sharedRepo is set to true	21:40
	and chmod g+w	21:41
whalesalad	okay	21:41
	← dim_ left	21:41
whalesalad	giving it a spin	21:41
	← iravid left	21:41
ayust	sorry, core.sharedRepository	21:42
patrikf	and the directories g+s	21:42
	and chgrp	21:42
whalesalad	so like 'chmod -R g+s <repo>'	21:42
patrikf	nah	21:42
whalesalad	im sort of a noob with unix permissions =/	21:42
patrikf	find repo -type d \| xargs chmod g+s	21:42
whalesalad	oh wow okay, leet	21:42
patrikf	you can also just start over and tell git init what you want to do (--shared=group)	21:43
whalesalad	yeah I was pondering that	21:43
patrikf	(g+s on files has a different meaning than on directories)	21:43
whalesalad	okay	21:43
	← markatto left	21:44
whalesalad	thanks guys for all the help	21:44
	it works	21:45
	← GeertB left	21:45
mainrain	how might i view the differences between to tree-ish as a single diff? i can git log over a set, but i get a patch for each version instead of a patch that would go from A to B in one swoop(to see the total changes, not all the steps in between)	21:45
	*between two	21:45
	← eno left	21:45
thiago_home	mainrain: git diff	21:45
mainrain	thiago_home: but that gives me a seperate patch for each commit	21:46
	→ iravid joined	21:46
thiago_home	mainrain: git log does; git diff makes one diff	21:46
mainrain	thiago_home: ahh, ok	21:46
	← Swimming_bird left	21:46
	→ captproton joined	21:46
mainrain	thiago_home: thanks	21:46
captproton	hi all	21:47
	I am having way too many conflicts when I pull master from remote	21:47
	← Aaaarg left	21:48
mainrain	i get that when someone on the team decides to re-format :(	21:48
	good reason for coding guidelines .. i'm sure theres other ways for it to happen though	21:48
captproton	someone showed me once, but what is a git command I can do that just takes in the remote by default?	21:48
	→ Blazento joined	21:48
mainrain	captproton: if you are in a merge, git checkout --theirs path/to/file	21:48
	captproton: i think	21:48
captproton	mainrain: our team is new to not working in the master	21:48
	← srji left	21:49
mainrain	captproton: otherwise, i think git checkout master -- path/to/file would work too	21:49
	← justin-george left	21:49
captproton	mainrain: what about if I just want to take in the remote wholesale?	21:50
mainrain	captproton: git status \| grep modified \| cut -d : -f 2 ?	21:50
captproton	it's something to do with force, I believe	21:50
	← Pewpewarrows left	21:50
mainrain	i dont like the -a flags, it always grabs other files	21:50
	maybee that line wont work though, i forget what it looks like exactly in the git status for merge	21:51
	← surikator left	21:51
	→ justin-george joined	21:51
cbx33	what is the difference between doing a checkout back to a previous version in a new branch, and doing a git reset --hard in a new branch?	21:51
mainrain	cbx33: i think git reset --hard removes any changes to the working tree after the target	21:51
	cbx33: as in, deletes the commits	21:51
wereHamster	mainrain: checkout does too	21:51
cbx33	yeh	21:52
thiago_home	cbx33: the difference is what happens to the branch	21:52
wereHamster	cbx33: the difference is that checkout moves HEAD (doesn't touch the branch) and reset moves the branch	21:52
mainrain	wereHamster: checkout will delete the commits?	21:52
thiago_home	checkout doesn't change the branch; reset changes it	21:52
wereHamster	mainrain: changes in the working tree	21:52
cbx33	wereHamster, ahhh ok	21:52
mainrain	wereHamster: yea, i wasn't clear, i meant to say --hard will delete commits after target	21:52
	← tizzo left	21:53
wereHamster	.. for a certain definitin of 'delete'	21:53
cbx33	yeh	21:53
	→ tizzo joined	21:53
cbx33	I was gonna say....so i have two branches.....A,B,C,D,E	21:53
	and i reset hard one of them back to C	21:53
	D,E still exist in the other branch right?	21:53
wereHamster	sure	21:53
cbx33	so how does it "affect" the branch?	21:54
	→ pantsman joined	21:54
	→ markatto joined	21:54
cbx33	i mean the "commit" objects D,E will still have parents	21:54
wereHamster	the other branch? Not at all	21:54
cbx33	from the other branch	21:54
	surely it just moves the HEAD in this case	21:54
	and "forgets" about them in the smaller branch	21:55
	← jstemmer left	21:55
	→ eno joined	21:55
	→ zorzar joined	21:56
	← iamjarvo left	21:56
fr0sty_	a branch is just a movable pointer to a commit.	21:56
cbx33	yeh	21:56
fr0sty_	and HEAD (if you have a branch checked out) is a pointer to the branch	21:56
cbx33	that's why I'm a little confused - the operation doesn't delete objects	21:56
fr0sty_	which is a pointer to a commit.	21:57
cbx33	objects get deleted at a clean up	21:57
	i mean	21:57
	if I did do a git reset --hard	21:57
thiago_home	cbx33: they aren't deleted, they are just dangling	21:57
cbx33	right	21:57
wereHamster	but taht cleanup is at least a month away	21:57
fr0sty_	and dangling only if not referenced by any other branches or tags.	21:57
wereHamster	maybe even >90 days	21:57
cbx33	rght	21:57
mainrain	how can you list dangling commits?	21:57
	← ereslibre_laptop left	21:57
wereHamster	mainrain: man git-fsck	21:57
jast	mainrain: the 'git-fsck' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-fsck.html [automatic message]	21:57
cbx33	but when wereHamster said <wereHamster> cbx33: the difference is that checkout moves HEAD (doesn't touch the branch) and reset moves the branch	21:58
fr0sty_	cbx33: that depends on what commands you actually use.	21:58
	git checkout <some commit> detaches head and moves it to <commit>	21:58
	git reset --hard <commit> moves your branch to point to that commit.	21:59
	← esparkman left	21:59
fr0sty_	'git checkout -b newbranch <commit>' and 'git checkout newbranch; git reset --hard <commit>' are equivalent.	21:59
wereHamster	cbx33: HEAD -> points to <branch> -> points to a <commit>. reset changes <branch> and checkout changes HEAD	21:59
	→ ereslibre_laptop joined	21:59
cbreak	do a "cat .git/HEAD" before and after a checkout/reset	22:00
	← hunmonk left	22:00
cbreak	also a cat .git/refs/heads/master	22:00
	before and after each	22:00
cbx33	wereHamster, what do you mean changes <branch> - sorry	22:00
cbreak	maybe that helps you understand :)	22:00
	what changing a branch means in both context	22:00
cbx33	ok	22:01
cbreak	oh	22:01
	make backups beforehand	22:01
cbx33	hah	22:01
	i'm not that silly :)	22:02
	→ thedangler joined	22:02
	← tizzo left	22:03
	→ Swimming_bird joined	22:03
	→ acid_ joined	22:03
	→ tizzo joined	22:03
	← mikewintermute left	22:04
	← webPragmatist left	22:04
cbx33	so - i think i understand now - checkout creates a detached HEAD, branch still points to tip.....reset moves branch and head accordingly and doesn't detach	22:04
wereHamster	cbx33: a branch <B> points to a commit <X>. After a reset --hard <Y> that branch will ponit to commit <Y>	22:04
cbx33	yes	22:04
	i understand	22:04
	→ bartimaeus\|work joined	22:05
	→ _Ludwig_ joined	22:05
	← drubies\|mbp left	22:05
	← acid left	22:06
	← jmil left	22:06
	← eno left	22:07
	← thedangler left	22:07
cbx33	thanks for the explanation	22:08
	→ eno joined	22:09
	→ disappearedng joined	22:11
	← disappearedng left	22:11
	→ disappearedng joined	22:11
	← gregglind left	22:12
	→ psoo joined	22:13
	→ karsten-nr joined	22:13
	→ Aaaarg joined	22:13
	→ airborn joined	22:14
karsten-nr	I want to search for an expression (regex matching hostnames) within a slew of repos, without having to check them out. I've got the git repo tree handy. Any good way to do this?	22:15
	← tjholowaychuk left	22:16
	→ dormouse joined	22:16
drizzd	karsten-nr: git grep <pattern> <tree> --	22:17
	← tizzo left	22:17
	← dv310p3r left	22:18
	→ kipras joined	22:18
	← johnw left	22:18
karsten-nr	drizzd: fatal: This operation must be run in a work tree	22:18
	→ esparkman joined	22:18
	→ dyer joined	22:19
	← dyer left	22:19
	→ dyer joined	22:19
	→ Zenith77 joined	22:20
	← theoros left	22:20
	→ tjholowaychuk joined	22:21
	← montylounge left	22:21
	← sebersole left	22:21
drizzd	karsten-nr: git --version?	22:22
karsten-nr	drizzd: NM. I checked out a slew locally.	22:22
	drizzd: git version 1.7.3.2	22:22
	drizzd: FWIW.	22:22
drizzd	and you're doing that in a bare repo?	22:23
karsten-nr	No.	22:23
	← DrNick left	22:24
karsten-nr	I just cloned all of them to /tmp/foo	22:24
wereHamster	for dir in /tmp/foo/*; do pushd $dir; git grep ..; popd; done	22:24
	← esparkman left	22:24
karsten-nr	wereHamster: Pretty much what I did.	22:24
	← kipras left	22:24
wereHamster	then I fail to see the problem	22:24
drizzd	well, I don't know how you get that error.	22:25
karsten-nr	wereHamster: The problem was I wasn't doing that initially.	22:25
drizzd	it should be fine to just add them as remotes	22:25
karsten-nr	drizzd: Yes, initially I was trying that in ... well, whatever a bare repo is.	22:25
	→ theoros joined	22:25
	← theoros left	22:25
	→ theoros joined	22:25
drizzd	karsten-nr: but that should work, I just tried with 1.7.3.2 and it works	22:26
	→ ISF_ec09_ joined	22:26
karsten-nr	What I did was: for d in /path/.git; do git clone $d; done; for d in ; do pushd $d; git grep <pattern>; popd; done	22:26
	So: first clone, then grep. I'm happy guys, really, no need to continue :)	22:26
	→ kipras joined	22:26
drizzd	sure, I'm just wondering what you did	22:26
	→ tizzo joined	22:26
karsten-nr	drizzd: I've tried to explain, I'm not clear enough on how git manages/stores its repos to explain clearly.	22:27
	← ISF_ec09 left	22:27
	→ cjolowicz joined	22:29
	← booginga left	22:29
	← codebeaker left	22:30
	← drizzd left	22:30
	→ abonec joined	22:30
	→ DrNick joined	22:31
	← BlindOracle left	22:32
	← Fullmoon left	22:32
	→ DrShiny joined	22:32
abonec	i added all files to commit by accident (git add .) and to commit added files from .gitignore. How i can delete this files from commit?	22:32
wereHamster	abonec: git reset HEAD^ && git add <the correct files> && git commit	22:33
	← tstclair left	22:33
DrShiny	i'm trying to figure out which remote branch my local branches are tracking, is there a way to do this?	22:33
	git branch -ra doesn't do what i need, it just lists both, but not the tracking association	22:33
abonec	wereHamster, thx this working	22:34
	← ShooterMG left	22:34
	→ esparkman joined	22:34
wereHamster	DrShiny: git remote show origin	22:34
	← m104 left	22:34
deryl	i'm geetting lots of use out of git commit -c xxxxx --amend as of late :)	22:35
	← kumbayo left	22:35
	← ph^ left	22:35
DrShiny	wereHamster: that's better than what i could find before, thanks ... it only shows which branches are tracked at all, though, but not which branches they're associated with locally	22:36
	i have a couple similarly named branches, unfortunately, and i think i got the tracking mixed up :(	22:36
wereHamster	DrShiny: it does show that here..	22:36
	← ericbarnes left	22:36
DrShiny	maybe my version is too old	22:37
	i'm on 1.6	22:37
	← IslandUsurper left	22:37
	→ ph^ joined	22:37
	→ ISF_ec09__ joined	22:37
DrShiny	i'll try upgrading, thanks for the tip	22:37
	← owst left	22:37
	← ch077179 left	22:38
	← linusoleander left	22:39
cjolowicz	hello, i need two remote repos. repo1 is the main public repo. repo2 is a fork, with changes flowing from repo1 to repo2 but not back. is `clone --mirror' adequate?	22:39
	→ SimonP86 joined	22:40
	→ chargingllama joined	22:40
	← ISF_ec09_ left	22:40
	← warthog9 left	22:41
abonec	i tryied add all files to commit (by add commit -a -m 'msg') exclude gitignore, but bunch of files stay untracked. Its not in gitignore	22:41
wereHamster	-a doesn't add untracked files IIRC	22:41
NfNitLoop	-a does not add untracked files, just modified files.	22:41
	← Tido left	22:41
abonec	how i can add all files?	22:42
wereHamster	git add .	22:42
abonec	git add . ignore my .gitignore config	22:42
wereHamster	add does honor gitignore	22:43
	maybe those fiels are already tracked?	22:43
	← ph^ left	22:43
abonec	my english is bad, i don't understand about honor	22:43
wereHamster	if you put a file into .gitignore, then git add won't stage it	22:44
	← nfiniteset left	22:44
wereHamster	honor ~= respects. git add respects your .gitignore settings	22:44
	← adreghiciu left	22:45
	← rayners left	22:45
abonec	i know this word but i dont understand this idiom :D	22:45
DrShiny	abonec: it means, it follows the .gitignore instructions	22:45
	→ warthog9 joined	22:45
	← cjolowicz left	22:46
abonec	:D	22:46
	after first explanation i understended :D	22:46
	← rgl left	22:46
	→ shiba_yu36 joined	22:47
DrShiny	oh, sorry	22:47
	← acts_as left	22:48
	← rorist left	22:48
	→ lukatmyshu joined	22:49
abonec	:D	22:49
	← DrShiny left	22:50
	← ThomasLocke left	22:50
	← cbx33 left	22:50
	→ WaltzingAlong joined	22:50
	← lessthanzero left	22:50
	← kipras left	22:51
	→ zorzar_ joined	22:51
abonec	.filename - it's right mask to the file 'filename' in root?	22:52
	← zorzar left	22:52
	← psoo left	22:53
	→ linusoleander joined	22:53
	→ mando joined	22:54
abonec	seems like my fault, i wrong put files in my gitignore	22:54
	wereHamster, thx for help	22:55
	← dreiss left	22:55
	→ tizzo_ joined	22:57
	← tizzo left	22:57
	tizzo_ → tizzo	22:57
	← xiong left	22:57
	adamholt → adamholt_away	22:58
	adamholt_away → adamholt	22:58
	← ilpoldo left	22:59
	← McMAGIC-- left	22:59
	← WaltzingAlong left	23:00
abonec	how add message when i use 'git add .'?	23:01
	→ Ryan45 joined	23:01
	→ ldigas_ joined	23:01
	← Amorphous left	23:01
Ryan45	hello, how do i git a folder or a project	23:02
	of a project	23:02
	http://nv-tegra.nvidia.com/gitweb/?p=android/platform/frameworks/base.git;a=tree;f=media/libstagefright;h=3f0b23e0e7a8847800f9b2f50c41623805eb3f67;hb=refs/heads/gingerbread-tegra	23:02
friskd	Hey all, i have a work flow question... I have Project A. which is my own project. There is Project B on github(opensource) i have spoken w/ the authors and they are open to forks / pull requests. So i want Use Project B in my Project A. (as a plugin) but i also want to add to Project B as i add features to it.	23:02
Ryan45	that is the web view of the folder i want to git	23:02
friskd	how do i do this so that commits to project B only affect project B and commits to project A only affect project A	23:02
	← bdiu left	23:04
	← _Ludwig_ left	23:04
	← gazoombo left	23:04
	→ scelis joined	23:05
	→ acts_as joined	23:05
	→ kipras joined	23:06
	→ babbio joined	23:07
	→ SimonP86_ joined	23:07
babbio	How to pull or clone ALL branches from remote repository?	23:08
	→ workmad3 joined	23:08
	→ thaw joined	23:08
thaw	hi	23:08
	why git has SHA1 hash for rev, and not incremental numbers ?	23:09
ayust	babbio: add it as a remote, then git fetch <remotename>	23:09
	thaw: because Git history is not linear	23:09
	← Ryan45 left	23:10
	← kipras left	23:10
engla	thaw: because git is a distributed system. And time-ordering is relative	23:10
	← ironcame1 left	23:10
thaw	ok, thx ayust and engla :)	23:10
	← mmw left	23:10
engla	thaw: if both you and I are at home, and we make a commit that improves upont r10, who of us can call theirs r11? it would be confusing	23:11
	← SimonP86 left	23:12
	← linusoleander left	23:12
friskd	If i had files in /app/plugins/p1 and now i want to replace p1 and its content as a submodule. How do i do that.	23:12
	if i just delete the files and try to add it as a submodule i get app/plugins/p1 already exists and is not a valid git repo	23:13
	?	23:14
	← Buglouse left	23:15
	← shiba_yu36 left	23:18
	← troessner left	23:18
	→ shiba_yu36 joined	23:18
	← ormaaj left	23:19
	← kenichi left	23:19
	→ Amorphous joined	23:20
	← beatak left	23:20
	→ t3i_ joined	23:21
	→ mosno joined	23:22
	← tjholowaychuk left	23:23
	→ tjholowaychuk joined	23:23
	← Swimming_bird left	23:23
wereHamster	friskd: git rm -rf app/plugins/p1 && git commit && git submodule add ...	23:23
	← t3i left	23:23
	t3i_ → t3i	23:24
friskd	wereHamster: ok. will try that.	23:24
	→ McMAGIC-- joined	23:24
	← j416 left	23:25
	← babbio left	23:25
	→ trobrock joined	23:25
	→ trick joined	23:26
friskd	worked!	23:26
	tnx wereHamster	23:26
	genious!	23:27
	← tizzo left	23:27
	→ tizzo joined	23:27
	← Zenith77 left	23:27
	→ ISF joined	23:28
	← Dave^\| left	23:28
	← ISF_ec09__ left	23:29
	→ chrisshattuck joined	23:29
	← Aaaarg left	23:30
	← abhinay left	23:31
	← chrisshattuck left	23:31
	← mando left	23:32
	→ dim_ joined	23:32
thaw	if I make a repository with apache2 + dav module and htaccess with one user, e.g. "joe". what will be the username and email for his commits ?	23:33
	← excess^ left	23:34
	← Remixman left	23:34
	← pyrony left	23:35
	→ meonkeys joined	23:35
	← tizzo left	23:35
	→ owst joined	23:35
	← alex__c2022 left	23:36
	← urkud_ left	23:36
	→ qwp joined	23:36
	← dim_ left	23:37
	← Kobaz left	23:38
	← workmad3 left	23:38
qwp	hi can you explain 2 alleged superiorities of git over centralized stuff like svn? a) "Allows users to work productively even when not connected to a network" <-- how cant you work with your local checkout? b) merging is so easy with git <-- how is merging technology dependent on distribution?	23:38
	← Textmode left	23:38
	→ BiggFREE joined	23:38
	→ jfelchner joined	23:39
	→ pyrony joined	23:39
	← genjix left	23:39
fr0sty_	qwp: 1. your 'local checkout' contains the entire repository history (all commits, branches and tags).	23:40
	you can go anywhere and do anything.	23:40
	← eletuchy left	23:40
	← flov left	23:41
	← lukatmyshu left	23:41
meonkeys	I did a cherry pick and got conflicts. Some files say "deleted by us"... but I can't find any record of these files being deleted from the target branch! Any ideas?	23:41
	→ luxurymode joined	23:41
fr0sty_	2. having all history locally allows you to determine branch-points easily and have intelligent auto-resolution of what would otherwise be merge conflicts.	23:42
	→ GJdan joined	23:42
fr0sty_	meonkeys: 'the target branch'? how do you know they were not deleted? (what command are you using?)	23:43
	→ hunmonk joined	23:43
qwp	thanks fr0sty_ but as a follow up why would i want to "work" with the history and how cant a local svn accomplish the same?	23:43
	← pantsman left	23:43
qwp	thanks 2 makes sense	23:43
meonkeys	fr0sty_: by "target branch", I mean, the branch I have checked out when I do the cherry pick	23:43
GJdan	any idea why git push -u origin master doesn't work when I'm trying to push to a new github repo?	23:43
fr0sty_	qwp: 'local svn'?	23:43
GJdan	says error: unknown switch, u	23:44
meonkeys	fr0sty_: the command I used was "git cherry-pick -x 1aad5f730e9"	23:44
qwp	fr0sty_: like using a local svn install	23:44
meonkeys	fr0sty_: I have "master" checked out, and 1aad5f730e9 is on "origin/f-release"	23:44
	→ adreghiciu joined	23:44
fr0sty_	qwp: how would a collaborator also work offline in that setup?	23:44
	← thiago_home left	23:44
fr0sty_	(without access to your local svn)	23:44
	meonkeys: how do you know 'deleted by us' is erroneous?	23:45
	→ t3i_ joined	23:45
qwp	fr0sty_: you checkout from the central repo and then use a local svn to keep track of changes and possibly go back in time locally, then once youre finished you commit the local head	23:45
	← hunmonk left	23:45
	→ bdiu joined	23:45
fr0sty_	qwp: does your local svn have a complete clone of the upstream?	23:46
meonkeys	fr0sty_: if I do "git log --decorate --find-copies-harder -C -M --name-status master" (and just search through that), I don't see any deletions.	23:46
	(of the file(s) supposedly "deleted by us")	23:46
qwp	fr0sty_: no but why would i need that	23:46
fr0sty_	how could you 'go back in time' otherwise?	23:46
	→ gusnan joined	23:46
qwp	fr0sty_: well i mean back in time somewhere between now and the initial checkout	23:47
	→ dekz joined	23:47
qwp	fr0sty_: why would i want to go further back in time	23:47
fr0sty_	sounds kinda limited...	23:47
	if you wanted to work on another branch based on a different portion of the code.	23:48
	← t3i left	23:48
	t3i_ → t3i	23:48
qwp	fr0sty_: well then i would simply checkout that branch	23:48
fr0sty_	but you can't	23:48
dekz	Anyone know why, after doing a git cvsimport (for 30 minutes), attempting to cvscommitexport reesults in "is not a CVS checkout"?	23:48
fr0sty_	no network connectivity.	23:48
qwp	fr0sty_: going back to other branches isnt exactly an everyday task anyway, i hardly want that, but i can initially do that	23:48
dekz	There aren't any CVS folders or subfolders, which might be the problem	23:48
fr0sty_	qwp: it is not an everyday task because your tool makes it hard.	23:49
dekz	Not sure, does cvsimport create those folders? I did a cvsimport to an empty directroy	23:49
fr0sty_	I do that many times in one day.	23:49
qwp	fr0sty_: but i dont see how its desirable	23:49
	→ urkud_ joined	23:49
bremner	qwp: to a certain extent, you sound like a person who has never used a full screen editor, wondering what the fuss is about ;)	23:50
qwp	fr0sty_: also srsly "network connectivity" isnt even an issue in the 21st century at all	23:50
fr0sty_	meonkeys: there could be some confusion between 'move' and 'delete' then.	23:50
qwp	bremner: heh whats a full screen editor	23:50
fr0sty_	if you lose -C and -M what do you get?	23:51
	→ ShooterMG joined	23:51
bremner	qwp: not a line editor	23:51
fr0sty_	qwp: if your working copy is large enough, it absolutely is...	23:51
qwp	bremner: ah. well nice metaphor but i would like to see the analogy	23:51
fr0sty_	I like being able to switch code in the working copy at the speed of my hard-disk and not the speed of my internet connection.	23:51
qwp	fr0sty_: hm ok, but then the initial git "checkout" likewise is very expensive	23:52
bremner	qwp: the way you can work with branches in git is just not possible in a centralized vcs	23:52
meonkeys	fr0sty_: mmm, yeah... these files weren't moved, either. What might be happening is my master is out of sync with origin/master. Argh.	23:52
fr0sty_	qwp: not very. it is only fractionally larger than the size of most working trees.	23:52
meonkeys	fr0sty_: yep, that was it!	23:52
qwp	fr0sty_: with all the history. so why would i want to portion the time consumption into one single giant checkout rather than small checkouts whenonlyever needed	23:52
bremner	qwp: there are many cases where the git checkout is faster than the svn one	23:52
	← killfill left	23:52
qwp	hm ok	23:52
	→ killfill joined	23:52
	← trobrock left	23:53
fr0sty_	qwp: the entire linux kernel tree initial clone is: ~400M, the size of the working copy is likewise ~400M	23:54
qwp	im not experienced can you give a use case example when using different branches really becomes desirable?	23:54
	hm ok fr0sty_ is this achieved by only storing differences?	23:54
	→ angelsl joined	23:54
fr0sty_	and zipping things up.	23:54
	← LiamH left	23:54
qwp	ok	23:55
	← meonkeys left	23:55
fr0sty_	after that every checkout is free (and fast).	23:55
qwp	i cant imagine why i would want to switch branches even once a week	23:55
	→ fisted_ joined	23:56
fr0sty_	qwp how often do you commit?	23:56
	← fisted left	23:56
qwp	maybe once a day	23:56
	→ Oxf13 joined	23:57
qwp	whenever something is finished	23:57
dekz	heh	23:57
Oxf13	is there a shortcut for creating a new remote bare git repo?	23:57
	→ werdan7 joined	23:57
fr0sty_	Oxf13: ssh host 'cd dir && git init --bare --shared=true'	23:57
Oxf13	or is just rsyncing up the .git/ dir still the best way?	23:57
	fr0sty_: assuming you already have a local repo with some code committed	23:58
fr0sty_	add 'git remote add...' and 'git push --mirror' to that...	23:58
	(on the local machine)	23:58
	← Bass10 left	23:59
Oxf13	ok. I was hoping somebody had created a way to do a push to a ssh url that will create the remote repo if it doesn't already exist.	23:59
	← cannonball left	23:59
fr0sty_	not that I am aware of.	23:59
	← whalesalad left	23:59
bremner	Oxf13: not with out extra software (e.g. gitolite)	23:59

Logs Search ←Prev date Next date→

Channels Documentation