IRCloggy #git 2010-10-14

Provider of IRC logs since 2005.

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

	2010-10-14
	→ ajpiano joined	00:00
	→ bitkiller joined	00:02
	→ poppiez joined	00:02
	Unode → _Unode	00:02
	← sako left	00:03
	← Pacman left	00:03
	→ jrmuizel joined	00:03
poppiez	hi guys. I'm just starting to learn about git. I'm a year long SVN user and I really like git so far. especially how branchs works. however, do you have a great technique to export your current branch to e.g. /var/www/mysite/ pushing that branch live on my website?	00:04
	← Aphelion left	00:04
frogonwheels	poppiez: there are a number of techniques - you may wish to have a google around as it's a common thing to do.	00:05
	→ Pacman joined	00:05
	← brian_g left	00:06
_Vi	poppiez, Example: "git archive your_branch \| tar -C /var/www/mysite -x"	00:07
	→ mithro joined	00:08
	← aah left	00:11
frogonwheels	poppiez: google git-website-howto	00:11
	poppiez: http://toroid.org/ams/git-website-howto	00:11
	→ bdiego joined	00:12
	→ jotik^^ joined	00:12
	← jotik left	00:13
	← Gecko1986 left	00:13
	← jrmuizel left	00:15
	→ sshc joined	00:15
	← Entonian left	00:15
	← steph021 left	00:15
	→ lamont joined	00:15
	← SimonP86 left	00:15
	← _Vi left	00:16
	← disappearedng_ left	00:17
	→ _Vi joined	00:17
	← RORgasm left	00:18
	→ JonasF joined	00:19
poppiez	frogonwheels: _Vi: thanks! :)	00:19
	← JonasF left	00:19
	← bitkiller left	00:19
	← ehabkost left	00:21
	→ Gecko1986 joined	00:21
	→ alberto56 joined	00:22
	→ coderdad joined	00:25
	← zombor left	00:28
	→ zombor joined	00:30
	→ jrmuizel joined	00:30
	← ajpiano left	00:30
	← ymasory left	00:30
	← phantomcircuit left	00:31
	→ pgib joined	00:33
	← pantsman left	00:33
	← kingfishr_ left	00:33
	→ xiangfu joined	00:33
	← EvanR left	00:35
	← justin-george left	00:38
	← LucasWilcox left	00:38
	← parasti left	00:38
	→ person_ joined	00:39
	← Colloguy left	00:39
person_	Hey everyone, in a bit of a nasty situation and looking for some assistance.	00:39
pgib	just ask	00:40
person_	Recently imported an svn project from Google Code to GitHub. A lot of work has been done since then, branches made, etc. but one of the developers recently notified me that his history was never imported. More specifically, his branch wasn't imported so he can't merge his branch from svn in.	00:40
	Just to clarify that last part, he imported his branch from svn into a fork of the project. However, he can't merge it into master because master doesn't contain that branch. I think when I imported his author name was wrong or something.	00:41
	I'm not sure what the best way to handle this is. Obviously I need to import his old branch, but I don't know how to do that without screwing up changes that have been made.	00:42
	→ rayners joined	00:44
	→ brettgoulder joined	00:44
	← jkp left	00:46
person_	Of course he could just copy the files over, but he wants to preserve his history.	00:46
	Any ideas or is this out of reach?	00:46
pgib	hmm, I think I might kind of understand - but I don't know the answer in either case. My thoughts would be you'd end up re-importing the svn, make sure his branch is there this time. then, you'd use some magic tool to merge those two repos. I guess you'd have to filter-branch or something like that	00:47
	← golodhrim left	00:47
pgib	I am not sure what tool or terminology would help. I'm no expert	00:47
person_	One sec...	00:48
	← kanru left	00:48
	→ Remixman joined	00:48
	→ muffinpeddler joined	00:49
pgib	how odd.. all of a sudden, I cannot access anything over http, cannot ping, ssh, etc.. but I'm still receiving events from IRC :-/	00:49
person_	He mentioned that it could easily be done with git pack and git export.	00:49
	→ golodhrim joined	00:49
person_	Err, git fast-export, not git export.	00:49
	bdiego → bdiego_away	00:50
person_	Not saying he is an expert either. I looked into it and didn't really see how it would be helpful.	00:50
	→ sako joined	00:50
	→ xiong joined	00:50
pgib	no, I don't see how pack would help	00:51
	well, rather, the packing commands	00:51
	← kukks left	00:51
	→ mordy joined	00:52
	→ ymasory joined	00:52
	← enherit left	00:52
	← tjholowaychuk left	00:53
	→ shiba_yu36 joined	00:55
	← andyburke left	00:56
	→ sonnym joined	00:57
	← Remixman left	00:57
	→ lv joined	00:57
	← jotik^^ left	00:58
mordy	if i forgot to include a file in my last commit, am i supposed to use git commit --ammend <file> ?	00:59
	→ Yuffster joined	00:59
Eridius	no	01:00
	git add <file> && git commit --amend	01:00
lv	mordy: git add file, then... what Eridius said	01:00
	lv → Aphelion	01:01
mordy	by 'include' i meant i forgot to include it on the command line for my last commit (e.g. git commit foo bar, where i was also supposed to commit 'baz'), sorry	01:01
Eridius	you specify files on the command-line to `git commit`? o_O	01:02
	learn to love your stage!	01:02
pgib	you can..	01:02
	but I dont like it	01:02
mordy	hrrm.. i'm just a newb.. and sorta new to this.. i make a bunch of changes and then try to group them into commits based on what i changed	01:03
pgib	yes - but that is what the 'git add' command is for	01:03
	it allows you to flag files for addition in the next commit - so you don't have to have some unwieldy command line args	01:03
	→ jotik joined	01:04
pgib	'git add -i' is also really nice if you want to add a bunch of stuff, but leave some files out	01:04
mordy	ohhhh	01:04
pgib	mordy, if you know you just want to commit everything tracked - then 'git commit -a' is nice too	01:04
Aphelion	you can also be lazy, if the files you modified are already tracked, and git commit -a	01:05
mordy	until now i thought git add only added a file so that git would track it for changes	01:05
Aphelion	heh	01:05
mordy	i used to just do git commit -a but then quickly realized that my commits didn't make much sense	01:05
pgib	ah no, 'inclusion into the next commit' git doesn't actually track files - just changes	01:05
	or so I'm told, and lead to believe	01:06
Aphelion	are any of scott chacon's git presentations recorded and up somewhere? they do a pretty good job of explaining the git object model, staging/index, etc.	01:06
	→ steph021 joined	01:07
	← leavittx_ left	01:09
Aphelion	while there are people active in here... anyone know of any decent git server administration tools that don't take as long to set up as gitorious? i'd really just like to have something simple for administering multiple repos on a box without giving anyone on the various teams shell access. i'd also prefer not to write it myself. ;)	01:10
	→ tungtn joined	01:10
	← zain left	01:11
	→ zain joined	01:12
	← kylehayes left	01:13
	← jrmuizel left	01:15
	→ jrmuizel joined	01:17
mordy	i've come in here like 2-3 times before on various occasions	01:17
	always had my question answered in like five minutes	01:17
	← jerome187 left	01:17
	← L0cky left	01:18
	→ ymasory_ joined	01:18
	← marienz left	01:18
Eridius	Aphelion: have you looked at the engine powering repo.or.cz? I have no idea if it's any easier to use than Gitorious, but it might be	01:18
	→ marienz joined	01:19
Aphelion	i'll check it out :)	01:19
atpa8a	Aphelion: gitolite was recommended to me here	01:20
	← pigdude left	01:20
	← elg left	01:21
	← frerich3 left	01:21
frogonwheels	Aphelion: I'd second Gitolite - it's administered by modifying an 'admin' repo	01:22
Aphelion	i looked at that briefly, but it wasn't immediately obvious that it didn't require shell access to administer	01:23
	if you can add repos and users by modifying an admin repo, that's awesome	01:23
frogonwheels	Aphelion: yep - easy to set up, and the config file is easy to read	01:24
	← copelco left	01:24
	← person_ left	01:24
frogonwheels	Aphelion: and allows you to deny/allow access by branch within a repo	01:25
	.. and I think path	01:25
	← hasrb left	01:26
	← coderdad left	01:26
	← jrmuizel left	01:26
	← flaguy48 left	01:26
	← agile left	01:28
	← ymasory left	01:29
	→ hasrb joined	01:29
	→ jrmuizel joined	01:30
	← madewokherd left	01:30
	← aspotashev left	01:32
	← alex__c2022 left	01:33
	← marienz left	01:33
	→ madewokherd joined	01:33
	← Yuuhi left	01:34
	→ pasky_ joined	01:35
	← MattDiPasquale left	01:36
	→ svaksha_ joined	01:36
	→ robins joined	01:36
	← jonmasters left	01:36
	← svaksha left	01:36
	→ archcoder joined	01:37
	← xiangfu left	01:37
	← brettgoulder left	01:37
	← rickmasta left	01:37
	← iatrou left	01:37
	→ rickmasta joined	01:38
	→ jonmasters joined	01:38
	→ kanru joined	01:38
	→ JoeCoolDesk joined	01:38
	← ymasory_ left	01:39
JoeCoolDesk	How do I create a new commit at the very base/start of a branch?	01:39
	→ iatrou joined	01:39
	→ gurjeet joined	01:40
	→ brettgoulder joined	01:40
gurjeet	`git diff ab6d9f16414a` shows me my patch, but if I do `git diff --stat ab6d9f16414a` I don't get anything!	01:41
	→ EvanR joined	01:41
gurjeet	^^ any idea why this might be happening?	01:41
nevyn	JoeCoolDesk: checkout the root of the branch	01:42
	make a newbranch and commit the new code.	01:42
	rebase oldbranch newbranch	01:42
	should do it.	01:42
JoeCoolDesk	That's it?	01:42
	← hasrb left	01:43
JoeCoolDesk	What I could use is a script that I can use that automatically does that...	01:43
	← brettgoulder left	01:45
	← rvsjoen left	01:46
gurjeet	Repeating: `git diff ab6d9f16414a` shows me my patch, but if I do `git diff --stat ab6d9f16414a` I don't get anything!	01:46
	→ marienz joined	01:47
	← EvanR left	01:47
gurjeet	^^ any idea why this might be happening?	01:48
	→ rvsjoen joined	01:48
	← Aphelion left	01:48
	→ bronson joined	01:48
bronson	When I clone this repo, it comes with changes staged for commit: http://github.com/vim-scripts/session.vim--Odding.git	01:52
	Anyone know what's going on here? Did I corrupt the repo?	01:52
	→ eletuchy joined	01:53
	→ hasrb joined	01:54
	→ dreiss joined	01:54
alvaro_o_	guys, a simple noob question. I'm getting "fatal: 'origin': unable to chdir or not a git archive" (I've making some googling, but answers are disperse). Just a few hours ago I did a git checkout commithash since I had to revert several files. The thing is that, with my new changes, I can't neither push nor pull. Do you have any clue?	01:55
pgib	JoeCoolDesk, hmm, why would you need to do that so frequently?	01:56
	← nineteeneightd left	01:56
	→ gretch joined	01:56
	← madewokherd left	01:56
pgib	alvaro_o, IIRC, if you checkout a commithash, then you are in a detached state - not on any true branch	01:57
	so it would make sense that push/pull do not operate	01:57
	→ madewokherd joined	01:57
alvaro_o	how can I get back to my HEAD branch?	01:57
	or even better, how can I merge my gurrent branch's changes into HEAD ?	01:58
pgib	git checkout my_branch	01:58
	→ coderdad joined	01:58
pgib	git checkout -b oops	01:59
	git add whatever	01:59
	git commit	01:59
	git co my_real_branch	01:59
	git cherry-pick what_i_just_committed	01:59
	possibly an easier way - but I know that will work	01:59
alvaro_o	thanks, I'll give it a try	01:59
pgib	or could merge in oops I suppose	02:00
	I prefer rebase in this case	02:00
	grr, cherry-pick	02:00
	I guess rebase could work too	02:00
	← MikhX left	02:00
pgib	</ramble>	02:00
	→ MikhX joined	02:00
alvaro_o_	when I type git branch I get	02:01
	* (no branch)	02:01
	master	02:01
	does it means the current branch has no name?	02:01
pgib	yep - because you are detached like I mentioned	02:01
alvaro_o_	ok	02:01
pgib	you aren't on any real branch - I think git makes a temporary pseudo-branch to manage things, but you shouldn't rely on that behavior	02:02
alvaro_o	so, could I make something like git push * master ?	02:02
pgib	I ran into trouble while committing while detached	02:02
	→ a9b joined	02:02
pgib	and then trying to pick the changes to master or whatever	02:02
	→ TeckniX joined	02:02
	← MikhX left	02:03
pgib	somehow, it all went to shit when I pushed to the remote - since the commit was not on any branch, the remote didn't receive the objects or some crazy behavior like that	02:03
alvaro_o	:S	02:03
	← alberto56 left	02:04
pgib	I forget exactly what was wrong - but it took an hour or so to figure out what had happened. and I had to use some really odd command someone told me here in order to make the commit visible to my coworkers	02:04
	→ patnotz joined	02:05
alvaro_o	brb !	02:05
pgib	now I just need to figure out strategies to parallelize this directed data flow	02:06
	→ brettgoulder joined	02:09
	← hobodave left	02:10
	← koo5 left	02:11
	→ offby1 joined	02:11
	← offby1 left	02:11
	→ quesada2 joined	02:12
	← TeckniX left	02:13
	→ akahn joined	02:13
	→ offby1 joined	02:13
	← offby1 left	02:14
	← quesada1 left	02:14
	→ welly joined	02:15
alvaro_o	pgib: I think I might found the answer http://bec-systems.com/site/696/git-submodules-what-to-do-when-you-commit-to-no-branch . I'll let you know if it works.	02:16
	← whaley left	02:17
	← akahn left	02:18
	→ Guest72923 joined	02:23
	← Guest72923 left	02:23
	→ MikhX joined	02:23
	→ phantomcircuit joined	02:25
	→ EvanR joined	02:27
	→ urkud joined	02:28
	← Tuller left	02:29
alvaro_o_	pgib: It worked!!!!	02:30
	→ offby1 joined	02:30
	← offby1 left	02:31
alvaro_o_	pgib: I followed the steps on http://bec-systems.com/site/696/git-submodules-what-to-do-when-you-commit-to-no-branch and I could merge a (no-branch) with my master branch. Thank you very much!	02:31
	← patnotz left	02:31
	→ ymasory joined	02:32
	→ ignatp_ joined	02:32
	→ offby1 joined	02:33
	← coderdad left	02:33
	← offby1 left	02:34
	← ignatp left	02:34
	← a9b left	02:35
	← JoeCoolDesk left	02:35
	← Elfe left	02:36
	← zombor left	02:36
	→ jaql joined	02:36
	← alvaro_o left	02:36
	← poppiez left	02:36
	→ offby1 joined	02:36
	← phantomcircuit left	02:37
	← offby1 left	02:37
	← muffinpeddler left	02:39
	→ Gryllida joined	02:39
	→ zombor joined	02:42
	→ lv joined	02:44
	← lv left	02:44
	→ lv joined	02:44
	lv → Aphelion	02:44
	← verto left	02:45
	← sftp left	02:46
	← ISF_ec09 left	02:46
	← oriba left	02:46
	→ MattDiPasquale joined	02:47
	→ dys` joined	02:48
	→ stliu joined	02:48
	→ momentum joined	02:50
momentum	is there somethig like git sed ?	02:50
	→ hobodave joined	02:50
momentum	i want to run sed -i on my souce files; but I don't wnat it to hit stuff in .git	02:50
	← dys left	02:50
	← programble left	02:51
Eridius	you could use a find command	02:51
PerlJam	momentum: find + sed	02:51
Eridius	find . -name .git -prune -or -type f -exec sed whatever {} +	02:51
	→ NfNitLoop joined	02:51
Eridius	that will pass all files outside of .git to a single invocation of sed	02:51
momentum	Eridius: nice; thanks can you make that into a path and submit it as "git sed" ? :-)	02:52
Eridius	or you could use something like git ls-files -c -0 \| xargs -0 sed whaetver	02:52
	which would handle tracked files	02:52
	→ a9b joined	02:52
	→ Elfe joined	02:53
jjuran	The manual for git-clone says that --mirror implies --bare. Is it possible to clone --mirror a non-bare repository?	02:53
PerlJam	jjuran: why?	02:53
	← gurjeet left	02:53
jjuran	PerlJam: I have a platform with a port of Git, but not a complete Bourne shell, so I can't run git-repack.	02:54
	← urkud left	02:55
jjuran	Fortunately, in this case I'm only using it to fetch and merge (i.e. pull), so I could re-clone the origin. But I wanted to see what my options were.	02:55
	Would there be any interest in a Perl rewrite of git-repack?	02:56
	← timj left	02:56
	← NfNitLoop left	02:56
PerlJam	Hmm	02:56
	← zombor left	02:59
	→ rkenned joined	02:59
	← ignatp_ left	03:00
	→ ep8 joined	03:00
	→ chrisshattuck joined	03:00
ep8	Anyone familiar with git-p4?	03:01
	→ zombor joined	03:01
	→ jotik^^ joined	03:02
	→ dl9pf_ joined	03:02
	→ alester joined	03:03
	← dl9pf left	03:03
	→ ignatp joined	03:03
	← hasrb left	03:04
	← jotik left	03:05
	← zombor left	03:05
	← Tommy[D] left	03:05
	→ elg joined	03:06
	← Aphelion left	03:06
	← jfkw left	03:06
	→ offby1 joined	03:08
	→ Tommy[D] joined	03:08
	→ boombatower joined	03:08
	← dreiss left	03:08
	← ep8 left	03:08
	← offby1 left	03:09
	← zain left	03:09
	→ gilaniali joined	03:09
	→ felipellrocha joined	03:10
	→ timj joined	03:10
	→ offby1 joined	03:11
	← offby1 left	03:12
	→ offby1 joined	03:14
	← emmanueloga left	03:15
	← jaql left	03:15
	← hohoho left	03:16
	→ hohoho joined	03:16
	← a9b left	03:17
	→ mw joined	03:17
	→ zain joined	03:19
	← felipellrocha left	03:19
	→ felipellrocha joined	03:19
	← hohoho left	03:20
	→ hohoho joined	03:21
	→ NfNitLoop joined	03:22
	← felipellrocha left	03:24
	→ shennyg_ joined	03:26
	← hohoho left	03:26
	→ hohoho joined	03:27
	← shennyg left	03:27
	shennyg_ → shennyg	03:27
	← NfNitLoop left	03:29
	← rvsjoen left	03:30
	→ MetaCosm_ joined	03:31
	→ rvsjoen joined	03:31
	← sako left	03:31
	← hohoho left	03:32
	→ shennyg_ joined	03:32
	← shennyg left	03:34
	shennyg_ → shennyg	03:34
	→ consolers joined	03:38
	← cannonball left	03:38
	← mw left	03:39
	_jesse_ → Cookie_Monster	03:40
	← wuj left	03:40
	→ random_ joined	03:41
	Cookie_Monster → _jesse_	03:41
	← MetaCosm_ left	03:42
	→ mags joined	03:42
	→ JEEBcz joined	03:42
	← random_ left	03:44
	← JEEB left	03:44
	→ hasrb joined	03:45
	← xiong left	03:47
	→ xiong joined	03:47
	← Raimondi left	03:50
	→ felipellrocha joined	03:51
	← ReleaseX left	03:52
	→ aspotashev joined	03:52
	← murr4y left	03:55
	← Slix` left	03:55
	← ricky left	03:56
	← welly left	03:56
jrockway	ep8: yes	03:57
	→ a9b joined	03:57
	→ plediii joined	03:59
jrockway	ah, he disappeared	03:59
	← EvanR left	04:02
	→ brntbeer_ joined	04:03
madsy	jrockway: Having filtering on QUITS and LEAVES is nice ;-)	04:03
	→ ricky joined	04:04
madsy	I also tend to reply to people who left like 2 hours ago.	04:04
	→ johnw joined	04:06
	→ aresnick joined	04:08
	→ xiangfu joined	04:10
	→ ckwalsh joined	04:12
	← elg left	04:13
ckwalsh	I have a repo where I mad a bunch of permission changes to files, but no content changes. I would like to commit only the files with content changes, and reset the permissions to what they were before. Any good way to do that?	04:13
	→ akahn joined	04:13
	→ ajpiano joined	04:15
	← aresnick left	04:16
	← akahn left	04:18
johnw	Git doesn't care about the permissions, except for the executable bit	04:18
	→ scarabx joined	04:18
Eridius	ckwalsh: maybe you can use `git diff --numstat` to figure out what files have no content changes?	04:18
johnw	so, it doesn't know what they were	04:18
	← madsy left	04:18
	dys` → dys	04:18
	→ MINOWAMAN joined	04:20
	→ cytrinox_ joined	04:21
	→ EvanR joined	04:21
	→ hyperair joined	04:21
	← stephenjudkins left	04:21
	← ignatp left	04:22
	→ ignatp joined	04:22
	→ aresnick joined	04:23
	← ymasory left	04:24
ckwalsh	Eridius, Sorry for replying so late, figured it out	04:24
	Could use http://stackoverflow.com/questions/1580596/how-do-i-make-git-ignore-mode-changes-chmod to make git ignore the permissions completely	04:24
	← cytrinox left	04:24
	cytrinox_ → cytrinox	04:24
ckwalsh	But I decided to fix them instead, via http://movabletripe.com/archive/recursively-chmod-directories-only/	04:24
	→ mattih joined	04:24
	→ madsy joined	04:26
	→ gebi joined	04:27
	← MINOWAMAN left	04:27
consolers	git only has files, perms can be only 644 or 755. git-ls-tree -r \| grep	04:27
	← aresnick left	04:28
	→ aresnick joined	04:29
consolers	oooh another nit!	04:31
	→ blaines joined	04:31
consolers	an ockham find command would only those files/dirs whose perms would NEED to be changed rather than chmodding all files/dirs	04:31
	→ aah joined	04:32
	← hasrb left	04:32
consolers	but no mention of -perm in the 58 comments!	04:33
	← MattDiPasquale left	04:33
	→ MattDiPasquale joined	04:34
	← rayners left	04:34
	→ Textmode joined	04:36
gilaniali	is it possible to enable authorization when running git instaweb?	04:37
	that is users will have to log in before looking at the files	04:37
	← aresnick left	04:38
	→ aresnick joined	04:38
	← quadz left	04:39
	← plediii left	04:39
	→ quadz joined	04:39
	← zain left	04:39
	← brettgoulder left	04:40
	← eletuchy left	04:42
	← MattDiPasquale left	04:43
	→ phantomcircuit joined	04:43
	← Bass10 left	04:44
	← phantomcircuit left	04:44
	→ phantomcircuit joined	04:45
	→ elg joined	04:48
	← aresnick left	04:48
	← OOPMan left	04:50
	← slonopotamus left	04:50
	← rkenned left	04:51
	→ leavittx_ joined	04:52
	← gebi left	04:52
	→ stringoO joined	04:55
	← phantomcircuit left	04:55
	→ doener joined	04:58
	→ freimatz joined	04:58
	← noyb left	05:00
	→ fred_ joined	05:00
	→ ct^^ joined	05:00
	fred_ → Guest42011	05:00
	← madewokherd left	05:03
	← ct^ left	05:04
	← consolers left	05:04
	← sivy left	05:06
	→ phantomcircuit joined	05:08
	→ OOPMan joined	05:10
	← elg left	05:10
	→ noyb joined	05:11
	← jjuran left	05:11
	→ goshawk joined	05:12
	← mattih left	05:15
	← master_klb left	05:16
	← a9b left	05:17
	← brntbeer_ left	05:17
	← leavittx_ left	05:18
	→ hohoho joined	05:21
	← Eridius left	05:24
	→ airborn joined	05:25
	→ zain joined	05:26
	← hyperair left	05:27
	← Yuffster left	05:28
	← hohoho left	05:28
	→ Yuffster joined	05:28
	← xiangfu left	05:31
	← stringoO left	05:31
	← batok left	05:32
	← gilaniali left	05:33
	→ xiangfu joined	05:36
	→ opalka joined	05:37
	→ psoo joined	05:39
	→ roop joined	05:40
	→ fr0sty__ joined	05:41
	← Garen left	05:42
	← scarabx left	05:42
	← fr0sty___ left	05:42
	→ radioman-lt joined	05:43
	→ stringoO joined	05:44
	← jrmuizel left	05:46
	→ Ron_ joined	05:50
	← aah left	05:50
	→ hyperair joined	05:52
	→ dreiss joined	05:53
	→ khelll joined	05:54
	← khelll left	05:55
	← chrisshattuck left	05:56
	→ chrisshattuck joined	05:56
	← goshawk left	05:57
	← comawhite left	05:57
	→ comawhite joined	05:57
	← comawhite left	05:57
	← psoo left	05:58
	← stringoO left	06:00
	← chrisshattuck left	06:00
	← Ron_ left	06:01
	→ urkud joined	06:03
	← ph^ left	06:03
	← Yuffster left	06:03
	← radioman-lt left	06:06
	→ mastro joined	06:08
	← dreiss left	06:08
	← xiangfu left	06:10
	→ Fullmoon joined	06:11
	→ MetaCosm_ joined	06:11
	→ eletuchy joined	06:13
	→ akahn joined	06:13
	→ psankar joined	06:14
	→ cbreak_work joined	06:16
	→ slonopotamus joined	06:17
	← akahn left	06:18
	→ priidu joined	06:21
	→ clsdaniel joined	06:22
	→ guardian joined	06:22
	→ stringoO joined	06:23
	→ _ollie joined	06:25
	→ psoo joined	06:28
	← xiong left	06:28
	→ solarian- joined	06:30
	← aspotashev left	06:31
	→ resmo joined	06:32
	→ koo5 joined	06:33
	← izzie321 left	06:34
	→ justin-george joined	06:34
solarian-	in the git submodule man page for the "status" option, it says "Each SHA-1 will be prefixed with - if the submodule is not initialized and + if the currently checked out submodule commit does not match the SHA-1 found in the index of the containing repository."	06:35
	what do they mean by SHA-1 found in the index of the containing repository.	06:35
	where is this SHA-1 and how can i change it?	06:35
	→ svaksha joined	06:37
	← svaksha_ left	06:38
	← johnw left	06:38
	← svaksha left	06:38
cbreak_work	solarian-: do you know what an index is?	06:38
	← priidu left	06:38
cbreak_work	it's the area of git that stores what you have added	06:38
	so if you change a file, or create a new one, and then git add it, it gets copied into the index	06:39
solarian-	yeah, i think of it as being where my changes go before they are committed	06:39
	→ svaksha joined	06:39
	→ xiong joined	06:39
	← alester left	06:39
cbreak_work	if you change a submodule, with git checkout or something else	06:39
	(change it's HEAD)	06:39
	then you can git add the submodule	06:39
	and the sha that is associated with the submodule is changed	06:40
solarian-	what is it exactly that goes into the index though	06:40
	is there a specific file that contains the SHA-1 associated with the submodule	06:40
cbreak_work	I think it's like tree objects	06:40
	it's inside the tree	06:40
	once you commit it	06:40
	the same place that stores which sha is associated with each path	06:41
	← resmo left	06:41
	→ resmo joined	06:42
cbreak_work	solarian-: like this: http://paste.the-color-black.net/50367	06:42
	that's the output of a git cat-file -p somecommit:sometree	06:42
Pieter	fr0sty__: it disappeared again?	06:43
	→ amerine joined	06:43
	→ Gitbot joined	06:43
solarian-	cbreak_work: yeah i see	06:43
	i did git cat-file -p master^{tree} and i can see the sha-1	06:43
	thanks	06:43
	← koo5 left	06:44
	← ki__ left	06:47
	→ ph^ joined	06:47
	← marc_kdab_ left	06:48
	← alnewkirk left	06:50
	← xiong left	06:50
	← airborn left	06:50
	← bronson left	06:52
	← ckwalsh left	06:53
	← urkud left	06:54
	→ Radar joined	06:59
	← Anti-X left	07:00
	← _ollie left	07:01
	← jexmex left	07:02
	→ jexmex joined	07:04
	→ ExtraSpice joined	07:06
	→ leavittx_ joined	07:06
	→ phrearch joined	07:09
phrearch	hi	07:09
	is it possible to git clone into an existing directory?	07:09
	← jexmex left	07:09
phrearch	im developing some module that needs to stay in the apps maindir while developing/testing	07:09
cbreak_work	phrearch: run git init inside the dir you want to use	07:10
	then git add the repo you want to clone from as remote	07:11
	and fetch/checkout the branch you want	07:11
phrearch	cbreak_work: ok, trying	07:11
	→ jexmex joined	07:12
	← guardian left	07:12
	→ chriscrown412 joined	07:13
	→ jjuran joined	07:13
	→ nevyn^_ joined	07:15
	← Chillance left	07:16
	← archcoder left	07:18
	← rvsjoen left	07:18
	← nibblebot left	07:19
	→ rvsjoen joined	07:20
	← OOPMan left	07:22
	← Radar left	07:23
	→ lucsky joined	07:24
	→ toobaz_ joined	07:24
	→ OOPMan joined	07:26
	← boombatower left	07:26
	← basicxman left	07:26
	→ boombatower joined	07:26
	← boombatower left	07:26
	→ boombatower joined	07:26
	← mithro left	07:27
	→ basicxman joined	07:28
toobaz_	Hello. If I run "git add ." in a repo (containing some big files - between 1 and 2 GB), I see that git starts spawning a lot of processes, each taking ~40 MB, until after ~40-50 of those processes memory is out and the kernel starts killing around - finally terminating the bash process I worked into.	07:28
	← kenneth_reitz left	07:29
toobaz_	Is this a normal behaviour?	07:29
	← krosenvold left	07:29
	→ rraasch joined	07:30
	← fmardini left	07:30
	← jexmex left	07:31
	→ dpino joined	07:32
	← chriscrown412 left	07:32
	→ albel727 joined	07:32
	→ xiangfu joined	07:33
toobaz_	(I mean: not killing memory, just the presence of ~50 "git" processes deriving from a single "git add .")	07:33
	→ jexmex joined	07:34
	← codespectator left	07:34
	→ chriscrown412 joined	07:35
	Putr\|Away → Putr	07:36
	← chriscrown412 left	07:37
	→ fmardini joined	07:38
	← jexmex left	07:38
	← hyperair left	07:38
	→ jexmex joined	07:38
	← leavittx_ left	07:39
	← jexmex left	07:40
	→ jexmex joined	07:41
	→ hyperair joined	07:41
	← jexmex left	07:42
	← carutsu__ left	07:43
	← steph021 left	07:43
	→ priidu joined	07:43
	→ jexmex joined	07:44
	→ JoeCoolNetbook joined	07:46
JoeCoolNetbook	How do i view the full history of my suppository?	07:46
	I just committed like 5 things but there are only three shown in "git log"	07:47
	← jexmex left	07:47
	← iksik left	07:48
	→ jexmex joined	07:49
cbreak_work	of your what?	07:50
	git log shows everything that is an ancestor of current HEAD	07:50
JoeCoolNetbook	cbreak_work, I followed this: http://stackoverflow.com/questions/3895453/how-do-i-make-a-git-commit-in-the-past And I'm trying to see if it worked.	07:51
cbreak_work	you can do git log --all --graph --decorate to show all known headds	07:51
	← jexmex left	07:51
JoeCoolNetbook	Yeah, I think i rebased wrong and created duplicates of everything.	07:52
cbreak_work	you have a GUI?	07:52
	check out gitk, or gitx if you're on mac os	07:53
JoeCoolNetbook	Not on this machine, but I can .	07:53
	← momentum left	07:53
	→ tatsuya joined	07:53
	→ HG` joined	07:53
	→ guardian joined	07:53
	→ urkud joined	07:54
	← priidu left	07:54
	→ jexmex joined	07:54
JoeCoolNetbook	OK, installed gitk, how does it help you?	07:54
	← MikhX left	07:55
	→ MikhX joined	07:56
	← jexmex left	07:56
cbreak_work	it shows you the history nice and clear	07:56
	← bhowmisu left	07:56
	← hyperair left	07:56
	← albel727 left	07:56
	← Fullmoon left	07:56
	← noyb left	07:56
	← marienz left	07:56
	← pasky_ left	07:56
	← tungtn left	07:56
	← mdel_ left	07:56
	← TML left	07:56
	← noktoborus left	07:56
	← brosner left	07:56
	← iizukaway left	07:56
	← PerlJam left	07:56
	← trodrigues left	07:56
	← awx left	07:56
	← electrogeek left	07:56
	← metellius left	07:56
	← dna left	07:56
	← cods left	07:56
	← ice799 left	07:56
	← udoprog left	07:56
	← joschi left	07:56
	← Marquel left	07:56
	← Gitbot left	07:56
	← psoo left	07:56
	← mastro left	07:56
	← Textmode left	07:56
	← dl9pf_ left	07:56
	← baccenfutter left	07:56
	← jast left	07:56
	← makubi left	07:56
	← Zenopus left	07:56
	← dharrigan left	07:56
	← kelvie_ left	07:56
	← robgleeson left	07:56
	← FabianB_ left	07:56
	← tildeequals left	07:56
	← nadim left	07:56
	← hyperboreean left	07:56
	← cognominal left	07:56
	← RSchulz left	07:56
	← dot-slaSh left	07:56
	← Adam left	07:56
	← _rane left	07:56
	← Soliton left	07:56
	← Zhonghua left	07:56
	← imarcust1is left	07:56
cbreak_work	the instructions on that stacksite aren't wrong	07:56
JoeCoolNetbook	I guess I have to start over again...	07:56
	→ jexmex joined	07:56
	→ airborn joined	07:57
JoeCoolNetbook	It's a huge pain in the ass trying to convert the dates, putting it in the right order, and following the lingo	07:57
	← jexmex left	07:58
	→ jexmex joined	07:58
JoeCoolNetbook	There needs a --before 'xxx' flag in the commit command.	07:58
	← MikhX left	08:00
	→ iksik joined	08:01
cbreak_work	no	08:03
	history rewriting is dangerous	08:03
	rebase -i makes it easy enough	08:03
	→ izzie321 joined	08:04
	← phantomcircuit left	08:04
	← izzie321 left	08:04
	← lucsky left	08:06
	← ignatp left	08:06
	← ricky left	08:06
	← Elfe left	08:06
	← dys left	08:06
	← _Vi left	08:06
	← Pacman left	08:06
	← rgr left	08:06
	← drizzd left	08:06
	← EgS left	08:06
	← neunon left	08:06
	← joevano left	08:06
	← DasIch left	08:06
	← martineo left	08:06
	← AAA_awright left	08:06
	← ebneter left	08:06
	← ruxpin left	08:06
	← jowls left	08:06
	← cschneid left	08:06
	← cwillu_at_work left	08:06
	← uau left	08:06
	← twopak left	08:06
	← seanius left	08:06
	← compnerd left	08:06
	← selckin left	08:06
	← sbob left	08:06
	← flowbee left	08:06
	← jeremyw left	08:06
	← schlortoo left	08:06
	← auscompgeek left	08:06
	← mmattice left	08:06
	← majoh left	08:06
	← wimt left	08:06
	← valerio left	08:06
	← tomaw left	08:06
	← eighty4 left	08:06
	← bburhans left	08:06
	← bnovc left	08:06
	← TTilus left	08:06
	← [exa] left	08:07
	← pcc1 left	08:07
	← bunk left	08:07
	← offby1 left	08:07
	← Ilari left	08:07
	← Ilari_antrcomp left	08:07
	← _Unode left	08:07
	← adamm left	08:07
	← elijahbal left	08:07
	← unixtippse left	08:07
	← mishok13 left	08:07
	← Vutral left	08:07
	← kenyon left	08:07
	← Putr left	08:07
	← jspiros left	08:07
	← frakturfreak left	08:07
	← Ingmar left	08:07
	← CompanionCube left	08:07
	← up_the_irons left	08:07
	← felipellrocha left	08:07
	← shiba_yu36 left	08:07
	← Gecko1986 left	08:07
	← kpreid left	08:07
	← tchan left	08:07
	← FauxFaux left	08:07
	← zorzar left	08:07
	← Pacman` left	08:07
	← erez left	08:07
	← ayanes left	08:07
	← Thumper_ left	08:07
	← mjv left	08:07
	← vhost- left	08:07
	← cehteh left	08:07
	← jettero left	08:07
	← logankoe1ter left	08:07
	← stepnem left	08:07
	← ludde left	08:07
	← f00li5h left	08:07
	← no_maam left	08:07
	← tychoish left	08:07
	← esmaxwill left	08:07
	← acknopper left	08:07
	← Pieter left	08:07
	← boombatower left	08:07
	← justin-george left	08:07
	← stliu left	08:07
	← golodhrim left	08:07
	← fr0ggie left	08:07
	← cthuluh left	08:07
	← tgunr left	08:07
	← urbanmonk left	08:07
	← reflectivedev left	08:07
	← EvanR-work left	08:07
	← vdv left	08:07
	← frsk left	08:07
	← LetoThe2nd left	08:07
	← amason left	08:07
	← darkskiez left	08:07
	← maguey_ left	08:07
	← bartman left	08:07
	← Strogg left	08:07
	← tango_ left	08:07
	← dwmw2 left	08:07
	← reto_ left	08:07
	← Lgb left	08:07
	← trez left	08:07
	← cantoma left	08:07
	← mrbrdo left	08:07
	← gattor left	08:07
	← saerdnaer_ left	08:07
	← artkrz left	08:07
	← corespeedxxx left	08:07
	← rudi_s left	08:07
	← maxb left	08:07
	← Scott0 left	08:07
	← pprkut left	08:07
	← Keruspe left	08:07
	← Rapp left	08:07
	← Kulag left	08:07
	← Smirnov left	08:07
	← xrogaan_ left	08:07
	← dquestions left	08:07
	← muep left	08:07
	← Derander left	08:07
	← c9s left	08:07
	← majeru left	08:07
	← dpino left	08:07
	← jjuran left	08:07
	← zain left	08:07
	← jotik^^ left	08:07
	← denysonique left	08:07
	← cbreak left	08:07
	← jas4711 left	08:07
	← ribasushi left	08:07
	← AlexanderS left	08:07
	← ari-_-e left	08:07
	← Blackguard left	08:07
	← SethRobertson left	08:07
	← madduck left	08:07
	← GodEater left	08:07
	← Woody2143 left	08:07
	← mouche left	08:07
	← iravid left	08:07
	← Sigma left	08:07
	← kandinski left	08:07
	← zenom left	08:07
	← j987 left	08:07
	← Tianon left	08:07
	← sigmonsays left	08:07
	← eno left	08:07
	← numbah left	08:07
	← s0enke left	08:07
	← plopix left	08:07
	← ohcibi left	08:07
	← Will\| left	08:07
	← urkud left	08:07
	← tatsuya left	08:07
	← anti-pattern left	08:07
	← brntbeer left	08:07
	← giallu left	08:07
	← tonyj left	08:07
	← cballou left	08:07
	← DrNick left	08:07
	← paja left	08:07
	← rson left	08:07
	← blee_ left	08:07
	← jason237 left	08:07
	← nuoHep left	08:07
	← bgerber left	08:07
	← saurik left	08:07
	← Simkin left	08:07
	← Moo-_- left	08:07
	← chrowe left	08:07
	← eban left	08:07
	← hachi left	08:07
	← markatto left	08:07
	← tpope left	08:07
	← BP{k} left	08:07
	← mrtazz left	08:07
	← sgronblo left	08:07
	← HG` left	08:07
	← basicxman left	08:07
	← ExtraSpice left	08:07
	← svaksha left	08:07
	← Promit left	08:07
	← eeanm left	08:07
	← AviZ left	08:07
	← mastro_ left	08:07
	← picasso left	08:07
	← dbatbold left	08:07
	← csgeek left	08:07
	← tg left	08:07
	← niko left	08:07
	← nairb774 left	08:07
	← jaeckel left	08:07
	← gregw left	08:07
	← masa- left	08:07
	← VadtecWork left	08:07
	← Fissure left	08:07
	← ben_h left	08:07
	← imMute left	08:07
	← domme left	08:07
	← ruskie left	08:07
	← thiago left	08:07
	← Trollkarlen left	08:07
	← ahf left	08:07
	← osfameron left	08:07
	← shadowmaster left	08:07
	← phryk left	08:07
	← avar left	08:07
	← mnemoc left	08:07
	← bigpresh left	08:07
	← TenOfTen left	08:07
	← homa_rano left	08:07
	← sunn left	08:07
	← guardian left	08:07
	← amerine left	08:07
	← rbarraud left	08:07
	← orafu left	08:07
	← alip left	08:07
	← Mage left	08:07
	← j0ran left	08:07
	← novas0x2a left	08:07
	← unrael left	08:07
	← nevyn left	08:07
	← zomg left	08:07
	← jamuraa left	08:07
	← Slush- left	08:07
	← wagle left	08:07
	← thomas_b left	08:07
	← ironcamel left	08:07
	← d-snp left	08:07
	← ddraskovic left	08:07
	← bremner` left	08:07
	← Haarg left	08:07
	← Tobias\| left	08:07
	← srcerer left	08:07
	← slakmagik left	08:07
	← coldboot left	08:07
	← crash\ left	08:07
	← tehbaut left	08:07
	← LRN left	08:07
	← odin_ left	08:07
	← bekabug left	08:07
	← Risar left	08:07
	← malfy left	08:07
JoeCoolNetbook	That's what vackupas are for.	08:07
	← robins left	08:07
JoeCoolNetbook	Well, I was tired about 16 hours ago, I've been up for 36 hours trying to make sense of this program, I' can't make any more sense without a sound mind.	08:08
	← freimatz left	08:08
	← jailbox left	08:08
	→ freimatz joined	08:08
	nevyn^_ → nevyn^	08:08
	→ teukka joined	08:09
	→ izzie321 joined	08:09
	← jrockway left	08:11
	← JoeCoolNetbook left	08:12
	→ PerlJam joined	08:12
	← teukka left	08:12
	← izzie321 left	08:13
	→ teukka joined	08:13
	← teukka left	08:13
	→ teukka joined	08:13
	→ d0ugal joined	08:13
	→ akahn joined	08:14
joeyreno	i'm trying to clone down to my local server from my remote, but i changed the port from 22 on my remote server, how do i specify the different port in the clone command?	08:15
	→ _Vi joined	08:16
	→ MINOWAMAN joined	08:18
	← akahn left	08:19
	→ izzie321 joined	08:20
	← izzie321 left	08:20
joeyreno	it tried git clone [email@hidden.address] but it doesn't work	08:20
cbreak_work	ssh://user@host:port/path	08:21
	→ ntoll joined	08:23
	→ izzie321 joined	08:24
	← izzie321 left	08:24
joeyreno	cbreak_work: thanks	08:25
	← _Vi left	08:27
	→ dytrivedi_ joined	08:31
	← OOPMan left	08:31
	← roop left	08:32
	← dytrivedi_ left	08:36
	← vital left	08:38
	→ OOPMan joined	08:39
	→ t3i joined	08:43
	→ gemmes joined	08:43
	→ Zhonghua joined	08:45
	→ HakanD joined	08:45
	→ intripoon joined	08:47
	→ radarek joined	08:47
	← MINOWAMAN left	08:47
	→ iizukaway joined	08:47
	← ct^^ left	08:49
	→ JohnFlux joined	08:49
JohnFlux	Is it better to revert a revert, or to cherry-pick the original commit? :)	08:49
	→ leavittx joined	08:50
cbreak_work	JohnFlux: they do completely different things	08:51
JohnFlux	cbreak_work: the effect would appear to be exactly the same	08:54
	cbreak_work: to undo the revert	08:54
	→ rasztasd joined	08:59
	leavittx → 15SAAYPBR	08:59
	nevyn^ → 64MAAPUP6	08:59
	← slonopotamus left	08:59
	→ hebz0rl joined	08:59
	→ hyperair joined	08:59
	→ tmz joined	08:59
	→ sadmac joined	08:59
	→ teuf joined	08:59
	→ copyleft joined	08:59
	→ bball__ joined	08:59
	→ defn joined	08:59
	→ StyleWarz joined	08:59
	→ pcc1 joined	08:59
	→ Will\| joined	08:59
	→ sunn joined	08:59
	→ homa_rano joined	08:59
	→ siprbaum joined	08:59
	→ kupsch joined	08:59
	→ Diziet joined	08:59
	→ ianmcorvidae joined	08:59
	→ spb joined	08:59
	→ py1hon joined	08:59
	→ bd__ joined	08:59
	→ mfoemmel joined	08:59
	→ piti joined	08:59
	→ jeffhung joined	08:59
	→ przemoc joined	08:59
	→ Carneus joined	08:59
	→ ReinH joined	08:59
	→ torben joined	08:59
	→ meuh joined	08:59
	→ Rhonda joined	08:59
	→ dotCOMmie joined	08:59
	→ adamholt joined	08:59
	→ wanders joined	08:59
	→ redondos joined	08:59
	→ OPK joined	08:59
	→ _W_ joined	08:59
	→ Iff joined	08:59
	→ deavid joined	08:59
	→ eMBee joined	08:59
	→ koki joined	08:59
	→ guybrush joined	08:59
	→ jakob joined	08:59
	→ wereHamster joined	08:59
	→ stuffcorpse joined	08:59
	→ charon joined	08:59
	→ fahadsadah joined	08:59
	→ hegge joined	08:59
	→ cheater joined	08:59
	→ Grum joined	08:59
	→ Khisanth joined	08:59
	→ zz_rubydiamond joined	08:59
	→ Ratler joined	08:59
	→ chrizz joined	08:59
	→ johnjay joined	08:59
	→ codejunky joined	08:59
	→ thoraxe joined	08:59
	→ hashier joined	08:59
	→ compengi joined	08:59
	→ bmalee joined	08:59
	→ Xavier joined	08:59
	→ TheUni joined	08:59
	→ eldragon joined	08:59
	→ d1b joined	08:59
	→ Weiss joined	08:59
	→ mahound joined	08:59
	→ kokx joined	08:59
	→ Bigcheese joined	08:59
	→ jayne joined	08:59
	→ LotR joined	08:59
	→ chuck joined	08:59
	→ leavittx joined	08:59
	→ orospakr joined	08:59
	→ metze joined	08:59
	→ guide joined	08:59
	→ DRMacIver joined	08:59
	→ gallon joined	08:59
	→ divVerent joined	08:59
	→ Exodist joined	08:59
	→ JStoker joined	08:59
	→ CosmicRay joined	08:59
	→ jpieper joined	08:59
	→ tic joined	08:59
	→ TTilus joined	08:59
	→ Derander joined	08:59
	→ bburhans joined	08:59
	→ Pieter joined	08:59
	→ mrtazz joined	08:59
	→ avar joined	08:59
	→ acknopper joined	08:59
	→ BP{k} joined	08:59
	→ muep joined	08:59
	→ eighty4 joined	08:59
	→ tomaw joined	08:59
	→ dquestions joined	08:59
	→ valerio joined	08:59
	→ majoh joined	08:59
	→ malfy joined	08:59
	→ xrogaan_ joined	08:59
	→ phryk joined	08:59
	→ wimt joined	08:59
	→ Risar joined	08:59
	→ s0enke joined	08:59
	→ Smirnov joined	08:59
	→ bekabug joined	08:59
	→ tpope joined	08:59
	→ markatto joined	08:59
	→ mnemoc joined	08:59
	→ numbah joined	08:59
	→ [exa] joined	08:59
	→ mmattice joined	08:59
	→ eno joined	08:59
	→ LRN joined	08:59
	→ tehbaut joined	08:59
	→ odin_ joined	08:59
	→ crash\ joined	08:59
	→ auscompgeek joined	08:59
	→ Keruspe joined	08:59
	→ no_maam joined	08:59
	→ schlortoo joined	08:59
	→ pprkut joined	08:59
	→ bnovc joined	08:59
	→ jeremyw joined	08:59
	→ up_the_irons joined	08:59
	→ shadowmaster joined	08:59
	→ f00li5h joined	08:59
	→ flowbee joined	08:59
	→ bunk joined	08:59
	→ osfameron joined	08:59
	→ maxb joined	08:59
	→ Trollkarlen joined	08:59
	→ ahf joined	08:59
	→ rudi_s joined	08:59
	→ hachi joined	08:59
	→ corespeedxxx joined	08:59
	→ artkrz joined	08:59
	→ eban joined	08:59
	→ thiago joined	08:59
	→ ludde joined	08:59
	→ sgronblo joined	08:59
	→ stepnem joined	08:59
	→ sbob joined	08:59
	→ ruskie joined	08:59
	→ esmaxwill joined	08:59
	→ saerdnaer_ joined	08:59
	→ chrowe joined	08:59
	→ Moo-_- joined	08:59
	→ logankoe1ter joined	08:59
	→ domme joined	08:59
	→ coldboot joined	08:59
	→ slakmagik joined	08:59
	→ jettero joined	08:59
	→ imMute joined	08:59
	→ Tobias\| joined	08:59
	→ sigmonsays joined	08:59
	→ Haarg joined	08:59
	→ Tianon joined	08:59
	→ bremner` joined	08:59
	→ ben_h joined	08:59
	→ cehteh joined	08:59
	→ gattor joined	08:59
	→ CompanionCube joined	08:59
	→ Simkin joined	08:59
	→ ddraskovic joined	08:59
	→ thomas_b joined	08:59
	→ wagle joined	08:59
	→ selckin joined	08:59
	→ Slush- joined	08:59
	→ plopix joined	08:59
	→ Fissure joined	08:59
	→ zenom joined	08:59
	→ Kulag joined	08:59
	→ Scott0 joined	08:59
	→ compnerd joined	08:59
	→ seanius joined	08:59
	→ kandinski joined	08:59
	→ bgerber joined	08:59
	→ vhost- joined	08:59
	→ jamuraa joined	08:59
	→ Sigma joined	08:59
	→ iravid joined	08:59
	→ uau joined	08:59
	→ cantoma joined	08:59
	→ nuoHep joined	08:59
	→ cwillu_at_work joined	08:59
	→ zomg joined	08:59
	→ mjv joined	08:59
	→ trez joined	08:59
	→ VadtecWork joined	08:59
	→ saurik joined	08:59
	→ j987 joined	08:59
	→ TenOfTen joined	08:59
	→ Lgb joined	08:59
	→ masa- joined	08:59
	→ mouche joined	08:59
	→ Ingmar joined	08:59
	→ reto_ joined	08:59
	→ frakturfreak joined	08:59
	→ c9s joined	08:59
	→ nevyn joined	08:59
	→ jason237 joined	08:59
	→ dwmw2_gone joined	08:59
	→ tango_ joined	08:59
	→ blee_ joined	08:59
	→ jspiros joined	08:59
	→ jaeckel joined	08:59
	→ nairb774 joined	08:59
	→ rson joined	08:59
	→ paja joined	08:59
	→ Thumper_ joined	08:59
	→ DrNick joined	08:59
	→ ayanes joined	08:59
	→ niko joined	08:59
	→ ohcibi joined	08:59
	→ Putr joined	08:59
	→ majeru joined	08:59
	→ tg joined	08:59
	→ csgeek joined	08:59
	→ Woody2143 joined	08:59
	→ tychoish joined	08:59
	→ cballou joined	08:59
	→ d-snp joined	08:59
	→ Strogg joined	08:59
	→ unrael joined	08:59
	→ dbatbold joined	08:59
	→ mrbrdo joined	08:59
	→ cschneid joined	08:59
	→ ironcamel joined	08:59
	→ GodEater joined	08:59
	→ ruxpin joined	08:59
	→ ebneter joined	08:59
	→ bigpresh joined	08:59
	→ twopak joined	08:59
	→ madduck joined	08:59
	→ SethRobertson joined	08:59
	→ Blackguard joined	08:59
	→ kenyon joined	08:59
	→ gregw joined	08:59
	→ erez joined	08:59
	→ ari-_-e joined	08:59
	→ picasso joined	08:59
	→ AAA_awright joined	08:59
	→ Pacman` joined	08:59
	→ bartman joined	08:59
	→ maguey_ joined	08:59
	→ darkskiez joined	08:59
	→ amason joined	08:59
	→ LetoThe2nd joined	08:59
	→ Rapp joined	08:59
	→ Vutral joined	08:59
	→ martineo joined	08:59
	→ mastro_ joined	08:59
	→ tonyj joined	08:59
	→ AlexanderS joined	08:59
	→ frsk joined	08:59
	→ zorzar joined	08:59
	→ vdv joined	08:59
	→ ribasushi joined	08:59
	→ joevano joined	08:59
	→ giallu joined	08:59
	→ j0ran joined	08:59
	→ AviZ joined	08:59
	→ FauxFaux joined	08:59
	→ mishok13 joined	08:59
	→ tchan joined	08:59
	→ jas4711 joined	08:59
	→ Promit joined	08:59
	→ brntbeer joined	08:59
	→ reflectivedev joined	08:59
	→ urbanmonk joined	08:59
	→ DasIch joined	08:59
	→ eeanm joined	08:59
	→ neunon joined	08:59
	→ EvanR-work joined	08:59
	→ cbreak joined	08:59
	→ tgunr joined	08:59
	→ alip joined	08:59
	→ orafu joined	08:59
	→ rbarraud joined	08:59
	→ kpreid joined	08:59
	→ EgS joined	08:59
	→ elijahbal joined	08:59
	→ unixtippse joined	08:59
	→ adamm joined	08:59
	→ denysonique joined	08:59
	→ _Unode joined	08:59
	→ fr0ggie joined	08:59
	→ cthuluh joined	08:59
	→ drizzd joined	08:59
	→ novas0x2a joined	08:59
	→ rgr joined	08:59
	→ Ilari_antrcomp joined	08:59
	→ Ilari joined	08:59
	→ anti-pattern joined	08:59
	→ Pacman joined	08:59
	→ Gecko1986 joined	08:59
	→ golodhrim joined	08:59
	→ shiba_yu36 joined	08:59
	→ dys joined	08:59
	→ stliu joined	08:59
	→ Elfe joined	08:59
	→ jotik^^ joined	08:59
	→ offby1 joined	08:59
	→ felipellrocha joined	08:59
	→ ricky joined	08:59
	→ ignatp joined	08:59
	→ zain joined	08:59
	→ svaksha joined	08:59
	→ amerine joined	08:59
	→ ExtraSpice joined	08:59
	→ jjuran joined	08:59
	→ basicxman joined	08:59
	→ dpino joined	08:59
	→ tatsuya joined	08:59
	→ HG` joined	08:59
	→ guardian joined	08:59
	→ robinsmidsrod joined	08:59
	→ jailbox joined	08:59
	→ jrockway joined	08:59
	→ codespectator joined	08:59
	→ JonasF joined	08:59
	→ jstemmer joined	08:59
	→ xiong joined	08:59
	→ xro joined	08:59
	→ akamike joined	08:59
	→ parasti joined	08:59
	→ Anti-X joined	08:59
	→ thierryp joined	08:59
	→ khmarbaise joined	08:59
	→ vital joined	08:59
	→ hukl joined	08:59
	→ MikhX joined	08:59
	→ err_ok joined	08:59
	→ albel727 joined	08:59
	→ Gitbot joined	08:59
	→ psoo joined	08:59
	→ Fullmoon joined	08:59
	→ mastro joined	08:59
	→ noyb joined	08:59
	→ Textmode joined	08:59
	→ dl9pf_ joined	08:59
	→ marienz joined	08:59
	→ pasky_ joined	08:59
	→ tungtn joined	08:59
	→ baccenfutter joined	08:59
	→ jast joined	08:59
	→ mdel_ joined	08:59
	→ makubi joined	08:59
	→ Zenopus joined	08:59
	→ dharrigan joined	08:59
	→ kelvie_ joined	08:59
	→ robgleeson joined	08:59
	→ FabianB_ joined	08:59
	→ TML joined	08:59
	→ noktoborus joined	08:59
	→ brosner joined	08:59
	→ tildeequals joined	08:59
	→ nadim joined	08:59
	→ hyperboreean joined	08:59
	→ cognominal joined	08:59
	→ trodrigues joined	08:59
	→ RSchulz joined	08:59
	→ awx joined	08:59
	→ dot-slaSh joined	08:59
	→ electrogeek joined	08:59
	→ metellius joined	08:59
	→ dna joined	08:59
	→ Adam joined	08:59
	→ cods joined	08:59
	→ ice799 joined	08:59
	→ udoprog joined	08:59
	→ _rane joined	08:59
	→ Soliton joined	08:59
	→ imarcust1is joined	08:59
	→ joschi joined	08:59
	→ Marquel joined	08:59
	→ khelll joined	09:00
	hyperair → Guest68417	09:00
	← werdan7 left	09:00
	← 15SAAYPBR left	09:00
	← Guest68417 left	09:01
	→ hyperair joined	09:01
	→ Schmallon joined	09:02
	→ urkud joined	09:02
	← Dalton left	09:03
	→ priidu joined	09:04
	← Vutral left	09:05
	← marienz left	09:06
	→ tvw joined	09:06
	← hyperair left	09:06
	→ bluenovember joined	09:06
	← tatsuya left	09:07
	← jeffhung left	09:07
	→ jeffhung joined	09:07
	→ Dalton joined	09:09
	← niko left	09:10
	→ niko joined	09:11
	→ slainer68 joined	09:11
slainer68	hello	09:11
	→ rlotun joined	09:12
xro	<wereHamster>, if iwant to update only one folder from my local repo, i have to do a pull, then all the local repo will be updated?	09:12
	← priidu left	09:13
	→ naquad joined	09:13
slainer68	how to revert a whole bunch of commits with git ? for example i would like to revert everything that was done yesterday? when using git revert it only reverts ONE commit. i would like to revert from HEAD to a specified commit, how can i do that? thnx	09:13
	← paja left	09:13
	→ paja joined	09:14
	→ curtana joined	09:14
	← paja left	09:14
	→ paja joined	09:15
	→ Radar joined	09:15
	→ icwiener joined	09:15
	← 64MAAPUP6 left	09:15
	→ bauruine joined	09:16
	← gemmes left	09:17
cbreak_work	slainer68: do you want to rewrite the history or not?	09:18
	← BOLovely left	09:18
	→ marienz joined	09:19
	→ CoinOpeBoy joined	09:19
	← t3i left	09:22
	→ _Vi joined	09:24
	→ tcurdt joined	09:24
	→ roop joined	09:24
slainer68	cbreak_work, no, i don't want to rewrite the history.	09:25
cbreak_work	do you want to remove the effects of all past commits until a boundary?	09:25
	do you have any uncommited changes?	09:25
	← err_ok left	09:25
slainer68	i would like to revert the effects of all the work that was done yesterday until a specified commit number (or whatever) without rewriting history.	09:27
	(and assuming that the work done yesterday was pushed to master origin)	09:27
	← Kulag left	09:28
	→ Kulag joined	09:29
cbreak_work	ok, if you have no local uncommited changes	09:29
	you can do git reset --hard newestcommityouwanttokeep	09:29
tango_	slainer68: git reset --merge commithash	09:29
cbreak_work	and then git reset --soft HEAD@{1}	09:29
	and then git commit -a -m "Undone a whole bunch of stuff"	09:29
	← marienz left	09:31
	→ albel727_2 joined	09:31
	← albel727 left	09:35
slainer68	thanks cbreak_work that seems to do the thing i want :).	09:35
	what does HEAD@{1} means and where i can find documentation about writing ranges like this?	09:35
	← martineo left	09:37
	→ martineo joined	09:37
	→ antgel joined	09:37
cbreak_work	it's referring to the reflog	09:37
	man git-reflog	09:37
Gitbot	cbreak_work: the git-reflog manpage can be found at http://git.or.cz/man/git-reflog	09:37
cbreak_work	it means "what I had in HEAD before"	09:38
	oh, gitbot's back!	09:38
ludde	cbreak_work: is HEAD the only thing you may use with @ ?	09:38
cbreak_work	no	09:38
	anything that has a reflog	09:38
	branches usually	09:38
	← stringoO left	09:38
cbreak_work	also check out git log -g	09:38
	it shows the reflog	09:38
	the reflog is nice if you screw up majorly	09:39
ptor	slainer68: man git-rev-parse under 'SPECIFYING REVISIONS' seems to have more info	09:39
Gitbot	slainer68: the git-rev-parse manpage can be found at http://git.or.cz/man/git-rev-parse	09:39
cbreak_work	you can do things like HEAD@{2.days.ago}	09:39
	→ marienz joined	09:40
	← MikhX left	09:40
	→ MikhX joined	09:40
	→ priidu joined	09:41
	← amerine left	09:41
	→ metoikos joined	09:42
	→ chrischambers joined	09:43
	→ gemmes joined	09:43
Anti-X	if you have a fork on github, and the original author updates his stuff, how do you update your fork without deleting and reforking?	09:44
	if possible	09:44
	→ sir_lewk joined	09:44
	← MikhX left	09:45
sir_lewk	(completely hypothetically) what do you think would happen if I tried to place my entire / under git control?	09:45
	← paja left	09:45
Anti-X	you would get huge status lists	09:45
	:P	09:45
	→ paja joined	09:45
esc	sir_lewk: boot a live CD and find out	09:45
	← parasti left	09:46
	→ naimon joined	09:46
	→ hyperair joined	09:46
	← chrischambers left	09:47
	→ jds joined	09:47
sir_lewk	think I might just do my /etc, probably more useful ;)	09:48
	← antgel left	09:50
	← paja left	09:50
	→ jkp joined	09:50
	← solarian- left	09:51
	→ MaikB joined	09:52
	← marienz left	09:52
	→ paja joined	09:52
	→ chrischambers joined	09:53
	→ tatsuya joined	09:54
	← darkskiez left	09:54
	← gattor left	09:54
	→ gattor joined	09:55
	→ darkskiez joined	09:55
MaikB	Hello. Given that I merge topic into master and have a merge conflict in the file foo/bar.c. I want to resolve by picking either the version of topic or master. How is this done?	09:55
	thx in advance	09:55
_Vi	MaikB, "git checkout master -- foo/bar.c"?	09:55
cbreak_work	just check it out, add it, commit	09:55
	I think you can use --ours or --theirs too	09:56
	for checkout, in this special case	09:56
	→ brian_g joined	09:56
MaikB	ahhh	09:56
	← priidu left	09:57
MaikB	i tried git checkout foo/bar.c"	09:57
	but it failed	09:57
	thx guy	09:57
	s	09:57
cbreak_work	that gets the version from the index	09:57
MaikB	hm	09:57
curtana	git checkout --ours foo/bar.c	09:57
	← radarek left	09:57
	← khmarbaise left	09:58
MaikB	hm, it would be a blast if you guys would know how to do it with magit	09:58
	→ radarek joined	09:58
cbreak_work	what's that?	09:58
MaikB	(the emacs git mode)	09:58
	zz_rubydiamond → rubydiamond	09:59
MaikB	cbreak_work: though I guess --ours and --theirs will give me good search hits on this topic	09:59
	→ marienz joined	09:59
avar	magit doesn't support --ours and --theirs	09:59
MaikB	avar: thank you	10:00
jast	there are entirely too many interfaces for git	10:00
	I think I'll make a new one and outlaw all the others	10:00
MaikB	there are, but magit is the first one that does make me use it rather than the cli	10:00
cbreak_work	there's only one that deserves the attribute "Best"	10:00
MaikB	jast :P	10:00
cbreak_work	and that is... bash	10:00
jast	bash doesn't contain a git interface	10:01
MaikB	cbreak_work: first of all it carries the attribute "complete"	10:01
	→ priidu joined	10:01
avar	jast: git-completion.bash ?	10:01
MaikB	but magit is really like	10:01
jast	that's an extremely partial interface, isn't it?	10:01
MaikB	I only recently started using it	10:01
cbreak_work	I can interact with git via bash	10:02
jast	it only displays a few status things and completes things that are ultimately handled by git's built-in interface	10:02
	← xiangfu left	10:02
avar	MaikB: I recently improved magit's rebase UI, it'll be merged soon-ish	10:02
jast	try using the bash completion without ever calling the git binary yourself :)	10:02
	← HakanD left	10:04
MaikB	avar: nice! I yet have to use magit's rebase UI	10:04
	← ntoll left	10:04
avar	it can still use work, but try rebase-mode.el	10:07
	← icwiener left	10:07
	→ g0bl1n joined	10:07
	← albel727_2 left	10:07
	→ albel727_2 joined	10:08
	← urkud left	10:08
	← intripoon left	10:09
	→ Infin1ty\|work joined	10:10
Infin1ty\|work	is it possible to ask a gitolite question in here?	10:10
	← toobaz_ left	10:10
frsk	No guarantee, just ask and see if anyone can help you out =)	10:10
cbreak_work	everything's possible	10:11
	git's a time machine :)	10:11
	← stliu left	10:11
Infin1ty\|work	i have installed gitolite, then edited the .gitolite.rc to change some permissions, to 0022 (for gitweb) , i can't find a way to tell gitolite to re read this file	10:11
	← marienz left	10:12
cbreak_work	doesn't gitolite work via it's own repo?	10:12
	so just commit the new config file	10:12
	and push the commit to the server	10:12
Infin1ty\|work	cbreak_work, i didn't see a way to commit .gitolite.rc file	10:12
	only the normal conf/keys	10:12
cbreak_work	then don't change it	10:12
Infin1ty\|work	but i have to	10:12
	that's my question :)	10:12
	→ HakanD joined	10:13
Infin1ty\|work	i need to reread the .gitolite.rc file	10:13
cbreak_work	you do know that gitolite doesn't run, right?	10:13
	it's started when you interact with it	10:13
	so it will reread it anyway, if it reads it	10:13
Infin1ty\|work	hmm, i understand this, but i try to understand how can i tell it to reread the gitolite.rc file, that's all	10:14
	→ akahn joined	10:14
	rubydiamond → zz_rubydiamond	10:14
Infin1ty\|work	i coudln't find any docs regarding what to do after editing that file	10:14
Ilari	Infin1ty\|work: chmod the files manually (the permissions setting only appiles to new stuff)?	10:15
cbreak_work	Infin1ty\|work: it will read the file anyway	10:15
	because it doesn't run at the moment	10:15
	← jkp left	10:16
cbreak_work	so if it needs the file contents, it has no other choice but to read it again	10:16
	→ galderz joined	10:17
	→ jotik joined	10:18
	← akahn left	10:19
	← AAA_awright left	10:19
	← jotik^^ left	10:19
	→ erez_ joined	10:21
	← Infin1ty\|work left	10:23
	→ jkp joined	10:23
	← jkp left	10:23
	→ jkp joined	10:23
	← khelll left	10:24
s0enke	re-post :) rebase question: it seems that "git fetch origin master && git rebase origin master" isn't the same as "git pull --rebase origin master"?! the second one sometimes creates weird results (merge conflicts, reapplying remote changes etc - any explanation?	10:24
	← hyperair left	10:25
	erez_ → Infin1ty\|work	10:25
	← Infin1ty\|work left	10:25
	→ Infin1ty\|work joined	10:25
Infin1ty\|work	cbreak_work, so i can't actually change the permission, only manually?	10:26
	cbreak_work, i know for sure it does not read it, i just added a new repo	10:26
Ilari	s0enke: Don't use 'git fetch origin master', use 'git fetch origin'.	10:26
	→ Torsten joined	10:26
s0enke	Ilari, ok. but that doesn't solve the original problem, does it? ;-)	10:26
Ilari	s0enke: Yes, its not the same. pull --rebase is much smarter.	10:27
	→ AAA_awright joined	10:27
	→ gebi joined	10:27
s0enke	Ilari, but pull --rebase screws up with remote and local commits. rebasing against the remote ref works like a charme though	10:27
	Ilari, so i need to get a clue about the "smartness" of pull --rebase	10:28
	→ pdelgallego joined	10:29
	→ khelll joined	10:29
	→ Yuuhi joined	10:29
	← tvw left	10:29
	→ tvw joined	10:29
	← segher left	10:29
Ilari	s0enke: Basically, it uses the old value of remote tracking branch as limiter and rebases onto new value.	10:30
	← Radar left	10:30
	→ segher joined	10:31
	dwmw2_gone → dwmw2	10:31
	← MaikB left	10:31
	→ bob_f joined	10:32
bob_f	Hi, is there a super popular way of dealing with svn externals when using git-svn ?	10:32
	Google gives me a bunch of different things so wondering if there's some super cool solution that everybody agrees on. :)	10:33
FauxFaux	Panic(tm).	10:33
s0enke	Ilari, ok for debugging, how can I see what git considers to be the rebase "base" ?	10:33
Infin1ty\|work	cbreak_work, nm, did it manully :)	10:33
	← mordy left	10:34
	← tvw left	10:34
	→ dels joined	10:34
cbreak_work	Infin1ty\|work: reading and acting on it are two different things	10:35
	→ badboy_ joined	10:35
	→ DasIch_ joined	10:35
Ilari	s0enke: It might be visible in tracing mode (GIT_TRACE)	10:35
	← Guest42011 left	10:36
	→ tvw joined	10:37
	→ thiago_muc joined	10:38
	thiago_muc → thiago_home	10:39
bob_f	I guess that's a no. :)	10:39
	← thiago_home left	10:39
	→ thiago_home joined	10:39
	← DasIch left	10:39
	→ goshawk joined	10:39
	→ hendry joined	10:40
s0enke	Ilari, thx. we'll try!	10:41
hendry	where is git-daemon configured? I can see it's by default looking in /var/cache/git/ and that's not where my repos are located.	10:41
Ilari	hendry: Command line.	10:42
	→ keystr0k joined	10:42
	→ zombor joined	10:47
	← thiago_home left	10:48
	→ radioman-lt joined	10:48
	→ thiago_home joined	10:48
	← robgleeson left	10:49
	← alip left	10:50
	→ antgel joined	10:50
	→ alip joined	10:50
antgel	hi all. i have a branch that i can see on our git server after a git fetch --all. however when i do git checkout $branchname i get "Cannot switch branch to a non-commit." i don't even understand what this means, let alone how to fix it, can anyone help?	10:51
	← zombor left	10:51
	← radarek left	10:51
Ilari	antgel: Premuably what you presume is a branch isn't (maybe its some tag to tree or whatever)...	10:52
	← thiago_home left	10:52
	→ stamina joined	10:54
	← phrearch left	10:54
	→ stamina_ joined	10:54
	→ thiago_home joined	10:54
antgel	Ilari: but i see it in git branch -r	10:55
	→ intripoon joined	10:56
Ilari	antgel: What does 'git for-each-ref refs/remotes/$branchname' say about it?	10:57
	→ temoto joined	10:57
antgel	Ilari: b8333c60f39c29a672ea313ebffd1dc42eec90fc commitrefs/remotes/origin/118a	10:58
	→ pozic joined	10:58
antgel	should be a space between commit and refs don't know why it didn't paste properly	10:59
pozic	How do I push a local branch to the server such that everyone can see that branch?	10:59
temoto	Hello. I'm using git-svn to communicate with legacy repo and even commits work fine. Cloning it whole was going to take more than 1 day so i cloned /trunk only. Now, how do i tell it where to track tags?	10:59
Ilari	antgel: And 'git checkout origin/118a' throws complaint about it being non-commit?	10:59
temoto	pozic, git push remote branch	10:59
	pozic, where remote is remote name, such as 'origin'	10:59
	→ eletuchy_ joined	11:00
pozic	temoto: ah, nice, so it happens implicitly.	11:00
temoto	pozic, well you explicitly tell which branch to push.	11:00
pozic	remote: fatal: bad object 0000000000000000000000000000000000000000	11:00
	What does that mean?	11:01
temoto	Wow, that i never seen.	11:01
	But i would classify so many zeros the same way: very badass object.	11:01
	← gemmes left	11:02
Ilari	pozic: Maybe there's some bad hook on remote side?	11:02
	← naimon left	11:02
Ilari	pozic: At least carelessly done hook could cause that if you push a new branch...	11:02
	← kanru left	11:02
DASPRiD	temoto, tho with a very VERY low chance, that could be a valid hash ;)	11:03
	← Adys left	11:03
pozic	Ilari: yes, it is some broken hook.	11:03
	← eletuchy left	11:03
	← gregw left	11:03
	← gretch left	11:04
Ilari	pozic: Does it also say that the push failed?	11:04
pozic	Ilari: beyond my current control, but I think it actually worked.	11:04
	Ilari: git says that a new branch was created.	11:04
	→ robgleeson joined	11:04
pozic	Ilari: so, while in fact it says 'OMG FIRE', there is no problem.	11:04
	→ icreatures joined	11:04
pozic	Ilari: fun, isn't it?	11:04
Ilari	pozic: If the creation of new branch would be rejected, it would have said it was rejected in per-branch summary.	11:05
pozic	Ilari: I am not blaming git for anything, just to be clear.	11:05
	Ilari: something like 'a hook said the following' would be better, maybe.	11:06
Ilari	pozic: Presumably post-update/post-receive hook... That hook can't prevent branch update from succeding.	11:06
pozic	Ilari: or the hook named blah said the following.	11:06
	That way I wouldn't have come to this channel to ask what was going on, but instead ask whoever wrote the hook.	11:07
Ilari	pozic: It actually says the messages come from remote side... And there's not a whole lot of those.	11:07
	← kpreid left	11:07
	→ Adys joined	11:07
pozic	Ilari: that's something I didn't know.	11:07
	→ marcob joined	11:07
Ilari	pozic: Basically, hook messages and some messages about stuff going very wrong. Usually the summary should be checked first and only then the rest of output.	11:08
	→ ramlev joined	11:08
	Putr → Putr\|Away	11:09
	← Fullmoon left	11:10
	← intripoon left	11:11
	→ intripoon joined	11:11
	← Schmallon left	11:12
	→ zorzar_ joined	11:13
	→ TheNewAndy joined	11:13
Tobias\|	How would I do something with git along the lines of svn:externals?	11:14
	← thiago_home left	11:15
	← zorzar left	11:15
esc	i remember merge.summary is deprecated in favor of merge.log, anyone confirm this. I grepped the git changelog and couldn't find anything	11:16
	← _Vi left	11:16
	→ _Vi joined	11:17
	← temoto left	11:18
antgel	Ilari: git checkout origin/118a puts me in detached HEAD state. usually i just do a git checkout 118a and it automatically tracks the remote branch	11:20
cbreak_work	antgel: git --version	11:20
antgel	cbreak_work: git version 1.7.1	11:20
cbreak_work	if you want to track, do git checkout -t origin/118a	11:20
	I thought 1.7 does that automatically though	11:21
antgel	cbreak_work: so is it a feature or bug that usually git checkout 118a tracks for me	11:21
	?	11:21
cbreak_work	new feature	11:21
	→ thiago_home joined	11:21
antgel	anyhow, explicitly providing -t worked, don't know what broke	11:21
cbreak_work	out of date git	11:22
	just get a newer one	11:22
antgel	cbreak_work: i stumbled across said feature and it did what i wanted, i like it :)	11:22
	→ naimon joined	11:22
	← gebi left	11:24
antgel	cbreak_work: i use whatever version of git is in debian squeeze :-O	11:24
	→ flaguy48 joined	11:25
cbreak_work	debian? The "oh-let's-kill-entropy-in-openssl-and-only-bunlde-4-year-old-mplayer" people...? :)	11:25
	→ chittoor joined	11:26
	← CoinOpeBoy left	11:28
darkskiez	im guessing your a gentoo user.	11:30
	→ hyperair joined	11:30
darkskiez	s/your/you're/	11:30
	← ramlev left	11:31
cbreak_work	no	11:31
	two guesses left :)	11:32
darkskiez	ubuntu, centos	11:32
	alt?	11:32
	← Dalton left	11:32
cbreak_work	nope.	11:32
	→ tj joined	11:32
cbreak_work	Mac OS X :)	11:32
	tj → tjholowaychuk	11:33
cbreak_work	you could have guessed from the elitist attitude...	11:33
darkskiez	lol	11:33
	→ brntbeer_ joined	11:33
	→ Dalton joined	11:33
Infin1ty\|work	hmm in gitolite after i created a repo, i get: warning: You appear to have cloned an empty repository. after clone, i can't git push	11:33
	→ mabrand joined	11:33
cbreak_work	you have to make a commit first	11:33
	→ bentob0x joined	11:33
	← naimon left	11:34
Infin1ty\|work	i did, i get no refs in common and none specified	11:34
	i know how to work with git as a dev	11:35
	← metoikos left	11:35
cbreak_work	yes, you have to specify which branch to push	11:35
	git push remotename branchname	11:35
Infin1ty\|work	hmm isnt it auto on master?	11:35
cbreak_work	no	11:35
Infin1ty\|work	worked :D	11:35
cbreak_work	it's auto on matching afaik	11:35
Infin1ty\|work	thanks!!	11:35
	thanks a lot	11:35
cbreak_work	so it looks which refs local and remote have in common	11:35
	← hyperair left	11:36
	→ toad_ joined	11:37
toad_	what do i do if i reset --hard a local branch? is it possible to get the previous rev back if i haven't gc'ed?	11:37
ptor	toad_: git reflog will show you the ref you need to reset --hard back to where you were.	11:39
	← mika left	11:39
cbreak_work	git log -g for more detail	11:40
	→ metoikos joined	11:40
cbreak_work	if it's the last thing you did, git reset --hard HEAD@{1} does the right thing	11:40
	← khelll left	11:40
	→ kpreid joined	11:40
	→ murr4y joined	11:42
	→ naimon joined	11:43
	→ gebi joined	11:44
	→ mika joined	11:44
	← psankar left	11:44
	→ jotik^^ joined	11:46
	← mansour left	11:47
j987	cr	11:47
	← airborn left	11:48
	← jotik left	11:48
	→ airborn joined	11:48
	→ urkud joined	11:48
	→ dnordstrom joined	11:49
	→ radarek joined	11:50
sgronblo	wouldn't it make more sense to write the branch name in the merge conflict rows instead of HEAD	11:51
	← radarek left	11:51
	→ radarek joined	11:51
	→ MattDiPasquale joined	11:52
	→ bitkiller joined	11:52
cbreak_work	hmm?	11:53
	branch names are not written anywhere besides the comment	11:53
	→ philthno2 joined	11:54
FauxFaux	I think he means in the <<<<<<<<<<< HEAD bits.	11:54
cbreak_work	oh, the conflict markers	11:55
	→ alberto56 joined	11:55
cbreak_work	hmm...	11:55
	→ nicoulaj joined	11:55
	→ kanru joined	11:55
	→ d0k joined	11:56
	← radarek left	11:57
	← alberto56 left	11:57
	→ khelll joined	11:58
	→ radarek_ joined	11:58
	→ whaley joined	11:59
	→ t3i joined	11:59
	← dpino left	12:00
	→ wuj joined	12:00
	← dels left	12:00
	→ dpino joined	12:01
	→ savava joined	12:02
	← bitkiller left	12:02
	← savava left	12:02
	← roop left	12:02
	← toad_ left	12:03
	→ hohoho joined	12:04
	← airborn left	12:04
	← _Vi left	12:05
sgronblo	FauxFaux: yeah	12:06
FauxFaux	I use rebase all the time and I get annoyed that gitk doesn't show you what's going on. Should work out how to fix that.	12:07
	zz_rubydiamond → rubydiamond	12:07
sgronblo	it's not clear if HEAD is the branch that was checked out when I called rebase or the branch on which the commits are being "pasted" at the moment	12:07
	← albel727_2 left	12:08
	→ albel727 joined	12:08
	← pgib left	12:08
cbreak_work	HEAD is where you're at	12:09
sgronblo	FauxFaux: yeah the lack of available information about what's going on during rebase conflicts is a bit annoying	12:09
FauxFaux	Yeah, but I get scared when I'm getting detached heads.	12:10
sgronblo	cbreak_work: yeah but HEAD jumps around a bit when rebasing right?	12:10
	Putr\|Away → Putr	12:11
	← Amorphous left	12:11
sgronblo	shouldnt the correct term be 'decapitated'?	12:11
	← brntbeer_ left	12:11
cbreak_work	detached :)	12:11
	→ jaql joined	12:12
	→ ep8 joined	12:13
	→ akahn joined	12:14
	rubydiamond → zz_rubydiamond	12:15
	zz_rubydiamond → rubydiamond	12:16
	← akahn left	12:17
	→ cannonball joined	12:17
	← goshawk left	12:17
	→ MattDiPa_ joined	12:17
	← bauruine left	12:17
	← neunon left	12:17
	← HakanD left	12:17
	← Anti-X left	12:18
	→ Rearden joined	12:18
	← jjuran left	12:18
	→ jjuran joined	12:18
	← MattDiPasquale left	12:18
	→ happypolla joined	12:19
	← galderz left	12:19
	→ airborn joined	12:20
	→ stliu joined	12:20
	→ Anti-X joined	12:21
	← eletuchy_ left	12:24
	→ Amorphous joined	12:26
	→ scrts\|w0rk joined	12:26
	→ HakanD joined	12:26
	→ eletuchy joined	12:26
	← chronos left	12:27
	← ajpiano left	12:28
	→ noahcampbell joined	12:28
	← jaql left	12:29
	→ b0fh_ua joined	12:29
	→ jaql joined	12:29
b0fh_ua	Hello! If I have branch master, then forked branch "dev" and applied some sort of modifications to the local config files, then implemented some business logic - how do I merge back only the business logic changes, w/o affecting configuration?	12:30
	using cherry-pick?	12:30
	→ flazz joined	12:30
	→ ehabkost joined	12:31
	→ bauruine joined	12:32
	→ Aleric joined	12:32
Aleric	Is it possible to cherry-pick a whole range of changesets from another branch?	12:33
FauxFaux	Really new versions support cherry-picking ranges; but unless oyu're on them you're going to have to go work out how the hard rebase syntax works.	12:33
	→ momentum joined	12:33
FauxFaux	Or rev-list \| xargs -n1 etc.	12:33
momentum	what prevent someone from using github as their free personal storage by taking files; encrypgint them, and storing them on github?	12:34
Aleric	FauxFaux: I have version 1.7.1	12:34
	← happypolla left	12:34
	→ Vutral joined	12:34
FauxFaux	momentum: Lucky you.	12:35
Aleric	momentum: Doesn't seem worth the trouble for 300 MB.	12:35
	→ d0ugal_ joined	12:37
dbrock-	b0fh_ua: yes, cherry pick into master and then rebase dev onto the new master	12:37
b0fh_ua	dbrock-: not sure how do I do rebase there?	12:40
	← d0ugal left	12:40
dbrock-	b0fh_ua: git checkout master ; git cherry-pick a b c ; git checkout dev ; git rebase master	12:40
tpb_	hi guys. trying to co a tag and i get this -> error: unable to unlink old 'root/webXG/html/ar/index.html' (Permission denied)	12:41
	what does that mean? never seen it before.	12:41
dbrock-	tpb_: git is trying to delete that file, but you don't have permission to delete it	12:41
	(unlink = delete)	12:41
	→ Bass10 joined	12:42
tpb_	dbrock-: cheers! thats not as bad as i thought then. do i just need to co as someone with higher perms then? or another solution?	12:43
dbrock-	tpb_: yes, I can't say what the right solution is; that depends on the situation	12:43
	← Anti-X left	12:43
	→ IslandUsurper joined	12:44
	→ comawhite joined	12:44
	← comawhite left	12:44
tpb_	dbrock-: ok thats cool	12:44
dbrock-	tpb_: maybe chown -R the whole repository to yourself?	12:44
	→ sitaram joined	12:44
	← sitaram left	12:44
	→ sitaram joined	12:44
	→ untitled joined	12:44
tpb_	dbrock-: i think what may have happened is another guy has accidentally taken ownership, i'll check it out.	12:45
	← priidu left	12:45
sitaram	bnovc: ping	12:45
	← Infin1ty\|work left	12:46
	DasIch_ → DasIch	12:46
	→ hyperair joined	12:46
	→ goshawk joined	12:46
	→ Infin1ty\|work joined	12:46
	→ pgib joined	12:47
	→ blaines_ joined	12:47
	→ jrmuizel joined	12:47
	→ dels joined	12:47
untitled	hi, little help here: I installed gitosis and run this command: sudo -H -u gitosis gitosis-init < my_rsa.pub, but it's still asking for password when i clone	12:49
	← blaines_ left	12:49
untitled	why?	12:49
	← blaines left	12:49
offby1	maybe you don't have my_rsa loaded or accessible	12:49
	what does "ssh-add -l" say?	12:50
untitled	Could not open a connection to your authentication agent.	12:50
offby1	there ya go	12:50
untitled	hm	12:50
	→ blaines joined	12:50
offby1	betcha "ssh the-server" also asks for a password.	12:50
untitled	so, what do I do? :)	12:53
	→ coderdad joined	12:53
	→ roop joined	12:53
	← shiba_yu36 left	12:54
bnovc	sitaram: pong	12:54
	→ leavittx_ joined	12:54
offby1	untitled: study SSH for six months. In the meantime, try "eval $(ssh-agent ~/.ssh/my_rsa)", more or less.	12:54
	← mdel_ left	12:56
	← tungtn left	12:56
	→ shiba_yu36 joined	12:57
	← eletuchy left	12:57
	→ ibansal_ joined	12:57
	→ priidu joined	12:57
ibansal_	hi all	12:57
sitaram	bnovc: calling gitolitea "duplicate project" to gitosis is like calling "git" a "duplicate project" of SVN ;-)	12:58
	bad space bar... s/gitolitea/gitolite a/	12:58
Mpenz	welcome back sitaram !	12:58
	sitaram does check gitlog for anything that needs responding to :)	12:58
untitled	offby1: doesn't work	12:58
ibansal_	can anyone guide me on how can i import a new version source ball to a existing sugar activity package	12:59
	check http://pastebin.com/ag7ApCse	12:59
sitaram	Mpenz: not back yet	12:59
	offby1 wishes there were an #ssh channel ... maybe there is	12:59
offby1	three users, including me.	12:59
	hmph	12:59
sitaram	Mpenz: tail end; got some free time, wife and daughter out shopping or something :)	13:00
offby1	untitled: if you want us to help, you'll have to be more specific than "didn't work".	13:00
Mpenz	whoa! sitaram ! bad!	13:01
	=)	13:01
	← badboy_ left	13:02
bnovc	sitaram: what're the differences?	13:02
sitaram	Mpenz: bad that theyre shopping? naah; my wife is not stereotypical in that sense at least :)	13:02
	→ gilaniali joined	13:02
bnovc	sitaram: I don't really know about gitolite at all. I just hate seeing so many projects for the same goal that don't share efforts	13:02
	← TheNewAndy left	13:02
untitled	offby1: I am following the guid on setuping gitosis, now ssh-add -l says "The agent has no identities.", I do this: sudo -H -u gitosis gitosis-init < my_rsa.pub, then try to clone from a remote machine and it asks me for a pass	13:02
sitaram	bnovc: too many to list; check the README :)	13:02
bnovc	next time I go to use gitosis, I'll check it out	13:02
	seems like it would have been possible to just extend gitosis though?	13:03
	not that it really matters now	13:03
sitaram	bnovc: thats a philosophical argument, or at least sounds like it. I dont do philosophy, sorry :)	13:03
	← ep8 left	13:03
ibansal_	can anyone guide on ^^ please	13:03
	← leavittx_ left	13:04
	→ ep8 joined	13:04
sitaram	bnovc: would have been, if I cared to learn python. And if the gitosis author had responded to my desperate emails to add just one measly line of code that was bare minimum I needed at that time	13:05
Mpenz	heh sitaram =) good. Perhaps this is OT: but are you enjoying your time disconnected?	13:05
	→ mw joined	13:05
	← mw left	13:05
	→ mw joined	13:05
	← ep8 left	13:05
sitaram	Mpenz: frankly? not too much :)	13:06
bnovc	I guess I feel like learning languages is pretty trivial and a lot better than re-writing the wheel	13:06
	rubydiamond → zz_rubydiamond	13:07
sitaram	bnovc: but even if he had, if he doesn't want exactly the same things I want, I would have forked it. As it is, due to my langage preferences, I rewrote it	13:07
	← antgel left	13:07
PerlJam	sitaram: and I at the very least am happier for it. Thanks. :)	13:07
sitaram	bnovc: I fully expect gitolite to be forked the first time I refuse to add a feature that someone wants	13:08
Mpenz	hseh sitaram	13:08
sitaram	bnovc: and that is a GOOD thing!	13:08
	← momentum left	13:09
	ibansal_ is waiting for a response	13:09
	→ sukima joined	13:09
bnovc	forking is not a good thing at all	13:09
Aleric	git diff HEAD^2..HEAD^1 why does that not work?	13:09
offby1	untitled: you need to get to the point where "ssh-add -l" lists the fingerprint of your private key.	13:09
sukima	bnovc: why?	13:09
bnovc	in the case that the original author abandons a project, then forking is better than re-writing	13:09
offby1	untitled: did you try "eval $(ssh-agent ~/.ssh/my_rsa)" as I suggested? If so, _exactly_ what did you type; _exactly_ what did the computer type in response; and how did that response differ from what you expected?	13:10
bnovc	duplicate maintenance	13:10
untitled	offby1: ok, lets start over, I installed gitotsis, it created the user 'gitosis' with no password, now how do I clone the repo?	13:10
offby1	bnovc: why is forking better than rewriting?	13:10
	untitled: I don't really know; I don't use gitotsis :)	13:10
	If you were to use gitolite, you'd be more likely to get help.	13:11
	← freimatz left	13:11
offby1	as bnovc points out, gitolite solves (roughly) the same problem as gitotsis, in a (roughly) similar way, but is more actively maintained and supported.	13:11
	offby1 whistles innocently	13:11
PerlJam	offby1: not to mention with much better access control options	13:12
offby1	so I hear	13:12
sitaram	bnovc: you're assuming they're more similar than they actually are. Even the config language is miles better and easier in gitolite, esp for large configs	13:12
sukima	bnovc: there shouldn't be any maintinance if you branch correctly	13:12
	→ eletuchy joined	13:12
	→ kenneth_reitz joined	13:12
sitaram	bnovc: which means I couldnt even reuse the parser from gitosis	13:12
bnovc	if you frequently merge back against the base there is less	13:12
	→ freimatz joined	13:12
tgunr	Does anyone here have any experience with gitslave? is it any better than using subtree or submodule?	13:12
sitaram	PerlJam: thanks :)	13:13
sukima	tgunr: What's a gitslave?	13:13
	← AlexanderS left	13:13
ptor	tgunr: It is different from either. It all depends on how you wish to work.	13:13
tgunr	http://gitslave.sourceforge.net/gits-man-page.html	13:13
	→ Anti-X joined	13:14
	→ zombor joined	13:14
	← priidu left	13:14
	← pdelgallego left	13:15
tgunr	basically, I have a subfolder which is a repo used in several other projects. If I change that subfolder I would like to have the tracking done a seamless manner such that other projects using the repo could pick up the changes from a pull.	13:15
	← kpreid left	13:16
	→ AlexanderS joined	13:16
	← kenneth_reitz left	13:16
	→ kenneth_reitz joined	13:16
	→ kylehayes joined	13:17
	→ meder joined	13:17
	← airborn left	13:19
	→ pdelgallego joined	13:19
	← hyperair left	13:20
	← noyb left	13:21
ludde	it looks like a commit i made a long time ago has mysteriously diseappeared from the tree, how can I check in what version it was removed? git log -S "the stuff on the line" revealed nothing..	13:21
	← HakanD left	13:22
	→ galderz joined	13:22
	← galderz left	13:22
	→ galderz joined	13:22
reto_	fg	13:23
	oups :)	13:23
	ludde: take care	13:23
	ludde: no space between S and the searched term!	13:24
	afaik	13:24
	→ kpreid joined	13:24
	→ lezz joined	13:24
reto_	ludde: if you are desperate you can also do a bisect	13:24
ludde	-S shows me a lot of relevant commits	13:24
	but neither of them is the one that reverted my change	13:24
reto_	ludde: checkout old version, check if thing is there, if yes say git bisect good, if not say git bisect bad	13:24
	→ blee joined	13:25
	→ comawhite joined	13:26
	→ priidu joined	13:27
	← dnordstrom left	13:27
	→ Aamir joined	13:28
dotCOMmie	Is it possible to track down who moved head on a branch in gitosys?	13:28
	← darkskiez left	13:28
	→ coreyballou joined	13:28
	← sitaram left	13:28
lezz	noob q - Do you typically use branches to maintain potentially divergent dev paths on a project long term - or just for short term to try out ideas?	13:28
	← Aamir left	13:28
selckin	both?	13:29
	← ibansal_ left	13:29
	→ HakanD joined	13:29
	→ saurik_ joined	13:29
bnovc	short term features/ideas	13:29
	branch as rarely as possible imo	13:29
	→ DrNick2 joined	13:30
bnovc	you will likely have to branch for major versions to do little fixes/etc. but the less branching the less work	13:30
	← gilaniali left	13:30
	→ sitaram joined	13:30
	offby1 branches alla time	13:30
offby1	I make a branch for each bug I work on e.g.	13:30
	also each feature	13:30
	→ gerberb joined	13:30
offby1	granted I have oodles of mostly-abandoned branches	13:31
bnovc	oh ya, I branch for things I work on too, but by branch I don't think he meant local	13:31
offby1	I wrote a little script that lists the branches, and a little summary of the commit they're "pointing to"; it sorts them by commit date, latest last. That way I can remember what I've been working on	13:31
bnovc	local/short lived branches for development don't matter	13:31
	offby1: the first part is done by -v	13:32
	git branch -va	13:32
	→ linusoleander joined	13:32
offby1	first part of what?	13:32
bnovc	shows the commit msg	13:32
offby1	ah	13:33
	→ darkskiez joined	13:33
lezz	Right. I understand branching locally, but am wondering about shared branches - such as if the team is considering two different approaches to a problem.	13:33
	→ parasti joined	13:34
sukima	lezz: in a distributed model you would use multiple remotes for that	13:35
	I think	13:35
	← sitaram left	13:35
	→ tpope_ joined	13:35
	← Zhonghua left	13:36
	→ MattDiPasquale joined	13:36
lezz	ahh. thanks sukima. I'll read up on multiple remotes.	13:36
bnovc	do they have a common base?	13:36
	will one of the branches be abandoned in favor of the other after evaluating?	13:36
	→ sitaram joined	13:36
	← sitaram left	13:36
	→ sitaram joined	13:36
	← MattDiPa_ left	13:36
sukima	When I first learned git I had to retrain my bnrain around it. Coming from subversion. I found that the distributed model worked so much better. I don't like centeralized scm anymore	13:37
	s/scm/vcs/	13:38
lezz	in this case, they have a common base. We're considering releasing a simplified version with some questionable features disabled. So we're not sure which version will be the preferred moving forward - this will depend on user feedback.	13:38
bnovc	we still (mostly) use centralized at work with Git	13:38
	← tchan left	13:38
bnovc	and commit everything into Gerrit	13:38
	→ ari-__-e joined	13:38
lezz	I'm retraining my brain from subversion now. :)	13:39
bnovc	lezz: branches sound great for that. just make sure that any common work that is done goes back to the place they branched from	13:39
	which can sometimes be a pain in the ass	13:39
sukima	lezz: I think what you want is to fork it and then you can patch changes between them. (multiple remotes)	13:39
	→ Woody4286 joined	13:39
PerlJam	centralization does have some advantage ... you're not so susceptible to local filesystem chaos.	13:39
	zz_rubydiamond → rubydiamond	13:40
	← blee_ left	13:40
	← anti-pattern left	13:40
	comawhite → 5EXABL0R4	13:40
	→ comawhite joined	13:40
	← comawhite left	13:40
	← saurik left	13:40
	→ ibansal__ joined	13:40
	← DrNick left	13:40
	← bgerber left	13:40
	← cballou left	13:40
	→ tizbac joined	13:40
	← tpope left	13:40
	← ari-_-e left	13:40
	← Woody2143 left	13:40
	← ibansal__ left	13:40
	→ akahn joined	13:40
PerlJam	(but since you can easily use a DVCS in a centralized manner, this is moot :)	13:40
bnovc	I guess I generally don't see the advantage. Having everything in a central place like Gerrit is incredibly helpful	13:40
	→ stamina__ joined	13:41
bnovc	and most branchse we want code reviewed going in	13:41
jim	use git for awhile, each of your devs would have their own repo, they make pull requests and then you review	13:41
	→ sivy joined	13:41
	← sivy left	13:42
jim	then if it passes review, merge it into the main repo	13:42
sukima	bnovc: check this out http://nvie.com/posts/a-successful-git-branching-model/	13:42
bnovc	that's exactly how we work except all the reviews are in Gerrit, which is a lot nicer than just pulling in a patch, and then all go into a central place	13:43
	→ tlir joined	13:43
	→ ep8 joined	13:43
	← stamina left	13:44
jim	what's a gerrit?	13:44
	← galderz left	13:44
	← stamina_ left	13:44
wereHamster	jim: google it	13:44
	→ tchan joined	13:44
bnovc	jim: http://nvie.com/posts/a-successful-git-branching-model/	13:44
offby1	jim: it's where poor artists live	13:44
bnovc	grr	13:44
	fucking clipboard	13:44
	https://review.source.android.com/#mine	13:45
tlir	can I commit links with git? (does it maintain them)	13:45
	→ kukks joined	13:45
	← priidu left	13:45
Ilari	tlir: Symbolic links?	13:45
tlir	Ilari: yep	13:45
Ilari	tlir: Yes.	13:46
	→ stamina joined	13:46
	→ sivy joined	13:46
jim	bnovc: second link, 404 not found	13:48
bnovc	loads for me.. try just https://review.source.android.com but the hash shouldn't matter	13:49
	→ priidu joined	13:49
	→ muffinpeddler joined	13:50
	→ TeckniX joined	13:51
sukima	http://lmgtfy.com/?q=gerrit	13:51
	← MattDiPasquale left	13:52
	→ merlin83 joined	13:52
	← merlin83 left	13:52
	→ merlin83 joined	13:52
	→ icwiener joined	13:53
	← ehabkost left	13:53
	→ ehabkost joined	13:53
	→ rgr_ joined	13:54
	→ brntbeer_ joined	13:55
	→ fowlduck joined	13:55
	← Infin1ty\|work left	13:55
	→ Infin1ty\|work joined	13:55
	← ExtraSpice left	13:55
	← rgr_ left	13:56
	→ shamrock joined	13:56
	→ warlock_mza joined	13:56
	→ beatak joined	13:57
	← goshawk left	13:57
	← shamrock left	13:58
	→ shamrock joined	13:58
	← untitled left	13:59
	→ hyperair joined	13:59
	← shamrock left	13:59
	→ JEEB joined	13:59
	← HakanD left	13:59
	→ shamrock joined	14:00
	← Torsten left	14:00
	← mishok13 left	14:00
	→ gdmfsob joined	14:00
	← lezz left	14:00
	← stliu left	14:01
	← JEEBcz left	14:01
	→ airborn joined	14:02
b0fh_ua	.ÊÇÛ	14:02
	← b0fh_ua left	14:02
	← dharrigan left	14:02
offby1	.!!!	14:03
	← shiba_yu36 left	14:03
	← freimatz left	14:03
	→ Ryback_ joined	14:04
	← Ryback_ left	14:04
	→ Ryback_ joined	14:04
	→ archcoder joined	14:04
	→ lezz joined	14:05
	← lezz left	14:05
	→ HakanD joined	14:06
	→ shiba_yu36 joined	14:07
Mpenz	lright	14:08
	← 5EXABL0R4 left	14:09
	← archcoder left	14:09
offby1	aw reet	14:09
	→ mbroeker joined	14:10
	← robinbowes left	14:10
	← rlotun left	14:11
	← frogonwheels left	14:11
	→ alester joined	14:11
	← ph^ left	14:11
	→ ki__ joined	14:12
	← kenneth_reitz left	14:12
	→ dsdeiz joined	14:14
	→ mkramer joined	14:14
	← mkramer left	14:14
	← priidu left	14:16
	← naimon left	14:16
	← ki__ left	14:16
	→ t0rc joined	14:17
	→ comawhite joined	14:18
	← jrmuizel left	14:18
	← xiong left	14:19
	← Nickeeh left	14:20
	← airborn left	14:20
	→ FYLGood joined	14:20
	← cannonball left	14:20
	→ pigdude joined	14:21
	← HakanD left	14:21
	→ airborn joined	14:21
	← hohoho left	14:22
	← sonnym left	14:22
	→ wjames6 joined	14:22
	→ hohoho joined	14:22
	→ HakanD joined	14:22
	→ krosenvold joined	14:22
wjames6	hi, so a little nubish here. it seems to me a local branch that tracks a remote can only push to that one. is that right?	14:23
	and if thats right, is there a way to ask that local branch what remote it is tracking?	14:23
offby1	not right.	14:23
	It pushes to that one _by default_	14:23
	→ copelco joined	14:23
	← rgr left	14:23
offby1	but you can specify the remote to which to push on the command line (I don't know the details, but I'm sure man git-push will tell you)	14:23
Gitbot	offby1: the git-push manpage can be found at http://git.or.cz/man/git-push	14:23
offby1	Gitbot: quit spying on my communications	14:24
Gitbot	offby1: You aren't allowed to use this command	14:24
	→ carutsu__ joined	14:24
dsdeiz	git log is somehow like using less? um, is there a way to just print it out so to copy/paste the commits easier? :D	14:24
	offby1 enjoins the courts for relief	14:24
	→ gurjeet joined	14:24
	→ emmanueloga joined	14:24
offby1	dsdeiz: I think "GIT_PAGER=cat git log" should avoid the pager	14:25
wjames6	offby1: ok, is there a way to ask the branch what it will push to by default?	14:25
	← kpreid left	14:25
offby1	wjames6: I was just wondering that. I don't know; what I do is: I look in .git/config	14:25
wjames6	i guess i could dryrun	14:25
selckin	you can configure the pager	14:25
dsdeiz	offby1: kinda new here. :D um, where do i set that? export GIT_PAGER="cat git log" ?	14:26
wjames6	ah thanks	14:26
offby1	dsdeiz: no, you would type "GIT_PAGER=cat git log " followed by the arguments for "git log"	14:26
wjames6	hmm	14:26
	config doesnt tell me the branch mapping	14:26
offby1	dsdeiz: you _could_ do "export GIT_PAGER=cat", which would make it take effect all the time.	14:26
	← clsdaniel left	14:27
gurjeet	I am using 'git version 1.7.1' `git status` shows there is 1 modified file, gitk also shows a modified file as 'Local Uncommitted Changes,...' but when I do 'git diff' it does not show me anything!	14:27
	← scrts\|w0rk left	14:27
	← hohoho left	14:27
dsdeiz	offby1: oooh, thanks!	14:27
Mpenz	sitaram: The docs suggest that C,D permissions are only for branches. Is that correct?	14:27
offby1	gurjeet: try "git diff --cached"	14:27
	← g0bl1n left	14:27
	← warlock_mza left	14:27
offby1	dsdeiz: as selckin suggests, there's probably something you could put in ~/.gitconfig that has the same effect.	14:28
gurjeet	offby1: nope.. nothing there either, and exit status is 0.	14:28
offby1	hmph	14:28
	→ nevyn^_ joined	14:28
offby1	when you click on the red dot in gitk, what shows up in the bottom pane?	14:28
	→ alex__c2022 joined	14:28
	→ ajpiano joined	14:28
gurjeet	offby1: The file diffs..	14:29
	→ mcdebugger joined	14:29
offby1	weird.	14:29
	← nevyn^_ left	14:29
dsdeiz	is it git config core.pager "cat" ?	14:29
offby1	gurjeet: maybe you've got something strange in your environment, or in ~/.gitconfig?	14:29
	dsdeiz: that sounds right	14:29
	→ MattDiPasquale joined	14:30
	← brntbeer left	14:30
fr0sty_	gurjeet: refresh gitk	14:30
offby1	yeah, offer it a Coke or something	14:30
	← airborn left	14:30
	→ elias joined	14:30
fr0sty_	XD ... that's terrible...	14:30
	→ airborn joined	14:31
gurjeet	fr0sty_: :D didn't work guys ..	14:31
	Do you know of a good place I can upload my screenshot for you guys to see?	14:31
dsdeiz	neat!	14:31
	← elias left	14:31
gurjeet	I don't see anything funny in ~/.gitconfig	14:31
patrikf	dsdeiz: you can also directly redirect the output of "git log" to a file	14:32
	(even with a pager configured)	14:32
	← airborn left	14:32
fr0sty_	gurjeet: imagebin.ca	14:32
	→ err_ok joined	14:32
	→ airborn joined	14:32
fr0sty_	imgur.com	14:32
	← err_ok left	14:32
	→ FabianB joined	14:32
fr0sty_	tinypic.com	14:33
	take your pick...	14:33
	← FabianB_ left	14:33
gurjeet	offby1: fr0sty_: Please see this: http://i52.tinypic.com/b9ehzp.png	14:34
	← psoo left	14:34
	→ marienz joined	14:34
	← felipellrocha left	14:35
	→ kpreid joined	14:36
	← airborn left	14:36
gurjeet	offby1: fr0sty_: Or this, (I did not use git aliases this time, and gitk shows the diff) http://i53.tinypic.com/35jz3mt.png	14:36
	← esmaxwill left	14:36
	→ airborn joined	14:36
gurjeet	I have a gut feeling that this might be a git bug :(	14:37
offby1	doubt it	14:37
fr0sty_	what is the 'diff' being shown? (the yum install line)	14:37
	← airborn left	14:38
gurjeet	Thats a text file ~/dev/dev_env_setup.txt . And that is exactly what I am expecting from git diff	14:38
	→ hohoho joined	14:38
fr0sty_	what changed on that line?	14:38
	→ airborn joined	14:38
fr0sty_	(according to gitk)	14:38
	← kanru left	14:39
gurjeet	I appended a new package to that line: ttp://i55.tinypic.com/33tp9hl.png	14:39
	^^ http://i55.tinypic.com/33tp9hl.png	14:39
	→ ntoll joined	14:39
	← radarek_ left	14:40
	← dsdeiz left	14:40
	← noahcampbell left	14:41
gurjeet	Oh, this is Ubuntu 10.10 installed just yesterday.. if that matters.	14:41
fr0sty_	probably not... where is the root of this repository? ${HOME} ?	14:41
	← brntbeer_ left	14:41
gurjeet	I had this exact repository on a CentOS 5.5 in a VM and git never misbehaved there.	14:41
	Yes... I have versioned my ~	14:42
offby1	gurjeet: another guess: the diff is a carriage-return at the end of the line, and somehow .git/config tells "diff" to not display those, but gitk does.	14:42
	→ goshawk joined	14:42
	→ rgr joined	14:42
offby1	oh.	14:43
	(just saw the third screenshot)	14:43
	now it _is_ starting to smell like a bug.	14:43
	either that or you've somehow confused yourself: you're (somehow) not running "git diff" in the same tree as you're running "gitk", even though it looks like you are.	14:43
fr0sty_	I wonder how gitk can get anything that git proper doesn't know about...	14:43
	← rvsjoen left	14:44
	← bauruine left	14:44
	→ rvsjoen joined	14:44
	→ ExtraSpice joined	14:44
fr0sty_	do you have any other git repositories under ~/ ?	14:44
eMBee	good evening	14:46
	→ xiong joined	14:46
	→ bronson joined	14:46
fr0sty_	gurjeet: ^^	14:47
offby1	Children of the night. What beautiful music they make!	14:47
	← kpreid left	14:47
	→ scarabx joined	14:48
	→ priidu joined	14:48
gurjeet	Sorry guys.. having trouble uploading files.. will ping back in a moment	14:48
	http://imagebin.ca/view/4Oa9apXG.html	14:49
	offby1: fr0sty_: ^^	14:49
eMBee	i am trying to walk though a part of git history and step by step import the changes into a foreign system. i suppose i best start with git log, and then for each commit extract a list of changed files and get the content of each file for upload.	14:49
gurjeet	offby1: fr0sty_: the `env \| grep -i git` shows that no environment vars at play here.	14:51
fr0sty_	gurjeet: nested git repositories...	14:51
	→ aspotashev joined	14:51
	→ chrisshattuck joined	14:51
	→ jrmuizel joined	14:51
fr0sty_	you have ~/.git and ~/dev/postgres/.git	14:51
	← khelll left	14:51
coldboot	If I do `git log --stat=100,100` and I can find the full path: /path/to/foo in one of the diffstats, then if I do `git log --stat -- /path/to/foo` I should definitely find at least one commit with foo in it, right?	14:51
gurjeet	offby1: yeah, but `git status` is able to detect the changed file	14:51
fr0sty_	is dev_env_setup.txt being tracked by both repositories?	14:52
offby1	gurjeet: I thought you said that "git status" _didn't_ detect the change.	14:52
	So it's only "git diff" that's acting odd?	14:52
gurjeet	offby1: it did... : http://imagebin.ca/view/huYa58b.html	14:53
	offby1: yes.	14:53
	← scarabx left	14:54
offby1	baffling	14:54
	if you were using Windows, I'd just shrug and say "what do you expect?"	14:54
gurjeet	:D	14:55
	← muffinpeddler left	14:55
	→ cannonball joined	14:55
fr0sty_	gurjeet: in ~/ git show dev/postgress/dev_env_setup.txt	14:55
gurjeet	But Yeah, I'd never use Windows (again) as a development environment	14:55
fr0sty_	and in ~/dev/postgres/: 'git show dev_env_setup.txt'	14:55
	→ Zhonghua joined	14:56
	← akamike left	14:56
coldboot	Are there any circumstances where `git log --stat=100,100 -- path/to/file` will not find that file in the diffstats?	14:57
fr0sty_	how long is /path/to/file ?	14:58
gurjeet	fr0sty_: that doesn't show anything	14:58
fr0sty_	either of them?	14:59
	hmm: 'git show HEAD:dev/postgres/dev_env_setup.txt'	15:00
	and (in ~/dev/postgres) 'git show HEAD:dev_env_setup.txt'	15:00
	thy those.	15:00
	→ codebeaker joined	15:01
	→ kjy112 joined	15:01
	→ awilkins joined	15:01
fr0sty_	s/thy/try/	15:01
	← priidu left	15:01
	← hebz0rl left	15:02
gurjeet	fr0sty_: both of those don't show anything	15:03
eMBee	does this look ok, or is there a better way? for commit in `git log --reverse --pretty=format:%H`; do for file in `git show --pretty=format: --name-only $commit`; do process $file; done; done	15:03
	← akahn left	15:03
patrikf	eMBee: see also "git rev-list", "git cat-file" and/or "git fast-export"	15:03
	which gives you the lower-level data	15:04
eMBee	patrikf: thanks, looking...	15:04
patrikf	eMBee: the command you just pasted would probably be simpler with for-each-ref	15:04
gurjeet	fr0sty_: http://imagebin.ca/view/I0YQu6z.html	15:04
	→ priidu joined	15:05
	← linusoleander left	15:06
	→ patthoyts joined	15:06
	← d-snp left	15:07
	← hobodave left	15:07
	→ hobodave joined	15:07
	← resmo left	15:08
eMBee	patrikf: yes, though the for loop is just to demonstrate the logic, i am not actually writing a shellscript but calling git from somewhere else	15:08
patrikf	eMBee: yes, of course	15:08
	→ sonnym joined	15:08
	→ dharrigan joined	15:08
	← dharrigan left	15:08
	→ dharrigan joined	15:08
patrikf	eMBee: if fast-export isn't useful for you, there's still some other low-level commands whose output is more easily parseable, e.g. ls-tree	15:08
fr0sty_	that would seem to indicate that the file in question is not being tracked in either repository...	15:09
	find ~ -type d -name ".git" ?	15:10
	→ nineteeneightd joined	15:10
	← priidu left	15:10
coldboot	fr0sty_: The path is complete, it's not too long.	15:10
	← nineteeneightd left	15:10
eMBee	patrikf: ok, i am still reading docs	15:11
coldboot	fr0sty_: It's 57 characters long.	15:11
fr0sty_	coldboot: my reading of the manpage would seem to indicate that the second value should be shorter than the first..	15:11
	--stat=100,60	15:11
gurjeet	fr0sty_: I think you meant these commands.. : http://imagebin.ca/view/bvnOTA15.html	15:11
	fr0sty: offby1 : ^^ the above shows that the file _is_ being tracked in ~	15:11
	→ Simoyd joined	15:11
coldboot	fr0sty_: Well that's not really important, the point is I have the full path without it being abbreviated, and doing `git log --stat -- path/to/file` doesn't show past commits that contain changes to that file, it just lists nothing.	15:12
	fr0sty_: But changes to that file can be found in past commits, although they've been merged in from other branches.	15:12
	← hobodave left	15:12
	→ RORgasm joined	15:12
	→ paradigm joined	15:12
	→ elg joined	15:12
FYLGood	Any suggestions for a gitk replacement for Mac OS X? I'm happy to buy a commercial product if needed.	15:12
	← dels left	15:13
curtana	gitx?	15:13
	← Simoyd left	15:13
	← dharrigan left	15:14
eMBee	patrikf: git fast-export is interesting, it has all the data i need, i'd just need to write a parser to pick out the individual bits	15:14
	coreyballou → cballou	15:14
fr0sty_	coldboot: you only need path/to/file if you are at the root of the repository...	15:15
	what does 'git log --oneline -- path/to/file' give you?	15:15
FYLGood	curtana: Yup, I've played with that one. Haven't settled on it yet, but wanted to know if there was a diamond in the ruff that I didn't know about	15:15
	curtana: Thanks :)	15:15
	→ g0bl1n joined	15:15
	← cbreak_work left	15:16
	← rvsjoen left	15:16
pgib	hmm git stash poop, apparently git doesnt want me to stash my poop	15:16
fr0sty_	gurjeet: got confused by the dierctories...	15:16
patrikf	eMBee: I only know the other direction (fast-import), depending on what your target VCS looks like it might be easy or not to adapt	15:17
	→ nineteeneightd joined	15:17
	→ nakkor joined	15:17
pigdude	how do I find the last time some keyword appeared in my source?	15:17
fr0sty_	gurjeet: so gitk is correct and git diff is wrong?	15:17
pigdude	I need to find an old bit of code	15:17
	→ rvsjoen joined	15:17
curtana	FYLGood, check out the tools page on the wiki anyway. it has a lot of links	15:18
fr0sty_	git log -S"keyword"	15:18
	→ kpreid joined	15:19
pigdude	ok, I have a possible revision. how do I view the file without checking it out?	15:19
	I have local changes	15:19
	← tildeequals left	15:19
fr0sty_	git show SHA:path/to/file	15:19
	you can do log -p -Skeyword to show the patch.	15:20
pigdude	ah, thanks	15:20
	so log -p is shortcut for git show on the first rev	15:20
	← joeyreno left	15:20
fr0sty_	no, it shows the patch along with every commit message.	15:21
	→ balford joined	15:21
fr0sty_	if you page down you would find the next commit (if one exists)	15:21
	← gurjeet left	15:21
pigdude	oh, I see	15:22
	→ rom joined	15:22
	→ adamcooke joined	15:22
	← d0ugal_ left	15:22
	→ marc_kdab_ joined	15:23
	→ resmo joined	15:24
	→ priidu joined	15:24
	→ leavittx_ joined	15:24
	→ robinbowes joined	15:24
pigdude	fr0sty: can git log -Sterm show a list of the relevant files?	15:25
	fr0sty: --pickaxe-all doesn't show any files but it says it would	15:25
	← carutsu__ left	15:26
fr0sty_	add --name-status	15:26
eMBee	patrikf: that's not a big deal, fast-export has everything i need, just need to write a parser for it	15:26
fr0sty_	(though that will show all files in the commit...	15:26
	← jrmuizel left	15:26
	→ gurjeet joined	15:27
	← tcurdt left	15:29
	← gebi left	15:29
	→ Heimidal joined	15:30
	← radioman-lt left	15:30
	→ dsdeiz joined	15:31
	→ sftp joined	15:31
	IslandUsurper → IslandUsurperAFK	15:31
	← gurjeet left	15:32
	← elg left	15:32
	→ irc2samus joined	15:33
	← patthoyts left	15:33
dsdeiz	hm, i also tried git config pager.log "cat" though it didn't work :D it says bad value for pager.log	15:35
	→ fod joined	15:35
	→ radarek joined	15:35
	← t3i left	15:37
	← fod left	15:37
	→ fod joined	15:38
	→ kanru joined	15:38
	← radarek left	15:39
	→ WebDragon joined	15:40
pigdude	fr0ggie: oh thanks sorry missed that	15:40
	fr0sty: ^	15:40
	← fmardini left	15:41
dsdeiz	oh i get it now heh.	15:41
	→ radarek joined	15:41
dsdeiz	yey, cool.. it works..	15:41
	← shiba_yu36 left	15:42
	→ hobodave joined	15:42
	→ karpar joined	15:42
	→ crankharder joined	15:42
	→ sebersole joined	15:42
crankharder	of my modified files, can I add just the ones that match a regexp?	15:43
	← priidu left	15:43
sebersole	does tagging work from your workspace? or from the commited branch state?	15:43
	→ dreiss joined	15:44
	→ artefon joined	15:44
	→ aresnick joined	15:44
	→ Dave^\| joined	15:44
	← codebeaker left	15:44
	← adamcooke left	15:45
jim	crankharder: sure... first get a list of your modified files, apply grep to that list, and add the result	15:46
	← Textmode left	15:46
fr0sty_	sebersole: what regex? if it is simle shell-glob stuff: 'git add "foo.*" '	15:46
sebersole	fr0sty_: ?	15:46
fr0sty_	how complicated is your regex?	15:47
sebersole	not sure what regex you mean	15:47
	i asked about tagging	15:47
	← hyperair left	15:47
sebersole	is there some implicit regex there? pretty new to git so i might bbe missing the correlation	15:48
	← leavittx_ left	15:48
	→ __name__ joined	15:49
	← __name__ left	15:49
	→ __name__ joined	15:49
	← aresnick left	15:49
	← icreatures left	15:49
sebersole	pro git specifically makes reference to the fact that the tag references the commit from which it was created, so i guess that answers my question	15:50
fr0sty_	crankharder: ^^^^^^	15:50
	sebersole: sorry, grabbed the wrong nick...	15:50
sebersole	np	15:50
pigdude	crankharder: find . -regex '' -exec git add {} \l	15:50
	crankharder: er, \;, not \l	15:50
	← hukl left	15:51
	← artefon left	15:52
	→ elmob joined	15:52
	← aspotashev left	15:53
	IslandUsurperAFK → IslandUsurper	15:53
pigdude	crankharder: this'll give you a list of filenames that are modified or untracked: git status -s \| grep -e '^ $M\\|\?\?$ ' \| awk '{ print $2 }'	15:54
	← airborn left	15:54
thiago_home	git ls-files	15:54
	→ sostenuto joined	15:54
pigdude	crankharder: so you can throw that in a for and do git add $F	15:54
	I figured there was some built-in way	15:54
	thanks thiago_home	15:54
	→ ibansal_ joined	15:55
pigdude	I probably do a lot of unnecessary juggling right now	15:55
crankharder	pigdude: thanx :)	15:55
	→ t3i joined	15:55
pigdude	crankharder: git ls-files, like thiago_home said. that will do what I did but much nicer	15:55
	→ yairgo joined	15:56
	← roop left	15:56
	← HakanD left	15:56
	→ airborn joined	15:56
pigdude	I wonder why git ls-files -m shows a deleted file	15:56
	or which option will show untracked files in .	15:56
	→ ki__ joined	15:56
	→ tildeequals joined	15:57
	→ artefon joined	15:58
	← jjore left	15:59
pgib	pigdude, ls	15:59
	← dsdeiz left	15:59
pigdude	pgib: hm?	15:59
pgib	ls will show untracked files. How would ls-files show untracked files if the whole point is to list tracked files?	16:00
	→ jjore joined	16:00
pigdude	pgib: so then my grepping and awking has some purpose I suppose	16:01
	pgib: I assumed ls-files would have an untracked option	16:01
EvanR-work	is it possible to merge branch A into B without first checking out?	16:01
	← ntoll left	16:01
pgib	oh I suppose that makes sense, like an inverse	16:01
pigdude	yea	16:01
	→ kenneth_reitz joined	16:01
pigdude	not for me anyhow :^)	16:01
pgib	i suppose you can do ls and ls-files, sort and compare	16:03
	→ psoo joined	16:03
	→ tcurdt joined	16:04
	← tcurdt left	16:05
	→ psankar joined	16:05
	→ warbee joined	16:06
	← joeytwiddle left	16:06
pigdude	well	16:06
	find .	16:06
	→ winterweaver joined	16:06
pigdude	but yea something like that	16:06
	→ jrmuizel joined	16:06
	→ khmarbaise joined	16:07
	→ frerich3 joined	16:08
	→ priidu joined	16:08
pgib	pigdude, oh yeah	16:09
	I guess 'find -t d .' is more appropriate	16:09
	err.. '-t f'	16:09
	← OOPMan left	16:10
pigdude	yea, good point, since we don't care about dirsw	16:10
	now to figure out how to do set difference in bash :^)	16:10
	I remember some article in 07	16:10
pgib	I'm sucking it up today: 'find . -type f'	16:10
pigdude	or maybe 08	16:10
pgib	if you sorted both sets - you could just do a diff	16:11
pigdude	that's true	16:11
	→ HakanD joined	16:12
	→ slonopotamus joined	16:12
	→ joeytwiddle joined	16:13
	→ yyfrankyy joined	16:13
	→ kenichi joined	16:13
	→ rayners joined	16:13
reto_	I'd like to look through ALL commits objects for a given log message	16:13
	← joeytwiddle left	16:14
slonopotamus	reto_: git help log. afair, you want pickaxe	16:14
	← HakanD left	16:16
yyfrankyy	test	16:17
slonopotamus	yyfrankyy: passed	16:17
	→ HakanD joined	16:17
yyfrankyy	slonopotamus: newbie here, :)	16:18
	← airborn left	16:18
	← mastro left	16:19
parasti	reto_: git log --all --grep=pattern (pickaxe looks for strings in the diff not the log message)	16:19
	→ airborn joined	16:19
	→ LiamH joined	16:20
	← dreiss left	16:20
	→ aah joined	16:20
	→ dharrigan joined	16:20
	← dharrigan left	16:20
	→ dharrigan joined	16:20
	← priidu left	16:22
	→ joeytwiddle joined	16:22
	← meder left	16:24
	← yairgo left	16:24
	← ibansal_ left	16:24
	→ ibansal_ joined	16:24
kylehayes	what command do I use to determine what base a branch is associated with?	16:25
	← tlir left	16:26
	→ OOPMan joined	16:26
	→ yairgo joined	16:26
	← yyfrankyy left	16:27
reto_	parasti: as far as I can understand this looks for all commit objects which are linked through a ref	16:27
	parasti: I mean raelly ALL commits :	16:27
	→ priidu joined	16:28
	→ joel_falcou joined	16:29
	→ hyperair joined	16:30
	→ Torsten joined	16:30
	← dharrigan left	16:30
	← yairgo left	16:31
	← whaley left	16:31
	← nicoulaj left	16:33
	→ _Vi joined	16:33
	→ elg joined	16:33
	← keystr0k left	16:33
	← TML left	16:34
HakanD	meh, easy to learn, hard to master	16:34
	→ dharrigan joined	16:35
	← dharrigan left	16:35
	→ dharrigan joined	16:35
	← chittoor left	16:37
	← priidu left	16:37
	← metoikos left	16:37
	→ priidu joined	16:38
	← elmob left	16:39
	← Torsten left	16:40
	← philthno2 left	16:40
	→ steph021 joined	16:40
	← nevyn left	16:41
	← psankar left	16:41
	→ khmarbaise_ joined	16:42
	← dharrigan left	16:42
	← kanru left	16:42
	← WebDragon left	16:42
	← tildeequals left	16:43
	→ nevyn joined	16:43
	← khmarbaise left	16:43
	khmarbaise_ → khmarbaise	16:43
	← pozic left	16:44
	→ tildeequals joined	16:44
	← g0bl1n left	16:45
	→ LucasWilcox joined	16:46
	→ noahcampbell joined	16:46
	← nevyn left	16:47
	→ aresnick joined	16:48
	→ dharrigan joined	16:48
	← dharrigan left	16:48
	→ dharrigan joined	16:48
	→ MikhX joined	16:48
	← xiong left	16:48
	← thierryp left	16:49
	→ Kronuz joined	16:49
Kronuz	hello	16:49
	hey, I have a repository I downloaded, and now I want to create a branch of a tree ID ...or commit ID (what's the difference by the way, vs. tree and commit) ....how do I do that? using git checkout -b mybranchname ?	16:50
	but now do I select the tree?	16:50
pgib	git checkout the_branch -b my_branch	16:51
	err -b my_branch the_branch	16:52
	← priidu left	16:52
Kronuz	pgib, but from a branch, I want an older commit	16:52
	(not the head)	16:52
pgib	oh - you want to branch from an older commit?	16:52
Kronuz	yep	16:52
pgib	checkout -b my_branch the_commit	16:52
Kronuz	the whole hex number?	16:52
pgib	create a branch, my_branch, starting at the_commit	16:52
	Kronuz, if you want - you can use the first few digits if that is unique enough	16:53
Kronuz	what's the difference between commit or tree?	16:53
pgib	unique = distinct	16:53
Kronuz	'cause in github I see parent, commit and tree	16:53
pgib	??	16:53
Kronuz	parent is obviously the commit number of the parent	16:53
pgib	parent is the commit the new commit is based on	16:54
Kronuz	commit is the number of the commit itself... but tree?	16:54
	→ necromancer joined	16:54
pgib	Kronuz, show me	16:54
	→ nevyn joined	16:54
Kronuz	pgib, http://github.com/replay/ngx_http_secure_download/commits/master/	16:54
	for instance	16:54
	every commit says commit, tree, parent	16:54
	← jrmuizel left	16:54
	→ boombatower joined	16:54
	← boombatower left	16:54
	→ boombatower joined	16:54
pgib	hmm no idea. you have your command now - so enjoy that at least	16:55
	→ jrmuizel joined	16:56
	← Dave^\| left	16:56
	→ TML joined	16:56
Kronuz	:)	16:56
	thanks	16:56
	→ d0ugal joined	16:56
	→ joe85 joined	16:57
	→ alnewkirk joined	16:57
	→ atula joined	16:57
joe85	anyone know how I can avoid this error "error.GitError: CyanogenMod/android_external_jpeg update-ref: fatal: b4dbfd4aa39a00273b57025574bf8e811cc25f45^0: not a valid SHA1"	16:57
	← codespectator left	16:57
	← tildeequals left	16:57
slonopotamus	joe85: ^0?	16:57
	← TML left	16:58
joe85	good point	16:58
	← dharrigan left	16:58
pgib	raised to the zero? so you mean 1?	16:59
	← karpar left	16:59
atula	I am having a hard time wrapping my mind around the way treat repos. Say I have a directory and I init it as a git tracking directory with a .git folder inside it. if I were to zip that up and bring that zipped filed to another computer with git installed. After extraction, should that directory be a legit git repos?	16:59
slonopotamus	atula: yep	16:59
	← winterweaver left	16:59
pgib	atula, yes, assuming the git versions are compatible	17:00
atula	interesting. what about the issues of onwership ?	17:00
	dwmw2 → dwmw2_gone	17:00
atula	*ownership.	17:00
necromancer	yeah git is basically a filesystem that tracks revisions	17:00
	if you wanna think of it that way	17:00
atula	I see.	17:00
	← khmarbaise left	17:00
necromancer	atula: what do you mean by "ownership"? ownership of the repo or ownership of the changes made to the files within?	17:01
atula	hm... I have a local server that's going to act as a betweener between my working computer and the web server. I want to use the local server as the central "meeting place" so to speak	17:01
awilkins	zip doesn't track those attributes, so whoever unpacks it, owns it	17:01
atula	the changes.	17:01
	→ WebDragon joined	17:02
necromancer	oh yeah	17:02
	so basically, you're trying to use git as a central repo for your project, a la svn?	17:02
	→ priidu joined	17:02
	← MikhX left	17:02
	← zain left	17:02
	→ MikhX joined	17:02
atula	indeed	17:03
	just me really.. but I want to use git... moving away from svn	17:03
necromancer	that's what i do. i have gitosis installed on my VPS, and my web server (also hosted on the VPS) pulls from there when i tell it to	17:03
atula	it seems more flexible	17:03
	← MikhX left	17:03
necromancer	it's a lot easier to use imo	17:03
	quicker too	17:03
awilkins	The server should get a bare repo ; in terms of ownership, whatever server process you use to write to the repo should have rights to do so - this either means the server process (if you are using one) or the user accounts (if you are using git+ssh)	17:03
	→ tildeequals joined	17:03
atula	I guess... here's a monkey wrench to this...	17:04
	← mags left	17:04
sitaram	Mpenz: yes C and D are only for branches. However, C all by itself is for repos	17:04
	→ MikhX joined	17:04
	← sostenuto left	17:04
coldboot	fr0sty_: The --oneline won't affect the list of commits its in. It still doesn't list past commits that the file was involved in.	17:04
atula	I'm using the local server as a webserver for development... (sadly, due to other softwares... I am developing on both windows and mac)	17:04
coldboot	fr0sty_: It seems that after doing a few merges, git loses the ability to reach the commits where that file was modified.	17:05
	← MetaCosm_ left	17:05
Mpenz	sitaram: Yeah, that's what I thought. Does D work for repos too?	17:06
	→ gilaniali joined	17:06
atula	if I could do this: have a full "checkout" on the local server acting as the main repos and my working machine will pull from it... then push changes.... my webserver from outside will pull from the local server to update.	17:06
sitaram	Mpenz: no... I dont want to create any code in mainline git that deletes whole repos ;-) You know why... !	17:06
atula	so I don't think I can do barebone repos	17:06
Mpenz	Yeh. Iunderstand.	17:06
	Ok, I went through all your docs today. Compiling my notes.	17:07
sitaram	Mpenz: there is the "rmrepo" adc (admin-defined command) for that though... but it needs to be installed (once) by the admin -- wont be default	17:07
Mpenz	sure.	17:07
	sitaram: In general the ordering of the restrictions doesn't matter except for deny-access rules. Is that correct?	17:08
	← khaije\|minder left	17:08
Kronuz	what's the equivalent of git's 1.7 checkout -u in 1.6 ?	17:08
	→ trochala joined	17:09
sitaram	Mpenz: yes	17:09
	← trochala left	17:09
	→ trochala joined	17:09
Mpenz	ok.	17:09
fr0sty_	coldboot: that seems unlikely...	17:09
sitaram	Mpenz: if there are no deny rules, the order is irrelevant	17:09
fr0sty_	did the file get moved around or massively rewritten?	17:09
Mpenz	One more question sitaram, why was there a need to have the NAME/ keyword for specifying restrictions for files/dirs	17:09
	yep	17:10
	← dpino left	17:10
Mpenz	Ah, and one more sitaram: the branch descriptions ending in $ determine an exact branch, correct?	17:11
sitaram	distinguish those refexes from the usual ones. What if you have a file called "master"?	17:11
	→ Q\| joined	17:11
sitaram	Mpenz: that's just a regex meta; so yes...	17:11
Mpenz	So, "NAME/master" is a file and "master$" would be the branch?	17:12
sitaram	yup	17:12
	→ justin-george joined	17:12
Mpenz	Interesting. Ok. I think that clears out pretty much all my questions so far.	17:12
	→ carutsu joined	17:12
Q\|	Can I fork a project and have the fork have it's own ignores (ignoring), but still be able to somehow cherry-pick some changes from the fork into the master?	17:13
Mpenz	brb	17:14
	→ dharrigan joined	17:14
	← dharrigan left	17:14
	→ dharrigan joined	17:14
	← rgr left	17:15
	→ gilesgoatboy joined	17:15
	← shamrock left	17:15
	← bluenovember left	17:16
	→ Dave^\| joined	17:16
	→ jfkw joined	17:17
	→ jotik joined	17:17
	← Elfe left	17:19
	→ Elfe_ joined	17:19
	→ enherit joined	17:19
Kronuz	pgib, I cloned a repo, then created a branch using checkout -b mybranch mycommitnumber	17:20
	next I made some changes and commited them using commit -am "mycomment"	17:20
	it all went ok, it said that x number of files where changed, etc... blah	17:20
	but then I did git push	17:20
	← jotik^^ left	17:20
Kronuz	and it says everything is up to date	17:21
	!!	17:21
	so it didn't push anything... why? :(	17:21
wereHamster	Kronuz: man git-config -> push.default	17:21
Gitbot	Kronuz: the git-config manpage can be found at http://git.or.cz/man/git-config	17:21
	← sitaram left	17:21
	← slonopotamus left	17:22
	← rom left	17:23
	← carutsu left	17:23
Kronuz	wereHamster, what about it? ...do I have to add my branch to the config file?	17:23
	is there a command for that?	17:24
	← blaines left	17:24
	← radarek left	17:24
	← urbanmonk left	17:24
	← dharrigan left	17:24
	← rvsjoen left	17:24
	→ rvsjoen joined	17:25
	← tvw left	17:25
	→ codespectator joined	17:27
	← aresnick left	17:28
	← atula left	17:29
	← airborn left	17:29
	→ atula joined	17:30
	→ airborn joined	17:30
	← stamina left	17:30
	← stamina__ left	17:30
Kronuz	arrg!	17:31
	I'm very new to git... and I want to branch and push... but I can't find out how	17:32
	is that tracking thing that I'm missing?	17:32
	← xro left	17:32
jim	you could look at gitcasts.com	17:32
	→ stephenjudkins joined	17:33
Kronuz	found it	17:33
	git push origin mybranch	17:33
jim	one thing in particular, "I can't find out how"	17:33
Kronuz	(I was missing the mybranch)	17:33
	(git push origin was doing nothing)	17:34
jim	"can't" has a bunch of alternative definitions	17:34
	did you mean you chose not to? or didn't know how?	17:34
	← d0k left	17:35
jim	(it has so many alternate definitions that it makes the original word so ambiguous as to be meaningless)	17:35
	→ temoto joined	17:36
temoto	I created svn branch with 'git svn branch foo', it created a remote tracking branch 'foo'. Exactly like that. As opposite to usual remote branches names like 'origin/foo'.	17:36
	Then i created local branch for it. And now `git checkout foo` complains that 'foo' is ambigous reference.	17:37
	How do i rename remote branch w/o breaking the whole git-svn thing?	17:37
	← airborn left	17:37
jim	why not rename the local branch?	17:37
temoto	Would mv .git/svn/refs/{,svn-}foo be safe?	17:38
	adamholt → adamholt_away	17:38
	adamholt_away → adamholt	17:38
jim	I don't know a lot about the internals myself, so I have no idea	17:38
temoto	jim, because it has "proper" name. Of course i would do it, if there's no safe way to rename remote branch.	17:38
	→ bitkiller joined	17:38
	← bentob0x left	17:39
jim	the remote branch is empty right now, right?	17:39
	and the local as well?	17:39
	→ airborn joined	17:39
	← FYLGood left	17:39
temoto	Well it has no commits that belong only to that branch.	17:39
	→ dharrigan joined	17:40
	← dharrigan left	17:40
	→ dharrigan joined	17:40
temoto	But it was branched from some point in master, so in git log it has commits (shared with master).	17:40
jim	what would be the consequence of deleting both branches and creating them again?	17:40
	→ dreiss joined	17:40
temoto	Well i don't want to create svn-foo branch in svn either.	17:40
pgib	Kronuz, yeah, git push without a branch will just push anything that is currently tracked remote	17:41
	→ fr0sty___ joined	17:41
	→ josefrichter joined	17:41
Kronuz	pgib, how can I make it work? I have to add my new branch to the config file?	17:41
pgib	you'll find git push will complain too if you have another branch that cannot be fast-forwarded. I find that 'git push origin foo' is the best form to use regardless	17:41
Kronuz	(so that I don't have to specify my branch)	17:41
temoto	I want to rename my local alias of remote branch. To something like svn/foo is best and conforms usual remote branches naming.	17:42
pgib	you can do git push --set-upstream origin my_branch I think	17:42
	← priidu left	17:43
	← fr0sty__ left	17:43
pgib	and then 'git push' will work next time (assuming your other branches don't suck)	17:43
	← urkud left	17:44
	← rasztasd left	17:44
	→ ProLoser joined	17:44
	→ _ollie joined	17:44
jim	if the two branches are ambiguous, why are both needed?	17:44
ProLoser	halloooo	17:45
	→ TML joined	17:45
ProLoser	i have a post hook	17:47
	that doesn't appear to be working	17:47
	i'm using it to publish the site, ut i'm not seeing the changes	17:47
	← dharrigan left	17:47
jim	so far you describe an unspecified but simple matter of programming	17:48
ProLoser	in post-receive it says git checkout -f	17:48
	it appears to be checking out the head, but it's like i have to run git reset --hard too	17:48
	← airborn left	17:48
ProLoser	is there a reason that the post-receive hook is not updating the working directory files?	17:48
	→ radarek joined	17:49
	→ airborn joined	17:49
	→ Pewpewarrows joined	17:49
ProLoser	what would be a proper post-recieve file to use?	17:50
temoto	jim, execute `git branch -a` in some your repo. See, remote branches have not the same name as local ones. They are named origin/master, etc. I want the same for svn branches. And i think i accomplished it by creating dir in .git/refs/remotes and moving some files to there.	17:50
	→ philthno2 joined	17:55
	→ tlir joined	17:55
	→ khmarbaise joined	17:56
	→ srcerer joined	17:58
	← srcerer left	17:58
	← wuj left	17:58
	← radarek left	17:59
	→ adam_test joined	17:59
	← tgunr left	17:59
	→ priidu joined	17:59
	→ icwiener_ joined	18:00
	← pdelgallego left	18:00
	← Kronuz left	18:01
	→ hukl joined	18:01
	← adam_test left	18:02
	← icwiener left	18:03
	→ zain joined	18:03
	← RORgasm left	18:04
	← frsk left	18:04
	← t0rc left	18:05
	← temoto left	18:06
	→ frsk joined	18:06
	→ FYLGood joined	18:06
	→ p3rg2z joined	18:07
	→ tgunr joined	18:07
	← p3rg2z left	18:08
	→ p3rg2z joined	18:08
	← hukl left	18:08
	→ dharriga1 joined	18:09
	→ hukl joined	18:09
	← hukl left	18:09
	→ hukl joined	18:10
	← hukl left	18:10
	← _W_ left	18:10
	→ hukl joined	18:11
	← hukl left	18:11
	→ brntbeer joined	18:11
	→ hukl joined	18:11
	← t3i left	18:14
	← priidu left	18:14
	→ _W_ joined	18:14
	← guardian left	18:15
	← codespectator left	18:16
	→ andyburke joined	18:16
ProLoser	aaaaaaaaaaaaaaaaaaaaaaaaaaaaaahhhhhhhh	18:17
	fucking hate subbmodule some days	18:17
	→ t3i joined	18:17
	gilesgoatboy → gilesgoatboy\|awa	18:17
ProLoser	why is this happening: http://pastebin.com/sDqgxyPS	18:18
	← unrael left	18:18
	→ khmarbaise_ joined	18:18
	← khmarbaise left	18:19
	khmarbaise_ → khmarbaise	18:19
	← tlir left	18:19
	← sukima left	18:19
	→ unrael joined	18:20
	gilesgoatboy\|awa → gilesgoatboy	18:20
	→ pantsman joined	18:20
	→ hakand` joined	18:21
	→ SavoxWork joined	18:21
_Vi	ProLoser, May be try to go to app/plugins/cacheable and do "git fetch"?	18:22
	← dharriga1 left	18:23
	→ tlir joined	18:23
	← SavoxWork left	18:24
	→ Slix` joined	18:24
	← khmarbaise left	18:25
krosenvold	leave	18:25
	← krosenvold left	18:25
	→ hakunin joined	18:26
	← brntbeer left	18:26
pgib	no, you leave	18:27
sebersole	ok	18:29
	← sebersole left	18:29
	← gilaniali left	18:29
	← hakand` left	18:31
	← darkskiez left	18:32
	→ aresnick joined	18:32
	→ darkskiez joined	18:34
Q\|	I can create a branch from every commit in the past, retrospectively?	18:34
	← Dave^\| left	18:34
	→ priidu joined	18:35
	→ codespectator joined	18:35
	→ sukima joined	18:36
parasti	Q\|: sure, the starting point can be anything that resolves to a commit	18:36
Q\|	parasti, cool, thanks	18:37
	→ LauJensen joined	18:37
	← p3rg2z left	18:37
LauJensen	I've made big local mistakes and want to reset the local repo to the head of origin, how do I do that ?	18:38
	→ anti-pattern joined	18:38
	→ RORgasm joined	18:38
	→ skoop joined	18:38
	→ srcerer joined	18:38
	← tlir left	18:38
	← Rearden left	18:39
csgeek	LauJensen: git reset --hard .. though you will absolutely lose anything you've done	18:39
LauJensen	csgeek: All my changes are pushed or in stash, so im safe right?	18:39
	→ Rearden joined	18:40
	← wjames6 left	18:40
	→ resmo_ joined	18:40
ep8	I just set up git-p4 following the directions on the Git SCM wiki. I got as far as cloning the Perforce repo, so I have an actual Git repository that reflects the Perforce repository contents. But when I run "git-p4 sync" to update the Git repo, I get this error: "fatal: 'origin' does not appear to be a git repository"	18:40
	Anyone have any ideas what that means?	18:40
	← ljungk left	18:40
csgeek	you want to reset to remote head, or local head?	18:40
LauJensen	csgeek: remote	18:40
csgeek	oh.. just commit.. stash or whatever.. you want. Then git checkout origin/master -b WorkingVersion	18:41
	if you haven't pushed you stuff up yet.. then you can check out origin as many times as you want	18:41
LauJensen	csgeek: problem is my local has staged changed, unstaged changed, unpushed commits etc, from a rewrite that went bad. I dont want a branch, I just my HEAD to be Origins HEAD	18:42
csgeek	git reset --hard will reset the state to the previous checkin on your local branch	18:42
	→ ljungk joined	18:42
anti-pattern	how to get HEAD's SHA? i know this is a faq, but i cant seem to find it	18:42
	→ t0rc joined	18:42
csgeek	the line I gave you checkous the head of the origin under a new branch..	18:42
drizzd	git rev-parse HEAD	18:42
csgeek	I would commit your "bad changes" to your local branch, checkout your remote branch under a new name..and merge in what you want /don't want	18:43
	→ alberto56 joined	18:43
anti-pattern	drizzd: ty	18:43
LauJensen	csgeek: I understand the line you gave which checks out origins head to a new branch, but how do I get it into my master ?	18:43
	← srcerer left	18:44
	← resmo_ left	18:44
csgeek	LauJensen: I was saying.. see what's in your current master..and pull whatever you need into your WorkingVersion	18:44
	→ kipras joined	18:44
	← trochala left	18:45
csgeek	then once you're done.. delete master, and do a checkout WorkingVersion -b master ; git push origin master:master	18:45
	probably will want some niceties with tracking... but general ideas	18:45
	→ gilaniali joined	18:45
	→ dfr\|work joined	18:45
	← d0ugal left	18:45
dfr\|work	hey guys, is there something that draws pretty git trees? [For a presentation about Git]	18:45
	→ d0ugal joined	18:45
	← josefrichter left	18:46
csgeek	dfr\|work: giggle might (horrible name)	18:46
dfr\|work	csgeek, lemme check out. THankies!	18:46
LauJensen	csgeek: git reset --hard origin/master, did the trick	18:47
csgeek	or gitk.. not sure what you mean by tree though.. and how pretty you want it	18:47
dfr\|work	csgeek, basically I want to put it on a presentation slide.	18:47
csgeek	LauJensen: like I said.. I wasn't sure if you wanted anything saved	18:47
LauJensen	thanks anyway	18:48
	← LauJensen left	18:48
dfr\|work	csgeek, maybe I can just do it regular text-based and fiddle with colours	18:48
	← aresnick left	18:48
	→ spearce joined	18:49
	← spearce left	18:49
	← rayners left	18:50
	→ spearce joined	18:50
	→ svnlto joined	18:52
	gilesgoatboy → gilesgoatboy\|awa	18:54
	← WebDragon left	18:56
	→ trochala joined	18:56
rvsjoen	is there a way to remove a file from version control and ignore it ?	18:57
_rane	git rm --cached	18:57
	and add it to .gitignore	18:58
rvsjoen	nice, thanks	18:58
	← Pewpewarrows left	18:58
	→ phantomcircuit joined	19:00
	→ Dave^\| joined	19:00
	→ josefrichter_ joined	19:00
	← philthno2 left	19:00
	← Dave^\| left	19:01
	← pedrobelo left	19:01
	→ Dave^\| joined	19:02
	→ pedrobelo joined	19:02
	→ philthno2 joined	19:03
	← alberto56 left	19:03
	→ alberto56 joined	19:03
	← alberto56 left	19:04
	← HG` left	19:04
	← doener left	19:04
	→ programble joined	19:04
	← HakanD left	19:04
	gilesgoatboy\|awa → gilesgoatboy	19:04
	→ HakanD joined	19:05
Q\|	If I want to track only one specific branch out of several branches in another directory on my local machine, how should I create that?	19:06
	→ ch077179 joined	19:07
	→ tatsuya_ joined	19:08
	← HakanD left	19:08
	← _Vi left	19:08
	← darkskiez left	19:11
	← trochala left	19:13
	→ Mage joined	19:14
	← Mage left	19:14
	→ Mage joined	19:14
	← MikhX left	19:14
	→ MikhX joined	19:15
	← zain left	19:15
	← MikhX left	19:16
	→ whaley joined	19:16
	→ kelvie__ joined	19:16
	← pedrobelo left	19:16
	→ MikhX joined	19:17
	← kelvie_ left	19:17
fr0sty_	Q\| clone the repository and checkout the branch?	19:17
	kelvie__ → kelvie_	19:17
	→ darkskiez joined	19:18
	→ morganick joined	19:18
	← Rearden left	19:18
	→ alkey joined	19:19
	← alkey left	19:19
ProLoser	git isn't tracking name case changes	19:19
	→ tvw joined	19:20
	→ cedwards joined	19:20
cedwards	I'm getting the following output when I do a push: Can't unlink already-existing object	19:21
Q\|	fr0sty, but wouldn't that store all objects into the cloned repo, too? I'll need that to be put onto a remote location, too, so I want to be sure only files from the current branch are there (to keep disk space, network traffic and stuff low)	19:21
cedwards	I'm not finding much on Google. I wonder if anyone here may have a suggestion.	19:21
fr0sty_	ProLoser: what is core.ignorecase set as in the repositories?	19:22
	← marcob left	19:22
ProLoser	true locally	19:22
	i'm on windows locally, linux remotely	19:22
fr0sty_	Q\|: that is not possible using git...	19:22
ProLoser	so i need to fix the casing discrepencies and then push the changes to the server	19:22
	→ pedrobelo joined	19:22
fr0sty_	Q\|: your best option would be to check those out on the server and rynch what you want to the other machine.	19:23
ProLoser	is it gonna hurt anything to change ignorecase to false?	19:23
fr0sty_	keep in mind: git is not a deployment tool.	19:23
ProLoser	why is it a big deal to use it as one though?	19:23
fr0sty_	ProLoser: is your filesystem case-sensitive on the windows machine?	19:23
ProLoser	i thought windows by nature isn't case sensitive	19:23
	changing that config option helped me out though, thanks	19:24
	← ibansal_ left	19:24
	→ trochala joined	19:24
	→ Torsten joined	19:25
fr0sty_	no problem...	19:25
	→ g0bl1n joined	19:25
fr0sty_	cedwards: where are you pushing, and with what command?	19:25
ProLoser	so why is it a big deal if i use it to publish?	19:25
	← airborn left	19:25
cedwards	fr0sty_: I've got a private repo setup (gitosis) and I'm just using 'git push' after a commit.	19:26
	fr0sty_: when I look at the log/changes on remote it appears that the push was successful, but I get that output for every file in my local repo.	19:27
fr0sty_	what is the actual error message?	19:27
Q\|	Umh, fr0sty, I guess I'm either expressing myself out wrong or thinking wrong currently. I'm pretty sure git can do what I need it to, I just have to figure out how ^^	19:27
fr0sty_	and what is your push= url in .git/config	19:27
	Q\| look into git archive perhaps?	19:27
Q\|	Well, thanks so far, going to eat something before I can continue, empty stomach doesn't help much with thinking ;)	19:27
	gilesgoatboy → gilesgoatboy\|awa	19:27
Q\|	fr0sty, I'll do so after the break, thanks so far ^^	19:27
cedwards	I wonder if it's specific to my (hack) post-update hook	19:28
	← murr4y left	19:28
fr0sty_	almost certainly that is the problem.	19:28
cedwards	looks like it. when I disable it I don't get the output.	19:29
	I'll see about cleaning up my hook. thanks.	19:29
sgronblo	sounds like he wants to export all the files from a commit?	19:29
	→ akahn joined	19:30
	← ep8 left	19:31
cedwards	rather, before I continue on the wrong path with my post-update hook, maybe you can suggest the right method of doing what I'm attempting.	19:32
fr0sty_	sgronblo: yeah, git archive should work for that...	19:32
	→ ep8 joined	19:32
	→ jherdman joined	19:33
cedwards	I'm maintaining plain text files locally that are pushed to the repo, which then need to be copied to a DocumentRoot on the webserver.	19:33
	adamholt → adamholt_away	19:34
cedwards	I don't expect I need many sanity checks, as it isn't code and it's not doing anything "production".	19:34
	adamholt_away → adamholt	19:34
	← darkskiez left	19:34
	← MikhX left	19:34
	→ MikhX joined	19:34
pgib	cedwards, any convincing reason to not make DocumentRoot and the repo the same directory?	19:34
	← philthno2 left	19:34
pgib	oh I see.. it is probably bare, huh?	19:34
	← phantomcircuit left	19:35
cedwards	what I was trying was: git archive --format=tar \| (cd /path/to/docroot/ && tar xf -)..	19:35
	that's probably ugly, but in my defense this is my first rodeo with hooks.	19:35
	→ aresnick joined	19:36
fr0sty_	you can set GIT_DIR and GIT_WORK_DIR and 'git reset --hard HEAD' (presuming HEAD is what you want put in DocumentRoot)	19:36
	← t3i left	19:36
pgib	cedwards, that is what the git docs seem to suggest	19:36
	← _ollie left	19:36
cedwards	that hook worked the first time, but after that I get the output I mentioned above. Perhaps I'm just missing a tar option?	19:36
fr0sty_	maybe permissions problems?	19:37
	← unixtippse left	19:38
cedwards	could be. I guess the post-update is running as git, but the files are www:www owned.	19:38
	→ _ollie joined	19:38
fr0sty_	either way if the umask is creating files without +w you will get that error.	19:39
	← flazz left	19:39
cedwards	looks like the files are 0664 www:www so that may be it.	19:40
	→ insulina joined	19:41
	→ unixtippse joined	19:41
insulina	hello, I have made a checkout that I shouldnt have done, with gitk I can see my local changes and I want to get them back, how can I do this ?	19:42
	gilesgoatboy\|awa → gilesgoatboy	19:42
	← Dave^\| left	19:43
	→ murr4y joined	19:43
cedwards	fr0sty_: changing ownership to git:www seems to take care of it. thank you.	19:44
	→ Nickeeh joined	19:44
	← eletuchy left	19:45
	→ javajunky joined	19:45
necromancer	is there a way to clone just a directory of a repo?	19:45
	← t0rc left	19:45
javajunky	lo, is there a 'noobs' channel, before I ask embarassingly simple questions in here ?	19:45
necromancer	javajunky: is it plugged in?	19:46
	← g0bl1n left	19:46
	← unixtippse left	19:46
javajunky	necromancer: ;) that'd be the one	19:46
necromancer	you can just ask it here	19:46
	this is the noobs channel iirc	19:46
	→ urkud joined	19:47
	→ Eridius joined	19:47
	→ unixtippse joined	19:47
javajunky	ok, fab :) if I've used git-svn to clone my SVN repo,…then later deleted some branches in the repo, is the correct way to clean up my local refs, just to do a git branch -rd <branch_name> ? .. git svn fetch doesn't appear to 'magic this up' (I kinda understand why, but I know its going to start annoying my team as a growing collection of feature branches occur in their local ref list)	19:48
	← priidu left	19:48
	→ neilthereildeil joined	19:48
	→ berkes joined	19:48
	← tatsuya_ left	19:48
neilthereildeil	hey im trying to apply to aufs patch to the 2.6.35 kernel	19:48
	→ v0n joined	19:49
necromancer	javajunky: where did you delete the branches, the svn repo or the git repo?	19:50
	← javajunky left	19:50
	→ airborn joined	19:50
insulina	it says "local uncomited changes, not checked in to index" , how can I put this changes back since I made a checkout to the folder ?	19:51
	→ kevinfish joined	19:51
	→ phantomcircuit joined	19:52
fr0sty_	insulina: just 'git checkout <where you want to be>'	19:52
	→ javajunky joined	19:52
javajunky	necromancer: ugghh really bad moment to lose my connection :( , sorry. I've deleted the branch from the svn repo	19:53
	→ johnw joined	19:53
kevinfish	Hi everyone. I'm wanting to develop my own linux distro based on another one. I'd like to use git for all the config files, etc... What is the best way to set this up. For instance, when you clone a repository it creates a subdir, but I'm thinking I want to have the .git dir right off of '/'. Should I go ahead and let it create a subdir then change that to be a symlink to /?	19:53
	BTW, I'm pretty new to git (if u cudn't tell)	19:53
neilthereildeil	ive already checked out the aufs tree	19:54
	its in a folder	19:54
	now i have another folder which is the 2.6.35 kernel tree	19:54
	how can i apply the aufs tree to the kernel tree?	19:54
	_Unode → Unode	19:54
Unode	for the gitosis admins, can we have multiple pub keys per user.pub file ?	19:55
insulina	fr0sty_: but I want to be in the uncomited changes, how do I checkout that ?	19:55
fr0sty_	insulina: refresh gitk	19:55
neilthereildeil	i basically need to merge 2 trees	19:55
	← justin-george left	19:55
fr0sty_	neilthereildeil: is the aufs tree in git too?	19:56
	→ naimon joined	19:57
necromancer	javajunky: haha it happens. are there additional changes made within the git repo that you don't want erased?	19:57
	← ep8 left	19:57
	gilesgoatboy → gilesgoatboy\|awa	19:58
neilthereildeil	fr0sty: i have a .git folder under the aufs folder....	19:58
necromancer	if not, the easiest method would be to just re-init the git repo and clone it from the current svn repo	19:58
javajunky	necromancer: none that wouldn't have local references ultimately pointing at them	19:58
fr0sty_	where did you clone aufs?	19:58
	err, from where did you clone aufs?	19:58
javajunky	necromancer: ughh 20k+ revisions ;)	19:58
jim	How can I get similar functionality to github on my web server?	19:59
necromancer	javajunky: wow! no wonder you moved to git haha	19:59
javajunky	necromancer: well… am transitioning the team… hence git-svn ;)	19:59
necromancer	so you're making a full transition to git from svn, so eventually all the coders are going to be using JUST git?	20:00
	← sonnym left	20:00
	gilesgoatboy\|awa → gilesgoatboy	20:00
	→ priidu joined	20:00
	← cedwards left	20:01
wereHamster	jim: what do you need?	20:01
javajunky	necromancer: not for several months though (product dev, at least 2-3 active mainlines (sob) and heavy usage of svn:externals.. so I've 'sterlised' the trunk so all future branch will be 'git happy'	20:01
	← artefon left	20:01
jim	accounts, repositories, pull requests, ssh keys,	20:02
necromancer	if so, i think your method of git branch -rd would be the best	20:02
	just basically keeping them both in sync (structure-wise) manually	20:02
wereHamster	jim: gitorious.org	20:02
necromancer	git-svn is really designed for someone to just move to git and be done with svn	20:02
wereHamster	jim: or buy github.fi	20:02
insulina	fr0sty_: I also have another one that says "Local changes checked in to the index but not commited", I want to at least go to here, how I do that ?	20:02
javajunky	I think I'm going to have to get a bit more buy in yet ;) but fingers crossed!	20:03
necromancer	wereHamster: does gitorious also track commits?	20:03
jim	what technology is gitorious based on?	20:03
Unode	ruby	20:03
fr0sty_	insulina: the index is always where you are now.	20:03
	← goshawk left	20:03
Unode	jim, just like github	20:03
	→ srcerer joined	20:03
wereHamster	necromancer: what do you mean by track commits?	20:03
	→ sonnym joined	20:04
	→ ep8 joined	20:04
fr0sty_	and local, uncommitted changes are always in your working directory.	20:04
javajunky	necromancer: cheers for the help :)	20:04
	→ drako joined	20:04
	← drako left	20:04
	→ drako joined	20:04
fr0sty_	you don't need to 'go' anywhere to get to them.	20:04
jim	so it's a lamp stack?	20:04
wereHamster	jim: no, there is no ruby in lamp	20:04
fr0sty_	insulina: what 'git checkout' command did you do that got your into trouble?	20:04
wereHamster	jim: gitorious is a rails project	20:04
	ruby on rails, google it if you don't know what it is	20:05
jim	oh, and so is github?	20:05
insulina	I just made git checkout folder/	20:05
	→ jowls joined	20:05
wereHamster	jim: yes, github also uses ruby on rails (but also other technologies, like nodejs and others)	20:05
insulina	fr0sty_: I just made git checkout folder/	20:05
jim	what does it use to store say account data?	20:06
fr0sty_	that was the command: 'git checkout folder/' ? with the slash?	20:06
jim	gitorius not github	20:06
	← GTAXL left	20:07
insulina	fr0sty_: sorry nevermind I was confused... I made a mistake I loocking at the wrong file ... realy sorry	20:07
fr0sty_	no problem	20:07
	← nakkor left	20:08
	← kipras left	20:08
insulina	tx anyway	20:08
	← insulina left	20:08
jim	howbout, how would I have a very simple single repo that I would push to, that uses git protocol	20:09
	does git itself contain the code for the daemon that does that?	20:10
	← dcsobralWork left	20:10
fr0sty_	jim: what kind of authentication?	20:10
wereHamster	jim: whatever you configure it to	20:10
	← joe85 left	20:10
jim	howbout ssh	20:10
	→ jotik^^ joined	20:10
	→ Radar joined	20:11
	wereHamster was answering to the earlier questeion 'what does it use to store say account data?'	20:11
jim	oh I see, thanks	20:11
	← Ryback_ left	20:11
wereHamster	jim: to host a git repo you don't need gitorious nor any server side software except git	20:11
	install git and ssh on the server and you are set	20:12
fr0sty_	jim: you need a repository in a read+write directory and git installed on the machine	20:12
jim	about gitorious, does it use a db like pg or mysql?	20:12
	→ xiong joined	20:12
jim	wereHamster, ok	20:12
pgib	probably for access lists	20:12
wereHamster	jim: http://gitorious.org/gitorious/mainline/blobs/master/config/database.sample.yml	20:12
	← jotik left	20:13
wereHamster	jim: ask google to see which databases activerecord supports	20:13
	← airborn left	20:14
jim	oh, it's activerecord	20:14
	→ airborn joined	20:14
wereHamster	activerecord = rails' ORM	20:15
	→ aspotashev joined	20:15
wereHamster	how surprising that gitorious uses activerecord.. since it's a rails app	20:15
	please don't tell me that you know activerecord and not rails..	20:16
	← curtana left	20:16
jim	I tried rails like once or twice, never got beyond helloworld	20:16
	→ alberto56 joined	20:16
	← johnw left	20:16
jim	at one point activerecord became visible to me, but I didn't pursue it	20:16
	→ sircodealot joined	20:17
	← sircodealot left	20:18
	← morganick left	20:18
jim	in a very large sense, I don't know either of them, I created a rails button or form or something, something overly simple so I could see a little of what rails was about	20:18
	← alberto56 left	20:19
necromancer	jim: why do you want gitorious? github does everything that gitorious does and more	20:22
	← sukima left	20:22
necromancer	rails is pretty interesting. it's really cool because you can develop web apps with the mindset that you're developing a "real" app	20:23
	← parasti left	20:23
zombor	hah	20:23
	← bitkiller left	20:23
	→ DarkUranium joined	20:23
zombor	all the code i write is fake :(	20:24
DarkUranium	hi	20:24
necromancer	haha	20:24
DarkUranium	?	20:24
necromancer	not if you're making a web site	20:24
pgib	"Rails: It makes development so simple!"	20:24
necromancer	you can't make a native site	20:24
pgib	yeah.. if you are making a guestbook	20:24
necromancer	it's not supposed to make development simple, it's supposed to make development fun	20:24
	→ nicoulaj_ joined	20:24
zombor	lol	20:24
Q\|	Making it simple is actually what makes it fun	20:25
	Not the other way round	20:25
jim	wouldn't it be more fun if it were simple?	20:25
necromancer	Q\|: the two aren't mutually exclusive	20:25
pgib	I have more fun struggling through things and learning	20:25
necromancer	sinatra is simple. sinatra is not "fun".	20:25
pgib	instead of "Wow, that was automagical. I wonder what the hell is going on for real"	20:25
jim	sinatra is dead...	20:25
	← urkud left	20:25
zombor	if you like writing ruby i can be	20:25
jim	he's no fun at all	20:25
zombor	it*	20:26
necromancer	pgib: it depends on what you want to do	20:26
pgib	yes	20:26
necromancer	pgib: if you think learning how to implement something in a certain language is fun, then it's definitely not for you	20:26
wereHamster	rails vs. something else is like emacs vs. vim. Everybody has their favourite and there's no point in discussing your choices	20:27
necromancer	but if you like learning about different workflows and methods of creating an app, then i think it's really great	20:27
	because you spend less time learning "the language" and its idiosyncracies, and more time to innovate in terms of HOW the app is designed	20:27
	← drako left	20:27
necromancer	less technicality, more creativity	20:28
	→ drako joined	20:28
necromancer	wereHamster: there's a point when someone doesn't understand it. i'm not trying to get anyone to use rails, but i think there are a lot of misconceptions about what it does, what it's for, and how it's meant to be used	20:28
	→ urbanmonk joined	20:28
	gilesgoatboy → gilesgoatboy\|awa	20:28
	← naimon left	20:29
Q\|	Even my mum could understand those three points if I explain them to her, and that's what you get in almost every doc about it. Don't know how someone can either not understand it at all or even misunderstand it.	20:29
	The big picture should be clear pretty fast I guess	20:30
	Details are another thing	20:30
	another -> a different	20:30
necromancer	well "the big picture" is irrelevant here, in many ways. all of the frameworks do basically the same things (or have the same ratio of things they do/things they don't do)	20:32
	it's how they go about doing those things that are of significance	20:32
	choosing a framework is hard because it's like choosing a frame before you make the painting...	20:32
	like twitter, they didn't know it was going to get this big. that's why they made the app in rails originally. then, they had to backpedal with making 3rd-party software to handle the bandwidth load	20:33
	after it got too big to handle	20:33
	the best option is the facebook route: create the entire thing from scratch!	20:34
	:)	20:34
	→ drubies joined	20:34
Q\|	No, frameworks are like libraries - they abstract in the first place, no more, no less. And how they do it differs, right, but that's what I was talking about -> the big picture != abstracting but "how is abstraction done"	20:34
	→ ISF_ec09 joined	20:35
	→ bauruine joined	20:35
DarkUranium	lol	20:35
	git just made me cry tears of joy \o/	20:35
	(no seriously)	20:35
	>_,	20:35
	>_<*	20:35
	← aspotashev left	20:35
necromancer	git makes me laugh every day at work, because we use svn	20:35
	→ yairgo joined	20:35
DarkUranium	lol	20:35
Q\|	Share it with us	20:35
DarkUranium	Q\|: nah, just a huge merge with 0 conflicts >_<	20:36
	well, huge by my standards	20:36
Q\|	^^	20:36
necromancer	and i'm just like "if only these graphic designers i work with actually wanted to read a little into git..."	20:36
DarkUranium	SVN would barf all over the place =P	20:36
	(I recently migrated SVN -> Git)	20:36
	→ flazz joined	20:36
	← nineteeneightd left	20:36
Q\|	I migrated today from file system -> git	20:36
Unode	anyone experienced with gitosis? I'm trying to figure out if gitosis accepts multiple public keys per user.pub file	20:36
Q\|	I think it's a good choice	20:36
jim	necromancer: make them watch gitcasts	20:37
wereHamster	Unode: I don't think so, one user = one key	20:37
necromancer	Unode: nah you need to make a different key for each user@computer.	20:37
	so necromancer@laptop and necromancer@server need to be 2 different keys	20:37
Unode	necromancer, not every user@computer, just per user	20:37
DarkUranium	Q\|: depends for what I guess ^^	20:37
necromancer	key files*	20:37
Unode	unless you need 2 keys for some reason	20:38
Q\|	DarkUranium, for versioning of course ;)	20:38
DarkUranium	Q\|: why would anyone ever use Git for versioning is beyond me	20:38
	=P	20:38
	→ spearce` joined	20:39
	→ justin-george joined	20:39
necromancer	Unode: if i wanna work when i'm on a computer at the job, i have to make another key so i'll be allowed access	20:39
DarkUranium	and necromancer	20:39
	regarding SVN	20:39
necromancer	because necromancer@work-computer is a different user than necromancer@laptop, regardless of the username	20:39
Unode	necromancer, you could simply copy your private key there :)	20:39
DarkUranium	be glad you don't use CVS	20:39
Unode	necromancer, actually not	20:39
necromancer	DarkUranium: i used to, just to download & compile open source projects	20:39
	Unode: i tried copying my key over, but it didn't work	20:39
DarkUranium	necromancer, I mean, USE	20:39
	necromancer, I mean, at work	20:39
necromancer	oh yeah	20:39
	fuck that shit haha	20:40
	DarkUranium shivers	20:40
Unode	necromancer, can't see why, I have 8 machines in which I have the same private key and they all work	20:40
necromancer	that's why i'm a big fan of git, because it's NOT cvs at all. svn is a little cvs.	20:40
	← skoop left	20:40
necromancer	Unode: maybe, i dunno i just generated them on each computer i wanted to have access to my gitosis	20:40
	Unode: i know that's the way it works with *NIX but i'm saying that gitosis doesn't understand that, afaik	20:41
DarkUranium	necromancer, to quote Linus: "The slogan of Subversion for a while was "CVS done right", or something like that, and if you start with that kind of slogan, there's nowhere you can go. There is no way to do CVS right."	20:41
necromancer	haha yeah	20:41
Unode	necromancer, I think you are confusing things now	20:41
	← urbanmonk left	20:41
DarkUranium	necromancer, http://en.wikipedia.org/wiki/Git_%28software%29	20:41
necromancer	Unode: i may be. :) i just followed the tutorial and was done with it, because i needed to get back to work on code :)	20:41
	DarkUranium clears his throat	20:42
DarkUranium	onto merging 2 other branches	20:42
	← spearce left	20:42
	spearce` → spearce	20:42
Unode	gitosis simply links the name of the file with the gitosis.conf content, regardless of where you are working	20:42
	DarkUranium puts on a hard hat and grabs a hammer (when it don't work, use a bigger hammer)	20:42
	Unode offers bigger nails	20:43
DarkUranium	lol	20:43
	→ nineteeneightd joined	20:43
necromancer	DarkUranium: he also said one time that git was basically a file system...with tabs on how the files inside have changed	20:43
	the way it's made is so damn simple	20:44
DarkUranium	^^	20:44
	← stephenjudkins left	20:44
Unode	it's actually a spreadsheet where each column is a different point in history on a per file basis	20:44
	which is why folders aren't tracked	20:44
DarkUranium	I like Linus because he isn't afraid of expressing his opinion (about SVN, CVS, Gnome -- he had harsh words for all of these)	20:44
Unode	but don't try to use excel or openoffice to open these spreadsheet files	20:44
	← Zeelot left	20:46
	← zombor left	20:46
	→ Zeelot joined	20:46
	DarkUranium is a happy camper because his univ requires the students to use OO.org as opposed to MS Office	20:46
	← airborn left	20:46
DarkUranium	AND because Git works so well	20:46
	AND because they promote GCC (as opposed to you-know-what)	20:47
	→ airborn joined	20:47
DarkUranium	AND because they promote Linux (they recommend it for dev work)	20:47
	\o/	20:47
	but I digress.	20:47
	back to work.	20:47
	→ krosenvold joined	20:48
	→ archis joined	20:48
	← spearce left	20:48
	→ spearce joined	20:48
	→ evelyette joined	20:49
	→ rgm joined	20:50
	→ alberto56 joined	20:51
ProLoser	i put a post-receive hook "git checkout -f" however this doesn't delete files in the working directory, why is this?	20:52
_rane	git checkout -f doesn't do anything by itself	20:53
	it needs a file argument	20:53
	← archis left	20:53
ProLoser	i thought it checks out head	20:53
	← alberto56 left	20:54
_rane	I think you want git reset --hard	20:54
ProLoser	that doesn't delete files either	20:54
_rane	git clean -f	20:54
	→ urkud joined	20:54
ProLoser	seems strange to run checkout, reset and clean	20:55
	← remi left	20:55
_rane	maybe if you explained what you want, sigh	20:55
	→ rasztasd joined	20:55
	→ Zeelot3k joined	20:55
_rane	you want to delete all files in your repo? do rm -rf *	20:55
	→ metoikos joined	20:55
ProLoser	no, i want to publish to web using hooks	20:55
_rane	you want to delete untracked files in your repo? do git clean -f	20:55
	→ remi joined	20:55
rasztasd	hi how can i make a new branch in git with a null parent commit	20:55
	← Zeelot left	20:55
wereHamster	rasztasd: --orphan	20:56
rasztasd	ty	20:56
	→ p3rg2z joined	20:56
	← pigdude left	20:57
Unode	wereHamster, thanks	20:57
	← jherdman left	20:57
	→ ijuma_ joined	20:59
	→ Schmallon joined	20:59
	← cannonball left	21:00
	← jaql left	21:01
	← fod left	21:01
	← mabrand left	21:02
	→ linusoleander joined	21:02
	← metoikos left	21:02
	→ johnw joined	21:02
DarkUranium	wereHamster: I didn't know you could do that =O	21:02
	s/O/D/ actually =P	21:03
	→ ph^ joined	21:03
	gilesgoatboy\|awa → gilesgoatboy	21:03
	→ sfalcon joined	21:03
	← gilesgoatboy left	21:03
sfalcon	I just created a light-weight tag with the same name as a branch and pushed to a remote repo	21:04
	I want to delete the branch with the same name and keep the tag.	21:04
	← remi left	21:04
	← Zeelot3k left	21:04
	→ Zeelot joined	21:04
	→ remi joined	21:04
	← remi left	21:04
	→ remi joined	21:04
fr0sty_	push <remote> :refs/heads/<name>	21:04
	← IslandUsurper left	21:05
	← joel_falcou left	21:05
wereHamster	DarkUranium: you could always do that with the low level commands, the orphan switch juust makes it easier	21:05
sfalcon	fr0sty: exactly! Thanks much :-)	21:05
DarkUranium	wereHamster: can Git make my breakfast as well?	21:06
	← copelco left	21:06
	→ jotik joined	21:08
	← necromancer left	21:10
	← metellius left	21:10
	← gilaniali left	21:10
	→ bitkiller joined	21:10
	← jotik^^ left	21:12
	← Mage left	21:13
	← pgib left	21:13
esc	anyone know what happens if i do 'git init' in an existing repo	21:14
wereHamster	nothing	21:15
fr0sty_	esc: try it and find out...	21:15
esc	i get the messag: 'Reinitialized existing Git repository' but what does this mean?	21:15
	← ajpiano left	21:15
esc	but its git 1.5.something	21:15
wereHamster	it means nothing	21:15
esc	wereHamster: ok, thanks	21:15
	← xiong left	21:16
	← flazz left	21:18
	→ guardian joined	21:19
	← nicoulaj_ left	21:20
	→ nicoulaj joined	21:20
	← priidu left	21:20
	← urkud left	21:21
	← sonnym left	21:21
	→ eletuchy joined	21:23
	→ alberto56 joined	21:24
	→ scarabx joined	21:25
	→ priidu joined	21:25
	← cognominal left	21:25
	→ cognominal joined	21:26
	→ _Vi joined	21:27
	← tizbac left	21:29
	← RORgasm left	21:29
rasztasd	is it possible to have two branches checked out, one of them is orphan branch	21:29
	how can i do that?	21:29
	← priidu left	21:30
orafu	rasztasd: two branches at the same time: no	21:30
	rasztasd: define orphaned	21:30
	rasztasd: unless you go to a different working directory	21:30
	→ priidu joined	21:31
rasztasd	two branches with no common ancestor	21:32
wereHamster	one git repo = one branch checked out	21:32
rasztasd	how can i handle for example eclipse settings files	21:32
wereHamster	what about them?	21:32
rasztasd	they can change anytime but they don't belong to a source file	21:32
orafu	so?	21:33
wereHamster	then ignore them	21:33
rasztasd	i thought orphan branches can help with this	21:33
wereHamster	no	21:33
rasztasd	ok	21:33
	← alberto56 left	21:35
	→ ive joined	21:35
	← ive left	21:36
	← thiago_home left	21:36
	→ bhosie joined	21:36
orafu	if you want to put an IDE settings file that is in your work tree under version control, you could try to soft-link it from a different git repository	21:37
	← Radar left	21:37
DarkUranium	rasztasd: .gitignore	21:39
	→ gilaniali joined	21:42
	→ boombatower_ joined	21:42
	← boombatower_ left	21:42
	→ boombatower_ joined	21:42
orafu	rasztasd: I have never tried this, and it sounds like overkill, but somehow it would be interesting to try using git submodules to do this ;)	21:43
	Putr → Putr\|Away	21:44
	← bhosie left	21:44
	← boombatower left	21:44
	awilkins just ignores eclipse files and uses Maven / M2Eclipse to regenerate them	21:45
	← pedrobelo left	21:45
	→ phantomcircuit_ joined	21:45
	→ pedrobelo joined	21:45
ShooterMG	could someone answer this little question.....i'm on branch Master, i've done some work and haven't committed yet....would it be possible for me to commit these changes on a brand new branch that has not been created yet?	21:47
cbreak	yes	21:47
	← phantomcircuit_ left	21:47
cbreak	git checkout -b newname	21:47
	← phantomcircuit left	21:47
cbreak	then commit	21:47
	→ phantomcircuit joined	21:48
cbreak	(after adding)	21:48
ShooterMG	so it would be checkout -b newname, add, commit?	21:48
	or should it be add, checkout, commit	21:48
cbreak	your choice...	21:48
	← guardian left	21:48
ShooterMG	k thanks :)	21:48
	← ki__ left	21:49
	→ mchinen joined	21:49
mchinen	how can I do a 'git pull' and keep my local commits at HEAD?	21:50
wereHamster	mchinen: your question doens't make sense	21:50
	← f00li5h left	21:50
	→ bhosie joined	21:52
	← jowls left	21:52
mchinen	wereHamster: maybe i'm saying it wrong. I have made local (unpushed) commits A, B, C and want to pull a large number of remote commits with git pull. I want A, B, and C to be at the top of the log (with C at HEAD)	21:52
wereHamster	mchinen: git pull --rebase maybe?	21:52
mchinen	I can do this by rebasing after the pull, but its hard when I have a lot of remote changes to pull	21:52
	→ leavittx_ joined	21:53
cbreak	rebase will destroy A, B and C	21:53
	it will rewrite history	21:53
wereHamster	he want's them 'at the top of the log'..	21:53
cbreak	and create A', B' and C'	21:53
	I'd say: just do a fetch instead of a pull	21:53
	→ bhosie_ joined	21:53
cbreak	that won't change HEAD :)	21:53
	← bitkiller left	21:54
	← irc2samus left	21:54
mchinen	cbreak: I haven't looked into that yet, will do now	21:54
	← mcdebugger left	21:54
	← martineo left	21:54
	→ virus_found joined	21:56
	← bhosie left	21:56
	← hendry left	21:57
	← DarkUranium left	21:57
mchinen	wereHamster: can you help me rephrase my question so I can learn correct git terminology?	21:57
virus_found	Hello. I need some help with "git clone --depth 1", so called shallow clone. I'd still like to do some "pulls" or "fetches" against it, is it possible with some flags? man says, fetch is not applicable to a shallow clone.	21:57
	→ bhosie joined	21:57
Eridius	virus_found: you misread	21:58
	you cannot fetch _from_ a shallow clone	21:58
	you can certainly fetch from a remote repo into a shallow clone	21:58
	basically, you can move commits into your repo, but you cannot move them out except as patches	21:58
	← bhosie_ left	21:58
virus_found	So that it doesn't fetch old revisions, yes?	21:59
Eridius	right	21:59
	→ bhosie_ joined	21:59
Eridius	if you `git pull` inside a shallow cloen it should do exactly what you expect	21:59
virus_found	Eridius: no flags needed? Hm, thanks a lot!	21:59
	Wondrous.	21:59
Eridius	note that I don't use shallow clones myself, but this is what I understand	21:59
virus_found	I've never used either.	21:59
	← neilthereildeil left	22:00
	→ Tuller_ joined	22:00
	← yairgo left	22:00
	← Tuller_ left	22:00
	→ yairgo joined	22:00
	← jrmuizel left	22:00
	← makubi left	22:01
virus_found	git is such a wonderful piece of software.	22:02
	→ makubi joined	22:02
	← bhosie left	22:02
	→ adymitruk joined	22:03
	← coderdad left	22:03
	← bhosie_ left	22:03
	← sivy left	22:04
	← ch077179 left	22:05
	← rgm left	22:06
	← tty1 left	22:07
	→ stephenjudkins joined	22:08
	← jstemmer left	22:09
	→ tty1 joined	22:10
rasztasd	i think git submodules can only store files in separate folders is it right?	22:10
Eridius	assuming I understand you correctly, then yes. A submodule must be contained within a folder	22:10
	← leavittx_ left	22:11
	→ MikhX_ joined	22:11
	→ bhosie joined	22:12
	← linusoleander left	22:12
	→ alberto56 joined	22:12
	→ Tuller joined	22:13
	← nicoulaj left	22:13
	→ drizzd_ joined	22:14
	← psoo left	22:14
	→ dharrigan joined	22:15
	← pantsman left	22:15
	← MikhX left	22:15
	MikhX_ → MikhX	22:15
	→ nicoulaj joined	22:16
	→ bhosie_ joined	22:16
	← bhosie left	22:16
	← alberto56 left	22:17
	← hukl left	22:17
	← javajunky left	22:17
	← drizzd left	22:17
	← stephenjudkins left	22:18
	← novas0x2a left	22:18
	← nicoulaj left	22:19
	→ bhosie joined	22:20
	← MikhX left	22:20
	→ MikhX joined	22:20
	← bhosie_ left	22:21
	← dharrigan left	22:21
	Unode → _Unode	22:22
	← __name__ left	22:22
	→ ReleaseX joined	22:22
	← berkes left	22:23
	→ stephenjudkins joined	22:23
	→ jargan joined	22:23
	← _Vi left	22:23
	→ bhosie_ joined	22:24
	← bhosie left	22:24
	bhosie_ → bhosie	22:24
	← bhosie left	22:25
	→ dl9pf joined	22:25
	← dl9pf left	22:25
	→ dl9pf joined	22:25
	→ jotik^^ joined	22:25
	→ _Vi joined	22:25
	← jast left	22:27
	→ Radar joined	22:27
	← Gitbot left	22:27
	← jotik left	22:27
	← dl9pf_ left	22:27
	← TML left	22:27
	→ weinzier joined	22:27
	← intripoon left	22:27
	→ TML joined	22:27
	pasky_ → pasky	22:28
	← virus_found left	22:28
	← tty1 left	22:30
	→ stamina joined	22:30
	← kpreid left	22:31
	→ tty1 joined	22:31
	← TeckniX left	22:31
	Anti-X → Anti-Zzz	22:31
	→ muffinpeddler joined	22:33
	← tty1 left	22:33
	→ kpreid joined	22:34
	→ sonnym joined	22:34
	← Tuller left	22:34
	→ tty1 joined	22:34
	← MikhX left	22:35
	→ MikhX_ joined	22:35
	← opalka left	22:35
	← atula left	22:35
	← Schmallon left	22:36
	← tty1 left	22:37
	← Promit left	22:37
	→ dharrigan joined	22:37
	→ pgib joined	22:38
	← spearce left	22:38
	→ pobega joined	22:38
pobega	If I cloned a repository and I'm in the directory, will a 'git checkout' alone update me to the newest version?	22:38
	I know it's a newbish question but I'm just wondering that	22:39
pgib	Can anyone tell me why git-stash is the only command (that I've noticed) which doesn't use a hypenated letter for subcommands?	22:39
atpa8a	hmm	22:39
pgib	git stash list, git stash pop...	22:39
	just seems odd to me, and I always try -l or --list first	22:40
	boombatower_ → boombatower	22:40
pgib	hmm I guess git-remote too	22:40
	← johnw left	22:41
	→ tty1 joined	22:41
	← weinzier left	22:41
atpa8a	hmm	22:41
	how can i exclude a repo from showing up in git-web?..	22:42
	← pobega left	22:42
kevinfish	Hi everyone. I'm wanting to develop my own linux distro based on another one. I'd like to use git for all the config files, etc... What is the best way to set this up. For instance, when you clone a repository it creates a subdir, but I'm thinking I want to have the .git dir right off of '/'. Should I go ahead and let it create a subdir then change that to be a symlink to /? BTW, I'm pretty new to git (if u cudn't tell)	22:42
rasztasd	kevinfish it would be tough	22:44
	→ frogonwheels joined	22:48
	→ dstol joined	22:49
pgib	yeah..	22:49
	I could understand a git repo that held all of your patches for packages etc...	22:49
	← dharrigan left	22:49
	→ zain joined	22:49
dstol	hey maybe you guys can answer this, there is some debate around the office about it	22:49
	is git checkout -b eop-1000; git push origin eop-1000	22:49
	← Torsten left	22:49
pgib	but you'll have constantly merging from hundreds of upstreams if you tried to put the whole thin in a repo (IMHO)	22:49
dstol	the same as git push origin origin:refs/heads/eop-1000; git checkout —track -b eop-1000 origin/eop-1000	22:50
	→ ajpiano joined	22:50
	← zain left	22:50
	← p3rg2z left	22:50
dstol	other then the order in which things are done?	22:50
	→ Veejay joined	22:50
	→ zain joined	22:51
pgib	I guess the first one wouldn't set the upstream of your branch - right?	22:51
	← ph^ left	22:51
pgib	and I think the -track in git co does that	22:51
	I could be wrong..	22:51
Veejay	I have a question: what comman should I use to do: "create the patch that will bring file FILE to the state it was at commit COMMIT"	22:51
	← boombatower left	22:51
pgib	I'd think git push --set-upstream origin eop-1000 would be closer	22:51
Veejay	I tried using git diff COMMIT_NUM file but it gives me a negative diff if you know what I mean	22:52
pgib	but I'm part-noob and part-ignorant	22:52
	← rasztasd left	22:52
	→ bdiu joined	22:52
	→ opalka joined	22:52
picasso	hey folks	22:52
Veejay	I then tried to switch the file name and the commit number but it is not a recognized syntax	22:52
dstol	thanks pgib that's helpful	22:53
	→ novas0x2a joined	22:53
bdiu	if I want to have a development branch that always has some differences in a config file that doesn't get merged back into master, how would I accomplish it?	22:53
Veejay	Got it	22:53
picasso	i'm in the process of researching dvcs tools to migrate a moderate sized development team to, coming from subversion	22:53
	← tty1 left	22:53
Veejay	git diff commit1..commit2 file does the job perfectly	22:53
	→ madewokherd joined	22:54
picasso	the largest pain point right now is the process of picking changesets to merge from trunk to a particular release/deployment branch	22:54
Ilari	picasso: In git, merges are all-or-none...	22:54
picasso	and having only used git in a 1 or 2 developer project before, i'm a little curious how it handles a larger team (10-15 developers)	22:54
Veejay	And my apologies for the logorrhea	22:54
	→ tty1 joined	22:55
	← icwiener_ left	22:55
jim	logorrhea_10(100) == 2?	22:55
picasso	Ilari: meaning you'd always have a branch when you are addressing a particular bug or feature?	22:55
	← dstol left	22:55
Ilari	picasso: Bugfixes and fetures should be put to their own branches.	22:56
	← tty1 left	22:56
	→ brettgoulder joined	22:56
picasso	ok. could/should those branches then be stored on our shared "central" server then?	22:56
tango_	yes	22:57
	picasso: but only if you want to	22:57
	← warbee left	22:57
picasso	the developer would have the option to work locally for smaller things, probably?	22:57
tango_	yes	22:57
	and then merge that work into whatever branches need it	22:57
	← hyperair left	22:58
	← yairgo left	22:58
	→ zombor joined	22:58
	← elg left	22:59
	→ yairgo joined	22:59
picasso	if a developer accidentally commits a bugfix or a feature to their master, instead of a branch, how do you recover from that?	22:59
	→ bitkiller joined	23:00
FauxFaux	git revert generates backwards commits, like in any other vcs.	23:00
zombor	"like any other"? you must never have used svn ;)	23:01
FauxFaux	http://book.git-scm.com/4_undoing_in_git_-_reset,_checkout_and_revert.html is pretty much exactly what I'd say.	23:01
jim	"git revert" works in any other vcs?!	23:01
FauxFaux	zombor: Last time I used svn revert it reverted all but one line of a file, and I have no idea why. /o\	23:01
zombor	because svn is crap	23:01
	← Devastator left	23:02
	→ elg joined	23:02
Veejay	It has its uses	23:02
	→ devas- joined	23:02
FauxFaux	It's a good thing to get to for migrating away from.	23:02
zombor	yeah, to waste time converting people to a better system ;)	23:02
Veejay	99.99% of it being: Making git look good	23:02
	← ep8 left	23:02
Veejay	To give credit to svn though	23:03
	Since it's older	23:03
	It has one advantage in my eyes: it is less elitist and easier to learn	23:03
FauxFaux	I'd rather use svn than bzr or mercurial, based on my experiences, tbh.	23:03
zombor	bzr and hg are miles better	23:03
FauxFaux	Or perforce. Oh god, work, why. WHYYYYYYYYYYYYYYYYYYYYYYYYYYYYY	23:03
	WHYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY	23:03
jim	I see, we're flexing our advocacy muscles... gaining new preaching skills that are only applicable to our choir...	23:04
	← elg left	23:04
	← ajpiano left	23:04
jim	got it :)	23:04
	→ thedeeno joined	23:04
	← slainer68 left	23:05
	→ dharrigan joined	23:06
	→ mdel_ joined	23:06
jim	if I wanted that, I'd watch an infomercial	23:06
	← EvanR left	23:07
	→ ajpiano joined	23:08
	← ehabkost left	23:10
	← scarabx left	23:10
	← _ollie left	23:10
	← novas0x2a left	23:11
	← bdiu left	23:13
	← d0ugal left	23:13
	← awilkins left	23:14
	← Radar left	23:15
	→ _ollie joined	23:15
	← priidu left	23:15
	→ priidu joined	23:15
	← chrischambers left	23:16
	← dharrigan left	23:16
	← akahn left	23:16
	→ linusoleander joined	23:17
	→ jotik joined	23:17
	→ novas0x2a joined	23:18
	→ noyb joined	23:18
	← airborn left	23:18
	→ Chillance joined	23:18
	← jotik^^ left	23:19
	→ kanru joined	23:19
	← brian_g left	23:22
	→ dharrigan joined	23:22
	← zain left	23:23
	→ Tuller joined	23:24
Q\|	Hot to undo git add somefile.xxx? git rm somefile.xxx?	23:26
jim	with --cached, yes	23:27
	check out man git on that for the gorey details	23:27
Q\|	kk jim, thanks	23:27
jim	build your tolerance to man pages by reconstructing solutions you already know	23:28
	→ mchinen_ joined	23:28
	→ felipe joined	23:29
jim	check git status alot	23:29
	just like the guy shows you at gitcasts.com	23:29
Q\|	Yeah, that's what I'm almost always doing, since it's my first day with git (or source control in general) ;)	23:30
	← dharrigan left	23:30
	← mchinen left	23:30
	mchinen_ → mchinen	23:30
jim	oh wow	23:30
	ok, what made you choose git	23:30
	→ epicserve joined	23:31
jim	are you in a group dealing with some program with git? or what?	23:31
	→ friskd joined	23:32
pgib	buzz word	23:32
epicserve	When I do a git svn rebase I get the error, "warning: refname 'profiles' is ambiguous."	23:32
pgib	we like to play that game at work alot	23:32
jim	"choosey muthas choose git"	23:32
	← trochala left	23:33
epicserve	I have a local branch which is profiles and I have a svn branch profiles and I want the local profiles to be linked with the remote profiles	23:33
	← dreiss left	23:33
Q\|	jim, two things: 1st, I'm convinced that Linus is a smart guy, and if he makes something chances are it's good, especially if he decided that alternatives sucked. 2nd, when I did some research and discovered git months ago and read the stuff about decentralized I was like "What - that's not usual? How stupid is that?"	23:34
	← ProLoser left	23:34
	→ Radar joined	23:34
pgib	I can see the commercial now. Some mom standing at the kitchen counter, hacking on the computer at 200wpm	23:34
	← linusoleander left	23:35
epicserve	I'm not sure if this helps, http://pastie.textmate.org/1222216 it's the output of the git show-ref command	23:35
jim	he is smart, and a totally big-time smart ass... arrogant, with strongly assholish traits	23:35
pgib	yeah, he is known to be very hard to work with	23:35
	just like the git CLI	23:35
	→ MikhX joined	23:36
	← MikhX_ left	23:36
	→ dharrigan joined	23:36
Q\|	jim, yeah, but there're people that are right most of the time and those who are not, and assholes are amongst both groups, whereas the latter one actually is not in position to be an asshole as opposed to the first group, so I'm fine with that	23:37
	← LiamH left	23:38
Q\|	stupid and ugly, I tell ya	23:38
	← pedrobelo left	23:38
	→ pedrobelo joined	23:39
jim	so essentially you came to git as a result of seeing someone who mostly makes good decisions, and finding out how it's distributed as you expected anything like this to be	23:41
	(especially when you consider open source dev)	23:41
Q\|	Exactly	23:41
jim	what do you want to apply it to?	23:41
Q\|	Basically to everything I develop, which currently is some web design stuff and Magento development (eCommerce cart)	23:43
jim	what's the card run on?	23:43
	← dharrigan left	23:43
Q\|	http://www.magentocommerce.com/ - an OS PHP app	23:44
	→ parasti joined	23:45
	← MikhX left	23:45
jim	mysql?	23:45
	→ MikhX joined	23:45
Q\|	Yep	23:45
	→ trochala joined	23:45
	← noktoborus left	23:46
jim	is anything you're doing already on a vcs?	23:49
Q\|	They have a SVN repo on their site if that's what you mean, but besides them making their code open source, there's not much "open" with it like you'd expect it for such a licenced software	23:50
	→ MikhX_ joined	23:51
jim	so it's a restrictive license, no alter/redist?	23:51
	← eletuchy left	23:51
Q\|	I imported a tarballed archive into my base repo, thus I'm currently independet from them.	23:51
	→ noktoborus joined	23:52
	← beatak left	23:52
Q\|	No, the license itself is allright, it's just that they don't do open development. There's no place to submit a patch and stuff, and you can't write to the repo as far as I know	23:52
jim	there's supposed to be a way of having a git repo and a reference within it to a svn branch	23:53
Q\|	So, you're pretty much dependent on updates from them or on stuff scattered throughout the net	23:53
jim	two that I've seen today had the same weird problem with it	23:53
	← MikhX left	23:53
	MikhX_ → MikhX	23:53
	← jkp left	23:53
	← JohnFlux left	23:53
Q\|	Yeah, I'm currently pretty short on time, since I'm in the middle of starting up my freelance business and I have tons of non-technical stuff to do as well as ongoing projects, so I'm somewhat cut on the technical stuff for now.	23:55
	← zombor left	23:55
	→ ymasory joined	23:55
Q\|	e.g. there's some cool guys with much Magento experience and repos on github which I could hook into, but as I said, I'll have to check this in a few weeks, or maybe even next year.	23:55
jim	so they've essentially forked it?	23:56
	→ kingfishr_ joined	23:56
	← Radar left	23:57
Q\|	The "community" around it is somewhat slow. It's over 2 years open sourced and everybody complains about not being able to submit stuff so that fixes get applied faster, but on the other hand nobody hosts a public fork and so on	23:57
	Yeah, but it's kinda unofficial yet	23:57
	← Yuuhi left	23:58
	← MikhX left	23:58
	← Heimidal left	23:58
	← kenichi left	23:58
	→ MikhX joined	23:59
kingfishr_	Question: I have a branch of master ("foo") to which I've made commits. Intermingled with those commits, I've also occasionally merged master into foo. How can I get a list of commits in foo that were not brought in by merging master?	23:59

Logs Search ←Prev date Next date→

Channels Documentation