IRCloggy #git 2011-08-02

Provider of IRC logs since 2005.

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

	2011-08-02
	← kenichi left	00:02
	→ Nuck joined	00:03
	→ alip joined	00:04
	← kvanderw left	00:05
	← brian_g left	00:06
	← [intra]lanman left	00:07
	← arosen2 left	00:08
rns	itrebal, cool that worked thanks	00:08
itrebal	great	00:08
	→ rvsjoen joined	00:09
	← devth left	00:10
	→ tansell-laptop joined	00:11
	← rvsjoen_ left	00:12
	→ Blazento joined	00:12
	← emf^ left	00:12
	← sh_sh left	00:12
Blazento	is there anyway on github to see all the fork from an app	00:13
cirwin	the network view	00:16
	← jimmy1980 left	00:17
	→ tanoku joined	00:17
Blazento	i see thanks	00:18
	→ Destos joined	00:19
	← steveoliver left	00:19
	← fiyarburst left	00:21
	← cjuner left	00:21
	→ GeertB joined	00:21
	← cccaldas left	00:22
	→ budda joined	00:28
	← beakerman left	00:29
budda	hi. i seem to have a knack of getting git in to a confused state which then causes further problems and wondered if there is a recommended solution to resolve it.	00:29
	i've got a repo cloned locally. and at some point a file or folder permission has been changed	00:29
	i then later do a git pull again as i know code at the origin has been updated	00:29
	git chokes on the pull due to the local file giving a permission denied	00:30
	i fix the permission, but at this point git has done half a pull and is now mixed up.	00:30
	i don't want to lose my local changes as they need to be committed after i've pulled down from origin.	00:30
	what should i do ?	00:30
	→ ISF joined	00:31
cirwin	budda: it sounds like you (in future) want "git pull --rebase"	00:32
	hten you can commit before you pull, and the commits will be put after the stuff you pull down.	00:32
budda	i was just reading http://stackoverflow.com/questions/2472254/when-should-i-use-git-pull-rebase :)	00:32
	i assume a git pull is not atomic then?	00:32
cirwin	if you want to have control over the process, you can just not use git pull	00:32
budda	i will bare in mind the git pull --rebase for the future	00:32
cirwin	use git fetch, which doesn't affect the working tree	00:33
	and then git merge (or git rebase) to introduce the changes locally	00:33
budda	how is git rebase used after a fetch to introduce the changes locally?	00:33
cirwin	git checkout master; git rebase origin/master;	00:34
	will move any commits you haven't pushed to origin to after any commits you pulled from origin	00:34
	← tystr left	00:34
Blazento	should i be worried about this warning when installing bundler in a gemset? Installing abstract (1.0.0) WARNING: abstract-1.0.0 has an invalid nil value for @cert_chain	00:35
cirwin	Blazento: #bundler ?	00:35
	(or #rvm)	00:35
Blazento	ahh. sorry!	00:35
budda	cirwin: the checkout & rebase result in "cannot rebase: you have unstaged changes"	00:36
cirwin	budda, you must commit your changes	00:36
	never, ever, do a rebase or a pull or a merge with uncommitted changes	00:36
budda	i've committed them locally	00:36
cirwin	not all of them :p	00:36
	git status	00:36
budda	thats the issue	00:36
	when i did the pull which failed	00:36
	at the start	00:36
cirwin	ok	00:36
budda	its made a load of files	00:36
	appear changed	00:37
	its like half a pull has happened	00:37
cirwin	I see	00:37
budda	and changed files locally	00:37
cirwin	git merge --abort may help	00:37
budda	but not updated some index of something	00:37
cirwin	though it may also through away your local uncommitted changes	00:37
budda	ah thats what i want to avoid	00:37
	well	00:37
cirwin	you can save copies of all the files you need to keep in a temporary directory	00:37
budda	hmm, i guess my local stuff is committed	00:37
	← jalama left	00:38
	→ effnj0X joined	00:39
	→ ericography joined	00:39
	← ericography left	00:39
	→ ericography joined	00:39
budda	cirwin: error: unknown option `abort' --- and i can't see anything similar to an abort switch. using git 1.7.0.4 here	00:40
cirwin	maybe it's only available in more modern versions	00:40
	I think it mainly does: git checkout -f	00:40
	→ ryez joined	00:40
	→ cccaldas joined	00:42
budda	its surprising how borked Git can get from a file permission during git pull :-(	00:42
cirwin	it's surprising that git pull exists :p	00:42
budda	and annoyingly i've poked myself in the eye a few times with the same thing :-)	00:42
cirwin	yeah	00:42
	I think everyone does	00:42
	I never use git pull anymore	00:42
	it's too confusing	00:42
	← jbrokc left	00:43
budda	you're the first to say that :-)	00:43
itrebal	cirwin: you do it manually? fetch + merge?	00:43
	/rebase	00:43
cirwin	yup	00:43
itrebal	ah	00:43
cirwin	when you have more than one branch, it's the only sane thing to do	00:43
	← Yuuhi left	00:44
cirwin	particularly I have a chance to see what I	00:44
	've pulled	00:44
	*fetched	00:44
itrebal	biggest problem w/ git pull is people don't fully understand it, and then you get this: "Git Pull til it git works!" -- http://teddziuba.com/2010/08/too-smart-for-git.html	00:44
cirwin	before it clobbers my work	00:44
budda	is that a unicorn in the window?	00:45
itrebal	I believe so	00:45
budda	aaaah	00:45
cakehero	I'm trying to tag a commit so that it can be used to track a release, for some reason after i tag and push/pull the branch to another location i don't see the tag	00:45
	any ideas?	00:46
	Tag command looks like this: git tag -m "Added 24 hour default advanced notice" 2.02 079b2ea9629a234f97e16395e2c656d630f0b976	00:46
itrebal	cakehero: have you pushed the tag? (and then fetch from remote)	00:46
cakehero	i pushed the branch I tagged on	00:46
	do i have to push the tag itself?	00:46
itrebal	yep	00:46
	it isn't associated to the branch, its associated to the commit when you tagged	00:47
cakehero	git push origin <tag> ?	00:47
itrebal	yep	00:47
cakehero	k	00:47
	awesome	00:47
	→ xiangfu joined	00:47
itrebal	(git push origin :tag to delete one, cakehero)	00:47
cakehero	sweet	00:47
	same as branch	00:47
	that worked - thanks	00:47
itrebal	yep	00:47
	← jfkw left	00:48
	→ kthomas_vh joined	00:49
	← Cromulent left	00:50
	→ cooloney joined	00:51
	← tansell-laptop left	00:51
	← EyesIsServer left	00:52
	→ mikemo joined	00:53
mikemo	I just broke something in my code, but havent had a commit in a while, so I'd like to save what I have in a separate branch. How can I break this into branch "broken" and then get back to my last commit? Thanks!	00:53
cirwin	mikemo: use git checkout -b newbranch	00:55
	then you will have two branches that are the same	00:55
	then git add -p, to choose which bits of which files to commit	00:55
	git commit	00:55
	then git checkout -m oldbranch to go back to where you were, but with half the commit on a new branch	00:56
mikemo	i did all those steps but the last one	00:57
	→ bonhoffer joined	00:57
mikemo	git status says there are a bunch of unsynched files	00:57
cirwin	unsynched?	00:58
mikemo	untracked	00:58
	← mlncn left	00:58
cirwin	if you want to commit them, use git add	00:58
	and then git commit	00:58
	otherwise delete them	00:58
	← ryez left	00:59
	← f0i left	00:59
	→ gusnan joined	00:59
	← ISF left	01:00
	→ seivan joined	01:01
budda	cirwin: just noticed that the git pull that went wrong earlier. its pulled down a load of new files from origin which are now listed as untracked locally. re-running the git pull then gives the "error: Untracked working tree file 'sites/default/modules/br_discussion/br_discussion.context.inc' would be overwritten by merge. Aborting" message.	01:01
	→ xissburg joined	01:01
budda	cirwin: would deleting the local files be safe to do and then re-pull ?	01:01
	→ stliu joined	01:01
cirwin	it should be safe, yes	01:01
	just check you don't delete anything that you created that's not in the repository ;)	01:02
	← mikemo left	01:02
budda	hah	01:02
	nah its all new things which another dev has added	01:03
	i think overall http://teddziuba.com/2010/08/too-smart-for-git.html summed up my issue pretty well :-) except i'd previously used CVS rather than SVN	01:03
	← chrischambers left	01:03
	← sirdancealot left	01:04
cirwin	if you don't use git pull, and don't use git push with no arguments; git will surprise you much less	01:04
budda	cirwin: is there any decent blog posts you know of to explain that?	01:05
	so i can send it on to the others in the team	01:05
	← nicoulaj left	01:05
cirwin	git for computer scientists is the oft-recommended "what's git really doing" article	01:05
	git push and git pull are just personal hates :p	01:05
	I could write a blog post I suppose, but seems a bit of a negative note on which to start	01:06
	→ nicoulaj joined	01:06
	← flavius left	01:06
	→ jlk joined	01:07
kthomas_vh	I've generated a new id_rsa key, but git gitosis-init < id_rsa.pub does not alter the keyfile. What am I missing?	01:07
	→ EyesIsServer joined	01:07
	kthomas_vh goes to read the man pages	01:07
jlk	what's the proper way to start committing to a new empty bare repo?	01:07
budda	cirwin: maybe it needs to be said :)	01:07
jlk	I created the repo, cloned it elsewhere, added a file and tried to push, but git doesn't like that. Says there is nothing in common and no branch to push to	01:07
cirwin	git push origin master	01:08
	don't use git push with no arguments	01:08
	→ ericography_ joined	01:08
budda	;)	01:08
	ericography → Guest38602	01:08
kthomas_vh	heh	01:08
jlk	blah, I was trying origin/master silly me	01:09
	← ericography_ left	01:09
	→ sirdancealot joined	01:09
	← shiba_yu36 left	01:10
	ericmuyser → ericmuyser\|away	01:11
	← Guest38602 left	01:12
	→ dr_win joined	01:12
	← dr_win_ left	01:12
	← PhillipA left	01:13
	← preflex left	01:13
	← verto left	01:14
	← verto_ left	01:14
	← nadirvardar left	01:15
	ericmuyser\|away → ericmuyser	01:16
	→ mlncn joined	01:16
	← mlncn left	01:19
	→ jbrokc joined	01:19
	kthomas_vh discovers that gitosis-init works only once	01:20
frogonwheels	!gitosis	01:21
jast	automatic message gitosis is no longer maintained and supported by the author; we usually recommend gitolite instead which has much better documentation and more features: http://github.com/sitaramc/gitolite	01:21
	→ bentkus joined	01:21
	kthomas_vh greps, groks	01:21
	→ Cromulent joined	01:23
	→ fiyarburst joined	01:23
	→ protozog joined	01:25
	← jungejason left	01:27
	→ Vampire0_ joined	01:28
	← kpreid left	01:28
	← Cromulent left	01:30
	← rickharrison left	01:30
	← spearce left	01:31
	→ shiba_yu36 joined	01:32
	← Vampire0 left	01:32
	← Araxia left	01:32
	← metcalfc left	01:33
	→ utu joined	01:35
	→ ilumi joined	01:37
	← sako left	01:38
	→ fivetwentysix joined	01:39
	← fivetwentysix left	01:39
	← alfplayer left	01:39
	→ Swimming_bird joined	01:39
	→ ericography__ joined	01:40
	← ericography__ left	01:42
	← ilumi left	01:42
	→ ericography joined	01:42
	← haseeb left	01:42
	← ericography left	01:43
	→ lm-brodo joined	01:43
	← brodo left	01:44
	← jbrokc left	01:45
	← dl9pf_ left	01:46
	→ dl9pf joined	01:47
	← ksawicki left	01:47
	→ natea joined	01:49
	→ jbrokc joined	01:50
natea	if i did a git merge --no-commit and now i want to revert the merge, how do i reset it?	01:50
frogonwheels	natea: did you have any files modified in your working directory when you did the merge?	01:51
natea	presumably it hasn't been committed yet (since i used the --no-commit), but it's still queued up to be merged, and i don't want that to happen.	01:51
frogonwheels	natea: I think git reset --merge will work regardless of modified files actually.	01:51
	→ d0k joined	01:52
	→ glennpratt joined	01:52
natea	frogonwheels: thanks, i think that worked. how can i be sure?	01:53
frogonwheels	natea: git status should tell you	01:53
	→ f0i joined	01:53
natea	it says the same thing it did before after i did the git merge --no-commit	01:54
	→ normanrichards joined	01:55
	← dr_win left	01:55
	→ captainramen joined	01:55
	← lolfrenz left	01:56
frogonwheels	natea: I just did a try here, and it seems it should work fine. what does it show exactly?	01:56
captainramen	is it possible to have git fetch automatically initialize all submodules?	01:56
frogonwheels	captainramen: git clone has --recursive, but fetch, nope.	01:56
captainramen	basically i need to submodule this project up but i don't want the other devs to have to remember to do anything extra (they come from svn)	01:57
natea	it says, "on branch master. your branch is ahead of 'origin/master' by 3 commits.	01:57
frogonwheels	captainramen: it's a pitb	01:57
	natea: but no other changes?	01:57
offby1	pitb must come right after pita in the dictionary	01:57
frogonwheels	offby1: true	01:57
natea	frogonwheels: no, just a bunch of "untracked files"	01:57
captainramen	frogonwheels: so there's no git config stuff i could do then	01:57
frogonwheels	natea: sounds good to me.	01:57
	captainramen: nope. it's a bit of a known submodule sore point	01:58
captainramen	frogonwheels: hah! oh well, git subtree is out of the question	01:58
natea	k. just weird that git status didn't show those changes before i did the git reset --merge	01:58
	← The_Ball left	01:58
frogonwheels	oooh.. wait	01:58
captainramen	frogonwheels: it's easy enough to do on the server since we just use a little script for that.	01:59
	→ The_Ball joined	01:59
frogonwheels	captainramen: investigate git-config submodule.<name>.fetchRecurseSubmodules	01:59
captainramen	frogonwheels: thanks!	01:59
	→ ISF joined	02:00
	← juangiordana left	02:00
frogonwheels	captainramen: just yesterday I had to remind a dev to git submodule init so I feel your pain.	02:01
	(in order to init a new submodule)	02:01
captainramen	frogonwheels: doh, this is no good. they might as well do it from git extensions	02:02
	itrebal → grahamc	02:02
frogonwheels	captainramen: look at githooks post-checkout ?	02:03
	captainramen: it's not actually fetch that's the problem, it's checkout.	02:03
captainramen	frogonwheels: ahhhhhh	02:04
	frogonwheels: this is the kind of thing that needs to be done once on each dev's machine	02:04
frogonwheels	yep.	02:04
captainramen	frogonwheels: really it's just cakephp and some assorted plugins. i don't care if they have 1.3.x instead of 1.3.7 unless it's some suuper critical bug	02:05
	cause the server will always be up to date	02:05
frogonwheels	captainramen: just send an email round.	02:05
	← Dreamer3 left	02:05
captainramen	frogonwheels: you don't understand	02:05
	← GeertB left	02:05
frogonwheels	captainramen: well maybe I do.	02:06
captainramen	frogonwheels: we already have all the documentation for correct workflow (git flow) and they still do dumb stuff like pull merge, merge commits where the branch is a single commit	02:06
	→ Dreamer3 joined	02:06
captainramen	frogonwheels: multiple merge commits with the same commit message, etc	02:07
frogonwheels	captainramen: I have a developer that goes back to TeamCoherence for history.	02:07
	← bitkiller left	02:07
captainramen	frogonwheels: i don't know what that is, but it sounds like the opposite of what it's called	02:07
frogonwheels	captainramen: which is basically like Visual Source Safe with better networking.	02:07
captainramen	frogonwheels: i'm sorry.	02:07
frogonwheels	yeah. me too	02:07
	he tried to tell our board (aka 'Dad' to me) that Git was a backwards step. Fortunately I was backed up by other team members	02:08
	← macUzer left	02:08
captainramen	...	02:09
	i've used vss. i was the only developer and somehow my files would get locked from time to time	02:09
	← budda left	02:10
frogonwheels	captainramen: I've used VSS, StartTeam, TeamCoherence. Nice to be finally using a real source control for a change.	02:10
	← f0i left	02:10
frogonwheels	*StarTeam	02:10
	→ davesag joined	02:10
	→ GeertB joined	02:11
chrisf	wouldnt be hard to outdo VSS's networking ;)	02:11
	→ Prasad joined	02:11
grahamc	I'm not sure how companies justify systems beyond git/svn/cvs	02:12
kmc	software you don't pay money for is clearly worthless	02:12
chrisf	grahamc: the usual sales reality distortion tricks, i think.	02:12
	← cooloney left	02:13
frogonwheels	grahamc: yeah well these projects all started a while ago.	02:13
kmc	VSS is enterprise grade and industrial strength	02:13
frogonwheels	lol	02:13
	kmc: that's amusing.	02:13
grahamc	oy	02:13
kmc	by the way Microsoft doesn't use VSS on their internal projects, hell no	02:13
	they use some ancient and crufty fork of Perforce	02:13
	p4 is the only non-free vcs I've heard good things about	02:14
	→ preflex joined	02:15
	→ haseeb joined	02:15
	← bonhoffer left	02:17
	→ cronin joined	02:17
	→ cooloney joined	02:18
	→ peterwald joined	02:18
	→ ndim joined	02:18
	→ Chib joined	02:19
	→ kpreid joined	02:19
	→ kpreid_ joined	02:20
	← kpreid left	02:20
	kpreid_ → kpreid	02:20
	→ rickharrison joined	02:20
	← rickharrison left	02:20
	← cyberswat left	02:22
	→ SirFunk joined	02:27
	→ cschneid joined	02:28
	← cschneid left	02:28
captainramen	lol yeah	02:28
	→ cschneid joined	02:28
	→ pen joined	02:28
captainramen	i heard a guy say that he would have trouble convincing his boss to use log4net because it hasn't been maintained in a while	02:28
	bosses are idiots	02:28
	→ o] joined	02:28
	← Prasad left	02:29
	← Destos left	02:29
	→ devth joined	02:29
	← ]o left	02:30
kmc	not all of them are	02:31
	if you have an idiot boss, get a new one	02:31
	→ gretch joined	02:31
captainramen	mine are so so	02:32
	at least they are committed to doing things a better way. I think that's the important thing	02:32
	← replore left	02:32
	→ sbell_ joined	02:33
	← hackez_work left	02:33
	← thews left	02:35
	← sbell left	02:35
	sbell_ → sbell	02:35
	← Xerkus left	02:37
	→ cyberswat joined	02:39
	← thiago left	02:40
	→ cyberswa_ joined	02:41
	→ Raging_Hog joined	02:42
	← Chib left	02:42
	← kthomas_vh left	02:43
	→ Chib joined	02:43
lahwran	anyone know of a plugin for maven (java build tool) to add the git revision to the project version used at build time (so that the artifact has the git revision in it's name)?	02:43
	→ kthomas_vh joined	02:43
	← kthomas_vh left	02:44
	← cyberswat left	02:44
	→ Techplex joined	02:44
	← xissburg left	02:44
	→ kthomas_vh joined	02:45
	ChanServ set mode: +v	02:45
	← gusnan left	02:46
Techplex	Hello?	02:46
	→ tansell-laptop joined	02:46
grahamc	hello	02:46
Techplex	How does one pull the latest version or a repo and loose all the local changes?	02:46
	← seivan left	02:46
cirwin	git fetch origin;	02:46
	git reset origin/master --hard	02:46
	← rendar left	02:47
grahamc	Techplex: you'll have to do the reset upon every branch you've changed locally	02:47
Techplex	thank you	02:47
	→ mcc joined	02:48
	← Kichael left	02:48
	→ metcalfc joined	02:49
	← kthomas_vh left	02:49
lahwran	resolved in #maven: buildnumber-maven-plugin	02:49
	← DrNick left	02:49
	→ xissburg joined	02:50
	← captainramen left	02:50
Techplex	cirwin: when I try to push that to github it says rejected not-fast-forward	02:50
cirwin	are you sure you did a fetch really recently>/	02:51
	→ mjessome joined	02:52
	← gerard0 left	02:54
	→ seivan joined	02:54
Techplex	when I follow your instructions i get my last commit to github	02:54
cirwin	ok	02:54
Techplex	I want the one from the master of the origional not my fork	02:54
cirwin	in that case, "git remote add fooble [email@hidden.address]	02:55
	and do the same again, with fooble in place of master	02:55
	you will then need to force push it, if you want to overwrite your github version with the version from fooble	02:55
	(you will lose your changes)	02:55
	← cyberswa_ left	02:55
	← towski_ left	02:56
	← glennpratt left	02:56
Techplex	I feel like what I want to do is: git pull waterbear master --hard	02:59
	but that doesn't work	02:59
cirwin	git fetch waterbear	02:59
	git reset waterbear/master --hard	02:59
grahamc	Techplex: try fetching their changes (git fetch waterbear) and then do git reset --hard waterbear/master	02:59
cirwin	I find git pull is very confusing	03:00
	→ roadt joined	03:00
	→ DrNick joined	03:01
grahamc	cirwin: I understand what you mean now.	03:01
	← tansell-laptop left	03:01
Techplex	the only problem with doing that is I get rejected when I try to push to github.	03:01
	← tjholowaychuk left	03:02
	← natea left	03:02
cirwin	Techplex: that's because you have commits on github that aren't in waterbear/master	03:02
	if you want github to forget those commits, you need to use git push -f origin master	03:02
	→ tansell-laptop joined	03:02
	→ dr_win joined	03:03
Techplex	well that worked! Thanks Guys!	03:03
cirwin	no worries	03:03
Techplex	I am really new to this whole git thing. Any suggestions. I find the documentation very confusing	03:03
	and i get trapped in these holes often. Ruining my productivity	03:03
grahamc	Techplex: have you read progit?	03:04
Techplex	nope	03:04
	just whats on github	03:04
grahamc	http://progit.org/	03:04
	http://book.git-scm.com/, too	03:04
Techplex	ok	03:05
	chapter a night	03:05
	→ L-Chymera1 joined	03:05
cirwin	Techplex: read the error messages	03:05
	they generally tell you what to do or where to look	03:05
Techplex	I have been trying to do what they say but It didn't get me where i wanted to be,	03:05
	← mjessome left	03:06
	← L-Chymera left	03:06
Techplex	Thanks much guys bakd to work	03:06
	← spaceonline left	03:06
	→ jacknagel joined	03:06
	← Techplex left	03:06
grahamc	something about "Thanks" and "Thanks much" makes me batty	03:07
	→ mjessome joined	03:07
cirwin	Thanks much is a bit clunky, what's wrong with thanks though?	03:07
	← juli0w left	03:09
grahamc	Hrm... any way I try to explain it sounds like I'm big-headed, but "thanks" seems a lot less gracious than "thank you", and since people are on IRC are helping out of their own free will, I feel like "thank you" is more appropriate	03:10
cirwin	fair enough :)	03:10
grahamc	I was raised in a southern home (US) and "thanks" wasn't very well received in most circles :P	03:11
cirwin	heh, for us it was "pardon" instead of "excuse me" that was utterly forbidden :p	03:12
	← tanoku left	03:13
grahamc	nice :)	03:14
	→ merkosh joined	03:15
	→ sven^ joined	03:16
	← ISF left	03:16
	← fission6 left	03:16
	← thehodge left	03:16
	← flamingspinach left	03:17
	→ juli0w joined	03:17
	→ flamingspinach joined	03:18
	→ cYmen joined	03:19
	← cccaldas left	03:20
	← mjessome left	03:20
	→ tanoku joined	03:20
	← Weust` left	03:21
	→ coldboot\|home joined	03:21
	← tansell-laptop left	03:21
	← Will\| left	03:21
	← Raging_Hog left	03:21
	→ MikhX joined	03:22
	← effnj0X left	03:22
	→ tansell-laptop joined	03:22
	→ towski joined	03:22
	← MikhX left	03:22
	← utu left	03:23
	← jpmelos left	03:24
roadt	hi, i found there are many xxx.git file for large project like git.kernel.org, is any way to check out all thing efficiently?	03:26
	→ cyberswat joined	03:26
	→ gnufied joined	03:27
	→ Weust` joined	03:28
	← cronin left	03:29
	← peterwald left	03:31
	→ cronin joined	03:31
offby1	git.kernel.org isn't a single project.	03:31
	It's a bunch of projects.	03:32
	→ zzing_ joined	03:32
offby1	each xxx.git "file" (actually a directory) holds one project, or (sometimes) a piece of a project.	03:32
	So chances are you only need to check out one, or a few, of those.	03:32
kmc	well many of the kernel.org repos have some objects in common	03:32
	← cronin left	03:32
offby1	ah	03:33
	short of fiddling with "alternates", I cannot think of a way	03:33
	→ Will\| joined	03:33
	← zzing left	03:34
	→ krz joined	03:34
	← gnufied left	03:34
	→ ericmuyse joined	03:35
	← tristanseifert left	03:36
	← jbrokc left	03:37
	→ tristanseifert joined	03:37
	← metcalfc left	03:37
	← tanoku left	03:38
	← ericmuyser left	03:38
	→ CannedCorn joined	03:39
	← Bass10 left	03:39
	→ jungejason joined	03:40
	← SirFunk left	03:41
	← flaguy48 left	03:41
	→ flaguy48 joined	03:42
	← flaguy48 left	03:45
	← tansell-laptop left	03:46
	→ tansell-laptop joined	03:47
	← cyberswat left	03:48
	← haseeb left	03:50
	→ msponge joined	03:50
	→ flaguy48 joined	03:51
	→ gerard0 joined	03:53
	→ f0i joined	03:54
	← jacknagel left	03:54
	← caseymcg left	03:55
	← Error404NotFound left	03:55
	← coldboot\|home left	03:57
	→ ncbncb joined	03:57
	→ _psychic_ joined	03:58
	← cschneid left	03:59
	← SimonNa left	04:00
	← ncbncb left	04:00
	→ ncbncb joined	04:00
	← kukks left	04:01
	→ alfplayer joined	04:01
	← OOPMan left	04:03
	→ joshteam1 joined	04:03
	→ ericmuyser joined	04:04
	→ segg2 joined	04:05
	← alfplayer left	04:05
	→ alfplayer joined	04:06
	← joshteam left	04:06
	joshteam1 → joshteam	04:06
	← ericmuyse left	04:08
	→ Error404NotFound joined	04:08
	→ guns joined	04:09
	← alfplayer left	04:09
	→ gnufied joined	04:09
	← pandeiro left	04:09
	→ alfplayer joined	04:09
	→ roop joined	04:09
	→ envi joined	04:10
	← lunks left	04:12
	← Rockj left	04:13
	→ Rockj joined	04:14
	← alberto56 left	04:14
	→ Pupeno joined	04:14
	→ beautifulmind joined	04:14
	← gnufied left	04:14
	→ vol7ron joined	04:15
	→ beakerman joined	04:16
	→ rdqfdx joined	04:19
	← vol7ron left	04:20
	→ dr0id joined	04:21
	→ caseymcg joined	04:21
	→ rcu joined	04:22
	→ gnufied joined	04:23
	← mkanat left	04:23
	→ OOPMan joined	04:24
	← OOPMan left	04:24
	→ Corren_ joined	04:25
	← rcu left	04:25
	← beakerman left	04:27
	← boaz left	04:27
	← ricky left	04:28
	← xissburg left	04:28
	→ Bacon890 joined	04:28
	← Bacon890 left	04:29
	→ boaz joined	04:29
	→ tore_ joined	04:29
	→ ricky joined	04:32
	← cirwin left	04:32
	← tansell-laptop left	04:32
	→ Fissure joined	04:33
	→ cytrinox_ joined	04:33
	→ cschneid joined	04:34
	→ zzing joined	04:35
	← gnufied left	04:35
	← cytrinox left	04:37
	cytrinox_ → cytrinox	04:37
	← zzing_ left	04:38
	← guns left	04:42
	← grahamc left	04:43
	→ itrebal joined	04:44
	→ eycel joined	04:45
	← itrebal left	04:46
	→ itrebal joined	04:46
	itrebal → grahamc	04:46
	← Blazento left	04:49
	→ dfr\|mac joined	04:49
	→ gnufied joined	04:53
	← alip left	04:56
	→ alip joined	04:59
	← farktronix left	04:59
	← Prime326 left	05:04
	→ farktronix joined	05:06
	→ mlncn joined	05:07
	→ Gunni joined	05:08
	→ acl_ joined	05:08
	→ ThomasLocke joined	05:08
segg2	needs help setting-up git server	05:09
	← kmc left	05:10
	← dfr\|mac left	05:10
	← dreiss left	05:10
	← cschneid left	05:11
	→ RobertLaptop joined	05:16
	← mlncn left	05:16
	→ macUzer joined	05:18
	← ceej left	05:19
	→ Kichael joined	05:19
	← devth left	05:20
sitaram	segg2: how many users? If it's only one or two and there are no serious access control needs, just plain ssh will do	05:20
	http://sitaramc.github.com/gitolite/doc/overkill.html has some instructions; there may be others around the web with similar info	05:21
	← seivan left	05:22
	→ rchavik joined	05:22
	→ seivan joined	05:22
	← cakehero left	05:22
	→ avinashhm joined	05:24
	← sasori left	05:28
	→ tansell-laptop joined	05:35
	→ cschneid joined	05:35
	← diegoviola left	05:37
	→ metcalfc joined	05:37
	→ joel_falcou joined	05:38
	→ Prasad joined	05:42
	→ j416 joined	05:43
	← _psychic_ left	05:44
	→ max8613 joined	05:45
	→ Niedar joined	05:46
	→ Jippi joined	05:46
	← SunilThaha left	05:46
	→ sunil joined	05:47
	→ mlncn joined	05:48
	← tore_ left	05:48
	← Error404NotFound left	05:48
	← d0k left	05:48
	← markbao_ left	05:49
	→ Error404NotFound joined	05:49
	→ steveoliver joined	05:51
	→ airborn joined	05:51
	← metcalfc left	05:54
	← madewokherd left	05:59
	← gnufied left	06:00
	→ mlncn-agaric joined	06:00
	→ vmil86 joined	06:00
	Nuck plops down to try and set up gitolite again	06:01
	→ stodan joined	06:02
	← mlncn left	06:02
	← Corren_ left	06:04
	→ gnufied joined	06:04
	← Error404NotFound left	06:05
	← macUzer left	06:07
	→ dc5ala joined	06:08
	← grahamc left	06:09
	→ bjoernh joined	06:10
	→ cirwin joined	06:11
	→ TrineLocke joined	06:12
	→ hemanth joined	06:13
hemanth	installing git without root permission, possible?	06:13
	→ cbreak_work joined	06:13
cehteh	hemanth: somewhat, but depends on the actual setup	06:15
hemanth	cehteh, m on shared hosting need to setup git server	06:15
	→ belkiss joined	06:15
	→ edoceo joined	06:16
edoceo	I did a `git checkout -b rev2` to switch from master to rev2, then hacked, then did `git commit -as` and `git format-patch origin` - so now I have a patch for rev2	06:17
	Now, I want to switch back to "master", and edit to make a patch for that revision as well	06:17
	So, `svn checkout -b master`, changes that - correct?	06:17
	→ Error404NotFound joined	06:18
	→ teweWork joined	06:18
	← steveoliver left	06:18
edoceo	But the files I edited are my edited versions, I need to make them the "master" copies, so I can edit, get diff, commit and format-patch again	06:18
cehteh	hemanth: i'd first ask the provider if they would install git	06:19
	next if it is even withhin their terms of service that you run git and/or install your own service	06:20
	installing it as user should be doable but certainly needs some custom setup, so if you can get it easier, thats the way to go	06:20
	← Error404NotFound left	06:21
	→ Error404NotFound joined	06:21
cehteh	i'd even threaten the provider to leave them if they dont provide git :P .. or if thats a problem for you host your normal stuff at that provider but use github or something like that	06:22
hemanth	cehteh, configure: error: no acceptable C compiler found in $PATH :(	06:22
cehteh	yeah, likely there is no development environment installed	06:23
cirwin	hemanth: well.. if you know the architecture, you can compile it locally and copy it up — probably not a fun thing to try though	06:23
cehteh	and more likely the provider dont like you install and run your own software	06:23
	yes thats a lot works and then possibly violates the terms of service, check that first	06:23
hemanth	cirwin, i'm on centosi686	06:24
	_^_	06:24
cehteh	would be a fun excercise to bootstrap a whole development environment with a assembler or C compiler written in bash or perl :P	06:24
	← Jippi left	06:25
	→ dl9pf_ joined	06:25
segg2	how much is this different from the GNU setup	06:25
hemanth	heh heh indeed, worth the effort	06:26
	← dl9pf left	06:26
	← fiyarburst left	06:26
	→ slithytove2006 joined	06:26
cehteh	well what provider? .. you earn nothing when you put efforts into it, trigger a lot red lights there and have your contract canceled	06:26
hemanth	cehteh, me on $hitty godaddy server :\|	06:27
	← msponge left	06:27
cehteh	as saied check the terms of service, in the easiest case, installing git is just one ticket away	06:28
IcePic	as one who installed gitosis due to such a ticket I can agree. Its dead simple and works like a charm. Kudos to sitaram for that one.	06:29
	← Prasad left	06:30
hemanth	cehteh, no support	06:31
cehteh	then change the provider	06:31
	← noetik left	06:32
	→ noetik joined	06:32
cehteh	gitosis or gitolite?	06:32
cirwin	!gitosis	06:33
jast	automatic message gitosis is no longer maintained and supported by the author; we usually recommend gitolite instead which has much better documentation and more features: http://github.com/sitaramc/gitolite	06:33
IcePic	oh dang. gitolite	06:33
	meant that one.	06:33
	→ aminpy joined	06:33
cehteh	:)	06:33
	→ simenbrekken joined	06:33
cirwin	!gitolite	06:33
aminpy	how can I set ssh key tu git server?	06:33
	in debian server	06:33
	or fedora	06:33
cehteh	man ssh-copy-id	06:33
	← beautifulmind left	06:34
cehteh	when you verified ! that key login works i'd sugest to remove the password from the server	06:34
	← lut4rp left	06:34
hemanth	cehteh, i got the binaries!	06:35
	→ xaxxon joined	06:35
cehteh	hemanth: with all libs?	06:36
hemanth	cehteh, http://www.krizka.net/download/files/git-1.7.3.4_centos5.2.tar.bz2	06:36
	← envi left	06:37
	← ncbncb left	06:37
cehteh	i have no idea if that will work, try it on your own risk	06:37
	google "godaddy git"	06:38
	.. no idea about cheap unsupported hosting, i'd rather not use such	06:38
	← xaxxon_ left	06:38
	→ [SySteM] joined	06:38
[SySteM]	Hello	06:38
	please i need some help with git	06:39
cehteh	hey google gives a lot results ..	06:39
[SySteM]	i fond git commit -amend to reedit last commit	06:39
	but i want to reedit the 3 lasts.. is there a possibility please ?	06:39
hemanth	cehteh, heh heh ok	06:40
cehteh	[SySteM]: git rebase --interactive	06:40
	← CannedCorn left	06:40
	→ mhauri joined	06:41
	→ saschpe joined	06:41
frogonwheels	[SySteM]: (hint, use 'edit' and once the rebase stops at the commit, make your changes, stage them (add to index) and use commit --amend)	06:43
	[SySteM]: before git rebase --continue	06:43
[SySteM]	git rebase -i HEAD~3 ?	06:43
cehteh	yes	06:43
	← mlncn-agaric left	06:43
	→ mlncn joined	06:44
cirwin	[SySteM]: see also "git commit --fixup" if you have a recent version of git	06:44
	→ envi joined	06:44
	→ Blekel joined	06:44
	→ mjessome joined	06:44
	→ tewecske joined	06:47
	→ cesario joined	06:47
	→ marc_kdab joined	06:49
	→ sako joined	06:50
	← sako left	06:50
	→ sako joined	06:50
	Nuck → _nuck	06:53
	← slithytove2006 left	06:53
	_nuck → ___nuck	06:53
hemanth	cehteh, yupppy it worked :)	06:54
cehteh	have fun	06:54
	___nuck → Nuck	06:54
	→ flijten joined	06:54
	→ mansour joined	06:54
cirwin	heh, that's cool	06:55
	^^ hemanth	06:55
mansour	I have a local project, and I want to make it available as a bare repo on a remote server.	06:55
	how to do so ?	06:55
	← airborn left	06:55
cirwin	ssh to the box, git init --bare;	06:55
hemanth	cirwin, cehteh hope they wont cancel my account ;)	06:55
mansour	cirwin: but all the code is local	06:56
cirwin	mansour: step 2	06:56
	git remote add mansour@server:path/to,git	06:56
	*git remote add origin mansour@server:path/to,git	06:56
	← Error404NotFound left	06:56
cirwin	git push origin master	06:56
	→ sasori joined	06:56
mansour	ok, cirwin will try that	06:57
sasori	hi, how to remove the existing folder at the github account?	06:57
	← emptyflask left	06:57
cirwin	sasori: existing folder? do you mean repository?	06:57
sasori	cirwin: yup..how ?	06:57
hemanth	cirwin, cehteh test1 git clone http://www.h3manth.com/repo/photoblog.git working file, /me <3 git <3's freedom	06:58
cirwin	sasori: I don't actually know, maybe #github can help	06:58
	hemanth: 'tworks	06:59
	→ rvsjoen_ joined	06:59
cehteh	hemanth: we run our websites through git too, but on our own server :P	07:00
	git + asciidoc .. winning team :)	07:00
hemanth	hope i will also have dedicated lines soon	07:00
	freedombox FTW!	07:01
	← rvsjoen left	07:01
[SySteM]	please another question : got permission denied only for make a stash. (there no problem about permission, got full permission, try too on root..)	07:01
cehteh	[SySteM]: if you once used it as root and permission/umask where not set up for sharing then root left file inaccessible for other users around	07:02
	→ abhishekb joined	07:02
	→ eletuchy joined	07:02
	→ Spockz joined	07:02
[SySteM]	it try to create a new file like /.git-stash.8100-index	07:02
	each time i make a stash	07:02
cehteh	and no access to write there	07:03
	permission problem	07:03
[SySteM]	its a mounted samba partition	07:03
cehteh	eek	07:03
[SySteM]	im owner of all files	07:03
cehteh	why would one do that :P	07:03
abhishekb	how to initialize git where it is alreadt initialized	07:04
	how to initialize git where it is already initialized	07:04
cirwin	abhishekb: you can run git init again?	07:05
	what are you wanting to do?	07:05
abhishekb	actually i had a git account which crashed	07:05
	now I have a new account i don t know how to setup	07:06
	→ aLeSD joined	07:06
cirwin	git = github?	07:06
abhishekb	please help me out	07:06
	yeah	07:06
	← mlncn left	07:06
cirwin	so you have a new account?	07:06
	you've set up the ssh keys?	07:06
	→ mlncn-agaric joined	07:06
abhishekb	not yet but i will wat to do after that	07:07
cirwin	I don't understand what you're trying to do	07:07
	delete the old repository from your computer and start again?	07:07
	just use "rm -r"	07:07
abhishekb	no that way i ll loose all my commits is there any way to keep them cause the pro. dir. still have a .git folder	07:08
cirwin	ok, what you want to do then is add a new remote	07:08
	git remote add new-repo [email@hidden.address]	07:08
	then you can "git push new-repo"	07:08
	git remote add new-repo [email@hidden.address]	07:09
abhishekb	ohh, thanks man, help is much appriciated, thanks alot :)	07:09
cirwin	no problem — the hard bit is working out what you're want to do ;)	07:10
abhishekb	yeah	07:10
	→ lundtor joined	07:10
	→ radarek joined	07:11
	→ goshakkk joined	07:11
	→ Error404NotFound joined	07:11
segg2	need a setup server for dummy, git init, create file1, on mycomp, git init --bare myrepo project.git	07:13
	→ ciberglo joined	07:13
segg2	now, where are the command to make the thing work with push	07:13
cirwin	man git-remote	07:14
jast	automatic message the 'git-remote' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-remote.html	07:14
	fairuz\|away → fairuz_	07:14
	→ CannedCorn joined	07:14
cirwin	i.e. git remote add origin [email@hidden.address]	07:14
	← Niedar left	07:16
	→ mastro joined	07:17
	← lundtor left	07:17
	→ lundtor joined	07:18
	→ herdingcat joined	07:20
	→ sourcerebels joined	07:20
	→ butter71 joined	07:20
	→ nellyb joined	07:20
	← butter71 left	07:20
	← kerrick left	07:22
	→ kriegerod joined	07:22
	← mlncn-agaric left	07:23
	→ tvw joined	07:23
tansell-laptop	so is there any way to test if a merge will be successful? Kinda like a git merge --dry-run or something?	07:24
	← mattp_ left	07:24
	→ JimHank joined	07:25
	→ babonk joined	07:25
babonk	Where's a good URL to start learning Git? I'm completely new to version control, but I udnerstand in the abstract how it works with diffs/merges/commits	07:25
	*understand	07:25
tansell-laptop	babonk, I would just jump right in and start trying to do stuff	07:26
	← milli left	07:26
	← roop left	07:27
	← seivan left	07:27
	← sako left	07:28
tango_	babonk: pro git probably	07:28
	→ liquidproof joined	07:28
nocturnal	one thing I like about another version control system is that I only have to do a commit to push files to the server. can that be done in git somehow or should I just add my own shell alias?	07:29
	← ciberglo left	07:30
nocturnal	I've learned git commit -am but I would like to get it down to just one step. I make many small commits.	07:30
	→ milli joined	07:30
	← dr0id left	07:30
	→ nimrod10` joined	07:34
abhishekb	how to remove untracked files?	07:34
nevyn	abhishekb: rm	07:34
abhishekb	git rm *.pyc , is it ok ?	07:34
nevyn	abhishekb: so you probably want to use gitignore for generated stuff like that	07:35
abhishekb	yeah, i got so in google results but i dont know how to use that command	07:35
	→ nd__ joined	07:36
	← nimrod10 left	07:36
	← Textmode left	07:37
abhishekb	please tell me how to use gitignore	07:37
	gitignore *.pyc is saying command not found :(	07:38
	← eycel left	07:38
cirwin	echo '*.pyc' >> .gitignore	07:39
segg2	is this making sense to any of you http://pastebin.com/fHD1TcUR	07:39
abhishekb	ohh, like that thanks man..!!	07:39
tango_	hm has anybody else had problems sending emails to the git ml? I'm not seeing my emails from yesterday yet	07:40
	← towski left	07:40
	→ qian_office joined	07:41
	→ Chaser joined	07:43
	→ starlays joined	07:43
	← jungejason left	07:43
	→ jungejason joined	07:44
masterkorp	hello,good monrning	07:44
	→ seivan joined	07:45
	← qian_office left	07:46
	→ pantsman joined	07:46
	← pantsman left	07:46
	→ pantsman joined	07:46
	→ qian joined	07:46
	← mastro left	07:46
	← jungejason left	07:48
	→ tatsuya joined	07:48
	← nellyb left	07:49
	soahccc → soahccc`	07:49
	← alfplayer left	07:50
	→ alfplayer joined	07:50
	→ aminpy_ joined	07:50
	→ Mkaysi joined	07:51
	← caseymcg left	07:51
	← belkiss left	07:52
	← abhishekb left	07:52
	← aminpy_ left	07:53
	→ OOPMan joined	07:54
	→ mhauri_ joined	07:55
	← workmad3 left	07:56
	← mhauri left	07:56
	→ dr_lepper joined	07:56
	→ Fullmoon joined	07:58
	→ alextheger joined	07:59
	→ mastro joined	07:59
	← Fullmoon left	08:00
	→ roop joined	08:00
	← mcc left	08:01
	→ davzie joined	08:03
	→ whitman joined	08:04
cbreak_work	is there an easy way to make a gitolite controlled server read only temporarily?	08:08
	→ dr0id joined	08:08
segg2	i need someone rsa key, that someone would check if my ssh setup is working for writiing	08:08
	← juli0w left	08:10
	← Chaser left	08:11
	← pantsman left	08:15
	→ thehodge joined	08:15
charon	tango_: there's some graylisting in place. also, some filter rules, notably large mails (>100kb or so) and html are dropped silently	08:15
	← tristanseifert left	08:16
	→ tristanseifert joined	08:16
	→ PigeonFriend joined	08:16
tango_	charon: I don't think either applies to my case, unless I stepped over a filter rule	08:17
	charon: I don't suppose you can check if I got filtered, can you?	08:17
	← Juo left	08:18
tango_	maisl are in the form [PATH [0-2]/2] .diff. from a @gmail.com address	08:18
	→ juli0w joined	08:18
	← Vile left	08:19
	← seivan left	08:20
	← gretch left	08:20
	→ _md joined	08:21
	→ TheWorldofDan joined	08:21
	← joel_falcou left	08:21
	← stliu left	08:22
	→ seivan_ joined	08:23
cbreak_work	hmm... I could change gitolite's update hook to always disallow	08:26
	→ Juo joined	08:26
	← johnw left	08:26
	← _md left	08:28
	→ himsin joined	08:30
	← ketas left	08:30
	← RobertLaptop left	08:31
	→ dfas joined	08:31
	← mishok13 left	08:32
	→ haseeb joined	08:32
	→ RobertLaptop joined	08:35
sitaram	cbreak_work: yes there is	08:37
	← Tommy[D] left	08:37
	→ alcy joined	08:38
	→ mishok13 joined	08:38
	→ nicoulaj_ joined	08:39
sitaram	cbreak_work: look for "disabling write access" in the master doc index: http://sitaramc.github.com/gitolite	08:39
	← sasori left	08:39
	← lm-brodo left	08:40
	→ Prasad joined	08:41
	→ brodo joined	08:41
	← babonk left	08:42
	← krz left	08:42
	→ plashchynski joined	08:42
	→ fs-sylr joined	08:43
cbreak_work	thanks! I've not found that in the normal docs.	08:43
	→ _md joined	08:43
sitaram	cbreak_work: assuming your gitolite is at least v1.5.8	08:44
	(and if you didn't find it in your docs perhaps your gitolite is too old... please tell me what version you're running)	08:44
	→ lut4rp joined	08:45
	← lut4rp left	08:45
	→ lut4rp joined	08:45
alcy	folks, what's the difference between post-update & post-receive ? only the kind/number of args ?	08:45
	← drev1 left	08:45
sitaram	alcy: yes	08:45
	→ drev1 joined	08:46
	← [SySteM] left	08:46
	→ caseymcg joined	08:46
cbreak_work	v1.5.7-18-g2bbcc82	08:46
alcy	sitaram: thanks. since I don't have a requirement for any args, it doesn't make any difference ?	08:47
cbreak_work	I am migrating to a new server with an all new installation	08:47
	← TomyLobo left	08:49
sitaram	cbreak_work: that should have the documentation for that feature... wonder why you didn't find it. Anyway, yeah it should work	08:50
cbreak_work	maybe I didn't search well enough	08:51
	← juli0w left	08:51
sitaram	cbreak_work: it's easier to search the master index because there's no eqvt for it in the shipped docs (it's auto-generated). Other than that it should be there...	08:51
	→ rapha joined	08:51
rapha	Hi all!	08:51
	← drev1 left	08:52
sitaram	alcy: shouldn't. Best way is to test with some dummy program	08:53
rapha	We have a repo here with a master and an alpha_2 branch, and we've been using the alpha_2 branch for months exclusively now, and the master branch has become pretty much useless. I'd like to keep the history, but apart from that I want it to get back to a state where there's only a master branch again and that's where the newest code which is now called alpha_2 is. How would I best do thatß	08:53
	→ Alvo joined	08:54
sitaram	rapha: git branch -M master old-master; git branch -M alpha_2 master; git push -f --all	08:54
	or equivalents	08:54
rapha	okay, let me try that	08:54
sitaram	sorry; use "-m" (lowercase) for safety	08:54
	← alfplayer left	08:54
	→ alfplayer joined	08:55
rapha	okay	08:55
cbreak_work	note that that only renames the local branch	08:55
	you'll have to do that on every repository	08:55
	(and force push to remotes)	08:56
	make sure that no one accidentally pulls the new master into the old version :)	08:56
	→ jfelchner joined	08:56
cbreak_work	(branch replacements count as history rewriting, potentially)	08:57
jfelchner	So I just did a commit and somehow it created it without a parent. Is git commit-tree what I want at this point?	08:57
	← gebi left	08:57
jfelchner	Or do I just have to do a hard reset and commit again?	08:57
sitaram	rapha: please also read what cbreak_work wrote above and understand the implications of doing this. You have to make sure all your team knows and does not push the old one out again!	08:58
FauxFaux	cherry-pick is probably the easiest fix.	08:58
	← alfplayer left	08:58
	→ alfplayer joined	08:59
	→ kR15t0 joined	08:59
	sitaram has always found it bldy hard to make a commit without a parent; how did someone do that accidentally?	08:59
	→ juli0w joined	08:59
jfelchner	sitaram: I wish I knew! :)	08:59
rapha	sitaram: yeah i'm wondering right now how to prevent an accident from happening here because we have non-programmer team members who push to the repo	08:59
	← f0i left	09:00
cbreak_work	why do you think it has no parent?	09:00
IcePic	learn "undo". Its the main tip ever when using versioning systems. When you know how to undo bad commits, everything gets simple.	09:00
rapha	sitaram: couldnt i just have them push their changes, stop working, delete their local copies, do my thing, and have them clone again?	09:01
cbreak_work	rapha: you can have them run git remote update && git checkout master && git reset --hard origin/master	09:02
	that'll nuke all local changes to master	09:02
	and is probably faster	09:02
rapha	okay	09:02
alextheger	is there a git tool (e.g. GUI), so that I can compare three or more different versions from file in a git repo?	09:02
rapha	yeah it's kind of a big repo ... 700MB or so	09:02
alextheger	e.g. seeing the last three commits that changes one specific file?	09:03
sitaram	alextheger: kdiff3	09:03
	→ curtana joined	09:03
	→ Vile joined	09:03
sitaram	alextheger: but you'd have to do something separately to get those versions out I suppose	09:03
	← crashanddie left	09:03
	← amoe left	09:03
jfelchner	FauxFaux: A cherry-pick worked great. Don't know why I didn't think of it myself. Thanks!	09:03
cbreak_work	alextheger: git log -p -- filename	09:03
	jfelchner: cherry-pick should not work without a parent	09:04
	since it works by diffs	09:04
	soahccc` → soahccc	09:04
cbreak_work	you should not use it to get changes from a commit without parent because commits without parents do not have a changeset defined	09:04
jfelchner	cbreak_work: Since the commit had no parent, it considered it a "first commit" and had everything listed. When I cherry-picked it, it diffed against the commit I was on and only added the changes.	09:04
cbreak_work	weird.	09:05
jfelchner	Not sure WHY it worked, but it did. :)	09:05
cbreak_work	maybe special case	09:05
	→ gretch joined	09:05
rapha	bah... 150k down and 50k up are not rly comfy for working with git	09:06
	→ RaceCondition joined	09:08
	→ Coriolan joined	09:08
	← seivan_ left	09:08
FauxFaux	rapha: Better than any centralised vcs, surely.	09:08
	→ seivan joined	09:08
alextheger	cbreak_work: can I also limit this to a special hunk (e.g. all between line 50 and 60, or whenever line x changed)?	09:08
	← goshakkk left	09:09
rapha	FauxFaux: indeed!	09:10
	→ BlaDe^ joined	09:10
rapha	FauxFaux: i'm more complaining about the speed of the pipe in general	09:11
FauxFaux	Roll on 4g and the EU beating the crap out of the mobile networks for us. ¬_¬	09:11
	← thehodge left	09:11
rapha	hey i'm on DSL here	09:11
	most 4G ppl get higher speeds :P	09:12
	← Alvo left	09:13
	→ achadwick joined	09:13
	→ ketas joined	09:15
	← svend left	09:16
rapha	sitaram: when i do "git branch -m master alpha_2" all i get is "fatal: A branch named alpha_2 already exists"	09:16
	→ workmad3 joined	09:16
rapha	oh wait	09:16
	you LITERALLY meant "old-master"	09:16
	→ anubhaw joined	09:17
	← tango_ left	09:18
rapha	sitaram: okay, seems to have worked.	09:18
	← DrNick left	09:18
	→ jesteracer joined	09:19
rapha	sitaram: another question; is it possible to loop through all revisions and remove a certain directory whenever it's present?	09:19
	→ SRabbelier\|Lappy joined	09:19
sitaram	rapha: gfb! (the famous git-filter-branch -- it's man page should have examples)	09:19
rapha	sitaram: i mean physically remove it ... we want to get rid of anything we don't need anymore to get down to a reasonable size again - 700MB is quite hefty as 650 of that is probably junk	09:20
	sitaram: okay, thanks	09:20
	→ tango_ joined	09:20
	→ mattp_ joined	09:20
sitaram	rapha: read man git-filter-branch thoroughly; it has all the answers you need. Practice on a copy if you're not sure. It's very picky on syntax and all but works great	09:21
jast	rapha: automatic message the 'git-filter-branch' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-filter-branch.html	09:21
	→ joel_falcou joined	09:22
	← _md left	09:23
rapha	sitaram: okay, will do ... working on a copy is probably a good idea	09:24
	← haseeb left	09:26
	← eletuchy left	09:27
	→ jargon- joined	09:32
	→ DrNick joined	09:32
	← yeryry left	09:34
	→ yeryry joined	09:34
	→ giallu joined	09:35
rapha	sitaram: just got confirmation from one team member that everything has worked out nicely for him ... now i got to figure out what to do with the linguistics people who are using tortoisegit instead of command line git	09:35
	→ brian_g joined	09:35
	← Amorphous left	09:37
	← Vile left	09:38
	→ sebbi joined	09:40
	← sourcerebels left	09:40
	← RobertLaptop left	09:41
	→ flavius joined	09:41
	← Garen left	09:42
charon	tango_: i can't check except what i got delivered from the ML. but there's so much diff stuff going on right now that you may want to be a little less paranoid about your subjects and address	09:45
	→ Vile joined	09:45
	→ bittin` joined	09:45
tango_	I wondr why else I could have been filtered. messages were short	09:45
	→ alansaul joined	09:47
	← bauruine left	09:47
	← tiago left	09:47
	← nocturnal left	09:48
	→ Akkar1n joined	09:48
	→ _md joined	09:48
	← seivan left	09:50
charon	i was just saying i'm not getting into a guessing game	09:51
	← xiangfu left	09:51
	→ Amorphous joined	09:53
	→ sourcerebels joined	09:53
	→ RobertLaptop joined	09:54
	← pen left	09:57
	→ chrischambers joined	10:00
	→ beautifulmind joined	10:01
	← nineteeneightd left	10:01
	← xaxxon left	10:01
	← ph^ left	10:01
	→ xaxxon joined	10:01
	→ ph^ joined	10:02
	← toxico left	10:02
	← Tabmow left	10:02
	→ kimico joined	10:02
	← an0maly left	10:02
	← brainbox1100 left	10:03
	→ Tabmow joined	10:03
	→ brainbox1100 joined	10:03
	→ awallin_ joined	10:03
	→ jceb joined	10:03
	→ an0maly joined	10:03
	← Zeelot left	10:04
	← sven^ left	10:04
	→ Zeelot joined	10:04
	→ sven^_ joined	10:04
	← pastie left	10:04
	← airtonix left	10:04
	← Nuck left	10:04
	→ airtonix joined	10:04
	← nazgul101 left	10:05
	← numbah left	10:05
	← Dynetrekk left	10:05
	← mhauri_ left	10:06
	→ numbah joined	10:06
	→ sc joined	10:06
	← nevyn left	10:06
	← tonyhit left	10:06
	→ Dynetrekk joined	10:06
	← qknight left	10:06
	→ nazgul101 joined	10:06
	→ qknight joined	10:06
	← jpalmer left	10:06
	→ tonyhit joined	10:06
	→ nevyn joined	10:07
	→ nineteeneightd joined	10:07
	→ Nuck joined	10:09
	← cesario left	10:11
	→ thiago joined	10:12
	→ tanoku joined	10:15
	→ sanjoyd joined	10:15
	← tanoku left	10:20
	→ haseeb joined	10:21
	→ jbrokc joined	10:21
	← sourcerebels left	10:23
	→ SimonNa joined	10:28
	← zamabe left	10:29
	→ MUILTFN joined	10:29
	← brodo left	10:30
	← Prasad left	10:30
	→ TrevGamingRIg joined	10:32
	→ saschagehlich joined	10:32
	← TrevGamingRIg left	10:32
	→ abhishekb joined	10:33
abhishekb	how to change repo in project directory?	10:35
	anyone ?	10:36
	→ brodo joined	10:38
	→ sikao_lfs1 joined	10:39
	→ haseeb_ joined	10:39
	← haseeb_ left	10:40
	→ belkiss_ joined	10:40
	→ haseeb_ joined	10:40
	→ Prasad joined	10:41
	← haseeb_ left	10:41
	← haseeb left	10:42
	→ mlncn joined	10:42
	← caseymcg left	10:42
	→ haseeb joined	10:42
sitaram	abhishekb: what does the question even mean?	10:43
abhishekb	actually i created the repo with wrong name can i rename it ?	10:45
	on github ?	10:45
jpjacobs	use mv	10:45
	ah	10:45
Akari`	you can rename it, go to the admin panel	10:45
jpjacobs	not on github though :p	10:45
Akari`	https://github.com/USER/REPO/admin	10:46
	right there	10:46
abhishekb	thanks for help :)	10:47
	← Blekel left	10:49
	← JStoker left	10:49
	→ Blekel joined	10:49
	← Pupeno left	10:50
	← Juo left	10:50
	→ pen joined	10:50
	→ tore_ joined	10:52
	→ mhauri joined	10:53
	← nardev left	10:54
alextheger	is there an irc channel for gitx?	10:55
	← cirwin left	10:56
Pieter	alextheger: no, but you can ask questions here	10:56
	← _md left	10:57
	← herdingcat left	10:57
	→ ericography joined	10:58
	← OOPMan left	10:58
	→ Anubisss joined	10:59
	← joel_falcou left	11:00
	→ f0i joined	11:02
alextheger	Pieter: is there a way to have two windows of the same repository in gitx? Ideally I could run a cmd like gitx <sha1> and gitx2 <sha2> to open up to gitx windows.	11:03
Pieter	alextheger: no, I don't think so, it's document-based so it can only open a repo once	11:04
alextheger	Pieter: I already tried to copy GitX.app (naming it GitX2.app) and setting a symlink gitx2 in /usr/local/bin to GitX2.app, but it all opens it in one window	11:04
Pieter	alextheger: yeah, the second command-line tool will communicate with the same app as the first tool	11:04
	alextheger: you could compile gitx yourself and change the identifiers it uses for the command line client	11:05
alextheger	Pieter: in which file would I do this?	11:05
sitaram	Pieter: you serious? you can't open two views of the same repo using a GUI repo viewer?	11:07
	→ bonhoffer joined	11:08
Pieter	sitaram: yeah	11:09
	alextheger: probably a file with the word 'proxy' in it	11:09
	→ nenjordi joined	11:11
	→ hurikhan\|Work joined	11:11
alextheger	Pieter: I found kGitXBundleIdentifier in GitXScriptingConstants.h. It's set to @"nl.frim.GitX". Should this do the job?	11:11
	← haseeb left	11:11
	→ marekw2143 joined	11:12
nenjordi	Hi all, while rebase -i, if I decide to use reword, should I change the message in the actual buffer or will I get a new buffer to put my new message after saving changes? so, is it a two step or one step?	11:12
sitaram	Pieter: is this a Mac thing or a GitX thing? The GitX website says it's like 'git gui and gitk', and I know those two can open any number of views	11:12
	← flavius left	11:12
	→ nardev joined	11:12
marekw2143	hi, how to create "standard" patch acceptable by patch command?	11:12
Pieter	sitaram: it's an os x convention	11:12
	→ flavius joined	11:12
Pieter	alextheger: hmm, I'm not sure if that's the one. Perhaps something with CLI in it?	11:12
sitaram	Pieter: that's an odd definition of "convention" I must say	11:12
	← juli0w left	11:13
Pieter	sitaram: well, a document is a unique thing, so if you try to reopen it, it just goes to the thing already opened	11:14
	makes sense to me	11:14
	might not be the best way to model a git client, but oh well	11:14
	→ cjuner joined	11:14
sitaram	Pieter: a repo is a document?	11:14
Pieter	sitaram: yes	11:14
sitaram	Pieter: wow... I'm... speechless!	11:15
	← BlaDe^ left	11:16
	→ iXeno_ joined	11:17
Pieter	alextheger: you need to change ConnectionName	11:18
	→ spatulasnout joined	11:18
alextheger	Pieter: already on it. thx!	11:18
	← iXeno left	11:19
	← quadz left	11:20
	→ beautifulmind1 joined	11:20
	→ Juo joined	11:21
alextheger	Pieter: I compiled it with "#define ConnectionName @"GitX2 DO Connection". I also have a symlink from gitx2 -> /Users/USERNAME/Applications/GitX2.app/Contents/Resources/gitx . But still gitx2 will only open the first gitx:(	11:21
	→ juli0w joined	11:21
	← Juo left	11:22
	← beautifulmind left	11:22
	→ prasadkr joined	11:22
	← Prasad left	11:23
	← pen left	11:23
	← robinbowes left	11:23
alextheger	Pieter: is there maybe a applescript option to tell gitx2 to show commit <sha2>?	11:24
	← liquidproof left	11:24
	→ kms joined	11:25
	→ glennpratt joined	11:25
	→ fish_ joined	11:26
fish_	hi	11:27
	→ robinbowes joined	11:27
	← robinbowes left	11:27
fish_	I don't really get this submodule stuff.. how do I update to which commit a submodule refers?	11:27
	→ drake01 joined	11:27
	→ Juo joined	11:28
fish_	a submodule is a reference to a specific commit/revision in another repository, right? so if I do changes to that repository, how do I update the repository which points to it?	11:28
nenjordi	auto-reply: two steps :)	11:29
	← avinashhm left	11:29
	→ gavin_huang joined	11:29
	← Error404NotFound left	11:29
	← jceb left	11:29
	→ xjonc joined	11:30
	→ jceb joined	11:30
	← xjonc left	11:30
	→ tanoku joined	11:30
	← saschagehlich left	11:30
fish_	nenjordi: ? comit the changes in the refered repository, push them. and what do I do in the refering repos?	11:31
nenjordi	fish_: I was replying to my own question, sorry I didn't answer to you, have no idea :(	11:32
fish_	damn ;)	11:32
	→ OOPMan joined	11:35
	← dc5ala left	11:35
	← pngl left	11:36
	← himsin left	11:38
	→ cesario joined	11:38
	→ avinashhm joined	11:39
	→ johnw joined	11:39
	← GeertB left	11:41
	→ pngl joined	11:41
	→ Drakevr joined	11:42
	← avinashhm left	11:43
	→ tiago joined	11:44
	← bonhoffer left	11:46
	← belkiss_ left	11:50
	→ Error404NotFound joined	11:51
	← Error404NotFound left	11:51
	→ Error404NotFound joined	11:51
	← Fudge left	11:51
	→ Fudge joined	11:53
	← vmil86 left	11:53
	← shiba_yu36 left	11:54
	→ himsin joined	11:55
	→ cannonball joined	11:56
	← cooloney left	11:56
	→ thehodge joined	11:57
	← jbrokc left	11:57
	← Drakevr left	11:58
	→ Drakevr joined	11:58
	← marekw2143 left	11:58
	→ quadz joined	12:00
	← s0undt3ch left	12:02
Pieter	alextheger: nope, but may be possible to create one, I think there should be a system service	12:02
	← spatulasnout left	12:03
	← normanrichards left	12:04
	dwmw2_gone__ → dwmw2	12:06
	→ cyberswat joined	12:07
	→ vmil86 joined	12:07
	→ ccushing joined	12:07
	→ Martin_ joined	12:11
	← cyberswat left	12:11
	→ Jon47 joined	12:12
	← RaceCondition left	12:13
	→ kvanderw joined	12:15
	→ Vortex35 joined	12:16
	← Chris\|2 left	12:17
	→ svend joined	12:19
	← Vortex34 left	12:19
	← tansell-laptop left	12:22
	→ [intra]lanman joined	12:24
	← workmad3 left	12:25
	→ pandeiro joined	12:25
	→ cccaldas joined	12:28
	→ jonatasnona joined	12:29
	← prasadkr left	12:30
	→ beakerman joined	12:30
	→ lunks joined	12:32
	← fisted left	12:32
	→ joel_falcou joined	12:32
	→ fisted joined	12:32
	← zzing left	12:35
	← project2501a left	12:36
	← abhishekb left	12:37
	→ normanrichards joined	12:38
	→ project2501a joined	12:41
kelsin	fish_: you go into your subdirectory that contains the module, move it to the commit you want (probably a pull or something) and then go back to your parent repo's directory and do a git status. You should see that you can now "commit" this change to the submodule	12:41
	→ xiangfu joined	12:43
fish_	kelsin: thanks! but i already found that out. acctually it was exactly like i tried before, but i fucked something up because i lost a not pushed commit somewhere 'on the way'	12:43
	→ jsick3 joined	12:43
	→ bartek joined	12:45
	← cesario left	12:45
	→ jwineinger joined	12:45
	→ jfkw joined	12:46
	→ RaceCondition joined	12:46
	← thehodge left	12:47
jwineinger	hey guys, i've got a custom pretty-format for log in my .gitconfig. It uses various color codes in it. On some of my systems, the colors all work, on others only a couple work and the rest are spit out as text like "%C(yellow)%d". Any idea what to check for?	12:47
	→ AaronMT joined	12:47
SethRobertson	fish_: Depending on what you are trying to do, you might find gitslave easier to use and think about than git submodules. It is better for some workflows, but worse for others	12:50
	← mlncn left	12:53
	← drake01 left	12:55
	→ leonaves joined	12:55
	← project2501a left	12:56
GeorgeJ	Should I commit .gitignore to the repository?	12:56
	→ rendar joined	12:56
	ChanServ set mode: +v	12:57
leonaves	hello	12:57
	can anyone direct me to a git tutorial for absolute beginners	12:57
	and i mean i've never touched a command line	12:57
GeorgeJ	Have you tried google?	12:58
leonaves	yes	12:58
	← dfamorato left	12:58
leonaves	all i can find is tutorials that expect me to know how to use the command line	12:58
	what bout command line tutorials?	12:58
	im on unix	12:58
GeorgeJ	leonaves: Have you tried searching for command line tutorials?	12:58
leonaves	no :(	12:58
	← beautifulmind1 left	12:59
	← leonaves left	12:59
SethRobertson	leonaves: See !book	12:59
jast	leonaves: automatic message 'Pro Git' is a complete book about git that is available online for free: http://progit.org/book/	12:59
SethRobertson	But that probably will involve command lines. I will note that using the command line rarely causes wounds	13:00
	← kvanderw left	13:00
	→ juangiordana joined	13:01
SethRobertson	What you really need to do is see if your IDE supports git. If you are not using the command line you must be creating your content using some kind of GUI, and that GUI might well support git.	13:01
	→ SirFunk joined	13:01
cbreak_work	if you want to use git, nothing beats the command line	13:02
SethRobertson	https://git.wiki.kernel.org/index.php/Interfaces,_frontends,_and_tools has a list of GUIs for git	13:02
	Look for the chart	13:02
	Wow, he left. Lots of patience that one.	13:02
	→ drake01 joined	13:03
IcePic	Fall to the dark side, he will.. mmm?	13:03
murr4y	...why did he have +v?	13:03
	→ shiba_yu36 joined	13:04
	← drake01 left	13:04
	ChanServ set mode: +v	13:05
	→ project2501a joined	13:05
ndim	GeorgeJ: If you want the rules for everyone using the repo, put them into .gitignore. If you just want them locally, put them into .git/info/excludes	13:05
	→ drake01 joined	13:06
GeorgeJ	ndim: I'm using jgit with eclipse, adding a file to ignore(trough the menu) gets added to .gitignore sadly	13:06
	← starlays left	13:06
	← jspiros left	13:06
	← mpenzi left	13:07
	→ mpenz joined	13:07
ndim	GeorgeJ: You can still move those rules from .gitignore to .git/info/excludes manually, I guess.	13:08
	Depending on the importance and scope of the rules, I would consider doing that in your place.	13:09
GeorgeJ	I see, thanks	13:09
	→ s0undt3ch joined	13:10
	← s0undt3ch left	13:10
	← boaz left	13:10
	→ boaz joined	13:10
	← boaz left	13:10
	→ s0undt3ch joined	13:10
	→ NaNoNickV joined	13:11
	← NaNoNickV left	13:11
	→ bitkiller joined	13:11
	→ boaz joined	13:12
	→ Bass10 joined	13:13
	→ jalama joined	13:15
curtana	whoa, when did google code start supporting git	13:15
SethRobertson	a few weeks ago	13:15
FauxFaux	When github attained dominance.	13:15
	→ lolfrenz joined	13:15
curtana	ahf, it's a recent thing	13:16
	i just saw a git link on a project hosted there and blinked :)	13:16
FauxFaux	Probably two years after they gave a presentation on how hg was better than git in every way. ¬_¬	13:17
curtana	they did?	13:17
	how could anyone think such a thing!	13:17
	← protozog left	13:18
	dr0id → scal3	13:19
fairuz_	FauxFaux: What's "hg" ?	13:20
tango_	mercurial	13:20
	→ emptyflask joined	13:21
fairuz_	ah, ok	13:21
	scal3 → w3bscal3	13:21
	→ akosikeno joined	13:22
	← drake01 left	13:22
	← kermit left	13:23
	→ _psychic_ joined	13:23
	→ itrebal joined	13:23
	→ kermit joined	13:23
	← akosikeno left	13:23
	← hemanth left	13:24
	→ akosikeno joined	13:24
	← aminpy left	13:24
	→ jpmelos joined	13:25
	← akosikeno left	13:25
	→ dcarper joined	13:26
	→ jspiros joined	13:26
	← is_null left	13:26
	→ akosikeno joined	13:26
	→ kvanderw joined	13:27
wereHamster	FauxFaux: googlecode's web interface is horrible if you compare it to github. I have no idea why anyone is still using it	13:28
PerlJam	wereHamster: because they're still using subversion ;)	13:30
	← _psychic_ left	13:30
	→ spearce joined	13:30
	← himsin left	13:31
	→ teknoid joined	13:31
	← Swimming_bird left	13:32
	→ TeckniX joined	13:33
	← itrebal left	13:33
	← Nuck left	13:33
	→ MrMaksimize joined	13:33
	→ Prime326 joined	13:35
	→ nwp_ joined	13:35
	→ ceej joined	13:35
	→ v0n joined	13:36
	→ cyberswat joined	13:38
	→ workmad3 joined	13:38
	→ rmsc joined	13:38
wereHamster	they = google?	13:39
	internally they are using perforce..	13:39
	→ GeertB joined	13:40
	← SirFunk left	13:42
	→ rvsjoen joined	13:43
	→ mlncn joined	13:44
	← roop left	13:44
	← rvsjoen_ left	13:45
	→ dfamorato joined	13:45
	← jwineinger left	13:45
	→ beatak joined	13:46
	← OOPMan left	13:47
	→ ccushing_ joined	13:48
	→ ymasory joined	13:49
	← ccushing left	13:50
	→ cmyk_ joined	13:50
	← project2501a left	13:50
IcePic	wereHamster: isnt those kinds of statements like "nasa" or "MIT" or whatever sufficiently large institution where ANY claim will be true like "they run BeOS" or "They use FAT12" or whatever odd thing you can imagine?	13:51
	← zivester left	13:52
	← f0i left	13:54
	→ cherro joined	13:55
	← ptr_uzl left	13:55
	→ stliu joined	13:56
	← gavin_huang left	13:57
selckin	but they have perforce boxes with over 100gb of memory	13:58
FauxFaux	And teams of goblins to maintain them.	13:58
	→ ptr_uzl joined	13:58
FauxFaux	(And still everyone uses git-p4.)	13:58
	→ Dave^\| joined	13:58
selckin	and i couldn't care less :/	13:58
	← jfkw left	14:00
	→ project2501a joined	14:00
	→ Yuuhi joined	14:01
	→ haseeb joined	14:01
	→ nibblebot joined	14:01
	→ dajhorn joined	14:02
	→ rvsjoen_ joined	14:03
	← workmad3 left	14:03
	→ alberto56 joined	14:04
	← rvsjoen left	14:05
	→ w0bni joined	14:06
	← Martin_ left	14:06
	→ berkes joined	14:06
	→ Swimming_bird joined	14:08
	→ axl_ joined	14:09
	→ fiyarburst joined	14:09
	← project2501a left	14:09
	← ShooterMG left	14:10
	→ g0bl1n joined	14:10
	→ jimmy1980 joined	14:10
	→ asteve joined	14:10
	← asteve left	14:10
	→ asteve joined	14:10
berkes	I have added a remote (some upstream resource) and would like my collegues to have that same remote set. Is there a way to commit the "list of remotes" to the git repo?	14:11
	→ Behi joined	14:11
	← brodo left	14:11
	← awallin_ left	14:12
	→ _pr0t0type_ joined	14:12
	→ mart joined	14:12
	→ brodo joined	14:13
mart	Hi, can anyone explain the difference between refs/tags/foo and refs/tags/foo^{} in the output of ls-remote?	14:13
	It's a tricky thing to google for. :/	14:13
FauxFaux	mart: man git rev-parse	14:14
jast	mart: automatic message the 'git-rev-parse' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-rev-parse.html	14:14
	← ccushing_ left	14:15
	← mlncn left	14:15
simenbrekken	I went ahead and deleted my submodule directories and now git submodule update/sync	14:16
mart	FauxFaux: I don't understand why I only see the extra object sometimes. I don't seem to see them with tags I create myself.	14:16
simenbrekken	doesn't do anything, is there any way to force git to refetch submodules	14:16
	→ remyo joined	14:18
	→ Martin_ joined	14:19
	← max8613 left	14:19
remyo	So I've got two branches, one with one new commit that the original doesn't have. When I try to merge them I just get the message "Already up-to-date.", what am I doing wrong?	14:19
	← noisebleed_ left	14:19
cbreak_work	remyo: how?	14:20
	← sonnym left	14:20
	→ project2501a joined	14:20
remyo	cbreak_work: I've tried git merge experimental and git merge master. I'm currently on experimental	14:20
cmn	mart: when that documentatio speaks of tags, it means real i.e. annotated tags	14:21
remyo	(experimental being the one with the newest commit)	14:21
cmn	mart: if you just do git tag something, that's a lightweight tag	14:21
	→ noisebleed joined	14:21
	← noisebleed left	14:21
	→ noisebleed joined	14:21
	→ gastaldi joined	14:21
gastaldi	hey all !	14:22
	I am using Git on Github and find it awesome	14:22
	I wanted to have a similiar (free) environment in my company	14:22
	any recommendations ?	14:22
	← simenbrekken left	14:23
mart	cmn: OK. When I create a tag and push it, then I don't see the ^{} labels. When I use maven-release-plugin to tag, I do. But looking at it's logging, I can't see what I'm doing differently. How would I create a non-lightweight tag from the command line?	14:23
	→ SirFunk joined	14:23
cmn	mart: you give it a message	14:25
	you should see a difference if you use git show	14:25
	→ rlmumford joined	14:25
mart	cmn: Aha! Thanks :)	14:26
	← MrMaksimize left	14:26
	← project2501a left	14:26
	→ jfkw joined	14:26
jpjacobs	remyo: if you want to merge experimental with master then you should checkout master and merge experimental	14:26
cbreak_work	remyo: if you're on experimental, git merge master will merge the new commit from master	14:26
	← RaceCondition left	14:27
	← rmsc left	14:27
	→ airborn joined	14:27
remyo	Ugggh. Of course. I feel like such a noob. Thanks jpjacobs + cbreak_work	14:27
	→ kevwil joined	14:28
jpjacobs	gastaldi: you might be interested in this pqge then: https://git.wiki.kernel.org/index.php/InterfacesFrontendsAndTools#Web_Interfaces	14:28
	← buckiller_ left	14:28
gastaldi	jpjacobs: Thanks, I´ll dig into it	14:28
	→ mbtez joined	14:28
	→ buckiller joined	14:29
	← MUILTFN left	14:29
	→ helgikrs joined	14:29
mbtez	if i do git push ___ master	14:29
	what is ___	14:29
	?	14:29
	and where is the information about it stored	14:30
	→ project2501a joined	14:30
gastaldi	jpjacobs: Do you have any favorite ?	14:30
jpjacobs	never tried one.	14:30
FauxFaux	mbtez: "git remote"	14:30
	← project2501a left	14:31
	→ jatt joined	14:31
mbtez	mmn i c thanks	14:31
	→ project2501a joined	14:31
mbtez	question #2...if i have a bunch of changes to my application and do git commit -a, i get an error message, after doing :wq in vim - "Aborting commit due to empty commit message." why?	14:31
	→ peterwald joined	14:31
	→ tystr joined	14:32
	→ ramusara joined	14:32
	← rlmumford left	14:32
jpjacobs	mbtez: you should actually specify a message. lines starting with # are comments and won't be comitted	14:33
	← o] left	14:33
mbtez	i'm confused...why isn't it automatically detecting what changed?	14:33
	or am i supposed to uncomment those lines?	14:34
	← remyo left	14:34
nwp_	window goto 2	14:34
jpjacobs	mbtez: no you should type in a message that does not start with #	14:34
	→ MrMaksimize joined	14:34
mbtez	what is that message supposed to be exactly?	14:35
	just words?	14:35
jpjacobs	mbtez: the message has for purpose to have a description of what changed and why, in human language, because it's easier to read than raw difs	14:35
mbtez	OH	14:35
	← frogonwheels left	14:35
jpjacobs	or whatever you fancy	14:35
	but your co-devels will be annoyed if you don't properly describe what you did	14:36
mbtez	my co-devel is stoned	14:36
	out of his gourd	14:36
	lol	14:37
	← fiyarburst left	14:39
	→ novettam joined	14:40
	← anubhaw left	14:40
	→ seivan joined	14:40
	→ MUILTFN joined	14:42
	← dfas left	14:42
	→ lut4rp_ joined	14:42
	← lut4rp left	14:43
	← gastaldi left	14:43
	← lut4rp_ left	14:45
	← johnw left	14:46
	→ fedesilva joined	14:47
	→ dfr\|mac joined	14:48
	→ n8o-mba joined	14:49
	→ lut4rp joined	14:50
	← lut4rp left	14:50
	→ lut4rp joined	14:50
	→ seivan_ joined	14:52
	→ abhatnag joined	14:52
	→ freimatz2 joined	14:53
	← n8o-mba left	14:55
	← seivan left	14:55
	→ tech13 joined	14:55
	← tatsuya left	14:56
	← bjoernh left	14:57
tech13	we have a collection of developers on a lan, and origin on github. is there a suggested way of setting up a local caching mirror on the lan of the origin?	14:58
FauxFaux	There's loads of examples of creative ways to use hooks for mirroring.	14:59
	→ tatsuya joined	15:00
	→ dfamorato_ joined	15:00
	→ mlncn joined	15:00
	→ replore_ joined	15:01
	→ codebeaker joined	15:02
sitaram	tech13: it all depends on where you want pushes to go. If you don't mind everything being a local server, just do that and add a hook to that server to push to github on each push it receives. Done	15:02
	← dr_win left	15:03
codebeaker	when I have been incrementing tags such as `v1.0.1`, through v1.0.4 (across ~10 master branch commits) - why would `git describe` only show the first one, from the documentation it should find the most recent reachable tag ?	15:03
	← w3bscal3 left	15:03
codebeaker	(the tags are pushed, and etc)	15:03
	← dfamorato left	15:04
	→ dr_win joined	15:04
	← flijten left	15:05
	← Blekel left	15:05
	→ o] joined	15:05
	← seivan_ left	15:05
	→ workmad3 joined	15:06
	→ sonnym joined	15:06
	← Dreamer3 left	15:06
	← boaz left	15:06
	→ dfas joined	15:07
	← stliu left	15:07
	→ rlmumford joined	15:07
rlmumford	hey, what command would I run to find out the last commit in a remote?	15:08
wereHamster	codebeaker: only the first tag was annotated	15:08
	codebeaker: describe by default only considers signed/annotated tags	15:08
codebeaker	ahhh, damn - right	15:09
	→ shruggar joined	15:09
	← brodo left	15:09
codebeaker	thanks for the tip, I completely didn't see that in the documentation, I need to figure a way around that	15:09
	→ boaz joined	15:09
	← xiangfu left	15:09
codebeaker	we won't annotate "bug" versions, but feature versions, we'll put release notes in there	15:10
	thanks wereHamster - I'll hit the docs again	15:10
	→ brodo joined	15:10
wereHamster	make the tags signed	15:10
	← cmyk_ left	15:11
	← jceb left	15:11
	← alfplayer left	15:12
	→ johnw joined	15:12
	→ edbian joined	15:14
	← EricInBNE left	15:14
edbian	Is there a way to see if my local repo is behind the bare mirror without doing a pull? When I'm ahead status tells me but there is now way to see when I'm behind.	15:14
FauxFaux	git fetch	15:14
	← ph^ left	15:15
edbian	FauxFaux: What does git fetch show me if I am behind? (I'm not at this particular moment)	15:16
FauxFaux	git fetch makes git status tell you you're behind, like it tells you you're ahead.	15:16
	→ HG` joined	15:16
	← rchavik left	15:16
	← sontek left	15:16
	→ sontek joined	15:16
	← mhauri left	15:17
	→ gebi joined	15:17
	→ Xanax joined	15:17
	→ Determinist joined	15:17
	→ ph^ joined	15:17
	← pizza__ left	15:17
	→ pizza_ joined	15:18
edbian	thanks	15:18
	← cbreak_work left	15:18
	← ph^ left	15:18
	→ cronin joined	15:19
	→ ph^ joined	15:20
	← ph^ left	15:20
	← kpreid left	15:20
	→ ph^ joined	15:20
	← peterwald left	15:20
	→ aleiphoenix joined	15:20
	← Xanax left	15:21
	→ tjholowaychuk joined	15:21
	← stodan left	15:21
	→ cats4gold_ joined	15:22
	← cats4gold_ left	15:22
	← cats4gold left	15:22
	→ cats4gold_ joined	15:22
	← ph^ left	15:25
	← giallu left	15:25
	← edbian left	15:27
	← MUILTFN left	15:27
	→ berserkr joined	15:27
	→ ShooterMG joined	15:28
	→ kenichi joined	15:28
	→ macUzer joined	15:29
	→ Xanax joined	15:29
	← airborn left	15:30
	→ nadirvardar joined	15:31
	→ ddkilzer joined	15:32
	→ alvaro_o joined	15:32
mpenz	hi sitaram. I was wondering, are the latest commits going to the pu branch or the master?	15:33
	← alvaro_o left	15:33
	→ ph^_ joined	15:33
	← saschpe left	15:34
	← mart left	15:34
	→ roop joined	15:35
	← cccaldas left	15:36
	← jlk left	15:36
	→ nadavoid joined	15:38
	→ Corren joined	15:39
	← radarek left	15:39
	→ dfas` joined	15:41
	→ threecreepio joined	15:41
	→ cakehero joined	15:42
	→ rickharrison joined	15:42
	← novettam left	15:42
	→ richardkchapman joined	15:43
	← freimatz2 left	15:43
	← dfas left	15:43
	← JimHank left	15:45
	← haseeb left	15:45
	← mbtez left	15:45
macabre	i just got the dreaded push rejected, non-fast forward error while trying to push my commits to my branch, all this means is i have to issue a pull from my branch and then push?	15:45
	→ devth joined	15:46
	← Dave^\| left	15:46
	← buckiller left	15:46
	← alextheger left	15:47
	→ Cromulent joined	15:47
	→ sinojelly joined	15:47
	ChanServ set mode: +v	15:47
mike_perdide	macabre: pull rebase or pull merge and then repush	15:47
	macabre: are other developpers pushing on that remote ?	15:48
macabre	no	15:48
	its just my branch	15:48
	but yes in the master, other devs are working	15:48
	→ buckiller joined	15:48
mike_perdide	macabre: did you push from another location than your local repo ?	15:48
macabre	we all have seperate branches, im afraid one dev stepped too far ahead	15:48
	→ Prasad joined	15:49
FauxFaux	"dreaded" <3	15:49
	macabre: git fetch; gitk HEAD master origin/master	15:49
macabre	mike_perdide: no, i just stay in my branch	15:49
	i don't touch the master :P	15:49
sitaram	mpenz: pu	15:49
macabre	our lead dev does all the branch merging to keep sync	15:49
	← hyperair left	15:50
	← angelsl left	15:50
FauxFaux	"git fetch; gitk HEAD @{u}" probably works, too.	15:50
	→ novettam joined	15:51
	→ hyperair joined	15:52
	← nicoulaj_ left	15:55
	← s0undt3ch left	15:55
	→ sudojelly joined	15:55
	← fir31ight left	15:56
	→ drev1 joined	15:56
	→ fir31ight joined	15:56
	→ boutcher joined	15:56
	→ Rubin joined	15:58
Rubin	i have made (and committed) some local changes, but not pushed. I wish to push that stuff into a branch and get them out of master, but i'm a bit lost	15:58
kylehayes	Some large binaries (specifically wars) were accidentally checked into one of our repos and then removed. What's the best way to remove these permanently from the index	15:59
codebeaker	kylehayes: there's no good answer for that	15:59
kylehayes	codebeaker: heh, I know it's not a desired thing	15:59
	→ bauruine joined	15:59
	← dfr\|mac left	16:00
patrikf	permanently: rm and ignore. permanently and retroactively: filter-branch and ignore	16:00
	← brodo left	16:01
kylehayes	patrikf: ah...ok, I will look into that	16:01
	Thank you	16:01
	→ kpreid joined	16:01
	→ RaceCondition joined	16:02
	← Tac left	16:02
	← jatt left	16:02
	→ brodo joined	16:02
	← sebbi left	16:02
	soahccc → soahccc`	16:03
	→ Tac joined	16:03
	← cyberswat left	16:04
	← codebeaker left	16:05
	→ cyberswat joined	16:06
	→ goshakkk joined	16:06
	← nullvariable left	16:06
	← edoceo left	16:07
	→ nullvariable joined	16:08
	ChanServ set mode: +v	16:08
	→ s0undt3ch joined	16:08
sinojelly	how to config http.proxy?	16:09
	→ sterlo joined	16:09
wereHamster	sinojelly: man gitconfig	16:09
	← sc left	16:09
sinojelly	i have tested two ways	16:09
	git config --global http.proxy "localhost:9050"	16:10
	→ tyteen4a03 joined	16:10
sinojelly	the other way is: git config --global http.proxy /home/jelly/bin/proxy	16:10
	→ jungejason joined	16:10
	← Xanax left	16:10
sinojelly	the content of bin/proxy is: exec corkscrew localhost 9050 $*	16:11
	what's the difference of these two ways?	16:11
	← tyteen4a03 left	16:11
	← whitman left	16:12
	→ tyteen4a03 joined	16:12
	← tyteen4a03 left	16:13
	→ tyteen4a03 joined	16:13
	→ tMobile4a03 joined	16:14
	← tyteen4a03 left	16:14
	← tMobile4a03 left	16:14
wereHamster	the first one is correct, the second one is wrong (according to the man page)	16:14
nDuff	sinojelly, FYI -- from a shell programming perspective, $* is wrong -- it word-splits things, so if $1="foo bar" and $2="baz", it becomes three items, "foo", "bar", and "baz"	16:14
	→ tyteen4a03 joined	16:14
nDuff	sinojelly, "$@" (with the double quotes) is the proper replacement	16:15
	← SRabbelier\|Lappy left	16:15
wereHamster	nDuff: doesn't it split on IFS?	16:15
	← Cromulent left	16:15
nDuff	wereHamster, yes, it does -- but "$@" avoids splitting at all, actually preserving the original argument list.	16:15
	→ kukks joined	16:15
sinojelly	thanks, when to use localhost:9050? and when to use corkscrew?	16:16
wereHamster	ah, Note that $* uses the first character held in $IFS.	16:16
	← ericmuyser left	16:17
	← macUzer left	16:17
	→ tMobile4a03 joined	16:18
	← tyteen4a03 left	16:18
	← s0undt3ch left	16:19
	← teweWork left	16:19
	← tMobile4a03 left	16:19
	← liquid-silence left	16:19
	← Tac left	16:20
	→ s0undt3ch joined	16:20
	→ sako joined	16:21
	← sako left	16:21
	→ sako joined	16:21
	→ Tac joined	16:21
sinojelly	msg nDuff why git some thimes use port fowarding tools, such as corkscrew, thanks.	16:22
	→ _psychic_ joined	16:22
	← goshakkk left	16:23
	← aleiphoenix left	16:24
	→ aleiphoenix joined	16:24
	← aleiphoenix left	16:25
	→ aleiphoenix joined	16:25
	← aleiphoenix left	16:25
	→ Araxia joined	16:26
	→ RaceCondition_ joined	16:26
	→ robertfw joined	16:27
	← s0undt3ch left	16:29
	← RaceCondition left	16:29
	RaceCondition_ → RaceCondition	16:29
	→ cccaldas joined	16:29
	→ effnj0X joined	16:30
	→ thehodge joined	16:30
	← Determinist left	16:30
	→ liquidproof joined	16:30
	→ protozog joined	16:32
	→ Determinist joined	16:33
	→ cirwin joined	16:34
	← protozog left	16:34
	← dr_lepper left	16:34
	→ protozog joined	16:34
	→ ericmuyser joined	16:34
	← curtana left	16:34
	→ glimpsenirvana joined	16:34
	← kR15t0 left	16:35
	← ericmuyser left	16:36
	elliottcable → sad_elliottcable	16:36
	← sinojelly left	16:37
	→ curtana joined	16:38
	→ TomyLobo joined	16:38
	← curtana left	16:38
	sad_elliottcable → elliottcable	16:38
	← sudojelly left	16:38
	← svend left	16:41
	← glimpsenirvana left	16:43
	→ drudge01 joined	16:43
	← cccaldas left	16:43
	→ cccaldas joined	16:44
	→ buckiller_ joined	16:45
	← roop left	16:45
	← dl9pf_ left	16:46
	→ msponge joined	16:47
	→ mcc joined	16:47
	← project2501a left	16:47
	← plashchynski left	16:47
	← buckiller left	16:48
	← mjessome left	16:48
	→ icwiener joined	16:49
	Vampire0_ → Vampire0	16:49
	→ FylGood joined	16:49
	← GeertB left	16:50
	→ liquid-silence joined	16:50
	← liquid-silence left	16:50
	→ liquid-silence joined	16:50
	→ ObjMind joined	16:51
	← ObjMind left	16:51
	← o] left	16:52
	← alcy left	16:52
	← Vampire0 left	16:52
	→ adnasa joined	16:53
	→ Vampire0 joined	16:53
	→ svend joined	16:53
	← liquidproof left	16:54
	→ liquidproof joined	16:55
	← jargon- left	16:55
	→ mando joined	16:56
	← nenjordi left	16:56
	→ belkiss joined	16:57
	← rlmumford left	16:59
	← shiba_yu36 left	17:01
	Corren → kenperkins	17:01
	← shruggar left	17:02
	→ mkramer joined	17:03
	← SimonNa left	17:05
	← davzie left	17:06
	← cccaldas left	17:07
	→ NaNoNickV joined	17:08
	← NaNoNickV left	17:08
	← ymasory left	17:08
	→ ymasory joined	17:08
	← drudge01 left	17:09
	← liquid-silence left	17:09
	← liquidproof left	17:09
	→ mjessome joined	17:10
	← thehodge left	17:10
	→ ksawicki joined	17:10
	← workmad3 left	17:10
	← juli0w left	17:11
	→ Ryback_ joined	17:12
	← Ryback_ left	17:12
	→ Ryback_ joined	17:12
	→ cbx333 joined	17:12
	← cbx333 left	17:12
	→ joe-mac joined	17:13
	← FylGood left	17:13
	← g0bl1n left	17:13
	← ramusara left	17:13
joe-mac	I've created a branch from my git stash, there are variables not auto configured like remote.<nickname>.url = <url>, is that typical? If I make a branch off of master and not off my stash, this stuff gets filled in right?	17:14
	← achadwick left	17:14
	→ liquid-silence joined	17:14
	← liquid-silence left	17:14
	→ liquid-silence joined	17:14
	→ alfplayer_ joined	17:15
	← cirwin left	17:16
	→ tas_devil joined	17:16
	→ Dave^\| joined	17:16
	← alfplayer_ left	17:17
	← jfelchner left	17:17
	→ alfplayer joined	17:17
	→ babonk joined	17:17
	→ thehodge joined	17:18
	→ ttelford joined	17:19
	→ juli0w joined	17:19
	← Juo left	17:20
	→ cmyk_ joined	17:21
	→ binnson joined	17:22
	kenperkins → Corren	17:23
	← mastro left	17:23
	← akosikeno left	17:24
troyt	For purposes of a post-receive hook script, is there a way to determine which subdir(s) had changes in a given commit?	17:25
	← kriegerod left	17:26
	← babonk left	17:26
SethRobertson	Yes	17:26
	→ sustainableweb joined	17:27
troyt	OK, next question: Is it painful?	17:27
	← ttelford left	17:27
SethRobertson	post-receive hook gets "oldrev newrev refname" as arguments. You can use the output of `git log` or `git show` or whatever to get the filenames and then post-process the output the find the directory names	17:28
troyt	OK; and from there just parse it & chug along.	17:28
	→ kriegerod joined	17:28
troyt	OK, thanks.	17:28
SethRobertson	Well, it actually gets one or more lines of that data on stdin, but whatever	17:28
	→ Fitzsimmons joined	17:29
	→ shruggar joined	17:29
	→ jas4711 joined	17:30
	→ plashchynski joined	17:30
	→ macUzer joined	17:30
	→ steveoliver joined	17:31
Fitzsimmons	so I've imported my git repo from a mercurial repo, and it looks like a few .git directories were checked in that git now does not like. I'm getting errors like Invalid path 'vendor/plugins/prawnto/.git/foobar' - I should be able to run a git filter-branch to remove .git directories from my history, right?	17:31
	← mkramer left	17:32
j416	hm, if i have merged upstream into my topic branch at least once, I can no longer successfully rebase topic on top of upstream without trouble right	17:33
	I would have to continue merging instead if rebasing	17:33
	s/if/of/	17:33
	→ german joined	17:33
	← german left	17:33
	← dfas` left	17:36
	soahccc` → soahccc	17:37
	→ mastro joined	17:38
	← mcc left	17:39
	← effnj0X left	17:40
	← macUzer left	17:40
	← Error404NotFound left	17:40
	← binnson left	17:41
cbreak	j416: you can always rebase	17:41
	← Chib left	17:42
cbreak	but depending on what, you have to specify the merge base	17:42
	← helgikrs left	17:43
j416	cbreak: I tried to rebase, and it gave me the same conflicts as I got when I merged upstream (master in this case) into topic	17:44
	I thought maybe rerere is what I want, but then I thought, perhaps rebase isn't the thing	17:44
	→ PabloM joined	17:44
cbreak	j416: conflicts are normal	17:44
	← shruggar left	17:44
j416	if I merge upstream into topic again, it's clean	17:44
cbreak	just resolve them and --continue	17:44
j416	cbreak: it's the _same_ conflicts as when I merged.	17:44
	→ metcalfc joined	17:44
j416	exact same.	17:44
	← joe-mac left	17:45
	← adnasa left	17:45
	→ fission6 joined	17:45
	→ ObjectMind joined	17:45
fission6	i have a code repo on my local machine, i just got a web instance, i want to push all my code and create an upstream repo on it, whats the best way to do this?	17:45
cbreak	ssh server?	17:46
	→ samrose joined	17:46
	→ kmc joined	17:47
	← ObjectMind left	17:48
	← Prasad left	17:48
	← juli0w left	17:51
	← bittin` left	17:51
	← tatsuya left	17:52
fission6	yes cbreak i just followed these instructions which seemed to work great	17:52
	http://qugstart.com/blog/ruby-and-rails/create-a-new-git-remote-repository-from-some-local-files-or-local-git-repository/	17:52
	→ tatsuya joined	17:52
	→ MrPunkin joined	17:54
	← Tac left	17:54
MrPunkin	After a merge how do I clean up all the .BACKUP and .REMOTE and .BASE files? Just delete them?	17:54
cbreak	fission6: there's not much to do, just install git, git init --bare a repo, and you're done	17:55
fission6	well i need to set up the remote and track it locally	17:55
cbreak	MrPunkin: what?	17:55
	doesn't sound like git	17:55
MrPunkin	hmmm. I think I know what it may be actually.	17:56
fission6	cbreak, how would i approach the following, now that i have my upstream repo created, i want to be able to pull the code into a folder where the applicaiton is going to be deployed, how would i want to set up pulling code from a bare repo on the same box?	17:56
cbreak	just git pull	17:56
	→ derek_ joined	17:56
	→ Tac joined	17:56
cbreak	or if you want to do it more secure, use git archive with a tar piped in	17:56
	→ GeertB joined	17:57
	→ kerrick joined	17:57
	→ mkramer joined	17:57
fission6	cbreak, well there is no repo estbalished where the code is to be deploued	17:58
	so do i do git clone /to/local/path/	17:58
	→ cyberswa_ joined	17:58
cbreak	yeah. or use git archive	17:59
	→ xris joined	17:59
	→ cirwin joined	17:59
fission6	yea that worked nicely!	17:59
	thanks	17:59
	→ juli0w joined	17:59
cbreak	what I would do:	18:00
	← ph^_ left	18:00
	← derek_ left	18:00
cbreak	git archive \| tar x blahblah intonewfolder	18:00
	→ vanmik joined	18:00
cbreak	then mv oldfolder away, and newfolder in place	18:00
	← jlilly left	18:00
	← cyberswat left	18:01
	← MrPunkin left	18:01
xris	I'm required to use a corporate svn account at work. git-svn works fine as a client but would like to spin off a bare git repository to make it easier for devs to share and push to git branches. anyone have any helpful recommendations/links/tutorials?	18:01
	→ cccaldas joined	18:01
	→ jlilly joined	18:01
cbreak	xris: remember to only use one single git repo to talk with svn	18:02
	→ dreiss joined	18:02
xris	yeah, that's the plan	18:02
	just wasn't sure if there was any trick to using git-svn from a bare repo	18:02
cbreak	not sure if that works	18:03
	considering that dcommit might need conflict resolution	18:03
	which requires a working dir	18:03
	← robertfw left	18:04
xris	ok, so that would mean creating a separate bare repo for git, and then having one "user repo" defined as the one to move stuff from there to svn?	18:05
	← Mkaysi left	18:05
cbreak	I think so	18:05
xris	that makes sense	18:05
cbreak	not that I've used more than a single git-svn repo	18:05
	← cronin left	18:05
xris	well, would only need one git-svn repo, then	18:05
	I guess you could call it a proxy repo. that sort of makes sense	18:06
	just wish I could skip the whole mess and just use git, but corporate policy says everything has to get pushed into svn	18:06
	← plashchynski left	18:07
cbreak	you are aware that all the commits in svn will be from the same user?	18:07
	→ eletuchy joined	18:07
	→ plashchynski joined	18:07
xris	there is that. hmm..	18:07
	maybe it doesn't matter.	18:07
	having each user use git-svn wouldn't be much better.. anything they push would become owned by them in svn.. might make it more confusing.	18:08
	dunno, maybe I just need to push harder for a corporate git repo. :)	18:08
	→ hobodave joined	18:09
cbreak	I just asked and got a VM to set one up :)	18:09
	it's nice to be in research	18:09
	→ jxpx777 joined	18:09
necromancer	ughhhhhhhhhh we actually had to have a meeting this morning discussing the process for merging 2 dirs on svn	18:09
xris	my company isn't so flexible...	18:09
	heck, we have devs who are scared to leave CVS for svn	18:09
	I admit that git is scary for some, but svn was such a tiny shift from cvs...	18:10
	← gnufied left	18:10
necromancer	xris: that i can't imagine	18:10
	sticking with CVS	18:10
xris	some people love it. or rather.. don't know anything else.	18:11
necromancer	isn't CVS broken?	18:11
xris	only when compared to better stuff. :)	18:11
necromancer	like isn't it not maintained anymore, and doesn't quite work the way it was intended?	18:11
xris	no clue	18:11
	→ robertfw joined	18:12
	← ew0 left	18:12
	← The_Ball left	18:12
	→ himsin joined	18:14
	← lolfrenz left	18:15
	→ curtana joined	18:15
yrlnry	I used CVS quite successfully for a long time to track my blog articles.	18:15
	← johnw left	18:15
	→ ericmuyser joined	18:16
yrlnry	It worked fine because I never need to commit changes to two articles at the same time.	18:16
	← himsin left	18:16
SethRobertson	If you are going to try to get people to move, you might as well get them to move to git. I did it with my company. There is a list of equivalent commands, really only one new one (git push)	18:16
	← ericmuyser left	18:16
	← BlindOracle left	18:16
kmc	no, you really cannot learn git as a cookbook	18:16
	you have to learn the data model	18:16
SethRobertson	It worked fine because you didn't need to branch or move things into the attic and out of the attic	18:16
xris	SethRobertson: not going to happen here. I'm one dev in a company of hundreds.. and I'm the new guy.	18:16
SethRobertson	Untrue. Several people used it as a cookbook	18:17
	→ himsin joined	18:17
kmc	oh, i guess if you're sticking to a restricted CVS-like workflow	18:17
	then it might work	18:17
	→ ew0 joined	18:17
SethRobertson	Of course, they cried for help when something weird happened, but that was only once a month or two.	18:17
kmc	if you have branching and merging and rebasing then someone will screw one up	18:17
	and then they have to understand what's actually going on	18:17
xris	kmc: we did that at my last company… and it's worked with only a few large bumps when converting mythtv over to git	18:17
SethRobertson	The cookbookers never did (non-pull) merging or rebasing.	18:18
xris	SethRobertson: yeah, when I switched to git at my last company, we had a couple of very savvy git users to help all of us out.	18:18
SethRobertson	Well, actually that isn't true. We actually created a shell script to assist in the merging when they started to need to do it.	18:18
	→ kennethreitz joined	18:18
	→ zwick joined	18:18
	→ BlindOracle joined	18:19
	← brodo left	18:19
	← plashchynski left	18:19
xris	SethRobertson: we had two-way cvs integration when we started	18:20
	xris blames cxreg for that bit of brilliance :)\	18:20
	← BlindOracle left	18:20
SethRobertson	Ugh. That sounds awful	18:20
xris	sounds worse than it was. it actually worked quite well until we managed to get some stubborn remote devs off of CVS (which was required for some reasons out of our control)	18:21
cirwin	I can empathise with the CVS enthusiasts — if someone told me I had to use "X" instead of git, I'd also tell them to get lost in no uncertain terms.	18:21
	← vanmik left	18:21
kmc	does the git → cvs direction work?	18:21
xris	cirwin: I'm just glad git-svn works as well as it does. git makes an awesome svn client	18:22
	kmc worked somewhere with cvs → git imports	18:22
xris	kmc: through a massive custom perl script, I believe	18:22
	and hand-poking when there were conflicts.	18:22
	← cmyk_ left	18:22
kmc	in the finance world, if your code successfully makes money, nobody can tell you to do anything	18:22
SethRobertson	Are there any CVS enthusiasts? I know of people who refuse to change because it works "well enough" but they don't think it is better, just not worth the effort to change.	18:23
	→ BlindOracle joined	18:23
kmc	we were lucky they used CVS at all, instead of the good old directory system	18:23
	project/backups/backup2/backup_4/code_7.cpp	18:23
	← kriegerod left	18:23
xris	I've met some who like CVS because it was better than whatever they used before. and don't see any added value in svn/git/hg/whatever	18:23
	→ odie5533 joined	18:24
kmc	it's the same as the "Blub Paradox" in programming languages	18:24
	if you're used to svn then you don't see the ways git could make your life easier	18:24
	because you're not thinking in those terms	18:25
	← curtana left	18:25
	→ gnufied joined	18:25
	→ workmad3 joined	18:25
kmc	if you never think "maybe i should use a branch" then there is no reason to wish for cheap branching	18:25
	← Prime326 left	18:31
	← tas_devil left	18:31
	← envi left	18:31
	→ Pupeno joined	18:31
ew0	blub paradox?	18:32
	I never heard that	18:32
	← odie5533 left	18:32
kmc	it's from one of paul grahams "why you must do a software startup before the age of 12 or you are a failure in life" essays	18:33
	← kennethreitz left	18:34
kmc	guy's a supreme blowhard, but says some perceptive things	18:34
	← icwiener left	18:35
	← cccaldas left	18:35
	→ cccaldas joined	18:35
	← tystr left	18:36
	← ASIRINeiluj left	18:36
	← Behi left	18:36
	← kerrick left	18:37
	soahccc → soahccc`	18:37
	→ fiyarburst joined	18:38
	← tristanseifert left	18:39
kelsin	kmc: agreed, his essays are worth reading	18:40
	← w0bni left	18:40
	→ tristanseifert joined	18:41
ew0	ahua	18:42
	seems interesting	18:42
	← tvw left	18:42
	→ thews joined	18:42
	→ giallu joined	18:43
	← berkes left	18:43
	← ryansch left	18:43
cbreak	being perceptive is not a big deal	18:44
	if you want something that's just perceptive, buy a camera.	18:44
	→ Juo joined	18:44
	→ cbx33 joined	18:44
	← juli0w left	18:45
cbx33	why do I get this after a pre-commit script ran	18:45
	error: cannot run .git/hooks/pre-commit: No such file or directory	18:45
	it already ran and exited non-zero	18:45
ew0	I just read python paradox	18:45
	quite a nice piece of text	18:45
	(btw, is it bad to chat here?	18:45
	)	18:45
cbx33	ew0: link?	18:46
	→ kerrick joined	18:46
	→ johnw joined	18:46
ew0	)http://www.paulgraham.com/pypar.html	18:47
	→ masando joined	18:47
	→ Myth17 joined	18:48
	→ pantsman joined	18:48
	→ rzec joined	18:49
	← jdav_gone left	18:49
rzec	is there a way to force git to display the full path of the files when doing git diff --stat?	18:50
	→ joshsmith joined	18:50
	← mkramer left	18:51
cbreak	full?	18:51
	it should display it relative to repo root (or current dir?)	18:51
	→ Kedare joined	18:51
	→ tobago_ joined	18:52
cbx33	cbreak: any clue on my hook issue?	18:52
	→ adnasa joined	18:52
cbreak	hook?	18:52
cbx33	i made a pre-commit hook script	18:52
	← kassah left	18:52
rzec	cbreak: I mean instead of .../path/to/file/from/repo/root.txt I want the/real/full/path/to/file/from/repo/root.txt	18:52
cbx33	it's very simple checks for existance of a file	18:52
	→ juli0w joined	18:53
	→ OOPMan joined	18:53
cbx33	if it doesn't exist it exits 127	18:53
	if it does it exits 0	18:53
	→ macUzer joined	18:53
cbreak	rzec: cd into repo root	18:53
cbx33	it runs as expect	18:53
	expected - but when the return is 127, it also says error: cannot run .git/hooks/pre-commit: No such file or directory	18:53
	but it already ran as the echo output is above it	18:53
	any ideas?	18:53
cbreak	have you tried to return something else?	18:53
	← joel_falcou left	18:53
cbreak	like 2?	18:53
	→ shruggar joined	18:53
cbx33	no	18:54
cbreak	try :)	18:54
cbx33	:)	18:54
	hah	18:54
	worked	18:54
	see knew i should have asked you	18:54
	cbreak was just guessing, honestly	18:55
	→ jdav_gone joined	18:55
cbx33	thanks	18:55
cbreak	how did you pick 127?	18:55
	→ dropdrive joined	18:55
	→ cjs226 joined	18:56
	← dfamorato_ left	18:56
	← acl_ left	18:57
	→ caseymcg joined	18:57
	← tristanseifert left	18:57
	ChanServ set mode: +v	18:58
cjs226	I'm new to git and am wanting to fetch/pull/? only a portion of a repo to a system (an app's configuration). is this possible?	18:59
	→ dfamorato joined	18:59
	→ joel_falcou joined	18:59
	← sustainableweb left	18:59
	→ tristanseifert joined	18:59
	← SirFunk left	19:00
FauxFaux	cjs226: Nope.	19:00
	→ kumbayo joined	19:03
	← workmad3 left	19:04
	→ alester joined	19:04
	→ Phrogz joined	19:05
	← Phrogz left	19:05
	→ Phrogz joined	19:05
Phrogz	I have a repo with branches "master" and "planning". How can I rename planning to master and remove master?	19:05
	Or should I somehow merge planning into master and continue to use master?	19:06
	→ cronin joined	19:07
	← macUzer left	19:07
SethRobertson	The later would be easiest for others to understand.	19:08
	Replace one branch with another: git checkout $destination; git reset --hard $source; git reset --soft ORIG_HEAD; git add -A .; git commit -m "Rewrite $destination with $source"; git merge -s ours $source	19:08
Phrogz	SethRobertson: Thanks, both for the advice and code.	19:08
SethRobertson	Hmm. Actually there should be a `git clean -dfx` as the first step.	19:09
	→ eean joined	19:10
	→ Mannequin joined	19:11
	← rickharrison left	19:12
	→ whitman joined	19:12
	→ Mkaysi joined	19:13
	← farktronix left	19:13
	→ apexi200sx joined	19:14
	← mjsilva left	19:14
	→ Glycan joined	19:14
	→ bibinou joined	19:16
	→ Textmode joined	19:16
	← juli0w left	19:17
	→ Agos joined	19:18
mpenz	sitaram: thanks got it =)	19:18
Glycan	Hello	19:18
	← Mkaysi left	19:20
Glycan	I made a commit via github, now I'm ahead. How do I ignore that old commit and make a this new one the main one?	19:20
cbx33	hey sitaram you around?	19:20
	Glycan: where are you ahead?	19:20
	locally?	19:20
	← Coriolan left	19:21
	→ towski joined	19:21
	→ LongBeach joined	19:22
	→ plashchynski joined	19:23
	← replore_ left	19:23
	→ isarl joined	19:24
	← caseymcg left	19:24
	→ markbao joined	19:24
	→ juli0w joined	19:25
isarl	There is a file in my repository which exists as a skeleton for holding developer-specific debug flags. This file almost never changes in the repository, but frequently changes on a developer's machine as they enable/disable different debug flags. What is the best way to get Git to ignore these day-to-day changes?	19:25
cirwin	isarl: the best way is to remove the file from the repository and provide it as a file.example which developers can copy	19:26
	← cyberswa_ left	19:26
cirwin	then add the file to .gitignore so it doesn't get re-added accidentally	19:26
isarl	That sounds like a pretty good solution, but won't it mean that a clean checkout of the repository won't be able to build?	19:26
cirwin	you could add a step to your build process to copy the .example file if no real file exists	19:27
isarl	True.	19:27
	Good point.	19:27
	Thanks for the suggestion. =)	19:27
cirwin	np :)	19:27
	← adnasa left	19:28
	← bibinou left	19:30
	← _psychic_ left	19:31
	→ _psychic_ joined	19:31
	→ jwg2s joined	19:32
jwg2s	Hi, trying to get a folder added to git in my repo and for the life of me it just will not add to the index. Is there a command to override everything and force a folder to be included?	19:33
	This is driving me insane	19:33
	← Myth17 left	19:33
Glycan	cbx33: I am ahead locally, yes	19:33
FauxFaux	jwg2s: An empty folder? You can't track empty folders. git add -f	19:34
jwg2s	It's not empty	19:34
Glycan	Rather, the local repo HEAD and the global (?) repo HEAD are not the same. Thire common ansester is thier parent	19:34
	→ nimrod10 joined	19:34
cronin	i am so confused. i have a master branch and created a "experiment" branch to test things out. there are clearly changes in the experiment branch because, when i switch between the two, my project looks different. also, diff experiment master shows differences. however, when i checkout master and do a merge branch experiment it says "Already-up-to-date"	19:35
	← CannedCorn left	19:35
	Corren → kenperkins	19:35
	→ CannedCorn joined	19:36
jwg2s	FauxFaux: should i just make a file in each subdirectory called "empty" or something?	19:36
	→ hodgy joined	19:36
	← hodgy left	19:36
Glycan	Dummy	19:36
FauxFaux	jwg2s: Or ".gitignore".	19:36
jwg2s	I need the folder structure, and some subdirectories have files while others don't	19:36
	← Dave^\| left	19:36
jwg2s	ok	19:36
FauxFaux	cronin: "gitk master experiment @{u}"	19:36
Glycan	I made a commit via github, now I'm ahead. How do I ignore that old commit and make a this new one the main one?	19:36
	the local repo HEAD and the global (?) repo HEAD are not the same. Thire common ansester is thier parent	19:37
	← nimrod10` left	19:37
	→ ColKurtz joined	19:37
	→ pyrony joined	19:37
cronin	FauxFaux: oh that's cool. so i just go and resolve everything one by one?	19:38
FauxFaux	Glycan: You want to lose the commit that's on github?	19:38
cronin	is there no way to just blanked override master with experiment?	19:38
FauxFaux	cronin: I don't know what you're seeing, but I suspect it doesn't show what you think it does.	19:38
jwg2s	FauxFaux: thanks, worked great. that was driving me nuts	19:38
cronin	it opened up some app called "Wish"	19:39
kmc	'wish' is the thing that runs tcl/tk apps	19:39
	such as gitk	19:39
cronin	yea so i see all my commits i guess	19:39
	→ zamabe joined	19:40
	→ ISF joined	19:41
	ISF → Guest73062	19:42
	→ tvw joined	19:42
	→ frobnitz joined	19:42
	← jfkw left	19:43
	→ caseymcg joined	19:43
	→ _root_ joined	19:43
frobnitz	Is there an easy way to make the working tree match the current state of the index?	19:43
cirwin	git checkout .	19:44
	(-f)	19:44
FauxFaux	git clean	19:44
	→ Cromulent joined	19:44
cronin	so what do i do with this think. i see where i may have messed up.. http://i53.tinypic.com/bgy4nl.jpg	19:44
	(experiments is actually called "images" -- just thought it would be easier to explain)	19:44
cbx33	why do you think you messed up?	19:45
cronin	cbx33: i dunno, because images has changes that i want to include into master but i can't merge them anymore	19:45
	and master has all my old code now	19:45
Glycan	FauxFaux: Yes	19:45
	Sorry I keep disspearing	19:46
	← cirwin left	19:46
aLeSD	how to force to clone from master ?	19:48
	our branch and 'origin/master' have diverged,	19:48
	I want to lose all my changes	19:48
	→ ph^ joined	19:49
Glycan	FauxFaux?	19:49
	fisted → fisted_	19:49
	← towski left	19:49
	→ toxico joined	19:50
cronin	anyone?	19:50
	← kimico left	19:50
SethRobertson	That picture cannot tell us what is going on	19:51
	→ toxico` joined	19:51
	→ workmad3 joined	19:51
SethRobertson	cronin: What didn't get done correctly? The "revert"?	19:52
cronin	SethRobertson: I'm not exactly sure. All I know is that "master" has my old code and I want it to have the code in "Images"	19:52
	but I can't seem to merge the two anymore	19:52
	→ lolfrenz joined	19:52
SethRobertson	Do you want to replace master with the contents of images?	19:52
cronin	that would work as well	19:52
	i suppose	19:52
SethRobertson	Blindly without thought or consideration	19:52
cronin	i'd prefer merging them	19:53
	← Cromulent left	19:53
cronin	but i haven't made many changes.. i've just been trying to get master to reflect the changes in images	19:53
	← RobertLaptop left	19:53
	→ toxico`` joined	19:53
	← OOPMan left	19:54
	→ kerrick_ joined	19:54
	← frobnitz left	19:54
SethRobertson	You would really have to let us see what is going on. I imagine the "resolve conflicts" or "revert" change touched the files which you thought were old	19:55
	← toxico left	19:55
	← j416 left	19:55
	← toxico` left	19:55
cronin	it's like 6 files, i guess i can just copy and paste them haha	19:56
	unless it's easy to show you what's going on… i'm not sure how i would do that	19:56
	→ rideh joined	19:56
SethRobertson	You can expose the repo. You could show us the list of files being touched by each commit and the list of files which you think are "old"	19:57
	→ systemclient joined	19:57
systemclient	how can I tell git to use vim and not nano?	19:57
	← cbx33 left	19:58
	← juli0w left	19:58
SethRobertson	$EDITOR or git-cofnig core.editor	19:58
isarl	systemclient: I think you can set your EDITOR environment variable... mine does it automatically but I'm not sure how, because it's not in my env OR in my .gitconfig	19:58
SethRobertson	or $GIT_EDITOR	19:58
	← alester left	19:58
SethRobertson	or $VISUAL	19:59
systemclient	$EDITOR is set to /usr/bin/vim	19:59
SethRobertson	and $VISUAL, $GIT_EDITOR, and `git config core.editor` are set to?	20:00
isarl	is $GIT_EDITOR set to something else? what about core.editor in your gitconfig?	20:00
systemclient	I did the config now, it works	20:00
	← liquid-silence left	20:01
	← Vile left	20:01
	→ liquid-silence joined	20:02
	← kumbayo left	20:02
	← jwg2s left	20:02
	← tewecske left	20:02
SethRobertson	Which means that $VISUAL is set to nano	20:02
	← mastro left	20:03
systemclient	SethRobertson: it is empty	20:03
	→ Guest72979 joined	20:03
systemclient	SethRobertson: so is $GIT_EDITOR	20:03
SethRobertson	I find that difficult to believe	20:03
	Unless git-config core.editor was previously set to nano, of course	20:04
systemclient	nope, that was empty too	20:04
	→ kimico joined	20:04
	← Guest72979 left	20:04
Glycan	How do you remove mearge conflicts?	20:04
SethRobertson	Including in ~/.gitconfig?	20:04
	← tristanseifert left	20:05
SethRobertson	Glycan: manually after looking at `git status` or via `git mergetool`	20:05
	← toxico`` left	20:05
systemclient	SethRobertson: there was nothing in the core section except the excludesfile	20:06
cronin	well… i guess i fixed it. i did a hard reset on master back to the commit on the "images" branch where i had added all the new code	20:06
	seems to have worked	20:06
	→ juli0w joined	20:06
SethRobertson	systemclient: In ~/.gitconfig as well as .../.git/config?	20:06
	cronin: Not exactly recommended since it will require a force push to share upstream, but whatever makes you happy	20:07
systemclient	SethRobertson: I just created a new repo	20:08
	→ OOPMan joined	20:08
SethRobertson	And?	20:08
systemclient	SethRobertson: I mean that there should be nothing in the config	20:09
Glycan	My remote repo is one ahead of me. I have commited changes. It want to override the remote repo.	20:09
	How?	20:09
SethRobertson	systemclient: Did you check in ~/.gitconfig, which provides a suppliment to any config in your local repo	20:09
	← lut4rp left	20:09
	→ mkramer1 joined	20:09
systemclient	SethRobertson: yeah, it did not contain an editor before	20:09
SethRobertson	Glycan: Typically you `git pull --rebase` or `git pull`	20:09
	→ lut4rp joined	20:10
	← lut4rp left	20:10
	→ lut4rp joined	20:10
SethRobertson	systemclient: What is "it"?	20:10
	← juangiordana left	20:10
	→ s0undt3ch joined	20:10
	→ huma joined	20:11
systemclient	SethRobertson: ~/.gitconfig	20:11
Glycan	But it conflicts with my own	20:11
	→ drake01__ joined	20:11
	→ towski joined	20:12
	→ tristanseifert joined	20:12
SethRobertson	Glycan: So resolve the conflict. If your favor if you don't like any of the upstream change.	20:12
huma	how do i supress the "detached HEAD" note in "git checkout [rev]"?	20:12
	→ mhauri joined	20:12
	→ r0m4n joined	20:13
	→ cbx333 joined	20:13
Glycan	How do I resolve the conflcit?	20:13
SethRobertson	huma: Not a good idea. Detached heads are bad (IMHO) , so you need to know that you must hide them as quickly as possible.	20:13
Rhonda	Glycan: git checkout -b tempbranch [rev]	20:13
Glycan	What?	20:13
SethRobertson	Glycan: `git mergetool` or look at `git status` and edit the files it tells you to	20:13
	→ danking joined	20:13
SethRobertson	Rhonda: You were talking to huma	20:13
Rhonda	Glycan: Create a new branch with the checkout	20:13
	oh	20:13
huma	SethRobertson: it's a one time operation to build a package by revision	20:13
	→ juangiordana joined	20:13
Rhonda	huma: See above. Glycan, sorry for confusion. :)	20:14
SethRobertson	>&/dev/null	20:14
Rhonda	huma: Then simply ignore the message.	20:14
	→ antonkovalyov joined	20:14
Glycan	I am very confuesd	20:14
Rhonda	Glycan: Ignore me, just listen to SethRobertson, hope this helps reducing the confusion.	20:15
SethRobertson	Glycan: `git mergetool` or look at `git status` and edit the files it tells you to	20:15
huma	SethRobertson: well, if no option, guess this then	20:15
	← masando left	20:15
antonkovalyov	hey people. i am looking for info on how initial commit is different from normal commits—trying to make initial commit with libgit2/pygit2 and having troubles. anybody knows any good resources?	20:15
	← tore_ left	20:15
	← drake01__ left	20:15
danking	Hmm. After a fast-import from mercurial, my git repo has a commit (the very first commit) which has an Author line of "Author: <>". How would I go about editing the author of that commit?	20:15
Glycan	Okay	20:16
danking	This repo has never been pushed publicly, so I can muck the history all I'd like.	20:16
	→ SimonNa joined	20:16
kenperkins	how do I fast forward to lastest without auto-merging?	20:16
	→ mastro joined	20:16
	→ apocalyptiq joined	20:16
huma	SethRobertson: but then, i'd like "HEAD is now at" message	20:16
SethRobertson	danking: Why not edit the data being fed into fast-import?	20:16
	← threecreepio left	20:17
SethRobertson	huma: 2>&1 \| grep -iv "detached head"	20:17
	→ kumbayo joined	20:17
SethRobertson	kenperkins: git fetch && git merge origin/master	20:17
	← mhauri left	20:17
kenperkins	does specifying the origin/master not auto-commit the merge ?	20:18
	← iXeno_ left	20:18
	→ sardaukar joined	20:18
sardaukar	hey	20:18
SethRobertson	danking: You could also presumably use `git rebase -i` or `git filter-branch` but if you can trivially recreated it correctly, why not?	20:18
	← noisebleed left	20:18
	→ tore_ joined	20:18
SethRobertson	kenperkins: Not if you use --no-commit. man git-merge	20:18
jast	kenperkins: automatic message the 'git-merge' manpage can be found at http://www.kernel.org/pub/software/scm/git/docs/git-merge.html	20:18
	← r0m4n left	20:19
sardaukar	I cloned a github.com repo to my private server (bare clone, then mirror) - is there a way to add the original github repo as a ref to be able to sync new code from it?	20:19
	← s0undt3ch left	20:19
huma	SethRobertson: thanks	20:19
	← jas4711 left	20:20
	→ s0undt3ch joined	20:20
	← tore_ left	20:20
	→ toxico joined	20:20
Glycan	I don't get it	20:20
SethRobertson	sardaukar: git remote add realupstream other-github-url	20:20
	← juangiordana left	20:20
	→ drake01__ joined	20:20
SethRobertson	Glycan: I recommend reading !book which has a good section about resolving conflicts	20:20
jast	Glycan: automatic message 'Pro Git' is a complete book about git that is available online for free: http://progit.org/book/	20:20
sardaukar	SethRobertson: thanks. and to merge new code from upstream?	20:20
danking	SethRobertson: Hmm. I don't know much about fastimport and what not. I'll take a look at that and see if I can edit the incoming data.	20:21
Glycan	The remtoe repo has a commit with a changed .gitignore. I have a commit with a bunch of changes and the change to .gitignore	20:21
SethRobertson	sardaukar: My instructions were for merging new code from upstream (using manual, not auto, merging)	20:21
Glycan	How do I push properly?	20:21
SethRobertson	Glycan: resolve the conflict. See !book	20:21
jast	Glycan: automatic message 'Pro Git' is a complete book about git that is available online for free: http://progit.org/book/	20:21
	← kimico left	20:22
sardaukar	SethRobertson: won't that just add the remote? if it merges, why do I need to add the remote all the time?	20:22
	← drake01__ left	20:22
	→ drake01__ joined	20:22
SethRobertson	sardaukar: Sorry, I confused you with someone else. `git fetch realupstream` will fetch those branches. You can then `git merge realupstream` or `git rebase realupstream` as necessary	20:23
	← xris left	20:23
sardaukar	SethRobertson: great, just what I was looking for! Thanks for all the help	20:23
	→ danb joined	20:24
	← GeertB left	20:25
Glycan	!book	20:25
jast	automatic message 'Pro Git' is a complete book about git that is available online for free: http://progit.org/book/	20:25
	→ farktronix joined	20:26
	→ juangiordana joined	20:26
	← drake01__ left	20:26
	← joshsmith left	20:26
	← richardkchapman left	20:27
	→ Dreamer3 joined	20:28
	← vmil86 left	20:28
	← sardaukar left	20:29
	← danb left	20:29
	→ dabaR joined	20:29
	← markbao left	20:29
dabaR	How do I git add . for deleted files?	20:29
	→ markbao joined	20:30
	→ DrNick2 joined	20:30
SethRobertson	dabaR: `git add -A` I think	20:30
	← DrNick left	20:31
dabaR	seems like --all did it	20:31
	should be the same option	20:31
	← apocalyptiq left	20:31
SethRobertson	It is	20:31
	← _psychic_ left	20:32
	← mkramer1 left	20:32
	→ jas4711 joined	20:33
	← tobago_ left	20:33
	→ kimico joined	20:33
	→ savid joined	20:33
	← nwp_ left	20:34
	← ptl left	20:34
	← MaSch left	20:34
	← dabaR left	20:34
	← Guest36388 left	20:35
	← alansaul left	20:35
	→ drake01__ joined	20:36
	← toxico left	20:36
	→ steffo joined	20:36
	← thehodge left	20:37
	← hobodave left	20:37
	← apexi200sx left	20:37
	fisted_ → fisted	20:38
	→ thehodge joined	20:38
	← drake01__ left	20:38
	→ tystr joined	20:39
	← Determinist left	20:40
	→ _psychic_ joined	20:40
	← _psychic_ left	20:40
	← ymasory left	20:41
	← juli0w left	20:41
	→ ptl joined	20:42
	→ hobodave joined	20:43
	→ vmil86 joined	20:43
	← sterlo left	20:43
	→ ericmuyser joined	20:44
	→ sterlo joined	20:44
	← prs left	20:44
	← ericmuyser left	20:44
	← jonatasnona left	20:45
	→ _psychic_ joined	20:46
	→ juli0w joined	20:46
	← Ryback_ left	20:47
	→ prs joined	20:47
	→ Cromulent joined	20:48
	→ Vile joined	20:48
	← _psychic_ left	20:48
	→ drake01 joined	20:48
	← jalama left	20:49
	→ Determinist joined	20:49
	→ swartzcr joined	20:50
	← shruggar left	20:50
	→ _psychic_ joined	20:51
danking	If I have a /win c	20:51
	← danking left	20:51
	→ mkramer joined	20:51
	← himsin left	20:51
	← mkramer left	20:51
	→ project2501a joined	20:52
	← rideh left	20:53
alexim	if i "git mv" a file and then edit it, is it good practice to leave that as 2 commits (first the move, then the edit), or do both the move and edit in 1 commit?	20:53
	← jsick3 left	20:53
	→ alansaul joined	20:53
	← rzec left	20:54
	← kenichi left	20:56
	→ adnasa joined	20:56
	← _psychic_ left	20:57
	→ radarek joined	20:57
	← dcarper left	20:57
	→ _psychic_ joined	20:58
	→ Ryback_ joined	20:59
	← Ryback_ left	20:59
	→ Ryback_ joined	20:59
	→ lightcap joined	20:59
	→ cmyk_ joined	21:00
	→ MaSch joined	21:00
	← chrisf left	21:00
	→ ISF joined	21:01
	→ airborn joined	21:01
	← Guest73062 left	21:01
	← rbd left	21:02
	← PigeonFriend left	21:02
	→ chrisf joined	21:03
	→ JStoker joined	21:03
	← drake01 left	21:03
	← _psychic_ left	21:04
	← fiyarburst left	21:04
	→ eijk joined	21:05
	→ toxico joined	21:06
	← kimico left	21:06
	→ reber joined	21:07
reber	hi	21:07
	soahccc` → soahccc	21:08
	→ ASIRINeiluj joined	21:08
reber	i have 2 commits on my local git repos, and i want to merge them before pushing them. Didn't found how to do that, any ideas please ?	21:08
	← hyperair left	21:09
teuf	reber: git rebase -i can do that	21:09
	← whitman left	21:09
	→ deryl joined	21:10
reber	teuf, trying	21:10
deryl	I have forked a repo (and cloned it locally). I recently had a change I made merged into the original. I would like to make MY local copy be updated with any and all changes from the upstream I've pulled from. is there a way I can do this in git?	21:11
	or do I need to delete the forked tree and just do a reull?	21:11
	→ NaNoNickV joined	21:11
	→ f0i joined	21:11
	← sikao_lfs1 left	21:12
	← vmil86 left	21:12
	← adnasa left	21:12
devth	deryl: add the upstream repo as a remote, then fetch it and rebase on it	21:13
reber	teuf, this didn't worked, i see my several commits in gitk ...	21:14
	→ w0bni joined	21:14
reber	teuf, indeed i have several commits and i DON'T WANT TO SEE them in git history tree (gitk). Any ideas how to do that ?	21:15
	→ rideh joined	21:15
teuf	reber: using git rebase -i ...	21:15
	reber: I guess you didn't pass an argumeent after the -i and didn't get to a list of commits in an editor	21:16
	← NaNoNickV left	21:16
	→ nurey joined	21:16
	← rideh left	21:16
	← f0i left	21:16
reber	teuf, yes i pass the argument "master" after the -i	21:16
	git rebase -i master	21:17
deryl	ok, necveer done a rebase before. time to man	21:17
	→ f0i joined	21:17
reber	gush	21:17
teuf	reber: if the branch you want to remove the commits from is master, this is wrong	21:17
	you need to pass it a commit before the ones you want to merge	21:17
	← abhatnag left	21:17
teuf	git rebase -i origin/master will porbably work for you	21:18
	← cannonball left	21:18
deryl	oh all i had to do was git pull blah branch && git push origin.. nice	21:18
reber	git rebase -i origin/master	21:18
	Interactive rebase already started	21:18
	...	21:18
	→ jkyle joined	21:18
reber	then nothing more	21:18
	← robertfw left	21:19
	→ rideh joined	21:19
lolfrenz	reber, you should probably rm some file from .git	21:19
	← Cromulent left	21:19
	→ iXeno joined	21:19
teuf	reber: git rebase --abort if you're already in the middle of a rebase	21:19
jkyle	I have a remote repository. I can clone the repository on the local host. I can push to the repository from remote hosts. But when I try to clone the repository on a remote host, I get teh following (4x paste)	21:20
	remote: fatal: unable to create thread: Resource temporarily unavailable	21:20
	error: git upload-pack: git-pack-objects died with error.	21:20
	fatal: git upload-pack: aborting due to possible repository corruption on the remote side.	21:20
	remote: aborting due to possible repository corruption on the remote side.	21:20
	← systemclient left	21:20
FauxFaux	jkyle: git fsck && git repack -adf # the repository on the remote machine.	21:21
deryl	anyone using github that can tell me why on doing a git push i suddenly have to start entering my username and password even though I have the ssh keys in place and ON github?	21:21
	← tiago left	21:22
reber	teuf, thanks it worked :	21:22
	:)	21:22
jkyle	FauxFaux: k	21:22
	← bartek left	21:22
jkyle	hm, works	21:22
	← novettam left	21:23
	← gnufied left	21:23
	← HG` left	21:24
	← Phrogz left	21:25
	← rideh left	21:25
	→ cesario joined	21:26
macabre	if i received the infamous 'rejected, no fast forward' error .. it tells me to pull the repo, will this over write my changes/commits?	21:26
FauxFaux	"infamous". /o\	21:27
	← ch077179 left	21:27
	→ threecreepio joined	21:29
	→ novettam joined	21:30
	→ ch077179 joined	21:30
	→ sikao_lfs1 joined	21:31
	→ g0bl1n joined	21:33
	→ Omni\|Work joined	21:34
Omni\|Work	I need to get gitorious to drop some changes I've pushed to it.	21:34
	Is this possible?	21:34
	→ arosen1 joined	21:35
arosen1	Hello, I've make some code changes and now I want to create a packet for everything that I changed for one commit	21:35
	I tried git format-patch -M d8236775e4ce6c208252ab71e634f64b8825bc9f but that didn't create a .patch file?	21:35
	← yeryry left	21:36
	→ yeryry joined	21:36
	← msponge left	21:37
arosen1	nvm got it! :D	21:39
	← lolfrenz left	21:39
	← ISF left	21:39
	← kumbayo left	21:42
	← cesario left	21:43
	← novettam left	21:43
	← cakehero left	21:46
	→ kenichi joined	21:46
	→ msponge joined	21:46
	← nurey left	21:47
	→ nurey joined	21:47
	→ itrebal joined	21:47
	← nurey left	21:47
	→ hyperair joined	21:47
	→ systemclient joined	21:47
	→ novettam joined	21:47
systemclient	does it do any damage to use repos from 1.7.4.1 with 1.7.2.5?	21:48
	→ madewokherd joined	21:48
	← Spockz left	21:48
	← TrineLocke left	21:49
	← msponge left	21:50
	→ dfamorato_ joined	21:52
	← cjs226 left	21:53
	← beatak left	21:53
	← isarl left	21:54
	← asteve left	21:54
	→ mkanat joined	21:55
	→ robertfw joined	21:55
	infogulch → infogulch1	21:55
	infogulch1 → infogulch	21:55
	→ _psychic_ joined	21:55
	← dfamorato left	21:55
	→ Xentac joined	21:56
	← zwick left	21:56
Xentac	I really thought I understood this whole git thing... I want to know if there are any commits in a branch that aren't in my current branch (in other words, what commits will be merged if I git merge)	21:58
	I thought "git log HEAD..branch" or "git log branch ^HEAD" would give me that	21:58
fairuz	Xentac: It doesn't?	22:00
	← DrNick2 left	22:00
Xentac	fairuz: I have a situation in my history where it's not	22:00
thiago	it does	22:00
deryl	ok I don't understand this. if I do a git clone why don't all the branches show up? why does ONLY master?	22:00
Xentac	I think it has to do with merge left/right stuff	22:00
thiago	except that ^HEAD might be interpreted by your shell	22:00
fairuz	deryl: git branch -a	22:00
	→ acelent joined	22:01
	← tech13 left	22:01
thiago	$ echo branch ^HEAD	22:01
	branch akonadi-thiago.fSCGTd a.out [...]	22:01
deryl	fairuz: thanks	22:01
Xentac	thiago: (buildout)[jchu@donatello devel(master)]$ echo branch ^HEAD	22:02
	branch ^HEAD	22:02
	← _psychic_ left	22:02
deryl	i thought they were supposed to show up under git branch -v	22:02
	→ DrNick joined	22:02
acelent	is there some command or extension that rebases a whole tree of commits from a common root, mapping all branches and tags to the new commits, instead of just rebasing one branch?	22:02
thiago	must be a zsh thing then	22:02
Xentac	I don't know if I'll be able to re-create my situation again...	22:02
thiago	acelent: a tag is never rebased	22:02
	← eletuchy left	22:02
Xentac	these are commits in our project from 2 years ago	22:02
	no... 3 years ago	22:03
	→ eletuchy joined	22:03
Xentac	I doubt time has anything to do with it	22:03
thiago	acelent: you can write an easy script to do that over a list of branches though	22:03
acelent	thiago: ok, only branches then, is there something?	22:03
Xentac	I just wanted to make sure it was doing what I thought it was doing	22:03
	→ Sonderblade joined	22:03
Xentac	thing is, even though the commit shows up as "in branch, but not accessible by HEAD", git knows not to merge it	22:03
	← Sonderblade left	22:03
Xentac	that's why I thought I might be doing it wrong	22:04
	→ Sonderblade joined	22:04
	← ThomasLocke left	22:04
acelent	thiago: is it that easy? it sounds easy, but if you think a bit about it, it doesn't sound that easy anymore	22:04
	← protozog left	22:05
fairuz	It's easy if there are no conflicts :)	22:05
acelent	thiago: i'm thinking that such a rebase would be a bunch of cherry-picking, mapping the branches from the old commits to the new ones at the end. is this easy? it sounds like i'm forgeting something	22:06
	← f0i left	22:06
	← RaceCondition left	22:06
acelent	thiago: for instance, there'll be multiple detached heads while doing this	22:07
Xentac	acelent: why do you want to do this? are you trying to rewrite history? remove a nasty commit?	22:07
	→ f0i joined	22:07
Xentac	most things to do with rebase get sketchy when you consider merges	22:07
acelent	Xentac: rewrite local history	22:07
Xentac	as long as merges aren't part of it, a script is probably the best way	22:08
	otherwise you might want to look at git filter-branch	22:08
acelent	Xentac: mostly, it's things i keep for myself until i've tested them enough to push, so i keep rebasing after fetching instead of merging	22:08
	→ Sonder joined	22:10
	← Sonderblade left	22:10
Xentac	oh, so they're a bunch of un-merged feature branches where a simple git rebase would move them	22:10
	← Sonder left	22:10
	← joel_falcou left	22:10
	→ Sonderblade joined	22:10
	← whit537 left	22:11
	← Sonderblade left	22:11
	→ Sonderblade joined	22:11
	← _pr0t0type_ left	22:11
acelent	Xentac: yes, but some feature branches fork from other feature branches too. however, the common ancestor is always a commit that's in the shared (central) repository	22:12
	← felipe left	22:12
	← [intra]lanman left	22:12
acelent	Xentac: i.e. aside from merges, anything can happen	22:12
	Xentac: but thanks for the pointer, i'll look into filter-branch	22:12
Xentac	I think filter-branch doesn't rebase them in any way, it just modifies them "inline"	22:13
	→ [intra]lanman joined	22:13
	→ joel_falcou joined	22:15
	← normanrichards left	22:16
	→ haydenmuhl joined	22:16
	← nicoulaj left	22:17
haydenmuhl	I'm having some trouble installing Gitorious. I've installed everything, and successfully get to the Gitorious splash page, but I get an SSL error when navigating to the login page.	22:19
	→ tiago joined	22:19
	← shad left	22:19
	← LongBeach left	22:20
	→ ki__ joined	22:20
	← deryl left	22:20
	← [intra]lanman left	22:20
	→ angelsl joined	22:20
	→ [intra]lanman joined	22:22
	→ _psychic_ joined	22:23
	→ jkyle_ joined	22:23
	→ shad joined	22:24
	← MrMaksimize left	22:24
	← steffo left	22:25
	← jkyle left	22:25
	← belkiss left	22:25
	→ Nuck joined	22:26
	→ fiyarburst joined	22:27
	← _psychic_ left	22:27
rane_	it seems everyone has trouble installing gitorious	22:29
FauxFaux	It is written in Ruby.	22:30
thiago	it's not easy	22:31
	→ EricInBNE joined	22:31
haydenmuhl	I was following this guide: http://cjohansen.no/en/ruby/setting_up_gitorious_on_your_own_server	22:32
	I'm using Ubuntu 10.10, which is claimed to work, but I already found a couple errors, like having to use rugy-gems 1.3.6, not 1.3.5	22:32
	← joshteam left	22:32
haydenmuhl	Others were minor like having to run commands with sudo.	22:32
	→ spaceonline joined	22:33
	→ felipe joined	22:33
haydenmuhl	Anyone have any clues for figuring out this SSL problem? Apache configuration, maybe?	22:33
	← gebi left	22:34
FauxFaux	Well, it's horribly off-topic, but if you want people to help you might want to give more information than "I did something then I got an error".	22:34
	→ joshteam joined	22:35
haydenmuhl	I'm not really sure what more information there is to give. I get different errors depending on the browsers I use.	22:35
	FauxFaux palmfaces.	22:35
haydenmuhl	What information do you want?	22:36
	← rdqfdx left	22:36
	→ jdouthat joined	22:37
	← reber left	22:37
	→ rrjamie joined	22:37
haydenmuhl	Chrome: "Error 107 (net::ERR_SSL_PROTOCOL_ERROR): SSL protocol error."	22:37
rrjamie	I changed my url for my submodules in my .git/config (after they have been initalized from .gitmodules), but they still seem to be pulling from the old url	22:38
jdouthat	how do you find commits that contain a blob if you have that blob's SHA? I tried the scripts in http://stackoverflow.com/questions/223678 but neither return results for me	22:38
haydenmuhl	Firefox: SSL received a record that exceeded the maximum permissible length.	22:38
	(Error code: ssl_error_rx_record_too_long)	22:38
	← teknoid left	22:38
	→ iSikh joined	22:39
	← Fitzsimmons left	22:39
	→ frogonwheels joined	22:39
	→ zivester joined	22:40
FauxFaux	haydenmuhl: Oh, that kind of broken. Really broken. Uh, yeah, it'll be something wrong with Apache.	22:40
	← setmeaway left	22:41
	→ _psychic_ joined	22:41
haydenmuhl	Right. Not a simple 403.	22:42
	← bgerber left	22:43
jdouthat	How do you find a full-length hash given a unique prefix?	22:44
	← [intra]lanman left	22:44
	→ normanrichards joined	22:46
haydenmuhl	FauxFaux: Would I be better off in the apache channel?	22:47
cronin	trying to pull from my local repo to update my server files but it's not working. it says, Updating 144723d..12cd80f then lists all the files with "needs update" next to them. the final line is fatal: Entry 'heynelly/messages/views.py' not uptodate. Cannot merge.	22:47
ayust	haydenmuhl: probably, yes	22:47
	← pantsman left	22:47
	← sonnym left	22:48
	→ sivy joined	22:48
sivy	is there a trick to making git stash apply not die a horrible death when there' no changes to apply?	22:49
	← workmad3 left	22:49
rane_	a horrible death?	22:49
	does it return undesirable exit code or what	22:50
jdouthat	sivy: no changes to apply. like it's already applied?	22:50
	← systemclient left	22:50
sivy	jdouthat: i've got a script that does a pull, wrapped in stash/unstash just in case	22:51
	and sometimes there's no changes that got stashed	22:51
	git stash works, but stash apply dies	22:51
	← dajhorn left	22:51
cbreak	sivy: don't do the stashing if there's nothing to stash	22:52
sivy	cbreak: yeah, i wasn't sure hot o check	22:52
	how to	22:52
cbreak	sivy: check out git diff --exit-code HEAD	22:52
sivy	cbreak: thanks	22:53
	← airborn left	22:53
	→ bonhoffer joined	22:53
cbreak	maybe with --quiet	22:53
	← kevwil left	22:53
cronin	do i need to do a git pull -f or something	22:53
cbreak	why?	22:53
FauxFaux	jdouthat: Didn't see an answer to your short->long hash questoin; git rev-parse	22:53
	→ Glycan_ joined	22:54
	→ [intra]lanman joined	22:54
	← axl_ left	22:54
	← Glycan left	22:55
	Glycan_ → Glycan	22:55
	← shad left	22:56
	← cbx333 left	22:56
	← tristanseifert left	22:57
	→ shad joined	22:57
jdouthat	FauxFaux: thanks!	22:57
	→ zulax joined	22:57
	→ setmeaway joined	22:58
zulax	on github when i forked a repo, it just made like zulax/doc.git	22:58
	what if i want to for another doc.git for another project?	22:58
cbreak	add numbers	22:58
FauxFaux	Can't you specify the name when you're forking?	22:58
	→ Orphis_ joined	22:59
zulax	not sure, so new to github	22:59
	cbreak, where to add numbers?	23:00
	the is fork button	23:00
	← kmc left	23:00
FauxFaux	What error do you get when you try and fork again?	23:00
zulax	no textbox around it	23:00
cbreak	no	23:00
flavius	zulax: you can rename the project	23:00
	← Orphis left	23:00
cbreak	when you want to make an other project with the name doc	23:00
	call it doc1	23:00
	then doc2	23:01
	then doc3	23:01
	and so on	23:01
	← plashchynski left	23:01
	→ bgerber joined	23:01
zulax	ok, i will do that	23:01
	→ tristanseifert joined	23:01
	→ axl_ joined	23:02
	← TeckniX left	23:02
	← haydenmuhl left	23:02
zulax	in the admin tab, i found a way to rename it	23:02
	← Ryback_ left	23:03
zulax	but should there be a naming option at the beginning of the fork though	23:03
Omni\|Work	I need to drop some changes that I've pushed to gitorious.	23:03
	Anybody know how to do that?	23:03
cbreak	just force push something else	23:04
	← _psychic_ left	23:05
	← Orphis_ left	23:06
	← mastro left	23:06
	← iSikh left	23:06
	→ Orphis joined	23:07
	← stamina left	23:09
	→ stamina joined	23:10
	← nibblebot left	23:10
	← Martin_ left	23:11
	← marc_kdab left	23:11
	→ dcarper joined	23:12
	← zamabe left	23:15
	→ odin_ joined	23:15
	← AaronMT left	23:15
Omni\|Work	cbreak: How do I do that?	23:15
	cbreak: I don't know git that well. I know Mercurial.	23:16
cbreak	git push -f origin master	23:16
	for origin remote, master branch	23:16
	you can git reset --mixed HEAD~1 while on master to nuke away the last commit	23:16
	(before force pushing)	23:16
	replace --mixed by --hard if you want to throw away the changes	23:17
	→ zamabe joined	23:17
	← normanrichards left	23:20
	→ fedesilva_ joined	23:20
	← joshteam left	23:20
	← fedesilva_ left	23:21
	← Vile left	23:21
	← Rubin left	23:21
	→ Rubin joined	23:22
Omni\|Work	cbreak: Thanks.	23:22
	→ joshteam joined	23:23
	→ marc_kdab joined	23:23
	← tatsuya left	23:23
	→ kmc joined	23:23
	← eijk left	23:24
	← fedesilva left	23:24
	→ ericmuyser joined	23:24
	← Sonderblade left	23:24
	← Xentac left	23:27
	← lunks left	23:27
	← v0n left	23:27
	← dfamorato_ left	23:28
	← Omni\|Work left	23:28
	→ lunks joined	23:30
	← cmyk_ left	23:33
	→ tatsuya joined	23:34
	← giallu left	23:35
	→ shiba_yu36 joined	23:35
	← cccaldas left	23:36
	← hyperair left	23:37
	→ cjs226 joined	23:37
	← lunks left	23:38
	→ hyperair joined	23:39
	← cronin left	23:39
	← PabloM left	23:40
	→ IanLiu joined	23:41
	← flavius left	23:41
IanLiu	I'm working on a Mercurial project now. Is it possible to work with GIT and when pushing, use Mercurial?	23:41
	← nadavoid left	23:42
	→ replore joined	23:42
	→ simenbrekken joined	23:43
	← kvanderw left	23:43
	← thehodge left	23:47
	← kerrick_ left	23:50
	← kerrick left	23:50
	← odin_ left	23:51
	← ddkilzer left	23:54
	→ Fernandos joined	23:56
Fernandos	hi	23:56
	how do I commit a file inside a .git dir into my git repository?	23:56
	← Agos left	23:57
Fernandos	project-name/.git/description to be specific	23:57
rane_	i don't think you can	23:57
	description might come from the remote	23:58
Fernandos	git add .git/description results in: error: Invalid path '.git/description' error: unable to add .git/description to index fatal: adding files failed	23:58
	← sterlo left	23:58
	← EricInBNE left	23:58
	FauxFaux also doesn't think you can.	23:58
Fernandos	rane_: yep, I wanted to add the file so that I can push it into the remote. the reason is I use cgit and want it to list the repository's description	23:58
	← mlncn left	23:59
	← roadt left	23:59

Logs Search ←Prev date Next date→

Channels Documentation