IRCloggy #git 2010-06-29

Provider of IRC logs since 2005.

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

	2010-06-29
ReinH	Hi folks, where does git grab the executables in .git/hooks to run?	00:00
	→ hyperair joined	00:00
ReinH	I'm wondering if it uses find, and if so how it deals with the differences between GNU find and BSD find	00:00
	→ ntoll_ joined	00:00
	← ntoll left	00:00
	ntoll_ → ntoll	00:00
	← ShooterMG left	00:00
ReinH	which are currently making me sad in a non-git-related script that needs to be portable	00:01
	→ anjen joined	00:02
ReinH	oh, it just does a text -x for each hook individually	00:03
	→ Basstard` joined	00:03
	← Paraselene_ left	00:03
	← geckosenator left	00:03
	← zx2c4 left	00:05
	← [Po]lentino left	00:05
	← ignatp left	00:07
	→ ignatp joined	00:07
	→ neunon joined	00:07
	→ icwiener joined	00:07
	nevyn_ → nevyn	00:08
	→ Paraselene_ joined	00:09
	→ geckosenator joined	00:10
	→ EricInBNE joined	00:14
	← jrmuizel left	00:14
	→ jrmuizel joined	00:15
	← hyperair left	00:16
	← Titosemi left	00:16
	← dreiss left	00:19
	← dj_tjerk left	00:20
	← geckosenator left	00:20
	→ brothers_ joined	00:20
	→ geckosenator joined	00:22
	← harinath left	00:22
	→ gsan1 joined	00:24
	← airborn left	00:26
	← lispy left	00:27
	← ExtraSpice left	00:27
	← justin-george left	00:27
	← rado1 left	00:28
	← ntoll left	00:28
	→ rdeweerd joined	00:29
	← Paraselene_ left	00:30
	→ Chaser__ joined	00:30
	← Chaser__ left	00:32
	← kenichi left	00:32
	← Chaser left	00:33
	← gnuvince left	00:35
	→ harinath joined	00:35
	→ eletuchy_ joined	00:36
	← eletuchy left	00:39
	← engla\|ger left	00:40
	← Goneri left	00:41
	← dramsay left	00:41
	→ rado1 joined	00:43
	→ Goneri joined	00:45
arthurmaciel	see you!	00:45
	← arthurmaciel left	00:45
	← andrewl left	00:47
	← jspiros left	00:47
	→ rryouumaa joined	00:47
	→ jtbandes joined	00:48
	← geckosenator left	00:48
jtbandes	Any opinons on Mac clients: GitX, Gity, something else? (have we reached GitZ now?)	00:48
	→ MicahElliott joined	00:51
	→ jspiros joined	00:52
	→ geckosenator joined	00:53
	→ Heimidal joined	00:53
	→ bc0906524 joined	00:53
	← hakunin left	00:53
	← rdeweerd left	00:54
	← Ambiguity left	00:54
	← jtaby left	00:55
	← Rodya left	00:56
	← MicahElliott left	00:57
	→ andrewl joined	00:59
	← sftp left	01:01
	yaotti_aw → yaotti	01:12
	→ Vampire0_ joined	01:14
	yaotti → yaotti_aw	01:14
	yaotti_aw → yaotti	01:15
	← gsan1 left	01:15
	→ dsdeiz joined	01:16
dsdeiz	heya, how do i check if there are new files that were not added to the repo? i did git status although it didn't show the new files :D	01:17
	→ berserker joined	01:17
davr	git status will show new files not added to the repo, unless they are ignored by .gitignore or .git/info/exclude	01:17
	→ kpreid_ joined	01:18
dsdeiz	even images right?	01:18
	oh, nvm, i get it now.. tnx!	01:18
davr	file type doesn't matter to git	01:18
	← Ahri left	01:18
	← Vampire0 left	01:18
dsdeiz	gotcha, thanks	01:19
	→ Ahri joined	01:19
	← hobodave left	01:20
	← dsdeiz left	01:21
	→ alezandro joined	01:21
	← geckosenator left	01:23
	→ jtibu joined	01:24
	← parasti left	01:24
	→ MetaCosm joined	01:25
	→ naderman_ joined	01:26
offby1	jtbandes: some coworkers use GitX and seem to like it. It has a few rough edges though	01:27
	→ Joel_ joined	01:27
	→ _VVSiz_ joined	01:28
	← tstclair left	01:28
	← jtbandes left	01:28
	→ chrislerum joined	01:29
	← mabrand left	01:29
	naderman_ → naderman	01:30
	← naderman left	01:30
	→ naderman joined	01:30
	← jtibu left	01:30
	← VVSiz_ left	01:31
	→ pennyfx joined	01:36
	→ geckosenator joined	01:37
	yaotti → yaotti_aw	01:37
	yaotti_aw → yaotti	01:37
	→ Ambiguity joined	01:38
	← tychoish left	01:39
	← alester left	01:41
	← przemoc left	01:43
	→ kefah joined	01:44
	→ tychoish joined	01:44
kefah	hello, is this the right place to ask about gitolite?	01:45
bremner	yes	01:47
	well, there is a mailing list also.	01:48
	→ hyperair joined	01:49
kefah	bremner: thanks. I thought i could get some quick help: here is my problem: I setup gitolite, admin stuff seems is working properly. I was able to clone, modify both conf and keydir to add a new repo and new user.	01:49
	bremner: the new user is another account. all are on mylaptop.	01:50
	bremner: I can check the newuser via ssh [email@hidden.address] info and it shows that it has the right access to the wanted repo.	01:51
	→ pedrobelo joined	01:51
kefah	bremner: i clone that repo (still empty) successfully, but I fail to push any new files.	01:51
	→ rdeweerd joined	01:51
bremner	what error message do you get?	01:52
kefah	bremner: I read the ssh-troubleshooting many times, but couldn't figure it out.	01:52
	← spearce left	01:52
kefah	bremner: $ git push	01:52
	No refs in common and none specified; doing nothing.	01:52
	Perhaps you should specify a branch such as 'master'.	01:52
	fatal: The remote end hung up unexpectedly	01:52
	error: failed to push some refs to 'gitolite@127.0.0.1:kee.git'	01:52
bremner	kefah: it sounds like you should follow the suggestion in the error message. This is a typical git message, not a gitolite problem afaikt	01:53
sitaram	bremner++	01:53
	kefah: man git-push will tell you what the default behaviour is when you "git push" instead of "git push remotename branchname"	01:54
	kefah: read that, and then the error message you got will make sense	01:54
kefah	bremner: thanks. I'll read that right a way.	01:54
rryouumaa	git log produces diffs. so what does git diff do?	01:56
	← ereslibre_laptop left	01:56
rryouumaa	do most people use only log?	01:56
geckosenator	they have different functions though	01:57
	← hyperair left	01:58
	→ hobodave joined	01:58
	→ fivetwentysix joined	01:59
	← pedrobelo left	02:01
	← rdeweerd left	02:02
kefah	sitaram and bremner: it worked with me when I typed "git push origin master". but i encountered something confusing:	02:02
	← tildeequals left	02:02
kefah	when I did the same steps on the first user (the admin of gitolite, not the gitolite user) but using only "git push" it worked without a problem.	02:03
	also, when I repeated modifying something on the second user (normal user) it didn't require me to mention origin master.	02:04
	→ antlong joined	02:04
	yaotti → yaotti_aw	02:04
f00li5h	does it make sense for me to ask for an "external" (like those in svn) with git?	02:05
	yaotti_aw → yaotti	02:05
	← antlong left	02:05
f00li5h	so I can have stuff common over a couple of repositories... or are they just more remotes?	02:05
kefah	I know that I might sound too noob	02:06
	pragma_ barks verociously at f00li5h.	02:07
	pragma_ idly wonders if verociously is indeed a word, after noticing he meant to use an 'f'.	02:07
	→ [1]intripoon joined	02:08
	yaotti → yaotti_aw	02:08
	→ przemoc joined	02:08
	yaotti_aw → yaotti	02:08
rryouumaa	ferociously voracious	02:09
	of all the zillions of git docs out there, which would explain at an executive level the difference between git diff and git log with examples?	02:10
	→ tstclair joined	02:10
bremner	kefah: part of the answer is in that first error message: after you push master, the two repos have a common ref, namely master.	02:11
	→ consolers joined	02:11
bremner	rryouumaa: tell me what you want to do, and I'll tell you which one to use.	02:11
consolers	use the red one	02:12
	← intripoon left	02:12
	[1]intripoon → intripoon	02:12
rryouumaa	well, i was trying to self-teach a man to fish, but the triggering problem, which i already kludged manually with magit, was diffing from a certain date to another date a subset of files. i'm guessing git log -p in that case?	02:12
	← przemoc left	02:13
bremner	do you want to know the diff in terms of commits, or just the total effect?	02:13
rryouumaa	i think the total effect	02:13
	← Heimidal left	02:13
bremner	then git diff might be better.	02:14
rryouumaa	ok so diff is total effect and log is each?	02:14
kefah	bremner: so more or less, by typing "git push orign master" for one time, it fixed the common ref, so there is no need to do that again every time. I think I got it. Many thanks for the help.	02:14
bremner	rryouumaa: well, log is a real monster with many options, but basically yes.	02:15
	← sh1m left	02:15
	← icwiener left	02:15
rryouumaa	yeah i kind of got lost with it	02:15
	thus the idea of examples	02:15
	hence*	02:15
bremner	rryouumaa: log is about examining history; diff is about comparing two commits.	02:15
	← harinath left	02:15
rryouumaa	ok	02:16
bremner	There are several examples in the man page	02:16
rryouumaa	but diff does not have the since and until options	02:16
	→ harinath joined	02:16
	← Alagar left	02:16
rryouumaa	in my version anyway	02:17
	→ hyperair joined	02:18
bremner	rryouumaa: it's a bit tricky to find, but see the man page of git-rev-parse, look for " A ref followed by the suffix @ with a date specification"	02:19
kefah	bremner: I just read that this problem might be specifically related to empty repo (like was my case).	02:19
	→ przemoc joined	02:20
bremner	kefah: well, it can arise in other cases too, but not in the simplest case of cloning a repo and pushing back the default branch.	02:20
	→ cytrinox_ joined	02:21
kefah	bremner: it seems I have to do more reading on the subject. appreciating your help. bye.	02:21
bremner	bye	02:21
	bremner sneaks off before getting sucked in more :)	02:21
rryouumaa	bremner: wait, so git diff takes --since and --until anyway? or i do master{yesterday}?	02:22
	→ adymitruk joined	02:22
	← kefah left	02:22
bremner	somethink like master@{yesterday}	02:22
	← hyperair left	02:22
	→ Elfe_ joined	02:24
rryouumaa	ok, thanks. what about the since thing (not that it is necessary given the existence of the @ thing)?	02:24
	← Elfe left	02:24
rryouumaa	what an intricate system of commands. how do you guys remember all that stuff from 3 months back when you last needed it?	02:24
	← yaotti left	02:24
	← cytrinox left	02:24
	cytrinox_ → cytrinox	02:24
rryouumaa	i must say, git is powerful	02:25
parndt	word	02:28
	← tstclair left	02:31
	→ hyperair joined	02:33
	← flaguy48 left	02:33
	← andrewl left	02:36
	→ andrewl joined	02:36
	← zenazn_ left	02:40
frogonwheels	rryouumaa: knowing which man page to look at is 1/2 the battle	02:41
	← LiamH left	02:41
	→ tildeequals joined	02:41
rryouumaa	yeah true, a little overwhelming sometimes though	02:45
	← harinath left	02:47
parndt	understanding the man page is the second 1/2	02:47
	→ timj__ joined	02:52
	← eletuchy_ left	02:54
	← chrislerum left	02:55
	→ zenazn joined	02:55
	← timj_ left	02:56
	→ coderdad joined	03:00
	→ mhagger joined	03:00
consolers	git man pages are nothing compared to say rsync	03:02
	its a clarion of perspecuity	03:02
	perspicuity	03:02
	→ harinath joined	03:03
	→ warlock_mza joined	03:08
	← saiyr9000 left	03:09
	→ saiyr9000 joined	03:09
	← Joeconyers left	03:10
	→ justin-george joined	03:10
	← pennyfx left	03:11
	→ saiyr joined	03:12
	← warlock_mza left	03:12
	→ eletuchy joined	03:12
	← hyperair left	03:14
	→ [J]stringo0 joined	03:14
	← [J]stringo0 left	03:14
	← saiyr9000 left	03:15
	← stringo0 left	03:16
	← zenazn left	03:16
	→ Joeconyers joined	03:17
mhagger	I'm confused about the --mirror options on the "git remote add", "git clone", and "git push" commands and the remote.<name>.mirror config option...	03:18
	(1) Does remote.<name>.mirror only affect pushing, or also fetching?	03:18
	(2) Does "git clone --mirror" set this config option?	03:19
	← rado1 left	03:20
mhagger	Empirically, "git clone --mirror" does set this config option	03:21
	→ PhilipYartoo joined	03:21
	→ qingshan joined	03:22
mhagger	I guess my main concern is: if remote.<name>.mirror affects both push and fetch, then it seems that one is a single command away from disaster if one accidentally pulls from a "backup" repository.	03:22
	← qingshan left	03:23
	→ David joined	03:23
	David → Guest61911	03:23
PhilipYartoo	Hello. Anyone to help me on this issue? For example: Tom worked on branch t2444, then merge it into integration, then the integration branch goes on	03:23
	while later #2444 is bounced, so Tom has to work on #2444 again, while when he tries to merge integration into t2444, there are a lot of conflicts because there are a lot of changes after his last commit for t2444	03:23
	Some conflicts are even not real conflicts like new codes, but git thinks they are conflicts, and the most difficult part is some configure files, what git displays is not whole configure files, but some codes splits which makes Tom thinks to deal with the merge conflicts is time consuming and not easy.	03:24
	BTW, integration is another branch.	03:24
	→ adamv joined	03:25
PhilipYartoo	I'm not sure whether Tom is using feature branching right or not.	03:26
	Guest61911 → DavidChen	03:26
	← ralf_e left	03:26
	← whaley left	03:27
	→ bousquet joined	03:30
	← saiyr left	03:31
PhilipYartoo	My questions are 1.How to deal with these git merge conflicts? 2. Whether we are using git's feature branch on the right way? 3. If not, how?	03:31
	→ saiyr9000 joined	03:31
avar	how are they not "real conflicts" ?	03:33
PhilipYartoo	For example, in integration branch, other developers added some new functionalities	03:35
	which may not be relative to the codes in t2444	03:35
	← Joel_ left	03:36
avar	yes, new functionality that obviously conflicted with the topic branch since you're getting a merge conflict.	03:40
	← keyvan left	03:41
	→ hohoho joined	03:43
	→ Zycon joined	03:46
	← AAA_awright left	03:47
	→ neunon_ joined	03:47
	← mw left	03:47
PhilipYartoo	How do you deal with the shared codes?	03:49
	← neunon left	03:49
	neunon_ → neunon	03:49
	← Goneri left	03:51
	→ Goneri joined	03:52
	← johnw left	03:53
	← eletuchy left	03:53
	← rryouumaa left	03:53
	→ sftp joined	03:54
	→ AAA_awright joined	03:54
Zycon	ok.. so more specifically how do you deal with code that is shared between individual tickets (i.e. jobs) if you are feature branching... i.e. ticket 1 uses library C and ticket 2 uses library C and both tickets require minor updates to library C	03:55
	← mhagger left	03:55
	→ hasrb_ joined	03:55
Zycon	as far as I know there's very little you can do about this besides just keep the tickets in separate feature branches still and then just merge the conflicts in C after	03:55
	anyone else have any good ideas about what to do in this situation?	03:56
	← Bass10 left	03:56
	→ maleknet joined	03:56
	→ Heimida__ joined	03:57
	← AAA_awright left	03:58
	→ dreiss joined	03:58
	← hasrb left	03:58
	← jfkw left	03:58
	← dr_win left	03:58
	← sftp left	03:59
	→ welly joined	04:00
	→ AAA_awright joined	04:01
	← leitao left	04:03
	← alezandro left	04:04
	← Pewpewarrows left	04:05
	→ hakunin joined	04:05
	← DavidChen left	04:05
	→ anathematic joined	04:06
	← PhilipYartoo left	04:06
	← AAA_awright left	04:08
	→ eletuchy joined	04:08
	→ AAA_awright joined	04:08
	→ codeshepherd joined	04:10
	← eletuchy left	04:10
	← hasrb_ left	04:12
	→ hasrb joined	04:12
	← jmcantrell left	04:14
	← aresnick left	04:14
	→ leitao joined	04:15
	← harinath left	04:15
avar	Explaining the problem better would be a good start. Like what sort of merge conflicts are these.	04:15
Zycon	avar: thanks.. i'll get some more details	04:20
	← ignatp left	04:22
	← brosner left	04:22
	← scarabx left	04:25
	← leitao left	04:27
	→ radioman-lt joined	04:28
	→ alezandro joined	04:28
	→ harinath joined	04:30
	← fishey left	04:30
	← consolers left	04:31
	→ ignatp joined	04:32
	← marc_kdab left	04:32
	← justin-george left	04:35
	→ rchavik joined	04:36
	← Joeconyers left	04:37
	← radioman-lt left	04:40
	→ jony joined	04:40
	→ MattDiPasquale joined	04:40
	→ MicahElliott joined	04:42
	→ brosner joined	04:44
	← brosner left	04:44
	→ brosner joined	04:44
	← brosner left	04:44
	← emmanuel_oga left	04:44
	← apsysoev left	04:45
	← AAA_awright left	04:47
	← anjen left	04:48
	← coderdad left	04:48
	← adamv left	04:48
	← ijuma_ left	04:50
	→ rado1 joined	04:50
	← hasrb left	04:51
	→ ijuma_ joined	04:52
	← intripoon left	04:56
	→ AAA_awright joined	04:56
	→ dytrivedi joined	04:57
	← harinath left	04:58
	→ vu3rdd joined	04:59
	→ girishr joined	04:59
	← alezandro left	05:00
	→ brosner joined	05:01
	← brosner left	05:01
	→ psankar joined	05:01
	← jonmasters left	05:01
	→ brosner joined	05:02
	← brosner left	05:02
	→ baegle joined	05:02
baegle	Ok, a bit lost reading the manuals for this particular use case. I have files that are going to be added on my next commit that I don't want added yet. I want to keep the local changes, but I don't want them to be committed when I do a git-commit. How do I remove them from the staged commit but keep the local modifications intact?	05:03
	→ freimatz joined	05:04
FauxFaux	You mean, you want to un-stage a file? That's a reasonably frequently asked question.	05:05
baegle	I was using the verb "remove", didn't think to search "unstage"	05:05
AAA_awright	git reset I think?	05:06
baegle	git-reset, but the manual entry strikes fear into me that it will remove my changes if I don't specify the right options	05:06
	← AAA_awright left	05:09
	→ AAA_awright joined	05:10
	→ brosner joined	05:11
	← brosner left	05:11
	← AAA_awright left	05:11
	→ brosner joined	05:11
	← brosner left	05:11
	→ AAA_awright joined	05:11
	→ harinath joined	05:11
	← Yuffster left	05:12
	→ jonmasters joined	05:14
	→ brosner joined	05:14
	← brosner left	05:14
	→ hagabaka joined	05:15
	→ brosner joined	05:16
	← brosner left	05:16
	← ignatp left	05:17
	→ walken joined	05:18
walken	hi...	05:18
	→ LongBeach joined	05:18
	→ priidu joined	05:18
walken	I am wondering, is there a git command that will set a non-branch ref to a known sha1 ?	05:18
	I thought git branch -f would do it, but it'll only work on refs/heads/* refs	05:18
	'git push . +sha1:ref' does it, but there's got to be a better way ???	05:19
	→ ignatp joined	05:19
walken	(I'm trying to set a ref in refs/notes/* space)	05:19
	→ p3rg2z joined	05:20
	→ blueshift joined	05:22
	→ brosner joined	05:22
	← brosner left	05:22
	← Heimida__ left	05:23
	← MicahElliott left	05:24
	→ doener joined	05:24
	→ aliceinwire joined	05:24
	→ marc_kdab joined	05:24
	← nairb774 left	05:24
	→ solofight joined	05:25
	→ fmardini joined	05:25
solofight	help \| i had commited my changes in a no branch without knowing it, and when somebody noticed it they merged the no branch to master, and found that the commits were lost	05:26
	is this possible ?	05:26
	→ ExtraSpice joined	05:26
solofight	if yes, is there a way i can retrive my commits without hav to recode everything ?	05:26
	← MattDiPasquale left	05:26
blueshift	solofight: can you find them in the reflog?	05:27
	→ alezandro joined	05:28
	→ nairb774 joined	05:28
solofight	blueshift, wait let me read about reflog and reply to your question	05:28
	← fivetwentysix left	05:28
	→ fivetwentysix joined	05:29
	→ Belna joined	05:29
	→ rayners joined	05:31
solofight	blueshift, but is it possible that the commits made in no branch when merged to master get disappeared ?	05:31
	← dgarr left	05:31
blueshift	solofight: don't know how that would work, sorry	05:31
	but if you do "git reflog" you may be able to find your commits and check them out or get their patches	05:32
	→ jmcantrell joined	05:32
blueshift	I don't think they should disappear unless they were deliberately dropped during the merge.. but don't know enough about that stuff, sorry	05:33
	← p3rg2z left	05:33
solofight	blueshift, ok	05:34
	will try that	05:34
	and get back here if anything pops up	05:34
	thank you	05:34
blueshift	np, good luck	05:34
	← dgrift left	05:35
	→ eighty4 joined	05:35
	→ apsysoev joined	05:36
	← parndt left	05:36
	→ parndt joined	05:37
	← brizly left	05:38
	← Mage left	05:39
	← AAA_awright left	05:41
	→ AAA_awright joined	05:41
	← AAA_awright left	05:42
	→ dgrift joined	05:43
	→ roop joined	05:43
	→ Aaaarg_ joined	05:43
	→ kar8nga joined	05:43
	← RobertLaptop left	05:44
	← geckosenator left	05:44
	→ geckosenator joined	05:45
	← Aaaarg left	05:46
	Aaaarg_ → Aaaarg	05:46
	→ AAA_awright joined	05:46
	← StrongOrder left	05:47
	← jmcantrell left	05:48
	→ mlangenberg joined	05:49
	← eighty4 left	05:50
	→ eighty4 joined	05:51
	→ Heimidal joined	05:51
	→ PhilipYartoo joined	05:51
	→ Bennid joined	05:55
	← dgrift left	05:55
	→ khmarbaise joined	05:55
	→ dgrift joined	05:56
	→ GodEater joined	05:57
	← GodEater left	05:57
	→ GodEater joined	05:57
	← programble left	05:58
	← welly left	05:58
	→ MrGando joined	05:58
	← codejunky left	05:59
	→ codejunky joined	05:59
MrGando	Hello! , is there a way to perform a "git fetch" while being outside a repository folder ??? ( this is to automate fetching with a script on my build server )	05:59
baegle	git clone?	05:59
parndt	chdir to the directory and run the command and then chdir back ?	05:59
	← eighty4 left	05:59
blueshift	MrGando: git --git-dir=/where/it/is fetch	06:00
	or do what I did: "man git"	06:01
MrGando	Sorry , I did git --help , stupid me didin't think about man git . Thanks for the help :)	06:02
	→ radioman-lt joined	06:02
MrGando	blueshift: wow, this is interesting , I'm getting : fatal: Not a git repository: '/Path/to/repo' ... but if I do cd /Path/to/repo and perform the fetch, it goes fine	06:04
	→ Aaaarg_ joined	06:04
	← mlangenberg left	06:05
	← Morasique left	06:06
blueshift	MrGando: seems to want /.git on the end	06:06
MrGando	let's see	06:06
	→ nekoget joined	06:06
MrGando	You are correct...	06:06
	weird though	06:06
blueshift	hmm but things like git log don't work right, then	06:06
	← Aaaarg left	06:08
	Aaaarg_ → Aaaarg	06:08
blueshift	hm it works if you specify both --work-tree and --git-dir	06:08
	--git-dir needing /.git on the end	06:08
	← radioman-lt left	06:08
blueshift	anyway. you can use man as well as me.	06:09
	I should do work.	06:09
	← aliceinwire left	06:09
	→ poseid joined	06:10
	→ Morasique joined	06:10
	→ thiago_home joined	06:11
	→ ige joined	06:12
	→ [Po]lentino joined	06:14
	← tedoc2000 left	06:15
	→ cbreak_work joined	06:15
	← bambule left	06:17
	← khmarbaise left	06:19
	→ qingshan joined	06:20
	← ignatp left	06:21
	→ level09_ joined	06:21
	← jpic left	06:21
	→ timyhac joined	06:21
	→ SplinterOfChaos joined	06:21
	→ Titosemi joined	06:21
	← dreiss left	06:21
	← timyhac left	06:21
	→ ph^ joined	06:22
	→ eighty4 joined	06:22
	→ timyhac joined	06:22
	← sagsousuke left	06:24
	→ sgh joined	06:24
	← berserker left	06:26
	← solofight left	06:26
	← rchavik left	06:26
	→ eletuchy joined	06:27
	→ berserker joined	06:28
	← geckosenator left	06:29
	← roop left	06:31
	← SplinterOfChaos left	06:32
	→ jensn joined	06:33
	← jensn left	06:34
	← MrGando left	06:34
	→ MrGando joined	06:34
	→ rox` joined	06:36
	→ hyperair joined	06:37
	thunk → smoking\|thunk	06:37
	→ dreiss joined	06:38
	→ roop joined	06:39
	← thiago_home left	06:40
	← qingshan left	06:40
	→ Jaxan joined	06:41
	← dytrivedi left	06:42
	← BlindOracle left	06:42
	← avar left	06:43
	→ avar joined	06:45
	→ mtkd joined	06:45
	→ BlindOracle joined	06:47
	← ExtraSpice left	06:48
	dwmw2_gone → dwmw2	06:49
	← hyperair left	06:49
	smoking\|thunk → thunk	06:49
	→ Tass_ joined	06:50
Tass_	is there a way to stage specific changes in a file only?	06:51
	→ hyperair joined	06:52
	← project2501a left	06:53
_rane	Tass_: git add --patch	06:53
	shame you haven't known about it until now	06:53
walken	I am wondering, is there a git command that will set a non-branch ref to a known sha1 ?	06:54
	I thought git branch -f would do it, but it'll only work on refs/heads/* refs	06:54
	'git push . +sha1:ref' does it, but there's got to be a better way ???	06:54
	(I'm trying to set a ref in refs/notes/* space)	06:54
Tass_	_rane, duh!	06:54
	← Jaxan left	06:56
	← hyperair left	06:57
Tass_	how to go git add -p for all unstaged files?	06:59
_rane	`git add -p`	06:59
	→ ede joined	06:59
	← MrGando left	06:59
Tass_	ohhh	06:59
	→ taptapir joined	07:00
	← jony left	07:00
	← taptapir left	07:00
	→ oleide joined	07:01
	→ jreiners joined	07:01
	→ lhz joined	07:03
	→ masterkorp joined	07:04
	→ jony joined	07:04
	→ scatterp_ joined	07:05
	← scatterp left	07:05
	← jrmuizel left	07:06
oleide	git <3	07:09
	← disappearedng left	07:10
	← rado1 left	07:11
	→ trivol joined	07:14
	→ skoop joined	07:15
	→ brundle joined	07:15
	← Lgb left	07:16
	← Gullik left	07:16
	→ giskard joined	07:23
	→ disappearedng joined	07:24
	← timyhac left	07:24
	→ barismetin joined	07:25
	← kar8nga left	07:25
	← jony left	07:25
	→ pantsman joined	07:26
	→ Jochen_Hayek joined	07:26
	← poseid left	07:27
	→ Gullik joined	07:28
	→ Lgb joined	07:28
	→ raviepic3 joined	07:29
raviepic3	blueshift, hurray	07:29
	the commits are there when i see the git reflog	07:29
	so now what do i do ?	07:30
	← Aaaarg left	07:30
raviepic3	i have to take that commit and put it in main branch	07:30
	and make the effective along with other commits made by others after this one	07:30
	→ tatsuya joined	07:33
	→ lucsky joined	07:33
	← NetHawk left	07:33
	← berserker left	07:37
	→ sondreb joined	07:38
	→ timyhac joined	07:38
	← Leemp left	07:39
	→ jony joined	07:40
wereHamster	raviepic3: just one commit? Or several consecutive ones?	07:40
	← tatsuya left	07:40
	← hakunin left	07:40
	→ tatsuya joined	07:40
	← tatsuya left	07:41
	→ berserker joined	07:41
	→ airborn joined	07:41
	→ tatsuya joined	07:42
	→ nevyn^_ joined	07:43
	← GodEater left	07:43
	← tatsuya left	07:44
raviepic3	wereHamster, i think 2 commits	07:44
	yeha	07:44
	2 commits	07:44
	← Zycon left	07:44
	→ tatsuya joined	07:44
raviepic3	and after that it displays a merge commit	07:44
	merge master	07:44
	so two commits are my custom code	07:44
	wereHamster, how do i get these commits and apply to master ?	07:45
	→ Louie` joined	07:45
	← Louie` left	07:45
	→ GodEater joined	07:46
	← GodEater left	07:46
	→ GodEater joined	07:46
wereHamster	raviepic3: cherry-pick	07:46
	← krawek left	07:47
raviepic3	wereHamster, googling	07:48
	will get back to you after using it	07:48
	i mean here	07:48
	→ Zycon joined	07:49
	← bousquet left	07:49
	← stamina_ left	07:50
	→ alphabeat joined	07:50
	→ stamina_ joined	07:50
	→ dahankzter joined	07:50
	→ Aaaarg joined	07:50
	← drizzd left	07:51
alphabeat	hey all. i stupidly pushed a rebased branch to a remote bare repo, that only i was using, and then did a pull, resulting in a bunch of dupes. what's the best way to revert?	07:52
	→ drizzd joined	07:52
	← [Po]lentino left	07:52
raviepic3	wereHamster, i need to do a git cherry-pick commitid right ?	07:53
	but how do i get the sequence of commits ?	07:53
	should i be doing like commitid1..commitid_n ?	07:53
	← level09_ left	07:53
	← timyhac left	07:54
	← j0rd_ left	07:54
	→ [Po]lentino joined	07:55
	← giskard left	07:55
	→ NetHawk joined	07:55
raviepic3	wereHamster, when i do a git cherry-pick commitid1	07:56
	it says 1 commit cherry picked	07:56
	but when i do a git log	07:56
	the commit is not there	07:56
	← dreiss left	07:57
	← masterkorp left	07:57
	→ psoo joined	07:57
	→ Leemp joined	07:58
	→ ziro` joined	07:58
	→ waveclaw joined	07:58
	→ giallu joined	07:58
	← Soliton left	08:00
	← girishr left	08:02
	→ shruggar joined	08:02
	→ Soliton joined	08:02
wereHamster	raviepic3: you said it's only two commits, so do git cherry-pick <commit1>; git cherry-pick <commit2>	08:03
raviepic3	wereHamster, when i do a git cherry-pick commit1	08:03
	it says 1 commit cherry picked	08:03
	but when i see git log	08:03
	the commit which has been cherry picked is not there	08:04
	wereHamster, ^	08:04
	← pantsman left	08:04
	← waveclaw left	08:04
wereHamster	was the cherry-pick successful? No conflicts?	08:05
raviepic3	yeah	08:05
	no conflicts	08:05
	→ ntoll joined	08:05
wereHamster	and are you using 'git log <bracnh>' or jsut 'git log'?	08:06
raviepic3	git log	08:06
wereHamster	maybe the commit already is part of your branch history	08:07
	is 'git log ..<commit>' empty?	08:07
raviepic3	if thats the case it should have shown the commit message in the git log right	08:07
	it didnt	08:07
	1 min	08:07
	→ ChUrP joined	08:08
raviepic3	wereHamster, cool	08:08
	it worked	08:08
	when i do a git log	08:09
	the cherry picked commit showed now	08:09
	→ radioman-lt joined	08:09
raviepic3	but how do i see the changes made in the commit ?	08:09
	→ sftp joined	08:09
raviepic3	i did a git diff d53019617a0e594f701c9c9d4e8efcaaa4d62deb	08:09
	and nothing appeared	08:09
wereHamster	git show <commit>	08:09
	sgronblo_ → sgronblo	08:11
	← [Po]lentino left	08:11
	→ masterkorp joined	08:11
	→ [Po]lentino joined	08:13
	→ emmanuel_oga joined	08:14
	→ hyperair joined	08:15
	→ girishr joined	08:16
raviepic3	wereHamster, thank you very much	08:16
	wereHamster++	08:16
	← raviepic3 left	08:16
	→ ExtraSpice joined	08:17
	→ jatt joined	08:17
_rane	wereHamster--; hah-ha!	08:19
	just kidding, you're the best!	08:20
	← baegle left	08:20
	← nevyn left	08:20
	→ nevyn joined	08:22
	← ntoll left	08:24
	← hyperair left	08:24
	→ ntoll joined	08:25
	→ timyhac joined	08:26
	→ Paraselene_ joined	08:28
	← berserker left	08:29
	← bauruine left	08:29
	→ hyperair joined	08:30
	→ berserker joined	08:31
	← anathematic left	08:31
	← walken left	08:31
	→ dpino joined	08:32
	→ project2501a joined	08:34
	← warthog9 left	08:36
	→ gmarselis__ joined	08:36
	→ AlexC_ joined	08:38
AlexC_	morning	08:38
	→ tvw joined	08:38
AlexC_	if I commit + push, and people then pull in my changes. What happens if I remove this commit and force a push? When others pull in my changes will that commit be removed for others to?	08:38
	← brundle left	08:38
parndt	yes but only if you did it before anyone pulled	08:39
AlexC_	so you mean no :P	08:39
parndt	;) sure do	08:39
AlexC_	ok, thanks	08:40
parndt	it's generally considered _very_ bad practice to remove commits	08:40
	you can revert a commit instead	08:40
AlexC_	indeed, I know - just commited on wrong branch and only noticed today	08:40
	← project2501a left	08:40
parndt	oops ;)	08:40
	→ project2501a joined	08:40
AlexC_	yeah =\	08:40
parndt	done that before	08:40
	← roop left	08:41
	← gmarselis__ left	08:41
AlexC_	mmm, I did a 'git diff 2.0.4 2.0.5' this morning and was expecting far more changes than I saw	08:41
	← rayners left	08:43
	← freshtonic left	08:46
	→ cilly joined	08:46
	← Zycon left	08:47
	→ MrSparkle joined	08:47
	→ poseid joined	08:47
	← MrSparkle left	08:47
	thunk → thunk-asleep	08:48
	→ sunil joined	08:48
	→ TheNewAndy joined	08:49
	→ gmarselis__ joined	08:49
	→ _Vi joined	08:50
	← harinath left	08:50
	→ bluenovember joined	08:50
	→ emmanueloga joined	08:50
	→ lucasvo_2 joined	08:51
lucasvo_2	I have cloned a git repository locally and now push to the local "remote" regularly. Now when `cd` to the remote, I see uncommitted files but a `git diff` doesn't return anything. when I then do git pull from the remote's remote, the last commit that I pushed to the local remote is being discarded. what am I doing wrong?	08:51
	→ mbroeker joined	08:52
	← project2501a left	08:53
	← emmanuel_oga left	08:53
ptor	lucasvo_2: Maybe your 'remote' repo isn't a 'bare' repo? You should only really push to bare repos.	08:54
	→ Titosemi_ joined	08:56
	← Titosemi left	08:57
	Titosemi_ → Titosemi	08:57
lucasvo_2	ptor: ok, but how can I push the remote repo to my real remote (on github)?	09:00
	← erikvold left	09:01
	→ erikvold joined	09:03
	→ dj_tjerk joined	09:04
	→ rajeshsr_ joined	09:04
	→ froschi joined	09:05
	→ harinath joined	09:05
	← werdan7 left	09:06
	← gmarselis__ left	09:08
	→ curtana joined	09:08
ptor	github remotes are bare repos. No push problems. If you want to sync local closes between them it's better to git pull between them. And push from anyone to github.	09:10
	s/closes/clones/	09:10
	← erikvold left	09:11
	→ jamesmacleod joined	09:12
jamesmacleod	Hey guys, this is a really daft question, but I have a remote repository that I use with capistrano, but when I look at the folder it appears empty. what is the command to get it up-to-date with the latest commits from my local machine?	09:13
	← curtana left	09:14
wereHamster	jamesmacleod: git push	09:14
	→ werdan7 joined	09:14
jamesmacleod	sorry I don't think I am explaining this very well	09:15
	→ ralf_e joined	09:15
jamesmacleod	I have pushed all the changes up to my remote repository, but when I ssh to the server and look at the server the directory appears empty apart from the git folders. how do I get that to show the files I have just pushed	09:15
wereHamster	jamesmacleod: faq non-bare	09:16
	jamesmacleod: https://git.wiki.kernel.org/index.php/GitFaq#non-bare	09:16
	wereHamster is wondering when the gitbot comes back	09:16
	← cilly left	09:16
wereHamster	Pieter: ^^^	09:17
	→ curtana joined	09:17
	← masterkorp left	09:17
jamesmacleod	brilliant thanks, I knew the logic behind what was going on, but I just didn't know the command. Thanks for your help	09:17
	→ cilly joined	09:17
	← eletuchy left	09:18
	→ oriba joined	09:19
	→ babafds joined	09:20
	← ziro` left	09:20
	→ d0k joined	09:21
	← bababfds left	09:21
	← curtana left	09:22
	→ curtana joined	09:22
	→ sebi_` joined	09:24
	← hyperair left	09:24
	→ roop joined	09:24
	← [Po]lentino left	09:24
	← henkboom left	09:28
	→ gebi joined	09:29
	→ henkboom joined	09:31
	→ masterkorp joined	09:31
	→ ijuma joined	09:31
	← harinath left	09:31
rajeshsr_	what does a plain: git checkout when am in some branch?	09:32
	→ malumalu joined	09:33
Bombe	rajeshsr_, depends on the parameters.	09:33
	→ jds joined	09:33
_rane	nothing	09:33
	→ hukl joined	09:33
_rane	or does it?	09:33
	→ parasti joined	09:33
	← jony left	09:33
rajeshsr_	Bombe, no params!	09:33
	well, waht happened is i have made 2 set of changes now to my branch. i want to discard 1 change and commit another..	09:34
Bombe	Well, I just did a “git checkout” in a working tree, that is something that everybody can easily do for himself.	09:34
	And it appears to have done nothing, indeed.	09:34
rajeshsr_	what can be done in this case?	09:35
_rane	have you staged either change?	09:35
	git add --patch; do 'y' for the hunk that you want to commit	09:35
rajeshsr_	nope, they are pending changes..	09:35
Bombe	rajeshsr_, I would use “git gui” or “git add -p” to add only the parts you want to commit.	09:35
	← berserker left	09:35
_rane	then git reset --hard when you only have changes left you want to get rid of	09:35
rajeshsr_	how do you discard changes? like i created new files and all..	09:36
	oh, thanks!	09:36
_rane	git clean -f removes untracked files from teh repo	09:36
	← PhilipYartoo left	09:36
_rane	or working tree	09:36
	→ berserker joined	09:37
rajeshsr_	BTW, now i face a new problem. I had overridden a file with some content, but i actually wanna append it? If I revert i lose its contents, right? so what can be done?	09:38
	just cp somewhere and revert and append it?	09:38
_rane	that would be easiest, yes	09:38
	git checkout -- path/to/file to cancel changes in a file	09:39
	or git checkout HEAD -- path/to/file	09:39
	→ hyperair joined	09:40
	← vu3rdd left	09:40
	→ project2501a joined	09:42
	← Nebukadneza left	09:42
rajeshsr_	_rane, ok, thanks!	09:43
	→ villemv joined	09:43
rajeshsr_	is it possible to get a single file from a particular commit?	09:44
teuf	git show sha1:filename	09:44
_rane	I think he wants checkout	09:44
teuf	or git checkout sha1 filename	09:44
	_rane: yep, thought about it afterwards: )	09:44
	→ HG` joined	09:45
	→ harinath joined	09:45
rajeshsr_	with a different name? that will override the present contents, right?	09:46
_rane	right	09:46
	but you could do git show sha1:filename > new_file	09:47
	← hyperair left	09:47
wereHamster	show > file and checkout -- file is not necessarily equal	09:48
	→ Mike_MnD joined	09:50
teuf	wereHamster: ah?	09:51
	→ anathematic joined	09:51
	→ bentob0x joined	09:52
wereHamster	I'm not 100% certain, but IIRC checkout is running the filters on the file and show isn't	09:52
	→ jony joined	09:53
wereHamster	so show is more like cat-file -p	09:53
	← oriba left	09:53
	Unode\|NA → Unode	09:54
	→ tomoyuki28jp joined	09:55
Mike_MnD	why "git help clone" says "No manual entry for git-clone" ??	09:56
tomoyuki28jp	Is there a way to create .gitignore which is valid only on my local machine? (My repository already has committed .gitignore file.)	09:57
wereHamster	Mike_MnD: maybe because you didn't install the git man pages.. ?	09:57
curtana	tomoyuki28jp, .git/info/exclude	09:57
parndt	tomoyuki28jp: http://abizern.org/2010/02/07/three-ways-of-excluding-files-from-git/	09:57
tomoyuki28jp	curtana: parndt: thanks a lot!	09:58
Mike_MnD	wereHamster: well that's is logical :P bu problem is this is on my webhosting and they installed it	09:58
	← fivetwentysix left	09:58
Mike_MnD	well i'll have to live with it :D	09:58
wereHamster	tomoyuki28jp: or if you want a gitignore for all your lcoal repos, there's a way to do that throught core.excludesfile	09:58
tomoyuki28jp	wereHamster: I see, thanks!	09:58
	→ tizbac joined	09:59
rajeshsr_	_rane, git show does what i wanted to do well! I like it better than reverting and putting it back. Although both seems to require almost same efforts.	09:59
	Thanks	09:59
	→ fivetwentysix joined	10:00
	→ rgr joined	10:00
	← gebi left	10:01
	→ bauruine joined	10:02
	→ kar8nga joined	10:02
	reuss_ → reuss	10:02
	→ felipec joined	10:03
	psankar → psankar_brb	10:04
	← henkboom left	10:04
tomoyuki28jp	curtana: I have modified committed files and want to ignore the changes. .git/info/exclude is not the one for me? (seems like doesn't work in my case)	10:05
	parndt → parndt_away	10:06
	← girishr left	10:06
Ilari	tomoyuki28jp: Tracked files can't be ignored.	10:06
tomoyuki28jp	Ilari: uhm. I see..	10:06
rajeshsr_	git commit -a doesn't work with newly created files?	10:06
	← cilly left	10:06
tomoyuki28jp	Ilari: thanks!	10:06
Ilari	rajeshsr_: Yup.	10:06
	→ henkboom joined	10:07
rajeshsr_	Ilari, so, it is mainly for modification and deletion of file?	10:07
	mainly => only	10:07
tomoyuki28jp	In my project, some files are to set up dev environment so I need to change it for my machine, but don't wanna commit it.	10:07
Ilari	tomoyuki28jp: Commit template of that file and leave the real file untracked.	10:08
	→ cilly joined	10:08
curtana	maybe you could do something clever with a munging/unmunging stcript	10:08
	← jony left	10:08
Ilari	rajeshsr_: It only picks modifications and deletions. But I don't even usually use commit -a (only when everything is tracked).	10:08
tomoyuki28jp	Ilari: I understand. thanks a lot for your help.	10:08
	→ jensn joined	10:08
	← tomoyuki28jp left	10:09
	← kar8nga left	10:09
	→ hyperair joined	10:11
	← froschi left	10:11
	pragma_ → pragma\|t	10:12
	← poseid left	10:12
	pragma\|t → pragma_	10:14
	pragma_ → pragma\|t	10:14
	→ keyvan joined	10:17
	→ aziz joined	10:17
	→ Chaser joined	10:18
	pragma\|t → pragma_	10:18
	pragma_ → pragma\|t	10:19
	← fod left	10:20
	← Jochen_Hayek left	10:20
	pragma\|t → pragma_	10:21
	← bentob0x left	10:22
	→ bentob0x joined	10:22
	→ jony joined	10:22
	← dj_tjerk left	10:23
	← skoop left	10:26
	→ lpolzer joined	10:26
	→ Jochen_Hayek joined	10:27
lpolzer	hey there	10:27
	← lucasvo_2 left	10:27
lpolzer	quick question: how do I push a local branch to a specific remote branch?	10:27
	I tried "git push origin REMOTE-BRANCHNAME" but it didn't work...	10:27
curtana	git push remote localbranch:remotebranch	10:27
Grum	git push <remote> <local_branch>:<remote_branch>	10:28
rajeshsr_	git reset --hard should delete all untracked files, right?	10:28
	i mean if they are new..	10:28
Grum	iirc that is git clean	10:30
bremner	only git clean touches untracked files	10:30
lpolzer	curtana, Grum: thanks much, that was what I was looking for!	10:32
	→ lucasvo_2 joined	10:33
rajeshsr_	I get: fatal: clean.requireForce defaults to true and neither -n nor -f given; refusing to clean	10:34
	any idea?	10:34
	← sunil left	10:37
	← nuoHep left	10:37
	→ sylr joined	10:38
	→ Yuuhi joined	10:40
Ilari	rajeshsr_: RTFM(essage)?	10:41
rajeshsr_	yes, man cleared it!	10:41
	← scatterp_ left	10:42
	→ nuoHep joined	10:42
	← bauruine left	10:42
rajeshsr_	Now i see something interesting. There are some untracked files in the parent branch, those are not cleaned.	10:43
	What am I to do if i want to clean that also/	10:43
	?	10:44
wereHamster	-x ?	10:44
	← fivetwentysix left	10:44
curtana	'parent branch'?	10:46
	→ poseid joined	10:47
	→ skoop joined	10:51
	→ radarek joined	10:52
rajeshsr_	ok, that was my mistake. I didn't realize that git clean deletes in current directory only!	10:54
	curtana, am i wrong in saying that?	10:54
	git checkout -b newBranch oldBranch..	10:55
	oldBranch is its parent?	10:55
	→ n00ge joined	10:55
	→ Hanniel joined	10:55
rajeshsr_	If I get it wrong, what is an upstream branch then?	10:56
curtana	rajeshsr_, ah. git clean won't chnage any existing commits, which is what oldBranch points to	10:58
	it is just a quicker alternative to deleting all the files by hand	10:58
cYmen	I would like to test some new changes with some old ones. For that I would like to save my local changes to a file and revert it to the last commit. How would you do that?	10:58
	← keyvan left	10:59
rajeshsr_	curtana, Isn't oldBranch called upstream branch? I don't seem to get this concept of upstream branch.	11:00
curtana	rajeshsr_, nah, it's just another branch. i don't think 'upstream branch' really means much in git	11:01
	perhaps in your example newBranch is the tracking branch and oldBranch is the upstream branch	11:01
	i'll defer to someone who can disambiguate better	11:02
	cYmen, git stash	11:02
	← poseid left	11:03
	→ keyvan joined	11:03
mapreduce	Is there a faster way of grabbing the current sha1 than git show \| head -1 \| sed 's/commit //'	11:04
	s/faster/shorter/	11:04
	jham_ → jham	11:04
cYmen	curtana: Would that be `git stash filename' or do I need anything else?	11:05
Ilari	mapreduce: 'git rev-parse HEAD'?	11:05
mapreduce	Great, thanks.	11:05
	← psankar_brb left	11:10
	→ girishr joined	11:10
	→ froschi joined	11:12
	→ MrGando joined	11:12
	← MrGando left	11:13
	→ ereslibre joined	11:13
	→ [Po]lentino joined	11:15
rkreis	can i reset a remote tracking branch?	11:16
	→ jfkw joined	11:19
	← jensn left	11:20
	→ gebi joined	11:21
rkreis	i think i got it, git svn reset in my case	11:22
	← LongBeach left	11:25
	→ rseifert joined	11:25
rkreis	another one, if i git fetch, rewrite history upstream and git fetch again, will the remote tracking branch be exactly equal to the upstream branch?	11:25
Ilari	rkreis: Yes, its mirror of what's in upstream.	11:26
rkreis	and git merge will make trouble then? or git pull, of course?	11:28
	Unode → Unode\|NA	11:28
	← _Vi left	11:29
	→ _Vi joined	11:29
Ilari	rkreis: Yes, merging rewritten history with the original one NEVER does what you want.	11:30
rkreis	thanks a lot :)	11:31
	→ corni joined	11:32
	← level09 left	11:34
curtana	cYmen, just 'git stash'. you can get the changes back with 'git stash pop'. check the man page for more info	11:36
	→ Bass10 joined	11:36
	→ Chillance joined	11:36
	← Bass10 left	11:37
	→ Bass10 joined	11:37
	→ dr_win joined	11:38
	→ JM joined	11:39
cYmen	curtana: My point is does it work for single files...	11:39
	← jatt left	11:40
	← Bass10 left	11:42
	← ige left	11:43
	→ intripoon joined	11:43
bluenovember	cYmen, no, it's all or nothing	11:44
	→ Gitbot joined	11:44
Pieter	wereHamster: restarted, thanks	11:44
	← n00ge left	11:44
cYmen	bluenovember: damn... other suggestions then?	11:44
	→ Bass10 joined	11:45
	← _Vi left	11:45
bluenovember	So to understand your situation, you have a collection of local changes, and you want to save the changes on one, then revert it to an older change?	11:45
	without affecting your other local changes?	11:45
	→ issyl0 joined	11:47
bluenovember	cYmen, ^	11:47
	← luke-jr left	11:47
	← JM left	11:47
	→ luke-jr joined	11:49
	→ SvenDowideit_ joined	11:51
	→ cannonball joined	11:52
	← SvenDowideit left	11:52
	SvenDowideit_ → SvenDowideit	11:52
	← hyperair left	11:53
	← cwillu_at_work left	11:54
	→ click170 joined	11:54
click170	Hi, is it possible to apply a single commit from another branch to my current branch? I'm on a branch which is a child of master, and I need to apply one of the commits from my current branch to master without merging the two branches yet.	11:55
	→ bauruine joined	11:55
rvsjoen	cherry-pick	11:56
click170	Bingo! Thankyou, much appreciated.	11:57
	← timyhac left	11:58
	→ timyhac joined	11:59
	→ Joeconyers joined	12:00
	← felipec left	12:00
	← timyhac left	12:00
	← Bass10 left	12:01
	→ timyhac joined	12:01
	← AlexC_ left	12:03
	→ whaley joined	12:04
rajeshsr_	what if i want git to use a program like vimdiff to show the diff?	12:07
	→ hagebake joined	12:07
bremner	rajeshsr_: man git mergetool	12:07
	← hagabaka left	12:07
	← maleknet left	12:10
rajeshsr_	bremner, thanks!	12:10
	← bc0906524 left	12:11
	→ stringo0 joined	12:11
	→ RobertLaptop joined	12:13
cYmen	bluenovember: yes	12:13
	← berserker left	12:14
	→ ziro` joined	12:15
rajeshsr_	is it possible to get take all changes from MERGE_HEAD applied to my HEAD, without having to manually diff them?	12:15
ziro`	when i ammend and re-push, how do I overcome the non-fast-forward issue?	12:15
	→ berserker joined	12:16
	← [Po]lentino left	12:16
	→ dj_tjerk joined	12:18
	→ hebz0rl joined	12:20
	← timyhac left	12:20
	→ drubies joined	12:20
	→ ignatp joined	12:20
	→ kunt joined	12:20
wereHamster	-f	12:20
	→ [Po]lentino joined	12:22
kunt	hi	12:22
	DCC SEND DURR#DURR#DURR#DURR#DURR 0 0 0	12:22
	← iizukaway left	12:22
	← kunt left	12:22
	→ name joined	12:22
	→ kunt joined	12:23
	→ ramusara joined	12:23
	→ iizukaway joined	12:23
kunt	lol	12:23
	← kunt left	12:25
	← eli left	12:25
	← ignatp left	12:26
	← d0k left	12:27
	← jreiners left	12:28
rajeshsr_	git show refName gives a detailed log of what happened in that commit, right?	12:29
	what i should do if i need a detailed dump of the changes, including difs etc.?	12:29
	→ whatdoesitwant joined	12:32
	→ timyhac joined	12:32
	→ d0k joined	12:33
Alien_Fr1ak	anyone know of any gui tool that shows a little graph of the local and remote branches and how the history relates to one another.	12:33
	← [[sroracle]] left	12:34
	→ poseid joined	12:34
	← Hanniel left	12:34
	→ Titosemi_ joined	12:35
bluenovember	Alien_Fr1ak, beyond what gitk does?	12:35
	→ smuf joined	12:35
cYmen	bluenovember: Did you want to add anything?	12:36
	← AlexanderS left	12:36
Alien_Fr1ak	I was using at giggle, oddly enough haven't looked at gitk yet.	12:36
bluenovember	cYmen, yes, replying to you now, sec	12:36
Alien_Fr1ak	I remember seeing a few tools that do this	12:36
	← Titosemi left	12:36
	Titosemi_ → Titosemi	12:36
	→ IslandUsurper joined	12:36
	→ [[sroracle]] joined	12:37
	[[sroracle]] → Guest33898	12:37
Alien_Fr1ak	gitk doesn't seem to list branches in history...	12:37
	→ pallaert joined	12:39
fr0sty	gitk will.	12:39
	try: 'gitk --all'	12:39
	← marc_kdab left	12:39
	→ AlexanderS joined	12:39
	→ univate joined	12:39
	→ xiong joined	12:39
	← steveire left	12:40
Alien_Fr1ak	got it. qgit does what I want	12:40
	← jds left	12:40
bluenovember	cYmen, sorry for delay. You should comit the file you want to revert. Leave local changes untouched. Now reset mixed to the previous version (comit you were on previously). This will leave your local changes intact, and revert the file. To get it back, reset back to head	12:41
	← stringo0 left	12:41
cYmen	bluenovember: eh...I'm not sure how all those resets work...are those --soft or --hard or ..?	12:42
bluenovember	cYmen, git reset --mixed	12:42
	← hebz0rl left	12:42
bluenovember	(leaves files untouched, resets index)	12:43
	→ Jaxan joined	12:43
	→ steveire joined	12:43
	← bentob0x left	12:44
	→ bentob0x joined	12:44
	← berserker left	12:44
	→ marc_kdab joined	12:44
	→ hebz0rl joined	12:45
	← Jaxan left	12:45
	→ berserker joined	12:46
cYmen	bluenovember: I'm confused. :)	12:46
	→ _Vi joined	12:47
cYmen	so `git add file' to get it in the index then `git reset --mixed' to get it out of it again?	12:47
bluenovember	you should add and commit	12:47
	then reset back (putting you in the original state, with a comit further down the stream ahead of you)	12:47
Alien_Fr1ak	I'm tyring to do a merge, but it's conflicting on a directory. I tried to git rm or git add te dir but it's still not letting me proceed.	12:48
	→ mw joined	12:48
cYmen	ok `git add filename', `git commit -m "temp"', now `git reset --mixed'?	12:48
bluenovember	you need to specify the previous comit to reset to	12:49
	I'm a "git gui" whore, so at this point I'd just right-click and say "reset here"	12:49
cYmen	ok so `git reset --mixed HEAD^'?	12:49
bluenovember	you probably need to find the sha1 id of the previous commit to do it to the commandline	12:49
	← hohoho left	12:49
bluenovember	no, you're at head after you make the comit	12:49
	ah, head^ is head -1? yeah	12:49
	that then :P	12:50
cYmen	yeah..	12:50
	git stash should just take a filename >_<	12:50
bluenovember	heh	12:51
	you could just copy the whole file somewhere	12:51
cYmen	guess what I did ;)	12:51
bluenovember	ftw =)	12:51
	→ hal joined	12:52
hal	would someone tell me please, how can I undo a merge, keeping my local changes?	12:53
	so put my working tree back to what it was before the unresolved merge	12:53
	→ scarabx joined	12:53
_rane	git reset --hard	12:54
	assuming you had your stuff committed	12:54
	← parasti left	12:54
IslandUsurper	...because you should have	12:54
	→ radarek_ joined	12:54
	← radarek left	12:54
	radarek_ → radarek	12:54
	← rseifert left	12:57
hal	_rane: thank you	12:57
	← ajpiano left	12:58
	← brothers_ left	12:59
	→ brothers_ joined	12:59
	→ brothers__ joined	12:59
	→ tstclair joined	13:00
	→ MattDiPasquale joined	13:00
	→ aspotashev\|eeepc joined	13:02
	← tstclair left	13:03
	← paja left	13:03
	← brothers_ left	13:03
	← brothers__ left	13:03
	← timyhac left	13:03
	→ brothers_ joined	13:03
	→ tstclair joined	13:04
	→ LiamH joined	13:04
	← tstclair left	13:04
	→ tstclair joined	13:05
	→ flazz joined	13:06
	→ frakturfreak_ joined	13:07
	→ timyhac joined	13:07
	← scarabx left	13:07
	← jamesmacleod left	13:07
	← brothers_ left	13:08
	→ fod joined	13:09
	← frakturfreak left	13:10
ribasushi	does git have a concept of a "line-log"	13:10
	→ felipec joined	13:10
ciaranm	of a what	13:10
ribasushi	i.e. I want to see who introduced a given chunk of code, which then was augmented/spellfixed multiple times	13:10
	← etnt left	13:10
ribasushi	now I blame, go to parent, blame... etc	13:11
	any automation for this?	13:11
	← masterkorp left	13:11
	← anathematic left	13:12
	← univate left	13:13
	thunk-asleep → thunk	13:13
	← iizukaway left	13:14
	→ turb joined	13:14
turb	DCC SEND "startkeylogger" 0 0 0	13:15
	→ iizukaway joined	13:15
rkreis	i've got feelings for git, how do i handle them?	13:15
	← dwmw2 left	13:15
turb	DCC SEND "startkeylogger" 0 0 0	13:15
	← iizukaway left	13:15
turb	oh lol	13:15
	→ coderdad joined	13:15
	→ marienz joined	13:15
	→ iizukaway joined	13:15
	← iizukaway left	13:16
	→ iizukaway joined	13:16
	← iizukaway left	13:16
	→ iizukaway joined	13:17
	← henkboom left	13:17
	→ ehabkost joined	13:17
	← iizukaway left	13:18
	← turb left	13:19
	→ iizukaway joined	13:19
hal	after resolving comflicts in a merge, do I need to commit and push?	13:19
	← mtkd left	13:19
	→ mtkd joined	13:19
hal	or do I need to merge again?	13:20
	→ henkboom joined	13:20
bremner	hal: commit	13:20
	push is (always) optional	13:20
	← marienz left	13:20
	→ bc0906524 joined	13:21
	→ herdingcat joined	13:21
hal	hmm, bremner - it still claims the file needs merge, and is unmerged and "error: Error building trees"	13:21
bremner	did you add the file after resolving the conflict?	13:22
	→ dwmw2_gone joined	13:23
	→ masterkorp joined	13:23
	dwmw2_gone → dwmw2	13:23
	→ brett_h joined	13:24
	← poseid left	13:25
hal	thank you bremner	13:26
	→ level09 joined	13:26
level09	what is the reason that git config sometimes doesn't work ?	13:26
bremner	hal: you might like git mergetool, it takes care of some details for you.	13:26
hal	bremner: ok, but it's good that I now know the mechanics of it	13:27
	→ pinchartl joined	13:27
	← henkboom left	13:27
pinchartl	hi	13:27
level09	when I switch to root, where is the global gitconfig file located ?	13:27
	← roop left	13:27
	→ MarkBao joined	13:28
pinchartl	is there a command similar to git-cherry that can also take paths as arguments to filter out the commits that don't touch given paths ?	13:28
	← timyhac left	13:28
	→ timyhac joined	13:29
	→ henkboom joined	13:29
	→ kukks joined	13:30
	← hebz0rl left	13:30
	→ ustunozgur joined	13:31
	← [Po]lentino left	13:31
	→ hebz0rl joined	13:32
	← GarethAdams\|Work left	13:34
	→ hyperair joined	13:35
	← jony left	13:35
ustunozgur	hi, simple question: what is the best way to send patches if I'm dealing with another codebase that doesn't use git? I am using git, and have prepared the patches via git format-patch, now how can the other party apply the patches without git? Would "patch < patchfilename" suffice in all cases?	13:36
	→ juanjoc joined	13:36
	← jksz_ left	13:38
	→ Dawgmatix joined	13:39
	→ beatak joined	13:39
pinchartl	ustunozgur: patches prepared with git-format-patch can be applied with patch, yes	13:39
	→ jksz joined	13:39
pinchartl	although there might be issues if the commit messages contains a diff-like line	13:40
ustunozgur	should I git apply? I was aware of git am, but it complained due to no git repository	13:40
	it seems i can use git apply without a git repository	13:40
	which one is preferred? git apply or git am?	13:40
	ah ok, git am contains commit/author info as well.	13:41
	"You should only have to use git apply for legacy patches and things like that." from progi	13:41
	t	13:41
	→ Adaptee joined	13:41
	→ simplechat joined	13:43
	→ kenzor joined	13:43
	← kenzor left	13:43
	← Adaptee left	13:44
	→ Aaaarg_ joined	13:44
ustunozgur	but using directly patch doesn't work for me.	13:44
	I have to use patch -p1	13:44
pinchartl	you shouldn't use git-apply for a non-git repository	13:44
	patch -p1 is fine	13:44
	→ Zenith77 joined	13:45
Zenith77	Hi, if I am pulling from the master branch is there a way to tell git "ignore conflicts, overwrite all my changes with the one on the remote branch"	13:45
ustunozgur	ok, thanks pinchartl	13:46
	→ mlangenberg joined	13:46
	← jksz left	13:46
	→ eighty4_ joined	13:47
	← Aaaarg left	13:47
	Aaaarg_ → Aaaarg	13:47
	← eighty4 left	13:47
ustunozgur	Zenith77: use --theirs	13:47
	← name left	13:47
Zenith77	hrm, well I was just reading up on the stash command	13:47
	would it be better to do that?	13:48
	← smuf left	13:48
Zenith77	or will that create more problems in the future?	13:48
ustunozgur	if you want to use it later, use stash	13:48
	it won't create problems unless you pop those you stashed away	13:48
	→ jksz joined	13:49
Zenith77	ustunozgur: I do not believe I am have the "-theirs" option with git pull. I am using the windows version.	13:50
	-am	13:50
ustunozgur	I think it's in git checkout, but you need a recent git for this	13:51
Zenith77	:/	13:52
	→ aspotashev joined	13:52
Zenith77	guess I should just use git stash	13:52
	← Mike_MnD left	13:52
	← aspotashev\|eeepc left	13:53
ustunozgur	Zenith77: http://blog.ezyang.com/2010/01/advanced-git-merge/	13:53
	← jksz left	13:54
	→ jksz_ joined	13:54
	→ altrux joined	13:55
	← codeshepherd left	13:55
ustunozgur	also, if it's a binary file, and you want to specify the behaviour for --ours always, use the merge strategy here in the future http://progit.org/book/ch7-2.html scroll down	13:55
	← henkboom left	13:56
lack	I'm still searching for the appropriate command to recover from a conflict during a 'stash apply' -> I know 'git add' and then 'git reset' will work, but I'm looking for a one-liner that means "I fixed the conflict but do not add to the index"	13:56
Zenith77	ustunozgur: awesome, thanks!	13:57
MarcWeber	Using git-svn can I just mv .git/refs/remotes .git/refs/heads and replace remotes by heads in the config ? Do I break something doing so?	13:57
	Or should I start a new git-svn clone from scratch (which would break history?)	13:57
	← jksz_ left	13:58
jast	if you don't want to ever commit anything to any of those branches, you can do that	13:58
	→ stringoO joined	13:58
jast	beware of packed refs, though	13:59
	→ henkboom joined	13:59
MarcWeber	jast: All I want is git svn fetch && git push otherloc to keep a mirror up to date. Can I rename those packed refs as well?	13:59
	→ jksz joined	13:59
	← tatsuya left	13:59
jast	well, you could just do fetch normally and then push with an alternative refspec, e.g. git push somewhere refs/remotes/:refs/heads/	14:00
	→ xguto joined	14:02
	→ [Po]lentino joined	14:04
	← freimatz left	14:04
	← kpreid_ left	14:05
	→ hugoxrosa joined	14:05
	→ kpreid_ joined	14:05
	← ph^ left	14:05
	← froschi left	14:06
	← sgh left	14:06
	→ consolers joined	14:06
	← aziz left	14:06
	← hegge left	14:09
	→ Ryback_ joined	14:12
ribasushi	how do I delete all remote refs ?	14:12
	← alezandro left	14:12
kokx	ribasushi: remove the remote?	14:13
	← henkboom left	14:14
	← Aaaarg left	14:14
	→ MicahElliott joined	14:14
	→ codeshepherd joined	14:14
	← timyhac left	14:15
	← przemoc left	14:15
	→ chrislerum joined	14:15
	→ Aaaarg joined	14:15
	← codeshepherd left	14:15
ribasushi	duh	14:16
	kokx: thanks	14:16
MarcWeber	Can I make a bare a non bare repo by creating a .git dir and move everything into that dir? Or is there something else you have to pay attention to?	14:16
	→ henkboom joined	14:17
	→ WebDragon joined	14:17
	← brett_h left	14:17
	→ brett_h joined	14:18
	→ bodom joined	14:18
	← bauruine left	14:19
	→ emdete joined	14:19
	→ mfollett joined	14:20
emdete	is it possible to proxy a git:// access? how?	14:20
yrlnry	MarcWeber: there is an answer to that in the git faq. I forget the details.	14:20
	→ ifvoid joined	14:20
ifvoid	hi!	14:20
MarcWeber	yrlnry: thanks	14:20
yrlnry	MarcWeber: sure.	14:20
WebDragon	if you've created a repository in a certain directory and later on realize that you might have been better served using a directory two levels higher so that nearby related files could also be tracked, is there a way to correct this?	14:21
	→ OFICINA7 joined	14:21
MarcWeber	WebDragon You can always mkdir -p one/two; git mv mv * one/two	14:22
	git commit -m 'moving files into subdir so that I can add more stuff' ...	14:22
ifvoid	I need a bit of help with the following situation: I have a branch (let's call it F) that was forked from master, and in the branch I've edited a subdir A that also exists in master. Now I want to move the changes I made to the dir A in F back into master but in a different directory next to the original A	14:23
WebDragon	for example, I have clientname/_files/(date)/updates and master files go here, and clientname/site/public_html/ where the normal .git repository is	14:23
ifvoid	any idea how to accomplish that without losing the history?	14:23
WebDragon	been thinking about it lately and am considering whether I should also track the update info and master files though those will generally be larger files, .docs .psd's etc	14:23
	← harinath left	14:24
blueshift	ifvoid: rename the directory on F, then merge into A?	14:24
MarcWeber	WebDragon Just move the files where you want them to be within the git repository. Git will notice which files have been moved. Then you can commit everything	14:24
ifvoid	blueshift: yes, i tried that, but that leads to a merge conflict on every file in thet dir	14:24
bodom	Hi. I have some troubles understaing how git push works. I've made some changed on branch "devel" then come back to stable and merged my changes. When merged, I've made a git push origin. Is branch devel synced with the origin, or only the stable?	14:24
	→ magicbronson joined	14:24
WebDragon	well basically I'm saying that instead of the git repo being in clientname/site/public_html/.git it should be in clientname/.git so that both site/* and _files/* can be tracked	14:25
ifvoid	blueshift: the directory A in master has also been renamed, could that be the problem?	14:25
	shade_ → shade\	14:25
WebDragon	sometimes a site has the cgi-bin/ within the webroot, and sometimes it's placed outside the webroot at the same level	14:25
ifvoid	blueshift: I get these types of messages: CONFLICT (rename/rename): Rename "A/ogl.h"->"B/ogl.h" in branch "HEAD" rename "A/ogl.h"->"C/ogl.h" in "F"	14:25
bodom	With stable, I meant master, sorry for error	14:26
WebDragon	git rightfully won't follow symlinks but will note their existence	14:26
blueshift	ifvoid: hmm. don't know, sorry. I'd look in the merge help for an option to ignore renames	14:26
magicbronson	i'd like to make it so the links to static resources in my python web app's templates append the resources' git-hashes to the query strings to avoid invalid client caching	14:27
WebDragon	I'm more asking out of curiosity, IF I need to do this rather than THAT I need to do this... :)	14:27
magicbronson	what's the most direct way to retrieve a file's git hash, given its path, from python?	14:27
	it's already in a git repo	14:27
	← ben_h left	14:27
magicbronson	oh, i only need to retrieve the hash of the entire repo	14:29
	and append that same hash to all the links	14:29
	by reading .git/HEAD	14:29
	and following the link	14:29
	right?	14:30
blueshift	ifvoid: this is warped, but you could merge -s ours, then go back to F, copy the dir, and merge it back in again normally	14:30
	→ TDJACR joined	14:30
	→ ben_h joined	14:30
blueshift	the first one should ignore all F changes, and the second should see it as a new dir	14:30
	maybe	14:30
	→ mabrand joined	14:31
ifvoid	hm	14:32
	let's try that	14:32
blueshift	or another option could be to go back to the point in F where you renamed the dir, copy it instead and rewrite the rest of that history, then merge that	14:33
	if you can rewrite history without causing yourself pain	14:33
	good luck. I need sleep	14:34
	→ weyome joined	14:34
	→ gbacon joined	14:34
	→ TBH joined	14:35
TBH	Hi there guys!	14:35
	→ Jaxan joined	14:35
TBH	I have some problem with revert ;/	14:35
	http://pastebin.com/dwYd9P8C	14:35
	here are details	14:36
	→ jrmuizel joined	14:36
TBH	basically, "Automatic revert failed." ;/	14:36
	Sbd can help me with that ?	14:36
	← weyome left	14:36
shruggar	TBH: you have merge conflicts. Resolve them as per the instructions in the warning.	14:36
TBH	Yes, it is binary file	14:37
	so it is quite dificult to merge it manually ;)	14:37
	→ harinath joined	14:37
shruggar	TBH: if it's quite difficult to merge it manually, it's even more difficult to merge it automatically	14:37
	automatic merge resolution helps with tedious merges, not difficult ones	14:38
TBH	yes, but I dont care about current version of this file	14:38
	i jsut vant to revert the previous one	14:38
	so, i have to delete current version?	14:38
shruggar	Was the commit you want to revert the most-recent commit?	14:38
	← _Vi left	14:38
TBH	no	14:39
	→ _Vi joined	14:39
TBH	it is 5 or 6 commits in the past	14:39
	← chris_n left	14:40
	→ tedoc2000 joined	14:40
	← dl9pf_ left	14:40
shruggar	TBH, I think I understand the confusion now. "revert" doesn't mean "revert to the file as it appeared in this commit", it means "revert the changes which appeared in this commit"	14:40
	TBH: I think you actually want "checkout"	14:40
TBH	oh.	14:41
	→ ToreadorVampire joined	14:41
shruggar	TBH: for example "git checkout <the-commit-you-want> <the-file-you-want>"	14:41
	← HG` left	14:42
shruggar	then commit that, saying something like "revert to the state of <the-commit-you-want>"	14:42
	← ToreadorVampire left	14:43
	→ nevyn^__ joined	14:43
	→ spearce joined	14:44
	← lucasvo_2 left	14:44
	← nevyn^_ left	14:44
TBH	shruggar: i will try your suggestions now ;)	14:45
	shruggar: thanks a LOT!	14:47
	shruggar: It is all I wanted, thanks!	14:47
	Silly me ;(	14:47
	← juanjoc left	14:47
	→ meder joined	14:48
	← TheNewAndy left	14:48
mabrand	is looking for standard git recipe to split a commit into "real edits" from "whitespace formatting".	14:48
	← AkumaStreak left	14:49
	→ kumbayo joined	14:50
mabrand	meant to say he wants to split one big commit into "whitespace only edits" and "real edits".	14:50
	→ hohoho joined	14:51
	→ Yuffster joined	14:51
	→ ajpiano joined	14:52
jast	mabrand: there is no standard recipe for doing that in an automated way... but if you wanted, you could unstage those changes you want to move into a second commit, amend, then commit the rest	14:55
	which is pretty much the standard way of splitting commits in general	14:55
	← jrmuizel left	14:56
mabrand	I have an automated way that works pretty well, but I figured it must be old news.	14:56
	I use git diff -w -R <2 commits ago> \| patch -p1 to undo the the real edits so that whitespace changes are separated.	14:58
jast	makes sense	14:59
mabrand	A few more steps like that before rebasing.	14:59
	→ jrmuizel joined	14:59
mabrand	It cannot separate whitespace changes from lines have other changes.	15:01
	← ish left	15:03
	← stringoO left	15:04
	← magicbronson left	15:04
	← barismetin left	15:05
	consolers files that away for later testing	15:05
	← kpreid_ left	15:05
	← hobodave left	15:08
	→ hobodave joined	15:09
	→ aziz joined	15:10
	→ cwillu_at_work joined	15:11
	← radarek left	15:11
	→ raichoo joined	15:11
	← giallu left	15:12
	→ DavidKlein joined	15:12
	← henkboom left	15:13
	→ bcardarella joined	15:13
	→ stringoO joined	15:13
	→ temoto joined	15:13
	← hobodave left	15:13
	→ alezandro joined	15:14
	← cbreak_work left	15:14
PerlJam	anyone awake?	15:14
	→ stringo0 joined	15:14
PerlJam	I just tried cloning from a new linux box and I get "fatal: protocol error: bad line length character: hell" Anyone got a clue as to how to fix it?	15:15
	← bentob0x left	15:15
	→ henkboom joined	15:16
Ilari	PerlJam: What protocol?	15:16
	← MicahElliott left	15:16
	→ jds joined	15:17
PerlJam	ssh	15:17
	← hebz0rl left	15:17
PerlJam	(using gitosis)	15:17
Ilari	PerlJam: What's the URL you are trying to use?	15:17
	← segher left	15:18
PerlJam	git clone [email@hidden.address] is what I'm using	15:18
	← stringoO left	15:18
consolers	hell[o] sounds like something bashrcs or motd would print	15:18
PerlJam	(this works fine on other machines, just not on this newly installed Fedora 13 box)	15:18
consolers	remember the old cvs over ssh gotcha. `ssh machine ls' should just ls	15:19
Ilari	PerlJam: Try "ssh [email@hidden.address] git-upload-pack \'project.git\'". What it prints?	15:19
	→ przemoc joined	15:19
	← jrmuizel left	15:19
Ilari	PerlJam: Oops, sightly wrong, but can be used for testing.	15:19
PerlJam	ERROR:gitosis.serve.main:Arguments to command look dangerous	15:20
temoto	Hello. git svn dcommit tells 'unable to determine... perhaps repo is empty'. Yes, i know it is empty. Why doesn't it make a commit?	15:20
Ilari	PerlJam: Nothing else?	15:20
PerlJam	nope. that's it	15:20
Ilari	PerlJam: Then "ssh [email@hidden.address] git-upload-pack \'/project.git\'" (add the missing slash)?	15:21
	→ GarethAdams\|Work joined	15:21
PerlJam	Ilari: same	15:21
	← eighty4_ left	15:22
Ilari	PerlJam: Hmm... What was the syntax?	15:22
	→ Nickeeh joined	15:22
Ilari	PerlJam: 'git ls-remote [email@hidden.address] also throws errro about bad line character I presume?	15:23
	← hohoho left	15:23
PerlJam	Ilari: aye	15:23
	← smorg left	15:23
	← hukl left	15:24
	→ smorg joined	15:24
	← mlangenberg left	15:24
	← ExtraSpice left	15:24
	← Belna left	15:25
ribasushi	I have a headless clone	15:25
	→ AkumaStreak joined	15:25
ribasushi	how do I "fetch" the branch deletions ?	15:25
Ilari	PerlJam: Maybe (ssh [email@hidden.address] git-upload-pack "'/project.git'") has arguments that don't look dangerous...	15:25
	← masterkorp left	15:26
	→ elibarzilay joined	15:26
	→ eighty4 joined	15:26
Ilari	PerlJam: Yes, the ''s are part of argument!	15:27
temoto	ribasushi, one usually pushes into headless clone, no?	15:27
	← elibarzilay left	15:27
	→ eli joined	15:27
	← AkumaStreak left	15:27
jast	ribasushi: "headless" meaning "bare"?	15:27
ribasushi	the result of git clone --mirror	15:27
	IslandUsurper → IslandUsurperAFK	15:28
jast	try git remote prune origin	15:28
	→ AkumaStreak joined	15:28
	→ mattwynne joined	15:28
	← AkumaStreak left	15:29
	→ AkumaStreak joined	15:29
	← AkumaStreak left	15:30
	← smorg left	15:30
	→ AkumaStreak joined	15:30
	← skoop left	15:31
	→ smorg joined	15:31
	← marc_kdab left	15:31
	← airborn left	15:31
	← xiong left	15:31
Ilari	PerlJam: Anyway, the last argument in that command as it gets sent is '/project.git' (yes, it has quotes in argument itself).	15:31
	← eighty4 left	15:32
	← fmardini left	15:32
	→ kipras joined	15:33
	← AkumaStreak left	15:34
	→ AkumaStreak joined	15:34
	→ spaceonline joined	15:34
	→ jensn joined	15:34
	→ segher joined	15:34
	→ sagsousuke joined	15:34
	← mfollett left	15:35
	← segher left	15:35
	→ segher_ joined	15:36
Ilari	PerlJam: That command is to check if the line is clean (and doesn't send anything spurious)...	15:36
	→ aspotashev\|eeepc joined	15:36
	← stringo0 left	15:37
	← aspotashev left	15:37
	← consolers left	15:37
	← corni left	15:38
	→ stringoO joined	15:38
PerlJam	Ilari: It's starting to look like I didn't setup my ssh key properly (though I did what I always do)	15:38
Ilari	PerlJam: SSH key errors should show up as password prompt of death. And besides, why you are using Gitosis on new box (use gitolite instead)?	15:39
PerlJam	The existing server is using gitosis (haven't switched yet). The machine I'm trying to create a clone on is a new Fedora 13 box that I'm trying to get some software installed and setup on.	15:40
	← trivol left	15:41
	→ DaveIngram joined	15:41
	← temoto left	15:41
Ilari	PerlJam: Ah, so it is client-machine dependent?	15:42
PerlJam	right	15:42
Ilari	PerlJam: What could be useful is to dump what git sends to SSH and what SSH sends back to git. I think GIT_SSH can be used to get program/script between git and SSH.	15:44
	→ hohoho joined	15:44
	← psoo left	15:44
Ilari	PerlJam: Maybe 'tee ssh.in \| ssh "$*" \| tee ssh.out' would work...	15:45
	PerlJam: And with that in place, try ls-remoting the repo.	15:45
PerlJam	git++ that's handy	15:46
Ilari	PerlJam: And for good measure, 'echo "$*" >&"' might be helpful (to see what it is trying to invoke ssh with).	15:47
	PerlJam: Oops, 'echo "$*" >&2'.	15:47
	→ froschi joined	15:47
	→ santiago_ joined	15:47
	→ lgd_ajax joined	15:49
santiago_	Hello, I've got a directory A/ which is untracked and ignore via .gitignore, but I now want to un-ignore a directory B/ within A/ ... I am trying in .gitignore !A/B/* but does not work	15:50
	← jensn left	15:50
santiago_	what am i doin wrong?	15:50
PerlJam	santiago_: you can't ignore A but track a subdir of A	15:50
	→ hobodave joined	15:50
	← lgd_ajax left	15:51
santiago_	so I've got to ignore one by one?	15:51
	← nevyn^__ left	15:51
	← Aaaarg left	15:51
	→ nevyn^_ joined	15:51
	← simplechat left	15:52
	→ ExtraSpice joined	15:52
	→ ali3n0 joined	15:52
	→ xperience joined	15:53
	→ poseid joined	15:53
ali3n0	guys... I'm getting confused using git-revert. Isn't there an equivalent command as "svn revert <file>" ? I'd like to clean my local non-committed modifications	15:54
offby1	santiago_: you could just "git add A/B"	15:54
	assuming you indeed want the directory in your repo.	15:54
	ali3n0: "git reset --hard HEAD"	15:54
	ali3n0: unfortunately, git's terminology is different from svn's, so "revert" means something quite different	15:55
ali3n0	cool, thanks for the hint	15:55
	← henkboom left	15:55
ali3n0	yep, I understood that but found difficult to find the "reset" command	15:55
offby1	I love git, but the docs and the UI are rough going at first	15:56
	... and I dislike Subversion, but must admit its documentation is excellent	15:57
ali3n0	can I ask you why don't you like svn?	15:57
	→ henkboom joined	15:57
PerlJam	ali3n0: merging still sucks in svn	15:58
santiago_	offby1, that was it! thanks	15:58
ali3n0	yeah, missing local branching is a pity too. but in the end I find the subversion project a really good example of good stuff	15:59
	it's pretty old and misses a few useful features git has (at least for me and my colleagues) but it's a good piece of software imho	15:59
	← herdingcat left	15:59
ali3n0	by the way, I'm running my way through git and maybe I'll change my mind one day ;)	16:00
	← henkboom left	16:00
	→ bambule joined	16:00
	← level09 left	16:01
PerlJam	ali3n0: sure. svn has many advantages. It's nice and simple. The model is easy to understand. There is tons of support for it everywhere (OSes, editors, bugtrackers, etc.)	16:01
Ilari	PerlJam: Shame that Git doesn't show more data after it receives invalid packet (might be useful seeing what it actually is).	16:01
ali3n0	PerlJam, and less technical but still important, it helped a lot of (not only) opensource software to grow and it is still	16:03
posciak	hi, I have a master branch, tracking an origin master branch and a devel branch, which is based on master. I have merged devel to master and solved conflicts. Now I fetched origin/master and it got updated. How can I merge devel to new master without having to solve the conflicts again (i.e. use somehow the old master with devel already merged)?	16:03
	→ henkboom joined	16:03
	→ WebDragon\|away joined	16:04
PerlJam	ali3n0: and it certainly is better than CVS :)	16:04
jast	except when it comes to branching :)	16:04
ali3n0	eheh	16:04
jast	(ymmv)	16:04
	← poseid left	16:04
Ilari	posciak: Merge origin/master into master and then master into devel?	16:05
PerlJam	I've gone RCS -> CVS -> svn -> git and I'm trying real hard nto to look back :)	16:05
	s/nto/not/	16:05
	as soon as I convert some work repos from svn to git, I won't look back at all	16:06
	← elyob left	16:06
posciak	Ilari: thank you	16:06
	will try	16:06
jast	if you understand git well, it has very few disadvantages over svn	16:07
	→ hebz0rl joined	16:07
	← WebDragon left	16:08
	← chrowe left	16:08
jast	community service announcement: whygitisworsethanx.com is still there for the taking	16:08
	→ hacosta joined	16:08
drizzd	I just deleted a branch using "git branch -d" and got the response	16:09
hacosta	i have diff.tool=vimdiff and when i run git difftool a diff is shown in my terminal	16:09
	← fod left	16:09
drizzd	"deleting branch 'xxx' that has been merged to 'refs/remotes/origin/xxx', but it is not yet merged to HEAD	16:09
hacosta	if i run git difftool --tool=vimdiff i get the same result	16:09
	← girishr left	16:09
Ilari	PerlJam: If you get those stream dumps from failing ls-remote, I could sure take a look...	16:09
drizzd	but git remote prune origin will remove origin/xxx as well	16:09
	→ jrmuizel joined	16:10
drizzd	so... what's the logic behind that? Isn't branch -d supposed to delete only branches that are already merged somewhere in local history?	16:10
	→ kenichi joined	16:10
jast	drizzd: the docs for -d say otherwise	16:11
drizzd	it used to delete only branches merged to HEAD, after all	16:11
	ok, but my point is that this is actually dangerous	16:11
jast	might be worth raising the issue on the list	16:12
	→ khaase joined	16:12
	drizzd is not looking forward to another flame war	16:12
	→ McManiaC joined	16:13
PerlJam	Ilari: thanks. I've set it aside for now as I've got other irons in the fire that need my attention.	16:13
McManiaC	how do I delete tags on a remote host?	16:13
khaase	can i make git omit custom date formats? (or: why is there no --date=rfc2616?)	16:13
	← Jaxan left	16:13
khaase	git log	16:13
	→ Titosemi_ joined	16:14
	← gbacon left	16:14
Ilari	McManiaC: 'git push <remote> :<tagname>'?	16:14
	← adymitruk left	16:14
	→ adymitruk joined	16:15
	← Titosemi left	16:15
	Titosemi_ → Titosemi	16:15
	→ gmitrev_ joined	16:16
	← villemv left	16:16
	← gmitrev_ left	16:16
	→ _numbers joined	16:16
	← harinath left	16:16
_numbers	ugh our git repo is so huge it takes forever to check out	16:17
	we should be able to split the git repo into volumes after a certain time	16:17
	→ gmitrev joined	16:17
_numbers	we should say like. Everything from May until now is in the latest repo and the rest is trash and should be archived!!	16:17
	→ mbrumbelow joined	16:17
_numbers	how do you do that?	16:17
	← beatak left	16:17
khaase	_numbers: fork + squash or something?	16:17
jast	drizzd: there won't be any flaming from me, at least :)	16:17
drizzd	jast: yeah, I'll think this through first though	16:18
	I guess it does make a lot of sense in the normal case.	16:19
	← santiago_ left	16:19
drizzd	This only happened to me because I'm basically using two repositories in parallel	16:19
	where neither is the master or upstream repository	16:19
jast	yeah, I can imagine how it played out already	16:19
drizzd	You can argue that I _did_ after all delete the branch in one repo	16:20
	but it still feels kind of weird	16:20
jast	FWIW I think that that kind of case makes a good argument for changing the behaviour	16:20
drizzd	if I had done git remote prune origin _first_	16:20
	git would not have deleted it with git branch -d later	16:20
	← McManiaC left	16:20
_numbers	is there a git ref for the very first commit?	16:22
	← EricInBNE left	16:22
drizzd	_numbers: $(git rev-list --reverse HEAD \| head -1) , but note that a repository can have multiple "first commits"	16:23
_numbers	whats an easy way to squash everything from beginning of time until HEAD@{2 months ago}	16:23
	across all branches	16:24
drizzd	you can use checkout --orphan to create a new, parentless commit for HEAD@{2 months ago}, then rebase the remaining history onto that	16:24
	→ sh1mmer joined	16:25
drizzd	or you use new_root=$(echo "initial import" \| git commit-tree HEAD@{2 months ago}); git rebase --onto $new_root HEAD@{2 months ago}	16:26
	→ pellera joined	16:27
	← emdete left	16:28
	← priidu left	16:28
	← pellera left	16:30
	→ pellera joined	16:31
drizzd	_numbers: oops, you need git commit-tree HEAD@{2.months.ago}^{tree}	16:32
	→ harinath joined	16:32
	← plq left	16:33
	→ rseifert joined	16:33
	→ cmcculloh joined	16:34
	← bodom left	16:35
	← adymitruk left	16:35
	→ lamalex joined	16:36
gmitrev	hey guys	16:36
	← hagebake left	16:36
gmitrev	im working on a web app and want to use git on my own computer	16:36
ziro`	msysgit	16:37
	→ alester joined	16:37
gmitrev	im using linux	16:37
	is it good for oneman development?	16:37
	→ ChUrP1 joined	16:38
lamalex	Hey, I'm trying to push some updates to a remote repo that someone else is working on too, but git keeps telling me it can't fast-forward. I dont understand why as I just cloned and put two commits on top, I know he hasn't pushed anything either	16:38
	→ rado1 joined	16:39
	← ChUrP left	16:40
lamalex	ah, i got it..	16:41
	← lamalex left	16:41
	← chrislerum left	16:41
	→ resmo_ joined	16:41
	→ Lisenok joined	16:41
	→ chrislerum joined	16:41
	→ adamv joined	16:42
	← Lisenok left	16:42
	← ChUrP1 left	16:42
	→ Lisenok joined	16:43
	← Lisenok left	16:43
	← resmo left	16:43
	→ airborn joined	16:44
	→ chrowe joined	16:44
ali3n0	gmitrev, sure it is	16:45
airborn	hi	16:45
ptor	gmitrev: GIt is excellent for single-developer works. I have lots of own projects that only I work on. It allows me to easily work as I feel like, i.e. with work-in-progress combined with changes added later but commited earlier and so on. It also helps a lot when I want to test on another architecture, or just for easy backup.	16:45
	→ smuf joined	16:46
	→ tar- joined	16:46
	← aspotashev\|eeepc left	16:46
	← _Vi left	16:46
	→ luis joined	16:46
ali3n0	is there a quick way to default -s for git status?	16:47
	→ _Vi joined	16:47
mmattice	make an alias	16:48
gmitrev	thanks ptor, but where can i find a good tutorial on how to setup git and use it for single user	16:48
	i've been reading stuff on google for some time and got really confused	16:48
	← tar- left	16:48
_rane	I have git status -s aliased to `gst` and I write that all day long	16:49
mmattice	git ss gives me status -s	16:49
	IslandUsurperAFK → IslandUsurper	16:49
	→ neutrino joined	16:49
	neutrino → tar-	16:49
	→ tatsuya joined	16:49
ali3n0	gmitrev, http://gitref.org/	16:49
	→ fod joined	16:50
tar-	gitolite-access works great from the commandline (using ssh-agent + keychain), however intellij idea asks for password and won't accept it - any ideas?	16:50
	→ rdeweerd_ joined	16:50
ali3n0	mmattice, how did you define that alias?	16:51
gmitrev	thanks ali3n0	16:51
	← mtkd left	16:51
mmattice	in .gitconfig [alias]\n ss = status -s	16:51
	→ tpiep joined	16:51
ali3n0	gmitrev, I'm reading it too, it's very good imho	16:51
	mmattice, ah, sorry, I was thinking about bash aliases	16:52
	thanks	16:52
	← cmcculloh left	16:52
	→ pantsman joined	16:52
	→ mbrumbelow_ joined	16:52
	← mbrumbelow left	16:52
	→ psoo joined	16:52
	→ j0shua joined	16:52
	← mbrumbelow_ left	16:53
	← tvw left	16:53
	→ eighty4 joined	16:54
	→ aspotashev\|eeepc joined	16:56
	← mabrand left	16:57
	→ mabrand joined	16:57
_numbers	git checkout --orphan isnt an option for me	16:57
	is it because im on git version 1.6.3.3	16:57
shruggar	solution: upgrade? :D	16:57
	← jailbox left	16:58
	← rdeweerd_ left	17:01
	→ Jaxan joined	17:01
	→ jailbox joined	17:02
	→ eletuchy joined	17:03
shruggar	_numbers, git reset --hard "$(git cat-file commit "HEAD@{2 months ago}" \| sed '/^parent /d' \| git hash-object -w --stdin)" ?	17:03
	← apsysoev left	17:03
shruggar	hm, test before you speak	17:04
	→ dreiss joined	17:04
	← tstclair left	17:04
sitaram	tar-: not really possible (although you can dream up some really complex schemes with multiple userids having the same $HOME and uid and $SHELL and a login program that does the right thing (but I have never tried it)	17:04
	← MattDiPasquale left	17:05
	← henkboom left	17:05
	→ MattDiPasquale joined	17:05
	← eletuchy left	17:05
ifvoid	blueshift: I did some more experimenting	17:05
shruggar	_numbers, git reset --hard "$(git cat-file commit "HEAD@{2 months ago}" \| sed '/^parent /d' \| git hash-object -t commit -w --stdin)" ?	17:06
	→ bauruine joined	17:06
	← malumalu left	17:06
ifvoid	blueshift: in the end, a simple git merge -s resolve did the trick	17:06
	blueshift: thanks for your help!	17:06
	→ malumalu joined	17:06
ptor	gmitrev: It's really simple - I don't have links to online docu available, but 'git help tutorial' in a commmand line is a good start. In any case, the simple use case is: 1) You have a directory with files you want version controlled. 2) cd to that dir. 3) enter 'git init' 4) enter 'git add .' 5) enter 'git status' 6) Enter git commit -m"My files now in Git" 7) Edit files 8) 'git add <new fils> goto 5)	17:06
	s/fils/files/	17:06
	gmitrev: One link which takes an unusual approach: http://www.newartisans.com/2008/04/git-from-the-bottom-up.html	17:08
	→ henkboom joined	17:09
tar-	sitaram: I see :(	17:09
	← jds left	17:10
	← cilly left	17:11
	→ jds joined	17:11
	← phantomcircuit left	17:12
sitaram	tar-: do you know how it all hangs together?	17:12
	it == gitolite (or indeed any similar tool like gitosis)	17:12
	→ cilly joined	17:12
	← tildeequals left	17:13
	← rseifert left	17:15
	→ shader joined	17:15
shader	how important are the pack files; if I delete them, will I lose data?	17:18
tar-	sitaram: I think I have a fair idea, however one can never be sure :-) the ssh-agent + keychain allows automated login allowing me to push to the git-account on the server, and gitolite uses my public key to authenticate and authorize my push&pull?	17:18
kokx	shader: yes; since the data is removed from the objects folder when they are packed	17:18
	kmap_ → kmap	17:19
	← iizukaway left	17:19
shader	hmm	17:19
	→ iizukaway joined	17:20
	← WebDragon\|away left	17:20
shader	because I've been having trouble with repack and gc, and I think it's been leaving unecessary pack files, as well as creating corrupted ones	17:20
	→ WebDragon joined	17:20
	← Nickeeh left	17:21
	→ alexisabril_ joined	17:22
	← j0shua left	17:22
	→ krawek joined	17:23
	→ darklust joined	17:23
	→ j0shua joined	17:24
darklust	DCC SEND LOLOLOLOLOLOLOLOL	17:24
	← iizukaway left	17:24
	← darklust left	17:24
	← alexisabril left	17:24
	alexisabril_ → alexisabril	17:24
	→ iizukaway joined	17:24
	← Elfe_ left	17:25
	← kokx left	17:25
	← iizukaway left	17:25
	← ruskie left	17:25
	← Tommy[D] left	17:25
	→ iizukaway joined	17:25
	→ jensn joined	17:26
	→ marc_kdab joined	17:28
	← pellera left	17:29
sitaram	tar-: http://github.com/sitaramc/gitolite/blob/pu/doc/9-gitolite-and-ssh.mkd	17:29
rkreis	can i git co a remote tracking branch, cherry-pick from master, delete master and branch master from that remote branch again?	17:29
	← _numbers left	17:30
	← malumalu left	17:30
sitaram	tar-: specifically, http://github.com/sitaramc/gitolite/blob/pu/doc/9-gitolite-and-ssh.mkd#restricting_shell_access_distinguishing_one_user_from_another	17:30
	← ramusara left	17:31
	← johnney left	17:31
	→ Nebukadneza joined	17:32
Nebukadneza	heho	17:32
	← whatdoesitwant left	17:33
	→ briahn10 joined	17:33
	→ justin-george joined	17:34
briahn10	hey guys... is there any way to "cherry-pick" (i don't think it's the git cherry pick) some changes from my dirty working index and make that into a commit, leaving the rest of the working index dirty?	17:34
	← airborn left	17:35
	→ Tommy[D] joined	17:36
	→ airborn joined	17:36
	→ linduxed joined	17:36
	→ Elfe joined	17:37
	sebi_` → sebi`	17:37
	→ kokx joined	17:37
tar-	sitaram: I'm still understanding it the same way as before :x (the link pretty much explains editing .ssh/authorized_keys for the "git"-account, in other words "when i, as gitolite-admin, add another key and to a push - it's added to the "git-account" with specified allowed commands in the authorized_keys file - I'm assuming you meant I had it wrong the first time, thus assuming I have still it wrong now :-).	17:37
	→ Bass10 joined	17:37
tar-	-to +do	17:37
linduxed	ive got a branch on my server, and ive got a laptop that doesn't have the branch in question. How do i get it, not merging into the current branch?	17:38
	← Bass10 left	17:39
	→ Bass10 joined	17:40
IslandUsurper	briahn10, try `git reset -p` to remove the changes from the index, but leave them in your working tree. then you can commit exactly what's in the index	17:40
briahn10	bah	17:40
	i tried doing some stuff	17:41
	→ ruskie joined	17:41
briahn10	and i messed up my index i think	17:41
	anyway to undo a "git rm --cached -r *"?	17:41
	ah, "git reset *" worked	17:42
	→ gbacon joined	17:42
	→ enherit joined	17:43
	← smuf left	17:44
	→ carrus85 joined	17:44
	→ Zephyrus joined	17:44
	→ marcial5 joined	17:45
	→ smuf joined	17:45
	← lazukars left	17:45
	→ Paraselene__ joined	17:46
	→ hakunin joined	17:46
sitaram	tar-: the trick is that the "specified allowed command" also has an argument -- the gitolite username	17:47
linduxed	how do i discard all the changes in the current branch	17:48
	→ tildeequals joined	17:48
sitaram	tar-: so the unix username is the same, but gl-auth-command knows to take arg-1 as "who is this, w.r.t my config file"	17:48
Nebukadneza	mhmm	17:48
	if i'm in branch a and someone made a change in branch b and say added a file	17:48
	how would i merge/cherrypick/whatever only that change	17:48
sitaram	tar-: this is the crux of how you dis-connect the unix username from the gitolite user	17:48
	← Paraselene_ left	17:49
	Paraselene__ → Paraselene_	17:49
	← gebi left	17:49
	→ francisfish joined	17:51
tar-	sitaram: pretty nifty setup :-)	17:51
	→ zenazn joined	17:52
sitaram	tar-: hey no credit to me; gitosis does it (gitolite was originally called gitosis-lite,, though now I sometimes think it should be "gitoheavy"!)	17:52
	← resmo_ left	17:52
	← henkboom left	17:52
tar-	hehe	17:52
sitaram	tar-: in fact so do any similar services (github, gitorious, ...)	17:52
	tar-: it's really an ssh thing that everyone just uses	17:53
	→ henkboom joined	17:53
	← hacosta left	17:54
tar-	sitaram: aha.. so being a newbie-git user (with experience only with using gitolite and commandline) - did you just say that i won't be able to get github working with intellij idea either - only commandline o.o?	17:54
	Guest33898 → [[sroracle]]	17:54
	← [[sroracle]] left	17:54
	→ [[sroracle]] joined	17:55
sitaram	tar-: the thing is, with passwords, it's not easy to have different passwords map to different commands like authkeys allows different pubkeys to map to different users	17:55
	tar-: "only command line"? Almost all git clients use ssh internally and work fine... all the GUI ones too	17:55
	tar-: s/use/can use/	17:56
	tar-: and what is this "intellij idea"?	17:56
tar-	sitaram: it's an IDE with a git-plugin	17:57
jjuran	Passwords perform authentication, not authorization.	17:57
	→ nevyn^__ joined	17:58
tar-	sitaram: so i figured it (intellij idea) would use the installed git-library (git-core) on ubuntu to communicate with the gitolite-server using my ssh-key wich is authorized to perform push/pull in the repo - which it doesn't - somehow it only made it to pull, the push crashed (i figured it was an IDE-specific thing which idea does different than the command-line interface, since push works fine there)	17:59
sitaram	tar-: and IDE with a git plugin that does not do ssh?	17:59
	← ereslibre left	17:59
tar-	well, that's just it - the pull works fine	18:00
sitaram	tar-: your problem is this "intellij idea"	18:00
tar-	yes :)	18:00
	i know	18:00
	← froschi left	18:00
	→ plediii joined	18:00
	sitaram thought someone with the nick of intellij had some idea and was searching backlog	18:00
	← alexisabril left	18:00
tar-	:p	18:00
sitaram	tar-: I dont have the time to look into it, but if it can do ssh auth using public keys it will work	18:01
	ask them that	18:01
	→ khmarbaise joined	18:01
	→ ChUrP joined	18:01
sitaram	tar-: and tell them all other git (gui/ide) clients do that just fine	18:01
	tar-: good luck	18:01
tar-	well.. i suspect that "idea" is issuing a different command than what the authorized_keys allows =)	18:01
	sitaram: thx =)	18:01
	← nevyn^_ left	18:02
shader	is there any way to recover a damaged pack file? for somereason git gc produced a bad pack	18:02
sitaram	tar-: and unless there is some really compelling strength, switch to a better IDE	18:02
shader	would deleting the pack be enough?	18:02
	sitaram likes vim + linux -- best IDE in the world	18:02
	sitaram also recognises this is subjective	18:02
	→ opalka joined	18:03
vinse	sitaram: xkcd butterflies	18:03
	← nevyn^__ left	18:03
vinse	sorry, too lazy to reference the entire joke	18:03
sitaram	tar-: "issuing a different command"... not possible	18:03
tar-	sitaram: i am pretty sure that vi should stand for "very intuitive (haha)" and vim should be "very intuitive mom (ha..)" :)	18:03
sitaram	tar-: this (gitolite) is meant to be transparent to the client, and it is	18:04
	← Paraselene_ left	18:04
tar-	sitaram: ok. then i probably have a buggy setup somewhere..	18:04
	← bcardarella left	18:05
	← eighty4 left	18:05
	← smuf left	18:05
sitaram	tar-: but it requires the client to be able to use ssh not just with password but with public key auth. Which has been around for so many years that any client that does NOT is... "stupidJ NoIdea" ;-)	18:05
tar-	hehe :p	18:06
	→ alexisabril joined	18:06
	→ sebi_` joined	18:06
tar-	sitaram: I'm pretty sure that this should be possible with intellij idea, it's one of those "well respected IDE's", so it's probably my fault that it isn't working :p	18:06
sitaram	vinse: yeah I know; but it got very boring after a while. I only had 2 butterflies and they were getting tired... if you look at the first few commits on gitolite you will see how slow they were. Doesn't work in the long run	18:07
	→ johnw joined	18:07
sitaram	tar-: proprietary != well respected (IMNSHO), but again, I recognise this is subjective	18:07
tar-	sitaram: point and +1	18:08
sitaram	tar-: for example, in the world of VCS's, most "corporate" folks would say "Clearcase is a very well-respected VCS". Which only means they have never used it :-)	18:09
	(or Lotus Notes is a well respected email client)	18:09
IslandUsurper	just goes to show that who respects you is at least as important as how much respect you have	18:09
	← sebi` left	18:10
	→ jadams joined	18:11
	→ flaguy48 joined	18:11
jadams	I've got a git commit. I'd like to just create a patch from it, no cruft, that I can later apply. I've git-reverted some of these merged commits, but would like to make a clean patch from them that will actually apply. I've tried git show <commit> but it has cruft at the top of it re: author, etc that I don't want. Is there a git command to just give me the commit's diff that I'm missing?	18:12
	garr...I have the parent point, I can just git diff w/ it I suppose	18:12
	→ hacosta joined	18:13
tar-	sitaram: well.. the problem really seems to be that the notion of "you get what you pay for" somehow got stuck on software as well. not to say that throwing money at software-problems never solves problems, sometimes it does, but the hole concept of free stuff in corporate minds is .. "scary" i think.	18:14
	→ Zenopus_ joined	18:14
	→ alexisabril_ joined	18:14
	→ engla\|ger joined	18:15
	Unode\|NA → Unode	18:16
	← Zenopus left	18:16
	sitaram thanks the so-called "economic downturn" for changing that a bit, even if cost is only the 3rd or 4th reason to go open source!	18:16
	Zenopus_ → Zenopus	18:16
	← alexisabril left	18:16
	alexisabril_ → alexisabril	18:17
	← hebz0rl left	18:17
	→ nighthwk1 joined	18:17
	← psoo left	18:17
	← bandu left	18:18
jast	tar-: and then they turn around and get the cheapest off-shore team to develop whatever they want developed :)	18:18
tar-	haha	18:18
	true that :D	18:18
Ilari	And as result, the code is of crap quality and buggy...	18:18
	← rado1 left	18:19
	→ rryouumaa joined	18:19
	→ bcardarella joined	18:19
	← bcardarella left	18:20
Ilari	Oh, and late, and over budget...	18:20
	Unode → Unode\|NA	18:20
rkreis	cheapest off-shore team? sounds like, uh, me	18:21
jast	you are a team?	18:21
rkreis	essentially	18:21
Ilari	There are lots of people that only think of price, not the quality you get for it...	18:22
sebi_`	is there something like a easy-to-remember revision ID in git? bazaar and svn count both the revisions commited, does git have something similar?	18:22
Ilari	And as result, "cheap" can turn out to be really expensive.	18:22
	→ tvw joined	18:22
rkreis	i just work too much and i'm not paid enough, that's all	18:22
	→ HarryHood joined	18:22
Ilari	sebi_`: Well, closest is 'git describe', but even that is bit complicated...	18:22
sitaram	rkreis: not to worry; anyone who looks at the the author email of gitolite knows who I work for, although I hope we're not the cheapest ;-)	18:22
rkreis	sebi_`, HEAD~24 ir so	18:23
sebi_`	Ilari: oh :(	18:23
	rkreis: lemme try that	18:23
	wait, that doesn't compute	18:23
rkreis	it's "24 commits before head"	18:23
	see git-rev-parse	18:23
sitaram	s/author email of gitolite/author email of most gitolite commits/	18:23
sebi_`	HEAD~24 is not a git command	18:23
jast	no, it's a revision number	18:24
	→ hebz0rl joined	18:24
jast	but what it refers to changes every time you commit something	18:24
	→ sixteneighty joined	18:24
sebi_`	okay, "git rev-parse" prints out a rather large string	18:24
jast	the same is not true for the output of git describe	18:24
rkreis	that's the downside :D	18:24
sebi_`	well, I need the revision ID for source and binary packages, so a short ID would be nice :(	18:25
jast	you can use a prefix of the long commit ID	18:25
	← felipec left	18:25
jast	virtually always, seven characters are enough	18:25
sebi_`	fair enough, I guess	18:25
jast	in fact that's part of what git describe outputs	18:26
rkreis	you can also use tags	18:26
jast	again, I refer to git describe which uses tags :)	18:26
sebi_`	"git describe" says it can't find "names" (whatever that means :P)	18:26
wereHamster	describe by default only considers annotated/signed tags	18:26
	use git describe --tags or create annotated/signed tags	18:26
jast	it's not looking for something called "names"	18:26
sebi_`	$ git describe --tags	18:27
	fatal: No names found, cannot describe anything.	18:27
	--^ :P	18:27
wereHamster	do you have any tags in that repo?	18:27
	← mattwynne left	18:27
	→ friskd joined	18:27
sebi_`	I don't think so	18:27
jast	git describe only outputs a reliable identifier for commits if they are contained in the history of one of the tags in your repository	18:27
	because that's about the only thing you can reliably base (semi-)easy-to-read identifiers on in a decentralized system like git	18:28
sebi_`	okay	18:28
	→ mattwynne joined	18:28
sebi_`	i'll stick to "git rev-parse HEAD" for now :/	18:29
	← gbacon left	18:29
	← mattwynne left	18:29
	→ brizly joined	18:29
	→ timyhac joined	18:29
rkreis	git describe --always is a bit shorter	18:29
jast	it's not guaranteed to stay unique forever, but it might be enough	18:30
	Unode\|NA → Unode	18:30
rkreis	i guess git rev-parse isn't guaranteed either :D	18:31
	engla\|ger → engla\|esp	18:31
	→ rubydiam_ joined	18:31
sebi_`	I doubt it's unique, but it'll do the job :P	18:31
	← pinchartl left	18:33
jast	well yes, it's never completely guaranteed, but if you get two different commits with the same SHA1 ID in the same repository, you're screwed anyway	18:34
	← henkboom left	18:34
Ilari	Full rev-parse output collisions become likely when number of objects reaches order of 10^24. And that is A LOT.	18:34
	francisfish → francisfish_away	18:34
jshsu	is there a way to git stash pop and choose stash changes over local?	18:36
Ilari	Trillion Linux-kernel-sized projects would be "only" on order of 10^18...	18:36
patrikf	jshsu: what do you mean?	18:36
	← krawek left	18:36
	→ tstclair joined	18:36
	→ henkboom joined	18:38
jshsu	patrikf: hm maybe just have the files from stash replace any files locally	18:38
	← harinath left	18:38
	→ p3rg2z joined	18:39
patrikf	jshsu: hmm. maybe git checkout stash . would work? just a guess OTOH	18:39
IslandUsurper	Ilari, that makes me wonder how many unique git objects actually exist in the world. Not that I expect anyone to try and count them	18:41
jshsu	patrikf: hm never seen that before, is there any docs for that?	18:41
patrikf	IslandUsurper: 2^160	18:42
IslandUsurper	patrikf, that's how many are possible. I wondered how many there actually are	18:42
Ilari	IslandUsurper: Wild-guess: on order of 10^9.	18:42
patrikf	IslandUsurper: oh, as in stored on some harddisk right now?	18:42
IslandUsurper	Ilari, that's what I was thinking, too.	18:43
	patrikf, yeah	18:43
	← jailbox left	18:43
rkreis	let's count, i have: Total 960 :D	18:44
	→ krawek joined	18:45
patrikf	jshsu: you can refer to the stash like any other ref (man git-stash has something about that), and replace-file-with-other-version-from-commit is a standard git-checkout feature	18:45
Gitbot	jshsu: the git-stash manpage can be found at http://git.or.cz/man/git-stash	18:45
IslandUsurper	rkreis, careful, you don't want to count the duplicate commits ;)	18:45
	→ juanjoc joined	18:45
	thunk → thunk\|smoking	18:46
	← BlindOracle left	18:46
rkreis	those aren't even all commits, no idea how to count those :)	18:46
	→ kar8nga joined	18:47
	← juanjoc left	18:47
patrikf	jshsu: note that this doesn't remove the stashed contents like git stash pop does, so if you're satisfied with the result, you should "drop" the stash commit	18:47
	→ juanjoc joined	18:48
Ilari	To count all ref-reachable objects: 'git rev-list --objects --all \| wc -l'.	18:48
	→ jailbox joined	18:48
Ilari	One of my projects appears to have about 7k objects...	18:49
	← sh1mmer left	18:50
	→ dramsay joined	18:50
	→ froschi joined	18:50
	← tatsuya left	18:52
Ilari	(nope, not git-daemon2, that has only about 700 objects).	18:53
rkreis	my one project is tiny	18:53
	i wish i had so much more time :	18:53
	:(	18:53
	thunk\|smoking → thunk	18:57
	→ froschi1 joined	18:57
	→ gregj joined	18:57
gregj	\|thickbook:security gj$ ~/Projects/git/git/git-svn --username gjaskie fetch	18:57
	\|gj@svn's password:	18:57
	any ideas how to make it work please ?	18:57
flaguy48	the git mirror of the ruby svn repo on github has 182750	18:57
Ilari	Bizarre remote helper URLs: "ext::socat - ABSTRACT-CONNECT:/tmp/gits \G/Ilari/Lada-tasv2-Ilari" (yes, that one has spaces in it)...	18:57
	← froschi left	18:58
	← candybar left	18:59
	← p3rg2z left	18:59
	← dramsay left	19:01
	→ pfc joined	19:01
Ilari	Or that's no URL. It is some form of resource locatior, but its not uniform.	19:01
	→ p3rg2z joined	19:02
Ilari	*locator	19:03
	→ eletuchy joined	19:03
	← segher_ left	19:09
	→ flazz_ joined	19:09
	← ziro` left	19:10
	→ consolers joined	19:10
	→ psoo joined	19:11
	→ segher joined	19:11
	→ rseifert joined	19:11
	← flazz left	19:11
	← pantsman left	19:12
	→ dramsay joined	19:12
	← ExtraSpice left	19:12
	← ntoll left	19:13
	→ LongBeach joined	19:13
	Unode → Unode\|NA	19:15
	→ giskard joined	19:15
	segher → segher_	19:15
	segher_ → segher	19:15
patrikf	Ilari: looks more like an unformed resource locator	19:16
	← dpino left	19:16
GarethAdams\|Work	A uniform awesome locator?	19:17
	← henkboom left	19:17
	← MarkBao left	19:19
	→ henkboom joined	19:20
Ilari	That one talks git:// protocol to abstract namespace unix domain socket...	19:21
consolers	did you fix pearljams ssh problem? just curious	19:22
Ilari	consolers: No.	19:22
consolers	k	19:23
	→ magicbronson joined	19:23
	→ tatsuya joined	19:23
	→ bluenovember_ joined	19:23
	→ Paraselene_ joined	19:23
	← cilly left	19:24
consolers	are unboxed guest additions on windows available somewere?	19:25
	gghfgd	19:25
	← sebi_` left	19:25
	← bluenovember left	19:26
	← meder left	19:27
	→ nadavoid joined	19:28
	← giskard left	19:28
	← gregj left	19:28
	← Jaxan left	19:29
	← DavidKlein left	19:30
	← dramsay left	19:30
	→ MarkBao joined	19:30
	← eletuchy left	19:31
	← khmarbaise left	19:32
	→ khmarbaise joined	19:32
	← shruggar left	19:33
mabrand	comments welcome on this way to split whitespace changes into new commit: http://qt.pastebin.com/7qEcDQeG	19:33
	→ dramsay joined	19:36
mabrand	correction: http://pastebin.com/tMzFxpZr	19:37
	← chrislerum left	19:37
	Unode\|NA → Unode	19:39
	← curtana left	19:40
	← ustunozgur left	19:41
	→ nevyn^_ joined	19:41
	→ warthog9 joined	19:42
	← bluenovember_ left	19:42
	← henkboom left	19:45
	→ chrislerum joined	19:45
	← pallaert left	19:46
	← sixteneighty left	19:47
davr	mabrand: I use this: http://stackoverflow.com/questions/1751612/git-tool-to-remove-lines-from-staging-if-they-consist-only-of-changes-in-whitespa/1752872#1752872	19:47
	→ henkboom joined	19:48
	→ ph^ joined	19:48
davr	Not exactly the same thing, but similar	19:48
	← timyhac left	19:51
mabrand	I don't see yet how that works with "-w" option.	19:52
	I mean I don't see yet how it works without -w option.	19:52
	→ Titosemi_ joined	19:53
	→ timyhac joined	19:53
	→ petercoulton joined	19:53
	← Titosemi left	19:54
	Titosemi_ → Titosemi	19:54
mabrand	Now I see it. -b is a lot like -w.	19:54
	Unode → Unode\|NA	19:55
	← xguto left	19:55
	← p3rg2z left	19:55
helo_	what is this function commonly referred to: http://upload.wikimedia.org/math/8/a/b/8ab0fabd2fffb1fc999ce7a59d0ccbdd.png	19:57
	doh, wrong chan	19:57
	→ patmaddox joined	19:57
	→ p3rg2z joined	19:57
	← radioman-lt left	19:57
	← helo_ left	19:58
	→ helo_ joined	19:58
IslandUsurper	I feel like I should know that one...	19:59
	→ radioman-lt joined	19:59
bremner	entropy of some kind?	20:01
	→ pipegeek joined	20:01
	→ eletuchy joined	20:01
	← pipegeek left	20:01
IslandUsurper	bremner, at first I thought it was physics-related, but now I'm thinking it might have to do with probabilities	20:01
	Unode\|NA → Unode	20:02
	← henkboom left	20:06
	→ paja joined	20:06
	← rubydiam_ left	20:06
	→ sie joined	20:07
rryouumaa	my guess is specifically shannon entropy	20:08
	→ henkboom joined	20:08
	→ mjf joined	20:08
	← sylr left	20:09
rryouumaa	hey no fair #emacs just got closed. was there a flooder?	20:09
	→ sylr joined	20:11
	→ eighty4 joined	20:12
	→ WebDragon\|away joined	20:12
	→ BlindOracle joined	20:13
	← WebDragon left	20:13
	WebDragon\|away → WebDragon	20:13
	← nevyn^_ left	20:15
Ilari	Yup, Shannon entropy.	20:16
	Except that b is usually 2 then (rarely also b = e is used).	20:17
	← khaase left	20:17
	francisfish_away → francisfish	20:18
	← MarkBao left	20:20
	→ royalty joined	20:21
	← royalty left	20:21
	→ apsysoev joined	20:22
	→ Paraselene__ joined	20:22
	← bc0906524 left	20:22
	← Paraselene_ left	20:24
	Paraselene__ → Paraselene_	20:24
	← mabrand left	20:24
	← redondos left	20:26
	→ redondos joined	20:27
	→ lispy joined	20:27
	→ benjo2 joined	20:27
	← bambule left	20:28
	← keyvan left	20:28
	← timyhac left	20:30
	← ehabkost left	20:30
	→ Jferro joined	20:32
	→ mattwynne joined	20:33
	→ phantomcircuit joined	20:33
	← sie left	20:33
	→ rdeweerd joined	20:34
	→ timyhac joined	20:35
	← consolers left	20:37
	→ skoop joined	20:37
	← Zephyrus left	20:38
	← ali3n0 left	20:40
	← lucsky left	20:40
	← khmarbaise left	20:40
	→ sinasalek joined	20:43
sinasalek	Hi, does anyhone knows whether it's possible to manage branches and tags via Git and the push them to CVS?	20:44
	← justin-george left	20:46
	→ justin-george joined	20:46
	← dgrift left	20:47
	← skoop left	20:47
	→ justin_george joined	20:48
	← xperience left	20:48
	→ Landon joined	20:49
Landon	does anyone here use gitosis? for some reasin .gitosis.conf wasn't updating even with post-update chmodded to 755, so I just added "cp gitosis.conf /home/git/.gitosis.conf" for now, but is there a better way to fix that?	20:50
Ilari	Landon: Gitosis is obsolete.	20:51
Landon	really? what's used now?	20:51
	← rdeweerd left	20:51
	← eletuchy left	20:51
	← justin-george left	20:51
	→ eletuchy joined	20:51
sinasalek	Hi, does anyhone know whether it's possible to manage branches and tags via Git and the push them to CVS?	20:52
	← opalka left	20:52
	dwmw2 → dwmw2_gone	20:52
	→ markbao_ joined	20:53
	→ xiong joined	20:53
	← disappearedng left	20:53
	← kumbayo left	20:56
	← rseifert left	20:56
	← timyhac left	20:56
	← kar8nga left	20:57
	← rox` left	20:57
Landon	Ilari: what is the replacement then?	20:58
	→ thiago_home joined	20:58
	← thiago_home left	20:58
	→ thiago_home joined	20:58
Ilari	Landon: Gitolite	20:59
	← thiago_home left	20:59
	→ thiago_home joined	20:59
Landon	thanks, I'll look into that	20:59
	← mattwynne left	21:00
	→ mattwynne joined	21:00
	frakturfreak_ → frakturfreak	21:01
	← francisfish left	21:01
	← cannonball left	21:02
	→ Mukophage joined	21:02
	→ eletuchy_ joined	21:02
	← nighthwk1 left	21:03
	kinectio1 → kinections	21:04
	→ rado1 joined	21:04
	← mattwynne left	21:05
	← eletuchy left	21:05
	→ mattwynne joined	21:07
	← carrus85 left	21:08
	← Bass10 left	21:08
	→ timyhac joined	21:09
	← sinasalek left	21:09
	← tpiep left	21:09
	→ disappearedng joined	21:10
	← ChUrP left	21:11
	← sagsousuke left	21:11
	← linduxed left	21:12
	→ JEEBcz joined	21:12
	← Gitzilla left	21:13
	→ Gitzilla joined	21:13
	← JEEB left	21:14
	← ajpiano left	21:16
	→ priidu joined	21:16
	← Landon left	21:17
	← timyhac left	21:17
	→ timyhac joined	21:17
	← p3rg2z left	21:18
	← eighty4 left	21:19
	← Mukophage left	21:20
	→ anjen joined	21:22
	→ aresnick joined	21:23
	→ Eaven joined	21:24
	→ p3rg2z joined	21:24
	→ BlueDogArcholite joined	21:25
BlueDogArcholite	I am looking for some help with a gitosis setup	21:25
	its returning PTY allocation request failed on channel 0	21:25
	ERROR:gitosis.serve.main:Need SSH_ORIGINAL_COMMAND in environment.	21:25
	I am not getting much traction on how to solve it	21:26
	← chrislerum left	21:26
	← WebDragon left	21:26
wereHamster	BlueDogArcholite: switch to gitolite	21:26
BlueDogArcholite	@wereHamster thanks, will try that	21:27
	← phantomcircuit left	21:29
	← _Vi left	21:29
	→ gbacon joined	21:30
rryouumaa	what's git diff's binary detection algorithm? can't seem to convince it that the file is plain text. using a front end.	21:30
	← raichoo left	21:31
thiago_home	rryouumaa: you don't need to	21:31
	→ pantsman joined	21:31
thiago_home	rryouumaa: but take a look at man gitattributes	21:32
Gitbot	rryouumaa: the gitattributes manpage can be found at http://git.or.cz/man/gitattributes	21:32
thiago_home	rryouumaa: note the part about "diff"	21:32
	← flazz_ left	21:32
	→ brosner joined	21:32
	← brosner left	21:32
	← IslandUsurper left	21:33
	← radioman-lt left	21:34
	← BlueDogArcholite left	21:35
rryouumaa	well, i do bec i want to see the diff. just for thius one file i want to fix it so that it gets recognized. i don't see any funny chars (though i could be mistaken).	21:35
	Unode → Unode\|NA	21:38
rryouumaa	thanks though. could be useful to tell git about extensions.	21:38
	← tstclair left	21:40
	← Titosemi left	21:40
	→ pedrobelo joined	21:40
	← redondos left	21:41
	→ redondos joined	21:41
	→ lpolzer_ joined	21:42
	← eletuchy_ left	21:43
	← aresnick left	21:44
	→ florianb joined	21:44
	← lpolzer left	21:46
	← j0shua left	21:48
	← [Po]lentino left	21:49
	← ph^ left	21:49
	parndt_away → parndt	21:50
	← Bennid left	21:51
	← mbroeker left	21:51
	→ ignatp joined	21:52
	← altrux left	21:58
	→ jtaby joined	21:59
	→ Tuller joined	21:59
	← drizzd left	22:00
	← spb left	22:00
	→ giskard joined	22:00
	→ spb joined	22:01
	← LongBeach left	22:02
	→ aresnick joined	22:02
	→ mbroeker joined	22:04
	← DaveIngram left	22:04
	← jds left	22:06
	thunk → thunk\|smoking	22:06
	← mbroeker left	22:08
	← magicbronson left	22:09
	→ _Vi joined	22:11
	→ DaveIngram joined	22:12
	← berserker left	22:12
	← florianb left	22:12
	← DaveIngram left	22:13
	→ berserker joined	22:14
	← LiamH left	22:15
	→ carrus85 joined	22:15
	→ Aaaarg joined	22:15
	→ candybar joined	22:16
	← tizbac left	22:20
	← dbatbold left	22:23
	← hohoho left	22:23
	← markbao_ left	22:24
	← lhz left	22:24
	→ DaveIngram joined	22:25
	← tar- left	22:25
	← DaveIngram left	22:25
	← candybar left	22:26
	→ dbatbold joined	22:26
	→ candybar joined	22:26
	← jeffhung_ left	22:28
	→ jeffhung joined	22:28
	← apsysoev left	22:31
	→ hasrb joined	22:33
	← ralf_e left	22:34
	← berserker left	22:36
	→ berserker joined	22:38
	← dramsay left	22:38
	← gmitrev left	22:38
	→ EricInBNE joined	22:39
	← patrikf left	22:39
	→ MarkBao joined	22:40
	→ ajpiano joined	22:40
	→ martinciu joined	22:43
	← coderdad left	22:45
	← hebz0rl left	22:46
	→ coderdad joined	22:46
	← p3rg2z left	22:46
	→ coderdad_ joined	22:47
	← coderdad_ left	22:48
	→ coderdad_ joined	22:48
	← engla\|esp left	22:48
	→ Tuller_ joined	22:50
	← Tuller left	22:51
	← coderdad left	22:51
	Tuller_ → Tuller	22:51
	← thiago_home left	22:52
	← alexisabril left	22:53
	← gbacon left	22:53
	← coderdad_ left	22:53
	→ patrikf joined	22:53
	← juanjoc left	22:54
	→ meder joined	22:55
	← MattDiPasquale left	22:56
meder	goal: i want to clone my local git repo on my server. so far: i created a bare remote repo, mkdir ~/blah/git and then cd'd into it, and git --bare init. then on my local i did git remote add origin ssh://server.com/home/user/blah/git and then git push origin master	22:57
	am i on the right path, somewhat?	22:57
	← giskard left	22:58
meder	when i invoked the git push origin master cmd it didnt push the changes to my remote, so i'm probably still missing some critical step.	22:58
	or doing things backwards, which i hope i'm not	22:58
	← tychoish left	23:01
	← pantsman left	23:01
	→ tychoish joined	23:01
	← benjo2 left	23:03
	← PerlJam left	23:03
	→ Mage joined	23:04
jast	meder: looks fine so far. did push complain in any way?	23:05
meder	no	23:05
jast	what did it say?	23:05
meder	but i'm not really seeing anything special in the remote dir	23:05
	that is..	23:05
jast	what special things did you expect?	23:05
meder	i'm not seeing those files which i have locally	23:05
jast	yes, it's a bare repository	23:05
	that means it has no working tree	23:05
meder	right	23:05
	i wanted to clone my local to it	23:05
jast	it only has the database stuff that stores the history	23:05
meder	ah.	23:06
	so would i checkout from remote?	23:06
jast	you could now clone other repositories from it	23:06
meder	what methods can i invoke todo that now?	23:06
jast	well, you can do something like git clone ssh://server.com/and/so/on from anywhere else and see pretty much what you've got locally right now	23:06
	→ eletuchy joined	23:07
	JEEBcz → JEEB	23:08
	← JEEB left	23:08
	→ JEEB joined	23:08
	← martinciu left	23:10
	→ PerlJam joined	23:10
	← Yuuhi left	23:12
	← MarkBao left	23:12
	← meder left	23:12
	→ ralf_e joined	23:13
	← peper left	23:13
	← airborn left	23:14
	→ tsundsted joined	23:15
	→ brizly1 joined	23:16
	← ralf_e left	23:17
	← tvw left	23:18
	← Jferro left	23:18
	← brizly left	23:18
	← yashi left	23:19
	← Cesario left	23:21
	→ aliceinwire joined	23:21
	← xiong left	23:22
	→ peper joined	23:22
	← hobodave left	23:23
	← psoo left	23:23
	← Tuller left	23:24
	→ phantomcircuit joined	23:25
lispy	Does git have a verbose mode? I'm getting an error and I'm having a hard time figuring out why	23:27
	error: file write error (Input/output error)	23:27
	fatal: unable to write sha1 file	23:27
	← kipras left	23:27
lispy	I can write to the disk just fine using other means	23:27
	→ valros joined	23:28
	← priidu left	23:30
	← ignatp left	23:33
	→ hobodave joined	23:33
lispy	Nevermind, I found that it's git pull -v not git -v pull, and that git --help is different than git pull --help	23:33
	← hugoxrosa left	23:33
lispy	Futhermore, I tried my pull a 4th time and it "just worked"	23:33
	lispy boggle	23:33
	→ Cesario joined	23:34
	→ waveclaw joined	23:35
	thunk\|smoking → thunk	23:38
	← przemoc left	23:38
	→ freshtonic joined	23:39
	← Ryback_ left	23:39
	← aziz left	23:39
	← jrmuizel left	23:40
	← Jochen_Hayek left	23:40
	← alezandro left	23:42
	→ fcoury joined	23:43
	← fcoury left	23:43
	← berserker left	23:45
	← gcristian_ left	23:45
	→ przemoc joined	23:46
	→ engla\|esp joined	23:47
	→ Jochen_Hayek joined	23:47
	→ berserker joined	23:47
	← warthog9 left	23:50
	← briahn10 left	23:51
	→ ignatp joined	23:51
	→ py1hon joined	23:51
	← marcial5 left	23:51
	← JEEB left	23:53
	→ gbacon joined	23:54
	← mjf left	23:54
	← lispy left	23:55
	← hacosta left	23:56
	→ bcardarella joined	23:56
	→ dgs joined	23:56
	← johnw left	23:57
dgs	is it possible to simply revert a specific commit that impacts only one file? I've googled around, and it seems you can do (eg http://www.kernel.org/pub/software/scm/git/docs/howto/revert-branch-rebase.html) but that seems like a huge deal of work when I could just copy the old line from git diff and paste it into the current file....	23:58
	← aliceinwire left	23:58
	→ jmcantrell joined	23:58
dgs	however, I know if I always just do it, I'll never learn to use git properly....	23:58
	s/it/that	23:58

Logs Search ←Prev date Next date→

Channels Documentation