IRCloggy #git 2013-11-06

Provider of IRC logs since 2005.

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

	2013-11-06
	← groglogic left	00:00
	→ abelsiqueira joined	00:01
	→ CreativeEmbassy joined	00:01
	← pasky_ left	00:02
	→ pasky_ joined	00:03
	← lun__ left	00:03
	→ DANtheBEASTman joined	00:04
	→ lun__ joined	00:04
	← benpicco left	00:06
	→ ezio joined	00:06
	← ezio left	00:06
	→ ezio joined	00:06
	→ Destos joined	00:06
	← kriks left	00:06
	→ woollyams joined	00:06
	← pasky_ left	00:07
	← motto left	00:08
	← hyperair left	00:08
	← lun__ left	00:09
	→ ezioa joined	00:09
	← ezio left	00:10
	← mfulz left	00:11
	← decotii left	00:11
	← Misan left	00:12
	← spaceonline left	00:13
	← Destos left	00:14
	← rabbite left	00:14
	→ Destos joined	00:14
	← reim left	00:14
	← thiago left	00:15
	→ reim joined	00:15
deryni	osse: https://gist.github.com/deryni/7328699	00:16
	← ezioa left	00:16
	← pfFredd left	00:17
	← Watabou left	00:17
	← bwreilly left	00:19
	← SporkWitch left	00:21
	← AaronMT left	00:21
	→ SporkWitch joined	00:21
	← SporkWitch left	00:22
	→ SporkWitch joined	00:22
	← simesy left	00:24
	→ simesy joined	00:24
	← primitive left	00:24
deryni	And the answer appears to be because 'describe --contains' is just 'name-rev (--peel-tag) --name-only --no-undefined' + appropriate options.	00:25
	← echo-area left	00:26
	→ ezio joined	00:26
	← ezio left	00:26
	→ ezio joined	00:26
	→ simesy_ joined	00:26
	→ eaj joined	00:27
	← infynyxx left	00:27
	← delasteve left	00:27
	← amcsi left	00:28
	← hashpuppy left	00:28
	← lavaman left	00:28
	← simesy left	00:28
	← pitzips left	00:29
	→ cesarkawakami joined	00:29
	→ Chwing joined	00:29
	← Chwing left	00:29
	→ Chwing joined	00:30
	→ delasteve joined	00:30
	← alan5_ left	00:33
	← eaj left	00:33
	← MatRoo left	00:34
	→ dyng joined	00:35
	← CKyle left	00:37
	→ defaultro joined	00:38
	← joelmo left	00:38
	← ezio left	00:39
	← SynthesizerPatel left	00:39
	→ joelmo joined	00:39
	→ nurey joined	00:39
	← Gavrisim_ left	00:40
	→ hashpuppy joined	00:41
	→ pasky_ joined	00:42
	→ threesome joined	00:43
	← joelmo left	00:44
	← marhaban left	00:44
	→ blahdodo joined	00:44
	← Gamecubic left	00:45
	→ Dougie187 joined	00:46
	← mmlac-bv left	00:46
	← pasky_ left	00:47
	← koda left	00:47
	→ bwreilly joined	00:48
	→ canoon joined	00:49
	← HelloShitty left	00:51
	→ hyperair joined	00:51
	→ gumble joined	00:53
	gitinfo set mode: +v	00:53
	→ pasky_ joined	00:53
	← _iron left	00:53
	← boombatower left	00:53
gumble	hey guys. git didn't work for me, so I gave my last version of a project to someone else who pushed the whole thing online. Now I did some more work and want to push it again. git tells me I need to pull first. But I don't want to, because I know that the files online are older then mines and will overwrite my files. thats just *****	00:54
	can anyone tell me what to do? how do I tell git that I am the one having the newest files	00:54
	→ acharlieh joined	00:55
	← etcetera left	00:55
	← Zarthus left	00:55
	← hyperair left	00:56
canoon	gumble, git push -f	00:57
	← cadabra left	00:57
	← whunt left	00:57
	→ mae_tae joined	00:58
mae_tae	hello people....	00:58
blahdodo	git filter-branch -d /run/shm/git --prune-empty --subdirectory-filter drivers/net --tag-name-filter cat -- --all	00:58
	the git gc	00:58
	→ whunt joined	00:58
skorgon	gumble, push -f would !rewrite history	00:58
gitinfo	gumble: [!rewriting_public_history] Rewriting public history is usually bad. Everyone who has pulled the old history have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push -f` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	00:58
blahdodo	^then	00:58
gmac	ls -la	00:58
	gah	00:58
gumble	canoon: I just found that out too. I did that but I can't see the push online at github	00:59
skorgon	gumble, you probably want to look at the 'ours' merge strategy if you really want to discard all work that has been done	00:59
	← hwrd\|work left	00:59
blahdodo	shouldnt that remove all files not in drivers/net	00:59
mae_tae	does basic configuration of github allow push &pull of repositories?	00:59
	→ etcetera joined	00:59
blahdodo	how come git checkout v3.0.1 puts all the other files back?	00:59
	← etcetera left	00:59
blahdodo	bt ir removed refs/orgianal	00:59
	← nurey left	00:59
	← Robarelli left	01:00
blahdodo	btw I remove refs/originals	01:00
canoon	gumble, did it error out? maybe just needs some time to update the web ui?	01:00
	→ vipzrx joined	01:00
blahdodo	anuy ideas?	01:00
	→ etcetera joined	01:00
	→ dsdeiz joined	01:00
gumble	it's 2 o clock where I live and I have to get up early tomorrow :D I just want to make this commit and sleep. I am the only one uploading anything to that thing and git only thinks that someone else did a newer one because a collegue did it for me 2 days again	01:00
	← etcetera left	01:00
	← vipzrx left	01:00
gumble	no it said everything fine	01:00
	→ boombatower joined	01:00
canoon	gumble, are you looking at a different branch locally?	01:01
	→ etcetera joined	01:01
gumble	but the web ui normally was very fast	01:01
	master branch I am looking at	01:01
	everywhere	01:01
canoon	if you cat .git/config	01:01
	← woollyams left	01:01
canoon	is it pushing to github?	01:01
SamB	gumble: did you update your local copy after colleage pushed?	01:01
	← ehmatthes left	01:02
	← dyng left	01:02
	→ dyng joined	01:02
gumble	canoon: remote origin is url = "github.com/...."	01:02
	→ joelroa joined	01:02
gumble	SamB: no I'm new to github should have pulled	01:02
	→ r0bby_ joined	01:02
	→ vipzrx joined	01:03
	→ SimonNa joined	01:03
	← acharlieh left	01:03
	← groglogi_ left	01:04
gumble	can I somehow see my commits with git to check if it's only the web ui? because github gave me: http://pastebin.com/LnvWckce	01:04
	→ hyperair joined	01:04
gumble	I mean git gave me	01:04
	→ nurey joined	01:04
gumble	which looks as if everything works. but on github again it looks as if nothing worked	01:04
canoon	wait gumble have you not commited locally?	01:05
gumble	I did git add, git add, git add, git commit -m "my message", git push origin master	01:06
	← harish left	01:06
gumble	as it says in some beginner tutorial	01:06
mae_tae	does basic configuration of github allow push &pull request of repositories?	01:06
	← richgilbank left	01:06
canoon	gumble, does git status show anything?	01:06
	mae_tae, yeah	01:06
	→ R1KRDO joined	01:06
	→ woollyams joined	01:07
mae_tae	canoon: with that free acount?	01:07
gumble	git status: http://pastebin.com/ACyBZXKW	01:07
canoon	mae_tae, free accounts just don't have private repos	01:07
	← pasky left	01:07
canoon	so everyone can see your stuff	01:07
gumble	still says to be comitted	01:08
canoon	gumble, yeah you need to stage those deleted/modified files	01:08
	and then commit everything	01:08
gumble	damn. what is staging. ah this gonna be long :D	01:08
	← asQuirreL left	01:08
canoon	gumble, see the git add/rm stuff	01:09
	git rm all those deleted files	01:09
	and git add the modified ones and the other ones you want in the repo	01:09
	and then just git commit	01:09
	→ Gamecubic joined	01:09
	← rafaqueque left	01:10
	→ thiago joined	01:11
mae_tae	canoon: what do you mean by private repos? i mean if i build my own git server, does my other programmers able to participate or push/pull request from github with that free account	01:11
	← dsdeiz left	01:11
canoon	mae_tae, wait your own git server and github?	01:11
	→ mizu_no_oto joined	01:13
	← herdingcat left	01:13
	← Freeman__ left	01:14
mae_tae	canoon: what do you mean by wait your own git server?	01:14
gumble	canoon: THANKS THANKS!!! you saved my sleep	01:14
	it worked	01:14
	thanks so much	01:14
canoon	gumble, nice, you'll have to let your coworker know you just overwrote his work though :p	01:15
mae_tae	canoon: got it private mean those request that were not shared publicly? is that what you mean?	01:15
	← R1KRDO left	01:15
gumble	he just uploaded my stuff I gave him, I am the only one working on the project	01:15
	← maestrojed left	01:15
canoon	mae_tae, there a repos on github which you can't see those are private	01:16
	→ ehmatthes joined	01:16
	← Destos left	01:16
	← SocalNick left	01:16
	→ maestrojed joined	01:16
	← boombatower left	01:17
	→ str joined	01:18
	→ boombatower joined	01:18
	← cenuij left	01:18
mae_tae	canoon: ok lastly for clarification, just my concern is that I just want that my peer can only able to push & pull request with that github free acount, is that only sufficient on my need?	01:20
	← DonRichie left	01:20
	→ DonRichie joined	01:20
canoon	mae_tae, are you hosting your own git server?	01:20
	← boombatower left	01:21
	← kcj left	01:21
	← mizu_no_oto left	01:22
mae_tae	canoon: yes, i want to install our own git server	01:23
	→ lithiumn joined	01:23
	→ oriba joined	01:23
canoon	mae_tae, github isn't relavent then	01:23
	you don't need a github account	01:23
mae_tae	canoon: but what them to have something web based or gui?	01:24
	→ Watabou joined	01:24
canoon	mae_tae, you can use a program with a web based ui on your private server, or you can host your repos on github	01:25
	← PaulCapestany left	01:25
canoon	you can't view repos not hosted on github on github	01:25
	← tinti left	01:25
canoon	mae_tae, or wait are you talking about using their gui client?	01:26
	→ kcj joined	01:26
	← halu_ left	01:27
EugeneKay	jast - have I ever told you how fiendishly difficult it is to use the gitinfo source without any sort of documentation?	01:27
	← thiago left	01:27
	→ ewnd9 joined	01:28
	← penguin42 left	01:28
	→ Nicholas_Rishel joined	01:28
mae_tae	canoon: yes, i want them to have some tool that they can able to pull & push updates to the server	01:28
	← zhost left	01:28
	← Nicholas_Rishel left	01:28
	← mae_tae left	01:28
canoon	mae_tae, yeah i don't know how their client works / if you can use it with other servers etc	01:29
	← redrocket left	01:29
	→ chuckharmston joined	01:29
	← Watabou left	01:30
	← kermit left	01:31
	→ mae_tae joined	01:31
	→ kermit joined	01:31
	← whunt left	01:32
	→ thiago joined	01:32
	← Sigma[Mtp] left	01:33
	← etcetera left	01:34
	→ kpreid joined	01:36
	→ Watabou joined	01:36
	→ ezio joined	01:39
	← ezio left	01:39
	→ ezio joined	01:39
	→ jason237 joined	01:39
mae_tae	does this mean that if install/host my own git server, I dont need to use github? but require the programmers to used some any GUI client tool, is this that idea?	01:39
thiago	mae_tae: yes, no	01:40
	mae_tae: if you run your own server, you don't need someone else's server (github)	01:40
	whether you want to use a GUI client tool or not, it's up to you	01:40
mae_tae	i see, thats clear, hehe	01:40
	← nwertman_ left	01:41
	→ etcetera joined	01:41
	← etcetera left	01:42
	← zarubin left	01:42
	→ ojacobson joined	01:42
	← kukks left	01:43
	← maestrojed left	01:43
	← gumble left	01:44
	← kwmiebach left	01:45
	← vipzrx left	01:45
	→ dsdeiz joined	01:45
	→ kukks joined	01:45
	← threesome left	01:46
	→ Davey joined	01:46
	→ vipzrx joined	01:47
	← vipzrx left	01:48
	→ nettoweb joined	01:48
	← CreativeEmbassy left	01:49
	→ etcetera joined	01:51
	→ Goplat joined	01:51
	→ tplaner joined	01:51
	← bwreilly left	01:51
	→ snuffeluffegus joined	01:52
	→ CKyle joined	01:52
	→ daito joined	01:54
	← tplaner left	01:55
	→ harish joined	01:56
	→ mmitchell joined	01:56
	→ kama joined	01:57
	→ vipzrx joined	01:57
	← vipzrx left	01:57
	← sgambino left	01:58
	← jhulten_ left	01:58
	→ jhulten joined	01:58
	← alvaro_o left	01:59
	→ freestyl1 joined	01:59
	← nettoweb left	01:59
	→ bobdobbs joined	01:59
	← freestyl3r left	01:59
	→ madewokherd joined	02:01
	← kama left	02:01
	→ nettoweb joined	02:01
	→ weiyang joined	02:02
bobdobbs	I'm having trouble pushing a newly created project to a newly created repo on github	02:02
	← jhulten left	02:02
	→ sgambino joined	02:02
	← etcetera left	02:02
	→ intripoon joined	02:02
bobdobbs	I create the project on github, and then add the remote to the local project	02:03
	then I try and push	02:03
	I get: error: failed to push some refs to [myproject]	02:03
thiago	what was the error?	02:03
	→ etcetera joined	02:03
bobdobbs	error: failed to push some refs to [my remote project]	02:03
	← etcetera left	02:03
thiago	pastebin the entire output	02:04
bobdobbs	http://hastebin.com/qimovepego.coffee	02:04
	→ etcetera joined	02:04
	← etcetera left	02:04
	→ luc_ joined	02:04
	→ etcetera joined	02:05
thiago	"non-fast-forward" is the part I was looking for	02:05
	that project is not empty	02:05
	have you just created it?	02:05
bobdobbs	yes. created it without a readme or license, to avoid that problem	02:05
thiago	looks like it has stuff in it	02:06
	either merge it, or push -f to obliterate what's there	02:06
bobdobbs	ok	02:06
	← intripoon_ left	02:06
	← danmackay left	02:06
	→ vipzrx joined	02:06
	← vipzrx left	02:07
bobdobbs	hm... push -f is hanging	02:07
	I can't tell if it's doing anything or not	02:07
	← sgambino left	02:07
	← _5kg left	02:07
	← maqr left	02:07
thiago	wait	02:08
	→ vipzrx joined	02:08
	← vipzrx left	02:08
bobdobbs	oh cool. the prompt returned. the push seems to have succeeded. checking github...	02:09
	yes! done!	02:09
	→ vipzrx joined	02:10
	← qdii__ left	02:12
	→ felixsamora joined	02:13
	→ groglogic joined	02:13
	← nettoweb left	02:16
mae_tae	im back, what's the good client tool for github? any suggestion	02:16
	← kai__ left	02:17
	→ trusktr joined	02:17
canoon	mae_tae, git	02:18
	sourcetree?	02:18
mae_tae	canoon: git is something like textbased, is there any graphical?	02:18
	sourcetree, ok ill search it	02:19
	→ macabre joined	02:19
	→ dhruvasagar joined	02:20
	→ Hoksilato joined	02:20
	→ curvedmark joined	02:21
mae_tae	canoon: another thing, if i install a webbased ui something like github, do we have any alternative for github where i can install in my server?	02:21
imMute	mae_tae: gitolite	02:21
Amadiro	I'm looking through a fairly large, fairly high-traffic repo, searching for a file that I know was there at some point, but got deleted. I'd like to find the last revision in which the file was there, and get that version. I know the exact name of the file, but not the full path. Anyone got any good ideas?	02:21
thiago	mae_tae: there's gitlab, gitorious, gitolite	02:22
	the first two exist as services online too	02:22
	← jfoy left	02:22
canoon	iirc gitolite is used by gitlab but its only the ssh frontend	02:23
	← dsdeiz left	02:23
	← woollyams left	02:23
	→ dsdeiz_ joined	02:23
mae_tae	i see, which is easier to setup among those being mentioned? how about gitlist?	02:24
	← hashpuppy left	02:24
imMute	having only setup gitolite, it's pretty easy.	02:24
	→ woollyams joined	02:25
	← Targen left	02:25
	← siaW left	02:25
	← Skrypter left	02:25
deryni	Amadiro: git log --name-status -- name ?	02:26
	Might take a while.	02:26
Amadiro	I got it loaded and hot in cache on an SSD, let me give it a shot :)	02:26
wagle	which git-log option for displaying changed files? I'm not seeing it in the docs	02:26
mae_tae	imMute: ok ill consider it installing gitolite	02:26
	→ CheckDavid joined	02:27
deryni	wagle: --stat or --name-only or --name-status depending on what you want exactly.	02:27
Amadiro	deryni, hm, came up empty immediately	02:27
deryni	With the wildcards in the pattern? Case right?	02:28
Amadiro	`git log --name-status -- DefaultCreateWindow`	02:28
wagle	deryni: thanks!	02:29
	← raonyguimaraes left	02:30
	→ pen joined	02:30
deryni	Amadiro: That's the name of the file? If that's a string in the file then -S or -G might be more useful.	02:31
	← m0viefreak left	02:32
	→ m0viefreak joined	02:32
Amadiro	deryni, should be the exact name of the file (well, it should be "DefaultCreateWindow.js". I'm looking for it because some other component tries to use it and barfs (but because of LAYERS AND LAYERS OF ENTERPRISEY INDIRECTION it's a PITA to figure out the full path from where it could want to include it)	02:32
deryni	Heh.	02:32
	If you've got a string that you know was in the file you could try -S/-G instead and see what you get.	02:33
Amadiro	It's not entirely un-possible it's in a different- or sub-repo, I'm running the query on all of those now.	02:33
	→ mizu_no_oto joined	02:33
Amadiro	Allright, I'll give that shot too	02:33
	← r0bby_ left	02:33
mae_tae	thanks people.....	02:34
	special thanks to canoon, thiago	02:34
canoon	np	02:34
	→ hashpuppy joined	02:35
	→ dsdeiz joined	02:36
Amadiro	deryni, something like `git log -G '.DefaultCreateWindow.' look correct? I'm assuming that's the kind of syntax -G expects	02:36
Hello71	man git log	02:36
gitinfo	the git-log manpage is available at http://jk.gs/git-log.html	02:36
Amadiro	(I'm fairly sure the string "DefaultCreateWindow" would occur in the file)	02:36
	→ mribeirodantas joined	02:37
	→ nettoweb joined	02:37
deryni	I don't think you need the wildcards for -G for this but yes.	02:38
thiago	-G takes a regexp	02:38
	but it's probably not anchored	02:38
Amadiro	right.	02:38
deryni	Right.	02:38
	← dsdeiz_ left	02:38
	→ Vampire0 joined	02:39
	→ ezioa joined	02:40
wagle	odd: howcome "git branch" reports three branches, while the file ".git/config" has only two?	02:41
imMute	wagle: because branches aren't stored in .git/config	02:41
	→ sriracha joined	02:42
deryni	Upstream tracking information for branches is.	02:42
	← MattMaker left	02:42
imMute	aye :)	02:42
sriracha	whenever I pull in my submodules, they always come in with HEAD detached. How can I lock in branch so that stops happening?	02:42
	← Vampire0_ left	02:42
	→ hwrd\|work joined	02:43
	← hwrd\|work left	02:43
	→ wbill joined	02:43
wagle	imMute: oh right.. its been a while	02:43
	→ hwrd\|work joined	02:43
	← ezio left	02:43
	→ MattMaker joined	02:44
	← dhruvasagar left	02:44
	← hashpuppy left	02:44
	← yuwang left	02:44
deryni	sriracha: That's how submodules work. Though supposedly recent git can do branch tracking instead (I don't know anything about it).	02:45
wagle	problem is that branch "wild-goose-chase" is a fork of branch "the-real-thing", and the two branches are following each other around, when "the-real-thing" should have been left behind	02:45
	if i do a git branch, it puts a star on "wild-goose-chase"	02:45
	so what's going on? how do I tell?	02:46
imMute	wagle: the star indicates the current branch	02:46
	← Reacto left	02:46
deryni	Which is explained in the first sentence of the git branch man page.	02:47
wagle	imMute: right, but "the-real-thing" is the same sha1 as "the-real-thing"	02:47
	imMute: right, but "the-real-thing" is the same sha1 as "wild-goose-chase"	02:47
	← ezioa left	02:47
	→ guideX joined	02:47
deryni	If the two refs point to the same commit then git just picks one.	02:47
Amadiro	deryni, that found it after a few minutes, awesome!	02:47
	thanks a bunch	02:47
deryni	Welcome.	02:48
	So what was the filename?	02:48
wagle	I know what the star means, I dont understand why the two branches are tracking each other	02:48
Amadiro	The file was indeed called exactly what I thought it was (and, as expected, withhin a gorillion nested subfolders), so don't know why the other query did not catch it	02:48
imMute	wagle: are they both local branches? or is one of them a remote tracking branch?	02:48
deryni	Odd.	02:48
wagle	local branches	02:48
deryni	wagle: Are they tracking? Does changing one change the other?	02:48
sriracha	deryni: so there is no way to avoid this?	02:48
deryni	sriracha: Look into whatever the recent git feature for submodule branch tracking is. Maybe it does what you want or maybe you don't want submodules at all.	02:49
wagle	i created "wild-goose-chase", checked it out, and have been making commits exclusively to it	02:49
guideX	I have been using git for some time, and I have never figured out how to efficiently use the update command. I am not using the terminal, I'm using windows github. I usually just delete the older version of the repo and clone it all over again	02:50
wagle	but now the two branches point to the same sha1	02:50
	← vipzrx left	02:50
guideX	how would I more efficiently do it, with the tool i'm using	02:51
Dougie187	guideX: what does the update command do? git doesn't have an actual update command. So that would have to be something in the github app.	02:51
guideX	well in svn, you right click a folder, and click update on an older repo	02:51
Dougie187	git != svn	02:51
guideX	I want to learn how to do that in windows github	02:51
Dougie187	I don't know what commands the windows github app has.	02:52
	← mmitchell left	02:52
Dougie187	But, in plain git terms, you either want to combine `git fetch` with `git reset` or, you want something like `git pull`	02:52
guideX	oic	02:52
wagle	deryni: commiting to "wild-goose-chase" causes "the-real-thing" pointer to change	02:53
deryni	git fetch + merge\|rebase\|reset	02:53
guideX	I appologize about the github windows part, the terminal is much harder to use	02:53
Dougie187	guideX any or all of those	02:53
	← etcetera left	02:53
deryni	guideX: Don't apologize. Use whatever works just realize people here don't necessarily know what a given UI looks like.	02:54
Dougie187	or can do for that matter.	02:54
deryni	guideX: Update presumably fetches changes from the remote repo?	02:54
guideX	yeah	02:54
	well put simply, sometimes I work on my github repo from work, then I want to come home and work on it some more, but the copy i have at home is out of date	02:54
deryni	Yeah. You want whatever the option is to fetch and merge or rebase your working directory with those changes.	02:55
wagle	why might it do this?	02:56
imMute	wagle: I honestly can't think of a way where it would even be possible to set it up to do that intentionally	02:57
	← CKyle left	02:58
canoon	wagle, sorry your commiting to one branch and it causes another branch to change?	02:58
wagle	canoon: apparently	02:58
	→ hashpuppy joined	02:58
	← hwrd\|work left	02:58
canoon	wagle, just happen once?	02:59
	what were the pointing to before / after?	02:59
	← chrisss404 left	02:59
	← hashpuppy left	03:00
wagle	the one that should't have moved, moved 8 commits up (according to gitk --all), to match the sha1 of the one that I was committing to	03:00
	→ intripoon_ joined	03:00
deryni	symbolic ref?	03:00
	→ bwreilly joined	03:00
	→ hwrd\|work joined	03:00
	← rudak left	03:00
deryni	Does one of those branches exist as a file in .git/ ?	03:00
wagle	both in .git/refs/heads	03:02
	← freestyl1 left	03:02
wagle	the contents of the two files is the same sha1, the mtimes are 50 minutes apart.. i did use git stash at one point recently	03:03
deryni	Stash shouldn't cause this. If you commit again now does the other one change?	03:03
canoon	whats the time on the commit compared with the mtimes?	03:03
	← intripoon left	03:03
	← dpomerantz left	03:04
	← hwrd\|work left	03:04
thiago	the most likely scenario is that you did something else that caused it to move	03:05
	← bwreilly left	03:05
wagle	canoon: the mtime matches the sha1 for "the-real-thing"	03:05
	← BoyanYordanov left	03:05
canoon	sounds like thiago is right	03:06
wagle	thiago: yeah, I figure this happened once instead of tracking	03:06
	now that I remember the git stash thing..	03:06
	← jokajak left	03:06
wagle	now its a issue of whether git stash is b0rked in my version, or pilot-error	03:07
	→ Skrypter joined	03:07
wagle	if i cant repeat it, then...	03:07
	← kukks left	03:07
	← ewnd9 left	03:08
	→ jhulten joined	03:09
	→ tmcmahon joined	03:10
deryni	I can't imagine how git stash can have done this. Other commands, sure, but not stash.	03:11
	← canoon left	03:12
	← undecim left	03:13
	→ echo-area joined	03:13
	→ undecim joined	03:13
	← daito left	03:13
	→ daito joined	03:14
	← jhulten left	03:15
	→ canoon joined	03:15
	← nettoweb left	03:16
	← abelsiqueira left	03:16
	→ Targen joined	03:16
	→ r0bby_ joined	03:18
	← daito left	03:18
	← RogerWS left	03:19
wagle	I went through my bash history, i didnt fork when I thought I did, I forked "recently" and haven't made any commits to the fork yet.. so no bugs to report	03:20
	→ btree joined	03:20
	← felixsamora left	03:21
deryni	Heh.	03:21
wagle	what i get for vacationing for a week	03:21
	was trying to figure out where I was and got gibberish	03:22
	→ Snibble joined	03:22
	rm_work → rm_work\|away	03:22
	→ felixsamora joined	03:22
	→ Sigma[Mtp] joined	03:22
	← felixsamora left	03:23
	→ felixsamora joined	03:23
	← felixsamora left	03:23
	← btree left	03:24
	→ felixsamora joined	03:24
	← felixsamora left	03:24
	→ felixsamora joined	03:25
	→ PaulCapestany joined	03:25
	→ _5kg joined	03:25
	← pdimitrov left	03:25
	← pen left	03:26
	← mizu_no_oto left	03:27
	← sriracha left	03:27
	← Sigma[Mtp] left	03:27
	← pr0ggie left	03:28
	→ bwreilly joined	03:28
	← CheckDavid left	03:28
	→ pdimitrov joined	03:28
	→ rhl joined	03:31
	← _davetoo left	03:32
	← shinnya left	03:32
	→ tplaner joined	03:33
	← felixsamora left	03:33
	← eletuchy left	03:33
	→ eletuchy joined	03:34
	→ _davetoo joined	03:34
	→ rurufufuss joined	03:34
	→ felixsamora joined	03:34
	← felixsamora left	03:34
	→ felixsamora joined	03:35
	← felixsamora left	03:35
	→ felixsamora joined	03:36
	← felixsamora left	03:36
	← r0bby_ left	03:36
	→ r0bby_ joined	03:37
	→ felixsamora joined	03:37
	← felixsamora left	03:37
	→ felixsamora joined	03:38
	← felixsamora left	03:38
	← eletuchy left	03:38
	← dyng left	03:39
	← Hoksilato left	03:39
	→ dyng joined	03:39
	→ Hoksilato joined	03:39
	→ sriracha joined	03:39
	← r0bby_ left	03:42
	→ pr0ggie joined	03:42
	→ sgambino joined	03:42
	→ z8z joined	03:42
	← z8z left	03:43
	← tmcmahon left	03:43
	→ z8z joined	03:43
	→ jokajak joined	03:44
	→ sqlnoob joined	03:44
	← dyng left	03:44
	← joelm left	03:45
	← tplaner left	03:46
	← lithiumn left	03:49
	← ToxicFrog left	03:50
	← YoungFrog left	03:51
guideX	hmm it says "fetch command not found" in the git bash	03:52
	→ ToxicFrog joined	03:53
	→ Hello71 joined	03:53
	→ daito joined	03:54
	← guampa left	03:54
	← oriba left	03:54
wagle	anyone having trouble with gitk (wish) freezing up from the mavericks/homebrew combo?	03:55
	→ mmlac-bv joined	03:55
	→ Destos joined	03:55
	← pandeiro left	03:55
	→ FrodoTheHobbit joined	03:57
	← FrodoTheHobbit left	03:57
	← simesy_ left	03:57
	→ FrodoTheHobbit joined	03:58
	→ simesy joined	03:58
	← trusktr left	03:58
	← FrodoTheHobbit left	03:58
	→ FrodoTheHobbit joined	03:59
	→ JeremyWei joined	03:59
	→ trusktr joined	03:59
	→ bklane joined	04:01
	→ ezio joined	04:01
	← ezio left	04:01
	→ ezio joined	04:01
	← trusktr left	04:01
	← simesy left	04:03
	→ rodrigovaldes joined	04:05
	← _davetoo left	04:05
	← sgambino left	04:06
	← nurey left	04:06
	← calcifea left	04:07
	← roxtrongo left	04:08
	→ trusktr joined	04:08
	→ iamjarvo joined	04:09
	← iamjarvo left	04:10
	→ iamjarvo joined	04:11
	→ SocalNick joined	04:12
	→ Hoksilato_ joined	04:14
	→ ewnd9 joined	04:14
	→ pixelgremlins_ba joined	04:14
	→ magnus^^p joined	04:15
	→ sonicblud joined	04:15
	→ ItSAN____ joined	04:15
	→ sword` joined	04:15
	→ _Norm_ joined	04:16
	→ titusjose_ joined	04:16
	→ Drool joined	04:16
	→ FatWreckord joined	04:16
	← daito left	04:16
	→ acl__ joined	04:16
	→ vadviktor__ joined	04:16
	→ Nikoli_ joined	04:17
	→ daito joined	04:17
	← acl__ left	04:17
	← pdimitrov left	04:17
	→ simesy joined	04:17
	→ Tacker- joined	04:17
	→ M-ou-se_ joined	04:18
	→ iamtakin1iteasy joined	04:18
	→ ScottE_ joined	04:18
	← ScottE_ left	04:18
	→ ScottE_ joined	04:18
	→ lusers joined	04:18
	→ Andre_work joined	04:18
	→ imMute^ joined	04:19
	← imMute^ left	04:19
	→ imMute^ joined	04:19
	→ maroloccio2 joined	04:19
	→ tokkee_ joined	04:19
	→ kanzure_ joined	04:19
	→ onur_ joined	04:19
	← iamjarvo left	04:19
	← daivyk left	04:19
	→ iamjarvo joined	04:20
	← pr0ggie left	04:20
	→ pdimitrov joined	04:20
	← mastro left	04:21
	← daito left	04:21
	→ ickyb0d- joined	04:22
	→ lep2 joined	04:22
	→ Invisible joined	04:22
	→ cworth` joined	04:22
	→ durarara_ joined	04:22
	→ Maelstrom joined	04:22
	→ spaceplu- joined	04:22
	→ jorj_ joined	04:22
	→ boblehest_ joined	04:22
	→ crazed- joined	04:22
	→ HedgeMage_ joined	04:22
	→ SirCmpwn_ joined	04:22
	← macabre left	04:23
	← z8z left	04:23
	← Hoksilato left	04:23
	← ojacobson left	04:23
	← jason237 left	04:23
	← ehmatthes left	04:23
	← SimonNa left	04:23
	← Norm__ left	04:23
	← jorj left	04:23
	← tpollard left	04:23
	← zackiv31 left	04:23
	← acl_ left	04:23
	← nfroidure left	04:23
	← Baluse left	04:23
	← ItSANgo_ left	04:23
	← jayrobot left	04:23
	← imMute left	04:23
	← scalability-junk left	04:23
	← zorzar left	04:23
	← Droolio left	04:23
	← qwertz_ left	04:23
	← leprechau left	04:23
	← titusjose left	04:23
	← deryni left	04:23
	← maroloccio left	04:23
	← boblehest left	04:23
	← Alenah left	04:23
	← sword left	04:23
	← surfdue left	04:23
	← ecube left	04:23
	← antoks left	04:23
	← NET\|\|abuse left	04:23
	← iamtakingiteasy left	04:23
	← cworth left	04:23
	← lazers left	04:23
	← pixelgremlins left	04:23
	← crazedpsyc left	04:23
	← Nikoli left	04:23
	← magnus^p left	04:23
	← durarara left	04:23
	← vadviktor_ left	04:23
	← M-ou-se left	04:23
	← onur left	04:23
	← ashooby left	04:23
	Maelstrom → LocalPCGuy	04:23
	lep2 → leprechau	04:23
	spaceplu- → spacepluk	04:23
	← ezio left	04:23
	jorj_ → jorj	04:23
	→ ecube joined	04:23
	→ Baluse joined	04:23
	→ scalability-junk joined	04:23
	titusjose_ → titusjose	04:24
	→ ezio joined	04:24
	← ezio left	04:24
	→ ezio joined	04:24
	SirCmpwn_ → SirCmpwn	04:24
	crazed- → crazedpsyc	04:24
	→ deryni joined	04:25
	← canoon left	04:26
	← FatWreckord left	04:26
	← chriswk left	04:26
	← zero7 left	04:26
	→ milieu joined	04:26
	→ preflex_ joined	04:26
	← guideX left	04:27
	← preflex left	04:28
	preflex_ → preflex	04:28
	→ chriswk joined	04:28
	→ lavaman joined	04:28
	→ zero7 joined	04:29
	→ z8z joined	04:29
	→ ehmatthes joined	04:30
	→ jason237 joined	04:30
	→ qwertz_ joined	04:30
	→ CKyle joined	04:30
	→ SimonNa joined	04:30
	→ antoks joined	04:30
	→ ashooby joined	04:30
	→ zackiv31 joined	04:31
	→ tpollard joined	04:31
	→ nfroidure joined	04:31
	→ NET\|\|abuse joined	04:31
	→ zorzar joined	04:31
	→ DrZaius joined	04:31
	← JeremyWei left	04:32
	← wafflejock_ left	04:33
	← nwertman left	04:33
	→ pr0ggie joined	04:33
	→ CreativeEmbassy joined	04:33
	← Drool left	04:35
	← hyperboreean left	04:36
	← Targen left	04:38
	→ acharlieh joined	04:38
	→ hyperboreean joined	04:39
	→ angelsl joined	04:39
	← lacrosse_ left	04:39
	→ eletuchy joined	04:40
	← SocalNick left	04:41
	← PaulCapestany left	04:41
	→ calcifea joined	04:41
	← CKyle left	04:42
	→ PaulCapestany joined	04:42
	→ R1KRDO joined	04:42
	← acharlieh left	04:43
	← sriracha left	04:43
	← Snibble left	04:43
	← R1KRDO left	04:44
	← cesarkawakami left	04:45
	← bklane left	04:45
	imMute^ → imMute	04:47
	← str left	04:47
	→ dreiss joined	04:49
	← Dougie187 left	04:51
	→ AlCoF__ joined	04:51
	← AlCoF__ left	04:51
	sword` → sword	04:52
	→ AlecTaylor joined	04:53
AlecTaylor	hi	04:53
	It's taking way too long to setup my build environment >.<	04:53
	→ Burer joined	04:53
	AlecTaylor has had to build make, coreutils, gcc, curl, nano, svn and is now building git	04:53
	← yhager left	04:54
milki	svn is pretty big...	04:54
AlecTaylor	Yeah, only just fullfilled the dependencies	04:54
	gcc is also massive	04:55
	→ War2 joined	04:55
	AlecTaylor is currently running `tar xf git-1.8.5.rc0.tar.gz`	04:55
	→ wrouesnel joined	04:55
	← luxgeek left	04:56
	→ nwertman joined	04:57
	→ eaj joined	04:57
	→ LuxuryMode joined	04:57
	← snuffeluffegus left	04:59
AlecTaylor	"Git - the stupid content tracker" - https://code.google.com/p/git-core/	04:59
	→ dyng joined	04:59
	← donmichelangelo left	05:00
	← z8z left	05:00
imMute	also, IRC is not Twitter..	05:00
	→ CKyle joined	05:00
AlecTaylor	?	05:00
	→ r0bby_ joined	05:00
	→ shoshin joined	05:00
	→ donmichelangelo joined	05:01
	→ yhager joined	05:03
milki	bitlee can connect to twitter just fine	05:03
shoshin	hello, i'm facing a little problem. I made changes to file main.py and create a commit A. I then modified other files and created a new commit, B. I then realised that i made a mistake in my main.py commit, i made changes to the file and rebased it to commit B instead of commit A. How do i add the change in commit A instead of commit B?	05:03
	i hope i was clear.	05:03
	i tried the following.	05:03
milki	shoshin: !fixup	05:03
gitinfo	shoshin: So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!	05:03
	← mudmaste_ left	05:04
	→ mudmaster joined	05:04
shoshin	milki git checkout <bad-commit> then git commit --amend -v, it opened up an editor with the code. how do i make modifications to this code? how do i remove the part of code that i don't want?	05:05
	milki okay, will try it.	05:05
	→ dalbertom joined	05:05
	← sword left	05:06
shoshin	but isn't fixup for merging the contents of 2 commits into one?	05:06
	i want to maintain them as separate commits. just shift the changes i made from commit A to commit B.	05:06
milki	the fixup term in an interactive rebase is not what that link is	05:08
	← calcifea left	05:08
	← yhager left	05:08
	← dalbertom left	05:09
	→ calcifea joined	05:09
	→ daito joined	05:11
	→ Tommy[D] joined	05:11
	← lavaman left	05:11
AlecTaylor	Please no errors!	05:12
	tar xf git-1.8.5.rc0.tar.gz && cd git-1.8.5.rc0 && ./configure --prefx=/home/student/96/42129796/opt/ && make && make install	05:12
	{$HOME} I think	05:12
	→ SocalNick joined	05:13
	→ dhruvasagar joined	05:13
	← Tommy[D]_ left	05:14
	→ rchavik joined	05:15
	→ beautifulmind joined	05:15
	← calcifea left	05:16
	← Destos left	05:17
	← iamjarvo left	05:18
	← CKyle left	05:18
	→ Squarism2 joined	05:19
	← jaimef left	05:20
	← SocalNick left	05:20
	← krixxkraxx left	05:22
	→ jaimef joined	05:23
	← oojacoboo left	05:23
	→ yhager joined	05:24
	← War2 left	05:24
	→ oojacoboo joined	05:25
	→ fionnan_ joined	05:26
	← echo-area left	05:29
	← dreiss left	05:29
	→ calcifea joined	05:30
	→ dreiss joined	05:31
	← yhager left	05:32
	→ CKyle joined	05:33
AlecTaylor	Whooops, that's --prefix >.<	05:33
	← dhruvasagar left	05:34
	→ dhruvasagar joined	05:36
	→ Xethron joined	05:36
	← Xethron left	05:36
	→ Xethron joined	05:36
	→ maleknet joined	05:37
AlecTaylor	Aww man, I need to build OpenSSL for git	05:37
	→ joelrobichaud joined	05:40
	← dhruvasagar left	05:40
	→ luxgeek joined	05:41
	→ dhruvasagar joined	05:41
	← luxgeek left	05:46
	→ mj12albert joined	05:48
	← matanya left	05:52
	← nicedice left	05:52
	← the_cybersphinx left	05:54
	← LuxuryMode left	05:54
	→ yhager joined	05:55
	← dreiss left	05:55
	→ Garen joined	05:58
	← CKyle left	05:59
	→ h0bbit_ joined	06:00
	→ matanya joined	06:01
	→ danmackay joined	06:01
	← yhager left	06:03
	→ takamichi joined	06:04
	→ juanmabc joined	06:05
	← magu\|q left	06:05
	→ SoftwareMechanic joined	06:05
	→ dreiss joined	06:06
	← PaulCapestany left	06:07
	← fridim_ left	06:07
	→ apipkin joined	06:08
	← mribeirodantas left	06:08
rhl	hi, can anyone explain how to get gitweb to only display repositories in a specified file? also how does one specify to gitweb precisely where the local configuration file should be?	06:08
	→ cenuij joined	06:09
	← cenuij left	06:09
	→ cenuij joined	06:09
	← dhruvasagar left	06:09
	→ dhruvasagar joined	06:10
	← fobius left	06:10
	→ arand__ joined	06:10
	→ leeN joined	06:11
	← tpollard left	06:11
apipkin	I thought I'd check here since there are many knowledgable people in here :) I'm trying to ping a domain from my server (where the domain is hosted) and I am getting an unknown host error. I changed the DNS earlier today. Is this just a result of the DNS having not been propagated yet, or is there something else wrong. Other domains on this server are able to be pinged.	06:13
	← dhruvasagar left	06:13
	→ jaseemabid joined	06:14
	← ezio left	06:15
	→ ezio joined	06:16
moritz	apipkin: probably just typical DNS caching phenomenon	06:17
	← groglogic left	06:17
moritz	apipkin: should be allright again after 1 day	06:17
thiago	why can't you ping? no reply or no resolution to the hostname?	06:17
apipkin	moritz: thanks! that's what I was hoping, but I couldn't find anything on the internet with a quick recursive search so I figured I'd ask :)	06:18
	thiago: no resolution	06:18
	→ kaictl joined	06:18
apipkin	I found the issue when i was trying to curl from one domain to another on the same server	06:18
thiago	apipkin: try resolving directly with the authoritative NS	06:18
	→ dyng_ joined	06:18
	← dyng left	06:18
	← Luke-Jr left	06:19
	→ irqq joined	06:19
apipkin	thiago: is that a script I can run or something?	06:19
thiago	host, dig, nslookup	06:19
	→ Luke-Jr joined	06:19
thiago	all of them can take a parameter saying which NS to query	06:19
	← kcj left	06:19
apipkin	OH!! I'll give that a shot!	06:20
	→ dhruvasagar joined	06:20
	→ Search12 joined	06:20
	→ lite_ joined	06:20
	→ jnavila joined	06:20
	← Search12 left	06:21
apipkin	Bummer. Plane is landing. Thanks! I'll do the force when I get on the ground if it's still not fixed :)	06:22
	→ svector joined	06:22
	← apipkin left	06:22
	← kaictl left	06:23
	→ ns5 joined	06:24
	→ kaictl joined	06:24
	→ JeremyWei joined	06:26
	→ TomyLobo joined	06:28
	← daito left	06:28
	→ daito joined	06:29
	← yacks left	06:31
	← dhruvasagar left	06:32
	← jnavila left	06:32
	← kaictl left	06:33
	→ kaictl joined	06:33
	← daito left	06:34
	← mae_tae left	06:35
	← JeremyWei left	06:36
	→ dhruvasagar joined	06:37
	→ pantsman joined	06:39
	← juanmabc left	06:40
	→ ThomasLocke joined	06:41
	← rchavik left	06:41
	→ marthinal joined	06:41
	→ kbart joined	06:41
	← Skrypter left	06:42
	→ Skrypter joined	06:42
	← joelroa left	06:42
	→ mdiers joined	06:43
	← ezio left	06:43
	Guest22459 → raar	06:43
	← raar left	06:43
	→ raar joined	06:43
	← dhruvasagar left	06:43
	← mr_red left	06:43
	→ mr_red joined	06:44
	→ dhruvasagar joined	06:44
	→ jargon joined	06:44
	← thiago left	06:45
	← MattMaker left	06:45
AlecTaylor	Damn	06:45
	http-push.c:17:19: fatal error: expat.h: No such file or directory	06:45
	→ rchavik joined	06:46
	→ War2 joined	06:46
	← mdiers left	06:46
	→ MattMaker joined	06:46
	→ daito joined	06:47
	→ threesome joined	06:47
	→ JohnBat26 joined	06:47
	← matanya left	06:48
	→ _RisH__ joined	06:51
	→ MattMake_ joined	06:52
	→ warbaque_ joined	06:52
	→ akher0n joined	06:52
	→ przemkov1 joined	06:52
	→ Cromulent joined	06:53
	→ luto1 joined	06:53
	→ zizzfizzix_ joined	06:53
	→ gonzzor_ joined	06:53
	→ uso_ joined	06:53
	→ xdbr_ joined	06:53
	→ wereHams1er joined	06:54
	→ Jordanw joined	06:54
	→ genehack_ joined	06:54
	← chamunks left	06:54
	→ fling_ joined	06:54
	→ avarab joined	06:55
	← luto left	06:55
	← przemkovv left	06:55
	← warbaque left	06:55
	← fling left	06:55
	← uso left	06:55
	← gunthaa__ left	06:55
	← gonzzor left	06:55
	← dbr left	06:55
	← wereHamster left	06:55
	→ kcj joined	06:55
	→ lun__ joined	06:56
	→ chamunks joined	06:56
	← r0bby_ left	06:56
	← Luke-Jr left	06:56
	← MattMaker left	06:56
	← madewokherd left	06:56
	← MattMake_ left	06:56
	→ Luke-Jr joined	06:57
	← Watabou left	06:57
	← mmlac-bv left	06:58
	→ robbyoconnor joined	06:58
	← Kabaka left	06:59
	← jaimef left	06:59
	→ jaimef joined	06:59
	← netsroht left	07:00
	← uso_ left	07:00
	→ JeremyWei joined	07:00
	→ War2_ joined	07:01
	← Squarism2 left	07:01
	← pantsman left	07:02
	→ PaulCapestany joined	07:02
	← War2 left	07:03
	→ Watabou joined	07:04
	← dhruvasagar left	07:04
	→ Raging_Hog joined	07:04
	→ netsroht joined	07:04
	→ dhruvasagar joined	07:04
Fandekasp	hi there	07:04
	I want to git subtree add a repo tag, but it fails. Seems to only work with branches, and I can't create a branch with the same name as the tag	07:05
	How would you go around that limitation ? I really want to git subtree pull v1.0.0 etc, to keep track of my subtree versions	07:05
	→ saurabh joined	07:06
	→ mlechner joined	07:07
	→ soee joined	07:08
	← angelsl left	07:08
	→ Sicp joined	07:09
	← Sicp left	07:10
deryni	submodule?	07:10
	→ germanoak joined	07:10
	→ angelsl joined	07:11
	← dhruvasagar left	07:12
	→ echo-area joined	07:12
	→ MattMaker joined	07:13
	← MattMaker left	07:13
	→ MattMaker joined	07:13
milki	"keep track of subtree versions"	07:14
	o.O	07:14
	→ papegaaij joined	07:14
milki	if you cant do it easily, you're probably using the wrong tool	07:14
	← JeremyWei left	07:15
	← chuckharmston left	07:15
	← _RisH__ left	07:16
	→ ciampix joined	07:16
	← woollyams left	07:16
	← ns5 left	07:17
	→ dhruvasagar joined	07:18
	← angelsl left	07:18
	→ webguynow joined	07:19
	→ eijk joined	07:19
	→ Octalot joined	07:20
	→ nilg joined	07:20
	→ angelsl joined	07:20
	→ JeremyWei joined	07:20
	← angelsl left	07:21
	→ matanya joined	07:22
	fling_ → fling	07:22
	→ angelsl joined	07:23
	→ Squarism joined	07:24
	← Gamecubic left	07:24
	← TomyLobo left	07:25
	→ freimatz joined	07:25
	→ zapb joined	07:25
freimatz	hi	07:26
	← thevishy left	07:26
	← mj12albert left	07:27
	→ galaris joined	07:28
	← MattMaker left	07:29
	→ _iron joined	07:30
	← cyphase left	07:31
	← dhruvasagar left	07:31
	→ dhruvasagar joined	07:32
	→ halu joined	07:32
	→ cyphase joined	07:32
	← Nibato left	07:33
	→ _RisH__ joined	07:34
	→ arand joined	07:35
	← JeremyWei left	07:35
	← jwmann left	07:35
	← Abbas- left	07:36
	→ mastro joined	07:36
	← eaj left	07:36
	→ eaj joined	07:37
	→ rudak joined	07:37
	← galaris left	07:38
	→ Nibato joined	07:38
	→ robertnix joined	07:38
	← dhruvasagar left	07:39
	← jonez left	07:39
	→ dhruvasagar joined	07:39
	→ fRAiLtY- joined	07:41
	← eaj left	07:42
	← simesy left	07:45
	← Cromulent left	07:45
	→ drizzd joined	07:45
	→ simesy joined	07:45
	→ Zarthus joined	07:46
	← threesome left	07:47
	→ rafaqueque joined	07:47
lite_	I accidentally comitted(and pushed) to the wrong branch - What do I do ?	07:47
_ikke_	What do you want to happen?	07:47
	← irqq left	07:48
	← banisterfiend left	07:48
	← joelrobichaud left	07:48
	→ GT4066 joined	07:49
	→ irqq joined	07:49
lite_	I want to delete the commit(and the push) from the "wrong" branch and commit(and push) the changes to the right one	07:49
	← Nibato left	07:49
	luto1 → luto	07:49
	→ h_kon joined	07:50
	← simesy left	07:50
	→ joelroa joined	07:50
	→ JeremyWei joined	07:50
	← dhruvasagar left	07:51
	→ dhruvasagar joined	07:51
	→ jonez joined	07:52
	← rafaqueque left	07:52
lite_	_ikke_: do you understand what im trying to accomplish or am I uexplaining it horribly?	07:52
	→ glosoli joined	07:52
_ikke_	lite_: Do you know where the wrongly pushed branch pointed to before you pushed to it?	07:53
	War2_ → War2	07:53
	← War2 left	07:53
	→ War2 joined	07:53
lite_	what do you mean?	07:53
	← _Norm_ left	07:53
lite_	I pushed to origin/master where i wanted to push to origin/release-branch	07:53
deryni	What revision was origin/master at before you pushed?	07:54
	→ arvind_khadri joined	07:54
	← calcifea left	07:55
lite_	HEAD ?	07:55
	← leeN left	07:56
_ikke_	HEAD is not a revision	07:56
lite_	i dont know what you mean then.	07:57
	→ calcifea joined	07:57
deryni	Before you pushed your changes what would someone checking out master have gotten as the current revision?	07:57
	← matanya left	07:58
	→ luckyruby joined	07:58
	← Hoksilato_ left	08:00
	← sonicblud left	08:01
	→ robertnix2 joined	08:01
	← raar left	08:02
	← aspiers left	08:02
	← robertnix2 left	08:02
lite_	By revision I understand a specific commit(Identified by SHA). I dont understand how this helps anyone.	08:02
	← arand left	08:02
	← drizzd left	08:02
	→ simesy joined	08:03
	→ jayrobot joined	08:03
_ikke_	lite_: Because you need it to reset the branch back to where you want it	08:03
	→ intellix joined	08:03
	→ raar joined	08:03
	→ War2_ joined	08:03
lite_	so the revision before the one I comitted is the one I need to get "back to"	08:03
	raar → Guest18364	08:03
	← War2 left	08:04
_ikke_	lite_: if you made and pushed one commit, then yes	08:04
deryni	The revision of master before you pushed your changes, yes.	08:04
	← robertnix left	08:04
	← cenuij left	08:06
lite_	I only made and pushed one commit, yes. so what do I do? My initial plan was git reset --soft HEAD^. then git checkout correct-branch and commit	08:06
	Finally do git revert HEAD	08:06
	would this be what I need?	08:07
_ikke_	no, you don't need git revert	08:07
lite_	oh	08:08
_ikke_	If you made and pushed on commit, you do: git push -f origin HEAD^:master	08:08
	while on the master branch	08:08
	lite_: On what branch did you create the commit locally?	08:08
lite_	master	08:08
_ikke_	ok	08:08
	← intellix left	08:09
_ikke_	then that command should work	08:09
lite_	ok. where will that leave the changes I need to commit to release branch ?	08:09
_ikke_	lite_: Just in your master branch	08:09
	Do you want that commit in another branch locally?	08:09
lite_	I want the "wrong" commit to be pushed onto the release branch and removed from master	08:10
_ikke_	Also locally?	08:10
lite_	sure?	08:10
	→ matanya joined	08:11
	→ lb1a joined	08:11
	← renatow_ left	08:11
	→ chovy joined	08:11
lite_	correction: yes, i do	08:11
_ikke_	git branch <relase-branch>; git reset --hard HEAD^; git push -f origin master; git push -u origin <release-branch>	08:11
	reset --hard will remove any locally uncomitted changes though	08:12
lite_	thats fine - there are none	08:12
	→ thierryp joined	08:12
lite_	uhm	08:12
	← m0viefreak left	08:13
lite_	why are you doing git reset --hard HEAD^ on release branch ?	08:13
deryni	He isn't.	08:13
	← DANtheBEASTman left	08:13
luckyruby	Hi, I'm looking for some advice on what to do if a series of commits were made by someone else in error. I made it worse by committing changes after the erroneous commits. What I would like is to rollback to the commit right before the first bad commit, then reapply all the later commits excluding the bad ones. Is that possible?	08:13
deryni	git branch doesn't change the active branch.	08:13
	← dhruvasagar left	08:13
	→ DANtheBEASTman joined	08:13
deryni	You can revert all the bad ones if that's what you want, otherwise you want to rebase from the last known good commit and drop all the bad commits.	08:13
	→ dhruvasagar joined	08:13
deryni	Revert doesn't rewrite history, rebase does.	08:14
lite_	i dont want to rewrite history. afaik thats bad practice and can cause issues when we're multiple developers workin on the same branch	08:14
milki	luckyruby: !fixup	08:15
gitinfo	luckyruby: So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!	08:15
chovy	i did a 'git init --bare' on a deploy server, how do I push my working git project to it?	08:15
	the working git project is a different repo.	08:16
	→ harobed_ joined	08:16
lite_	_ikke_: what is being pushed to release branch here: git push -u origin <release-branch> ?	08:16
	← Goplat left	08:16
	→ netiul joined	08:16
	← netiul left	08:16
	→ netiul joined	08:16
deryni	The current location (since it was branched before you reset).	08:16
	→ shruggar joined	08:16
deryni	chovy: You have a local repo that you want to push to a newly created remote repo?	08:17
lb1a	luckyruby, !revert	08:17
gitinfo	luckyruby: That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?	08:17
	← ecube left	08:17
_ikke_	lite_: git branch <branch-name> creates a new branch based on the current commit	08:17
lite_	deryni: when doing the git branch release-5.2 i get fatal: A branch named 'release-5.2.0' already exists.	08:17
chovy	deryni. yeah. i'm following the "Git" instructions here...http://clock.co.uk/tech-blogs/deploying-nodejs-apps but this assumes i'm starting fresh with a brand new repo for the project. I already have code written and is hosted on bitbucket. I want to use this deployment technique however.	08:17
luckyruby	deryni: thanks	08:17
	← Watabou left	08:17
_ikke_	lite_: So you already made that branch, and the commit needs to be moved?	08:18
lite_	yes	08:18
	→ pantsman joined	08:18
	← pantsman left	08:18
	→ pantsman joined	08:18
deryni	chovy: Add the new repo as a remote and push to it.	08:18
_ikke_	lite_: ok	08:18
	lite_: hold on	08:18
chovy	deryni? that's it? it won't conflict with bitbucket?	08:18
	→ zorbash joined	08:19
	← GT4066 left	08:19
	→ jceb__ joined	08:19
deryni	A repo can have multiple remotes.	08:19
_ikke_	lite_: git checkout master; git branch tmp; git reset --hard HEAD^; git rebase --onto release-5.2 master tmp; git checkout release-5.2; git merge tmp; git branch -d tmp;	08:20
lite_	_ikke_: but i dont want to rebase if I can avoid it.	08:20
deryni	You don't want to rebase master. You want to rebase changes from master to your release branch.	08:21
	→ galaris joined	08:21
	→ noname001 joined	08:21
	← ixian left	08:21
	← gerard0 left	08:21
	→ ixian joined	08:21
chovy	deryni: so then i just do git push origin live?	08:22
_ikke_	lite_: Why do you want to avoid it? It's just a way to move commits	08:22
lite_	ok	08:22
_ikke_	and you are force pushing anyway	08:22
	→ arand joined	08:22
	→ batrick joined	08:23
	→ gerard0 joined	08:23
lite_	_ikke_: mind walking me through what happens here :git rebase --onto release-5.2 master tmp	08:24
deryni	chovy: If live is your branch name, yes. Though you might need live:live and presumably you don't want to use origin if you want to keep bitbucket as origin.	08:24
canton7	take everything between master and tmp, and rewrite it to sit on top of release-5.2	08:24
	there's a nice graphical example in man git-rebase	08:24
gitinfo	the git-rebase manpage is available at http://jk.gs/git-rebase.html	08:24
	→ averell joined	08:24
	← beautifulmind left	08:25
	→ johanhar joined	08:25
chovy	deryni: http://pastie.org/private/jg4j5wtqu8uuruqli7erq	08:25
	neither worked	08:25
	the first one is trying to push to bitbucket it seems.	08:26
deryni	Right, because neither of those is correct.	08:26
	← lun__ left	08:26
deryni	git push <remote> <refspec>	08:26
	Your first was 'git push <remote> <remote>' and your second was 'git push <some-other-remote>'	08:26
	You need 'git push live <branch>'	08:26
	→ lun__ joined	08:26
deryni	Possible '<branch>:<branch>' I'm not sure.	08:26
chovy	what is <branch>	08:27
deryni	Your branch name.	08:27
	Probably master.	08:27
johanhar	Hi. I'm new to Git and need help with structuring my project. I have a library of code in a repository. Then I want to make various projects in each their repository, with a reference to the library. Is this possible with Git? Can I include a repository from a repository?	08:27
chovy	deryni: ok	08:27
_ikke_	johanhar: !subprojects	08:27
gitinfo	johanhar: So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.	08:27
	→ sparq_ joined	08:27
	→ juril joined	08:28
	← sqlnoob left	08:28
luckyruby	deryni: if I revert the bad commit, but later want to reapply it, would I just revert the revert?	08:29
	← PaulCapestany left	08:30
	→ pfFredd joined	08:30
	← lun__ left	08:32
	← matanya left	08:32
	← sparq_ left	08:32
moritz	yes.	08:32
	→ aChatir joined	08:32
moritz	or cherry-pick the original commit	08:32
deryni	What he said.	08:32
	← aChatir left	08:32
	→ matanya joined	08:33
	← dhruvasagar left	08:34
chovy	is post-recieve hook gone?	08:34
	→ dhruvasagar joined	08:34
chovy	i don't see it.	08:34
_ikke_	man githooks	08:35
gitinfo	the githooks manpage is available at http://jk.gs/githooks.html	08:35
chovy	i don't see a post-receive.sample	08:36
	i guess they don't include one?	08:36
_ikke_	Correct	08:37
	→ cmpera joined	08:39
	→ jarr0dsz joined	08:40
	← jarr0dsz left	08:41
	← j0ran1 left	08:42
	← tfnico left	08:44
mancha	Is there an easy way to take a set of commits and make a single patch out of them?	08:44
	→ j0ran1 joined	08:44
	→ Gonzo89 joined	08:44
	→ tfnico joined	08:44
mancha	some are mutually exlusive but others make changes to the same file so they would have to be "processed" in the order I give.	08:45
	← johanhar left	08:46
	← takamichi left	08:46
	→ eaj joined	08:46
	→ takamichi joined	08:46
	→ Sonderblade joined	08:47
	← Sonderblade left	08:47
	← pdimitrov left	08:48
	← DANtheBEASTman left	08:48
	→ Sonderblade joined	08:48
	→ chrisss404 joined	08:48
deryni	Are they sequential commits?	08:48
	→ johanhar joined	08:48
	→ kewah joined	08:49
moritz	mancha: start a new branch, do an interactive rebase to get them in the order (and squash them) that you want them, and then use git format-patch	08:49
	→ mdiers joined	08:49
	→ pdimitrov joined	08:50
mancha	moritz: the git branch has hundreds of commits and i only need 6. won't this be a long way to do this?	08:50
	→ ayaz joined	08:50
	→ jatt joined	08:51
moritz	mancha: you can throw away those commits you don't need	08:51
	← pr0ggie left	08:51
moritz	mancha: and you don't need to go back the whole branch, just before the first commit you want	08:51
mancha	right, but i would have to keep throwing away hundreds of commits, right?	08:51
deryni	"keep"?	08:52
moritz	mancha: you don't have to, unless you want to	08:52
	→ alorence joined	08:52
	← kermit left	08:53
	→ pr0ggie joined	08:54
	← dhruvasagar left	08:54
mancha	ok, so i checkout a temp branch, reset to before the 1st commit, and rebase interactively....	08:54
	thanks!	08:54
	← pantsman left	08:55
	→ dhruvasagar joined	08:55
	→ konadr joined	08:55
	← zapb left	08:55
	← dhruvasagar left	08:58
	→ psoo joined	08:58
	→ Gavrisimo joined	08:58
	→ ngladitz joined	09:00
	→ dhruvasagar joined	09:00
	→ threesome joined	09:00
	→ cenuij joined	09:00
	← cenuij left	09:00
	→ cenuij joined	09:00
	→ DANtheBEASTman joined	09:01
	← bwreilly left	09:01
	← SimonNa left	09:01
lite_	_ikke_: after doing the git reset --hard HEAD^ i am now behind by 1 commit(obviously)	09:02
	← dhruvasagar left	09:02
lite_	(do you remember my original issue from a few hours ago) ?	09:02
	← j0ran1 left	09:03
_ikke_	After that, you need to push -f origin master	09:03
	← Guest35083 left	09:04
lite_	remote: permission denied to force push branch master	09:04
	→ dhruvasagar joined	09:05
	→ Rob___ joined	09:05
	→ ezekielnoob joined	09:07
	→ j0ran1 joined	09:08
	→ chinychinchin joined	09:08
	→ sebhoss joined	09:08
	→ hoschi joined	09:09
	← weiyang left	09:10
	← eaj left	09:10
_ikke_	lite_: Then you have a problem :-/	09:10
	!rewrite	09:10
gitinfo	[!rewriting_public_history] Rewriting public history is usually bad. Everyone who has pulled the old history have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push -f` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	09:10
	← jas4711 left	09:12
	→ Dev1L joined	09:12
	→ Norm_ joined	09:12
	gitinfo set mode: +v	09:12
Dev1L	I have 2 branches and I want to merge them but without the merge commit. --no-commit just leaves out all commits (even those that come with the merge)	09:13
	← johanhar left	09:13
	← mlechner left	09:13
	← galaris left	09:14
Dev1L	I just want to "move" my work from one branch to another without creating any additional commits	09:14
_ikke_	You have to create at least one commit	09:14
	Or do you only want them in you work tree?	09:14
	← DANtheBEASTman left	09:14
Dev1L	Branch B is ahead of branch A with 3commits	09:15
	→ galaris joined	09:16
	← Ziber left	09:16
	← SamB left	09:16
Dev1L	I'd like to "move" those 3 commits to branch A and push. Without creating a merge commit. This isn't possible is it?	09:16
_ikke_	Dev1L: You can rebase them	09:16
Dev1L	i didn't see a rebase flag for the merge?	09:16
_ikke_	rebase is a different commadn	09:17
	command	09:17
	→ Ziber joined	09:17
	→ SamB joined	09:17
Dev1L	oh, i was used to pull --rebase, that's why	09:17
	← echo-area left	09:17
	← _5kg left	09:17
_ikke_	yeah, that's because, by default, pull = fetch + merge. pull --rebase = fetch + rebase	09:18
lite_	_ikke_: is there no way to simply "create a new commit" which in reality is HEAD^ and oush it ?	09:19
	push*	09:19
	← dhruvasagar left	09:19
bobdobbs	hey guys. I'm looking for a video on git. I think it was from a meetup. It's presented by a woman, and she uses lots of postit notes.	09:19
	→ joelmo joined	09:19
	← simesy left	09:19
	→ intellix joined	09:19
	→ simesy joined	09:19
bobdobbs	Does anyone know which video it is?	09:19
	→ dhruvasagar joined	09:19
	← simesy left	09:20
	→ simesy joined	09:20
	← JeremyWei left	09:20
	→ Misan joined	09:20
	→ rendar joined	09:20
	→ lidamao joined	09:20
bobdobbs	someone here gave me a link to it.	09:21
	← ewnd9 left	09:21
	→ kwmiebach joined	09:23
	pasky_ → pasky	09:23
	← lidamao left	09:24
lite_	What does git push origin +HEAD do ?	09:25
Dev1L	_ikke_: i should be doing: "checkout branch B" (which is ahead of A) and then "rebase A" right?	09:25
	← dreiss left	09:25
Dev1L	it says that Current branch B is already up-to-date, which is wierd because it should put B changes onto A?	09:25
	oh, no. I think I got this now	09:27
	→ LimeBlast joined	09:27
	→ aChatir joined	09:27
	→ buzzybron joined	09:27
	← dhruvasagar left	09:29
	→ sgambino joined	09:32
	← ItSAN____ left	09:32
	→ snql joined	09:33
	← War2_ left	09:34
	→ MrKeys88 joined	09:34
	→ victorbjelkholm joined	09:34
	→ dhruvasagar joined	09:35
	→ raonyguimaraes joined	09:36
	→ marhaban joined	09:37
	← valtido left	09:38
	← maleknet left	09:38
	→ howlymowly joined	09:39
	← Cerise left	09:40
	→ SergeyPenkin joined	09:41
SergeyPenkin	Is it correct way to look up all changes made to a file for the given branch: git log dev -- some/path/tofile?	09:42
	→ banisterfiend joined	09:42
_ikke_	Almost, because it will not be limited to the dev branch this way	09:42
SergeyPenkin	_ikke_, what do you mean?	09:43
	← pr0ggie left	09:43
	← pdimitrov left	09:43
	→ pr0ggie joined	09:43
	→ pdimitrov joined	09:43
	→ xrogaan joined	09:44
	← xrogaan left	09:44
	→ xrogaan joined	09:44
	← danillonunes left	09:44
	← joelroa left	09:44
SergeyPenkin	You mean also the branch from which dev was branched off?	09:44
_ikke_	yes	09:45
	→ zarubin joined	09:46
	← dhruvasagar left	09:46
	← pfFredd left	09:46
	→ dhruvasagar joined	09:46
	← takamichi left	09:49
	→ achadwick joined	09:49
	← harish left	09:49
	→ msch joined	09:50
	← jargon left	09:50
msch	is there a tool where I can easily look back further in the history when blaming?	09:50
	e.g. I see this line came from this commit, but where did the line it removed come frome?	09:50
	and so on	09:50
	← luckyruby left	09:51
	→ maleknet joined	09:52
	→ m0ltar joined	09:52
	→ takamichi joined	09:53
	→ ItSANgo joined	09:55
	← j0ran1 left	09:55
	→ j0ran1 joined	09:55
	→ whatwhatinthebut joined	09:55
	← marhaban left	09:56
	→ YoungFrog joined	09:56
	→ jargon joined	09:56
	→ EvilDMP joined	09:57
jast	EugeneKay: no, but thanks for letting me know. ;)	09:58
	← dhruvasagar left	09:58
	→ dhruvasagar joined	09:59
	← spal left	10:00
	← konadr left	10:00
	→ mlechner joined	10:00
	→ ewnd9 joined	10:01
	→ Radditz joined	10:01
	→ GT4066 joined	10:01
	→ Frank_qa joined	10:01
	→ kas84 joined	10:02
kas84	hi	10:02
Frank_qa	can anyone tell does git fetch+git merge = git pull?	10:02
	← mdiers left	10:02
kas84	hey, I want to ignore all .idea folder an its subfolders	10:02
Neptu	hej if my branch is in the past and I want to discard all my changes (did some git add already) how can i do that	10:02
kas84	how can i do that with gitignore	10:02
	I am doing .idea/** but it's not working	10:03
Neptu	git checkout will not fix it so far for me	10:03
kas84	same thing with .DS_Store files	10:03
YoungFrog	Frank_qa: from my naive point of view, yes.	10:03
	← germanoak left	10:03
SergeyPenkin	Frank_qa, "Incorporates changes from a remote repository into the current branch. In its default mode, git pull is shorthand for git fetch followed by git merge FETCH_HEAD."	10:03
	← dhruvasagar left	10:03
	→ Abbas- joined	10:03
	→ germanoak joined	10:03
	← germanoak left	10:04
	→ mdiers joined	10:04
	→ DanielFGray joined	10:04
Frank_qa	SergeyPenkin, so if i failed with git fetch, i will also fail with git fetch, right?	10:05
SergeyPenkin	No, fetch will download Git objects anyway.	10:06
	← aChatir left	10:06
	→ darkangel joined	10:06
	→ jon_r joined	10:06
darkangel	Has anyone used stashing with EGit?	10:06
	→ marhaban joined	10:06
	→ rath joined	10:06
	← galaris left	10:06
	→ davividal joined	10:07
	→ War2 joined	10:07
	← Frank_qa left	10:09
	→ dhruvasagar joined	10:09
darkangel	I thought that stashing clears the working directory?	10:10
YoungFrog	framling: depends on where your typo is, actually. If you failed with git fetch, it'll fail with git pull -- but if you failed with git pull, git fetch might work fine (it jsut needs access to the remote...)	10:10
	framling: sorry, tab completion error	10:10
	← mdiers left	10:11
YoungFrog	that was for Frank_qa but he left and I did not notice	10:11
framling	No worries	10:11
	→ galaris joined	10:11
	← War2 left	10:12
jast	darkangel: normally it discards uncommitted changes, yes. of course it's possible that EGit does things differently; it doesn't use the standard implementation at all	10:12
	→ spal joined	10:12
	← cmpera left	10:13
	→ ak5 joined	10:13
darkangel	jast: I tried using Git Bash on Windows as well, and it also doesn't work. :(	10:13
	→ asQuirreL joined	10:13
	→ Kabaka joined	10:13
ak5	hi, I want to merge branch into master, however, I want to keep one file different in the branching I am merging into master. Do I need to merge twice if I want masters changes in that branch?	10:14
	/s/branching/branch	10:14
	→ cmpera joined	10:15
	← simesy left	10:15
	→ simesy joined	10:16
	← jon_r left	10:17
	→ PaulCapestany joined	10:19
	← marhaban left	10:19
	← jargon left	10:19
	← simesy left	10:20
	← cads left	10:21
	← Radditz left	10:21
	→ tvw joined	10:22
	→ _5kg joined	10:23
	→ cads joined	10:23
	← hyperair left	10:23
	← galaris left	10:23
	→ galaris joined	10:24
	→ armin_w joined	10:24
	→ spaceonline joined	10:25
	→ dfanjul joined	10:25
lite_	I am in branch A, and up to date with my remote. In this case - what would 'git revert HEAD' do ?	10:25
	← Skrypter left	10:25
	← ewnd9 left	10:25
lb1a	ak5, you cant keep anything different in a branch when you commit it to that branch, and merge it afterwards	10:25
	→ mdiers joined	10:26
	← spaceonline_ left	10:27
	→ lun__ joined	10:27
chovy	how do i delete my cached username?	10:27
_ikke_	cached username?	10:27
lb1a	chovy, what are you talking about?	10:27
chovy	well, its using the wrong username	10:28
	i think	10:28
	it keeps telling me my password is wrong.	10:28
lb1a	chovy, !repro	10:28
gitinfo	chovy: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will help immensely with troubleshooting.	10:28
SamB	chovy: maybe you have the wrong URL?	10:28
	← spaceonline left	10:29
chovy	oh nevermind.	10:29
lb1a	"it"... what is it? please provide more details	10:29
chovy	yeah i do.	10:29
	← dhruvasagar left	10:29
	→ stodan joined	10:30
	→ dhruvasagar joined	10:30
	← delasteve left	10:31
	← lun__ left	10:31
darkangel	I want to clear local changes, so I do this: git checkout . (as mentioned here: http://stackoverflow.com/a/1146981/221528) but it doesn't do anything!!???	10:32
	← Squarism left	10:32
armin_w	darkangel, #git	10:33
darkangel	armin_w: Huh?	10:34
armin_w	there is a git channel	10:34
	→ germanoak joined	10:34
	← germanoak left	10:34
darkangel	armin_w: And we're in it?	10:34
armin_w	haha	10:35
	armin_w slaps himself	10:35
darkangel	lol	10:35
armin_w	not enough coffee today apparantly	10:35
	→ g3orge joined	10:35
darkangel	I think it's bc they are untracked files. I'm new to Git.	10:35
	← chovy left	10:35
armin_w	yes that might be	10:35
	← GT4066 left	10:35
g3orge	why is git grep so fast? do it assumes something that only exists in git repos or something??	10:35
moritz	darkangel: you can delete untracked files with git clean	10:35
	→ GT4066 joined	10:36
	← Abbas- left	10:36
darkangel	moritz: Thanks, reading this: http://stackoverflow.com/questions/1090309/git-undo-all-working-dir-changes-including-new-files	10:36
	→ Abbas- joined	10:36
moritz	g3orge: well, first of all it doesn't have to do all the crazy directory traversal that recursive grep has to do, becuase it knows exactly what files are tracked	10:36
	→ mackanfkp joined	10:37
lb1a	darkangel, git clean -f ( careful, deletes things)	10:37
moritz	g3orge: and then it reads objects that are stored in compressed form, so it has to do less IO than normal grep	10:37
	→ jkremser joined	10:37
	← jkremser left	10:37
	→ jkremser joined	10:37
darkangel	lb1a: Yep thanks.	10:37
moritz	darkangel: and maybe add -d if you need that (man git clean)	10:37
gitinfo	darkangel: the git-clean manpage is available at http://jk.gs/git-clean.html	10:37
	→ jargon joined	10:38
lb1a	darkangel, and to clear changes to tracked files use "git checkout -- <path>"	10:38
darkangel	Thanks.	10:38
	→ simesy joined	10:38
g3orge	thx moritz	10:38
	→ nnyk_ joined	10:40
	← ezekielnoob left	10:41
	→ QoS joined	10:41
	← luc_ left	10:41
	← simesy left	10:42
	→ simesy joined	10:42
	← user258467 left	10:43
	→ worblehat joined	10:43
	→ lugzer joined	10:43
lugzer	hi	10:43
	→ danillonunes joined	10:45
AlecTaylor	I'm getting an error when trying to `make` git:	10:46
	make: Fatal error: Unknown option `-C'	10:46
	Makefile:1793: recipe for target 'perl/perl.mak' failed	10:46
	AlecTaylor doesn't care about Perl, can he build without it?	10:46
	← jargon left	10:46
	← simesy left	10:47
	← cmn left	10:48
_ikke_	You may not care about perl, git does	10:49
AlecTaylor	Looks related to this - http://git.661346.n2.nabble.com/Compiling-fails-on-SunOS-td6063871.html	10:49
	But I am using GNU Make 4.0 :\	10:49
	← joelmo left	10:50
grawity	the root Makefile has all options described in a comment – NO_PERL=1 should work	10:50
	← jaimef left	10:50
	← worblehat left	10:50
	→ cmn joined	10:51
	← dhruvasagar left	10:51
AlecTaylor	grawity: That's: `make --NO_PERL=1`?	10:51
	→ dhruvasagar joined	10:51
grawity	no, `make NO_PERL=1`	10:51
	→ kenperkins_ joined	10:52
_ikke_	it's an env variable	10:52
AlecTaylor	Thanks, it's building now	10:52
grawity	although I only see all makefiles using $(MAKE) -C, so I don't know why they should suddenly run anything other than the same `gmake` as originally ran	10:52
	→ kriks joined	10:52
grawity	(see the last post in that thread, for example)	10:52
	→ codemagician joined	10:52
	← kenperkins left	10:53
AlecTaylor	mmm, and besides; I built my own make and that is the first link in PATH to make and gmake	10:53
grawity	maybe it's resetting PATH somewhere :/	10:53
	generally, use `gmake` :P	10:53
AlecTaylor	:\ - I set my PATH in .bash_profile	10:53
codemagician	if i checkout a feature branch 'features' and then do git checkout -b another, is 'another' a branch from the first branch or from master?	10:53
	→ nettoweb joined	10:54
moritz	it branches off of 'features'	10:54
_ikke_	codemagician: It uses the current branch	10:54
	← dsdeiz left	10:55
	→ dsdeiz_ joined	10:55
grawity	it only makes a difference when 'features' and 'master' are on different commits, of course	10:55
	→ LBV_User joined	10:55
	← h_kon left	10:55
	→ flujan joined	10:55
	→ guampa joined	10:56
codemagician	i had a 'feature' branch on which I was working. I did a whole lot of changes. Then I needed to do a minor change to a single file, which I intended to change in isolation, so I did git checkout -b feature/minorchange and did the minor change. when i merged the feature/minorchange to the master branch i got all the work i'd done in the first branch	10:56
grawity	yes, that's the way it works	10:57
flujan	hello guys. A colleague by mistake, just pushed a lot of binaries to our repository.	10:57
codemagician	but when i type git branch -l i get a flat list	10:57
flujan	how can I completely remove this single commit from the repository?	10:57
selckin	codemagician: by default it branches of the current branch, you wanted to branch of master, not your branch	10:57
grawity	codemagician: there is no hierarchy in branches – the only thing that matters is what commit you started from	10:57
codemagician	i see	10:58
moritz	flujan: drop it in an interactive rebase, and then do a force-push	10:58
grawity	codemagician: and `git checkout -b <new branch>` just continues off the current HEAD	10:58
	← Misan left	10:58
moritz	flujan: do that with all branches that reference this file	10:58
lb1a	https://help.github.com/articles/remove-sensitive-data	10:58
grawity	codemagician: (if you wanted to start fresh from master, you'd need to `git checkout -b <new branch> master` instead)	10:58
codemagician	is there a way to prevent branching whilst "inside" another topic branch?	10:58
flujan	moritz: do you have a reference/	10:58
	→ h_kon_ joined	10:58
grawity	codemagician: no, that absolutely doesn't make sense in Git	10:58
lb1a	flujan, https://help.github.com/articles/remove-sensitive-data	10:58
	← QoS left	10:58
	→ qknight joined	10:59
lb1a	flujan, but in your case a simple (interactive) rebase and a push -f should do fine. ( what moritz said)	10:59
codemagician	so I guess I just have to be careful to checkout the master first and then start a new branch from there? I suppose git checkout -b feature/minorchange master ensure this	10:59
grawity	yes, `git checkout -b feature/minorchange master` means the new branch will start at the same commit as master.	11:00
codemagician	Does git checkout -b feature/minorchange master switch back to the master branch and then create the branch	11:00
grawity	codemagician: (in the future, using `tig --all` or `gitk --all` or `gitg --all` may make things clearer)	11:00
flujan	lb1a: moritz do you have a reference of this?	11:00
	→ the_cybersphinx joined	11:00
grawity	codemagician: no, it doesn't need to switch back to the master branch	11:00
lb1a	flujan, or if you feel uncomfortable about a rebase, you can reset (hard) to the commit before the bad one and do a force push	11:00
	→ simesy joined	11:00
grawity	codemagician: because creating a branch is nothing more than writing the commit SHA1 to a file in .git/refs/heads/feature/minorchange	11:00
codemagician	what will happen if there are uncommitted changes on the feature/majorchange checked out branch?	11:01
grawity	codemagician: so `git checkout -b` does that, and then it switches to the newly created branch	11:01
codemagician	i see	11:01
grawity	codemagician: uncommited changes remain if they don't conflict	11:01
lb1a	flujan, what else do you need?	11:01
	← Ivo left	11:01
lb1a	it's just those 2 commands	11:01
grawity	codemagician: if they do conflict, git will just refuse to check out the new branch until you a) commit, or b) stash, those changes	11:01
codemagician	right i see	11:01
flujan	lb1a: but I don´t want to loose the newer commit. The wrong commit is 5 commits older.	11:01
grawity	!float	11:01
gitinfo	If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there. If the files you changed differ between branches, the checkout will fail. In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.	11:01
	← danillonunes left	11:02
lb1a	flujan, git rebase -i <sha of the commit before the bad one> ; mark the bad one as drop; complete the rebase; git push -f <repo> branch	11:02
	→ penguin42 joined	11:02
codemagician	grawity: but if i want to make sure my feature/minorchange doesn't include anything from my feature/majorchange then would it be a good idea to commit my changes, switch the master branch, then git checkout -b feature/minorchange in that order	11:02
grawity	codemagician: commit your changes, yes	11:02
flujan	lb1a: ok thanks I will give it a try.	11:03
grawity	codemagician: but the 2nd and 3rd steps do not need to be separate	11:03
	codemagician: `git checkout -b feature/minorchange master` will achieve the exact same thing	11:03
	← raonyguimaraes left	11:03
lb1a	flujan, if you need help with rebase see the man git rebase manpage	11:03
gitinfo	flujan: the git-rebase manpage is available at http://jk.gs/git-rebase.html	11:03
	→ jceb joined	11:03
codemagician	grawity: so it's telling it explicitly to create the new branch from the master	11:03
grawity	codemagician: yes	11:04
	jceb → Guest21101	11:04
lb1a	flujan, maybe this http://git-scm.com/book/en/Git-Tools-Rewriting-History or that https://help.github.com/articles/interactive-rebase helps	11:04
codemagician	if i were to graph my branches would i have master->major->minor i.e. a branch off of an existing topic branch?	11:04
	← DanielFGray left	11:04
	→ germanoak joined	11:04
grawity	codemagician: Git does not track such information	11:04
	→ abrkn joined	11:05
flujan	lb1a: Just one last question, people that already pulled from my repo will need to clone again? Since I am rewriting history?	11:05
	← cmpera left	11:05
grawity	codemagician: it only uses the commit history to determine what each branch 'looks like'	11:05
	→ abelsiqueira joined	11:05
codemagician	grawity: what would be a good way to prevent other developers in my team repeating this mistake?	11:05
	→ DANtheBEASTman joined	11:05
lb1a	flujan, not clone again, but they should be notified that your rewrite history and should bringt their repos up to the current state before working any further	11:05
	← jceb__ left	11:05
grawity	flujan: they'll have to `git reset` (maybe `--hard`) to the new commit	11:05
lb1a	flujan, see !rewrite	11:05
gitinfo	flujan: [!rewriting_public_history] Rewriting public history is usually bad. Everyone who has pulled the old history have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push -f` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	11:05
grawity	codemagician: teach them how to undo it if it happens :)	11:06
lb1a	flujan, the link explains recovering from upstream	11:06
codemagician	i already merged my minor branch into the master	11:06
grawity	codemagician: and, looking at the branch's history after every merge is kind of a good idea	11:06
flujan	lb1a thank you.	11:06
codemagician	you mean git log and check the last few commit messages	11:06
	?	11:07
grawity	codemagician: more like tools like `gitk`, `tig`, `gitg`, or even `git log --graph --oneline --decorate` – optionally with `--all` to see all branches	11:07
	← glosoli left	11:07
grawity	codemagician: in other words, to take a look at the actual commit graph, instead of the "flattened" history that a bare `git log` shows	11:07
lb1a	codemagician, !lol	11:07
gitinfo	codemagician: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	11:07
	← tvw left	11:08
	← buzzybron left	11:08
	← xdbr_ left	11:08
	← germanoak left	11:09
	→ dsdeiz joined	11:09
	→ kai__ joined	11:10
	← dhruvasagar left	11:10
	← spal left	11:10
	← jatt left	11:10
codemagician	cool. thanks for your helps guys	11:10
	→ dhruvasagar joined	11:11
	← dsdeiz_ left	11:11
	→ resmo joined	11:12
	← Abbas- left	11:12
	→ danillonunes joined	11:12
	← abelsiqueira left	11:13
	→ abelsiqueira joined	11:13
lb1a	codemagician, you can also setup an alias for that, if you're planning to use this more often. git config (--global) alias.lol log --oneline --graph --decorate --all	11:13
codemagician	good idea	11:13
	← ItSANgo left	11:14
	← donmichelangelo left	11:15
	← banisterfiend left	11:15
	← zarubin left	11:15
	← dyng_ left	11:16
	→ donmichelangelo joined	11:16
	→ dyng joined	11:17
	→ ewnd9 joined	11:17
	← simesy left	11:18
	→ simesy joined	11:18
	← darkangel left	11:20
	← PaulCapestany left	11:20
	← daito left	11:20
	→ rob_w joined	11:21
	→ aard joined	11:21
	→ daito joined	11:21
	← paulweb515 left	11:21
	→ Nibato joined	11:22
	← armin_w left	11:22
	→ banisterfiend joined	11:22
	← simesy left	11:23
	← dhruvasagar left	11:23
	← flujan left	11:24
	← EvilDMP left	11:24
	← lugzer left	11:25
	← nnyk_ left	11:25
osse	deryni: technically there's no need to provide the sha in the output when you use --contains. I suppose that's why	11:25
	← arvind_khadri left	11:26
	← daito left	11:26
	← kcj left	11:26
	← maleknet left	11:27
	→ nnyk_ joined	11:27
	→ VictorCL joined	11:28
	← asakura left	11:28
	→ dhruvasagar joined	11:28
	← guampa left	11:28
	← harobed_ left	11:28
	→ guampa joined	11:29
	→ konadr joined	11:30
	→ asakura joined	11:30
	→ johnw joined	11:31
	← _RisH__ left	11:31
	← noname001 left	11:31
	→ KeiKun_ joined	11:32
	KeiKun_ → KeiKun	11:32
	← kewah left	11:32
	gitinfo set mode: +v	11:32
	← Entomo left	11:33
	→ PeterBooker joined	11:33
	→ noname001 joined	11:33
	← johnw left	11:34
	→ srji joined	11:35
	← dyng left	11:36
	← JohnBat26 left	11:36
	→ dyng joined	11:36
	→ lugzer joined	11:36
	← dr_lepper left	11:37
	→ dr_lepper joined	11:37
	→ jargon joined	11:37
	→ rafeca joined	11:38
	← netiul left	11:38
	→ Stygia joined	11:39
	← dyng left	11:40
	→ str joined	11:41
	→ harobed_ joined	11:42
	← rafeca left	11:43
	gitinfo set mode: +v	11:43
	→ ddr2 joined	11:45
	→ johanhar joined	11:46
	→ rafeca joined	11:46
AlecTaylor	YAY	11:46
	← str left	11:46
AlecTaylor	$ git --version	11:46
	git version 1.8.5.rc0	11:46
	← lugzer left	11:46
	→ freestyl3r joined	11:47
AlecTaylor	Didn't need any of those NO_PERL stuff, just had to override SANE_TOOL_PATH	11:47
	← halu left	11:47
AlecTaylor	^ _ikke_, grawity ^	11:47
	← asQuirreL left	11:47
johanhar	I have a submodule. I did some changes in the submodule but not from the repository that "hosts" the submodule, I did the changes in a working copy for that submodule, pushed the changes and I can see in github that the changes were made. Now when I'm in the working copy that "hosts" the submodule, I'm not able to pull or update or whatever those c	11:48
	hanges... I have tried "git submodule update", and "git merge origin/master". I have tried to go into the submodule folder and do "git pull". Nothing :(	11:48
	→ jaimef joined	11:48
	← kwmiebach left	11:49
	→ kwmiebach joined	11:49
	→ maleknet joined	11:50
	→ dyng joined	11:50
	← MrKeys88 left	11:51
_ikke_	johanhar: What do you mean with, nothing	11:51
	← Gavrisimo left	11:51
	→ Droolio joined	11:52
	→ simesy joined	11:52
johanhar	_ikke_: Nothing happens. But I found a ticket/thread on stackoverflow. I had to checkout master and then pull from within the sub, then go back to the "host" and commit and push changes.	11:52
	← sebhoss left	11:54
	→ joelmo joined	11:55
	← gitTom left	11:58
	← konadr left	11:58
	→ konadr joined	12:00
	→ Intensity joined	12:00
	← dyng left	12:01
	→ cbreak-work joined	12:02
Intensity	Hi. I'm trying to understand both why "git rebase -p origin/master" continues to repeat its efforts (multiple steps) when I run it again, and why a "git push origin featurex" seems to do nothing.	12:02
	→ dyng joined	12:02
	← johanhar left	12:02
	← banisterfiend left	12:03
	← LBV_User left	12:03
	← msch left	12:03
Intensity	Also, there seems to be no real log entries around those steps. I would have expected that once I've rebased, the processing wouldn't be repeated again (28 steps). And I'd expect that the push would send upstream the results of the rebase.	12:04
	← chinychinchin left	12:04
	→ stepps joined	12:04
	→ chinychinchin joined	12:04
stepps	hi	12:05
gitinfo	stepps: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	12:05
stepps	I am setting up it to work with an existing redmine and I have some issues getting the local clone of the repo to sync	12:06
osse	I'm using filter-branch to rewrite my commits to change my email address but my tags' author info aren't changed. How do I also rewrite the tags?	12:06
	← dyng left	12:06
stepps	I have a bare repo locally, and I have tried "git --bare fetch --all" and "git fetch --all" but it looks like I am doing something wrong	12:07
_ikke_	osse: use --tag-name-filter cat	12:07
	← ddr2 left	12:07
_ikke_	(while doing the rewriting)	12:07
osse	_ikke_: I am. I know the tag is rewritten because it points to the rewritten commit, but the "Tagger:" info still contains the old email address	12:08
_ikke_	Are you using annotated tags?	12:08
osse	yes	12:08
_ikke_	Not sure if git-filter-branch can rewrite annotated tags	12:08
	→ marhaban joined	12:09
_ikke_	"Nearly proper rewriting of tag objects is supported."	12:09
osse	I suppose I could manually recreate the tags with the original date. Luckily there's only two of them.	12:09
	← simesy left	12:10
_ikke_	" There is also no support for changing the author or timestamp (or the tag message for that matter)."	12:10
	→ simesy joined	12:10
_ikke_	So git filter-branch does not support it	12:10
	← dhruvasagar left	12:10
Takumo	right I've created a new local branch using git-svn	12:10
osse	Ahh, ok. I didn't fully understand that part when I read it myself	12:10
Takumo	how would I then create and commit this branch back to the svn origin?	12:11
	→ alan5 joined	12:12
	→ johanhar joined	12:12
johanhar	As a SVN user trying Git. What is the difference between git checkout and git pull? Which should I use to update changes?	12:13
selckin	checkout is like svn revert	12:13
	svn checkout is like git clone	12:13
johanhar	Is it? So I will lose all changes?	12:13
_ikke_	johanhar: git is distributed, that means that nearly all operations happen locally	12:13
	← marhaban left	12:14
	→ pandeiro joined	12:14
selckin	'like' its not the same, but should help you at the start	12:14
	← tokkee_ left	12:14
_ikke_	johanhar: git checkout <branch> would refuse if it had to overwrite uncomitted changes	12:14
	← lb1a left	12:14
_ikke_	johanhar: git checkout is a local operation	12:14
johanhar	Ok	12:14
	→ tokkee joined	12:14
_ikke_	gitinfo: So it doesn't contact the remote	12:14
	← simesy left	12:15
	← KeiKun left	12:15
	→ pfFredd joined	12:15
johanhar	I see, it is something you use when you want to switch between branches? Or did I completely miss the point of checkout?	12:15
selckin	git pull --rebase == svn update	12:15
	sorta	12:15
_ikke_	johanhar: git pull = git fetch (which downloads new history from the remote) + git merge	12:15
johanhar	Ah, ok	12:15
	So pull will be like svn update? I see.	12:15
_ikke_	johanhar: git checkout has multiple uses	12:15
Takumo	so using git-svn how do I commit a locally created branch back to svn?	12:15
	← stodan left	12:16
	→ Jackneill joined	12:17
	← Jackneill left	12:17
	→ Jackneilll joined	12:17
moritz	Takumo: to a new svn branch?	12:19
selckin	Takumo: could be an easier way, but, create the branch in svn (with svn client), git svn fetch --all, rebase your branch on top of the svn branch, and dcommit	12:19
	← ak5 left	12:19
moritz	if yes, I guess you have to create it first with 'git svn branch ...'	12:19
	and then dcommit	12:19
	← rafeca left	12:20
	→ banisterfiend joined	12:20
	← SporkWitch left	12:21
	→ daito joined	12:21
	→ rafeca joined	12:21
	→ avolz joined	12:22
	→ armin_w joined	12:23
	→ frgtn joined	12:23
	← mtk left	12:24
	→ focusn1k joined	12:25
	→ Misan joined	12:25
Takumo	moritz: done `git svn branch foo` but git svn dcommit still tries to commit to trunk	12:25
	→ crankharder joined	12:26
selckin	your commits need to be on top of the svn branch commits and not have svn-id	12:26
	← ewnd9 left	12:26
selckin	so you also need a rebase at least	12:26
	← Misan left	12:27
	← kai__ left	12:27
	→ mtk joined	12:27
	← snql left	12:27
Intensity	Maybe I'll start with the question about "git rebase". When I do that, and do it again, the work seems to repeat itself. Is this normal?	12:28
	→ lun__ joined	12:28
selckin	define work	12:28
	→ Misan joined	12:28
crankharder	this is odd and start recently. I leave my dev machine for a while (overnight, usually) and come back and my repo is doing this: https://gist.github.com/crankharder/0d232d45f484a153f55c	12:28
	← dsdeiz left	12:29
	→ leeN joined	12:29
selckin	crankharder: something is moving or renaming the dir, or maybe remounting external drive?	12:29
moritz	crankharder: is the repo on some network file system?	12:29
crankharder	it's @github.com, private repo	12:30
	had it for a while now	12:30
selckin	thats not relevant	12:30
	← daito left	12:30
selckin	its filesystem error	12:30
crankharder	and no, i can't imagine anything is moving the repo	12:30
moritz	crankharder: I meant your local copy	12:30
_ikke_	crankharder: Has nothing to do with git	12:30
moritz	or maybe some nightly backup job creating havoc	12:30
_ikke_	crankharder: This happens when you are in a directory that no longer exists	12:30
	← konadr left	12:31
	← nilg left	12:31
moritz	complain to your admin :-)	12:31
crankharder	okay, very odd, nothing i know of would be moving it. dont have backups running on this machine. it's a VM, I can rebuild it pretty easily	12:31
	thanks	12:32
	→ chimay joined	12:32
	← j0ran1 left	12:32
	← lun__ left	12:32
	→ gunthaa__ joined	12:33
	← whatwhatinthebut left	12:34
	← przemkov1 left	12:35
	→ j0ran1 joined	12:35
	← thierryp left	12:35
	→ thierryp joined	12:36
	→ przemkovv joined	12:36
	→ germanoak joined	12:36
	← oojacoboo left	12:37
	→ Pullphinger joined	12:37
	→ marhaban joined	12:40
	← thierryp left	12:40
	→ simesy joined	12:41
	→ grilix joined	12:41
	← marhaban left	12:44
	→ yacks joined	12:44
	→ khushildep joined	12:45
	← yacks left	12:45
	→ renatow joined	12:45
	→ yacks joined	12:46
	← kas84 left	12:47
	← sgambino left	12:47
bobdobbs	I do: "git push -u origin master", and I get back "ranch master set up to track remote branch master from origin"	12:49
	but nothing gets pushed	12:49
	← simesy left	12:49
moritz	so maybe origin/master is already up to date?	12:50
bobdobbs	hmmm	12:50
	I was just about to say "no, because I just made some changes"	12:51
	→ sriracha joined	12:51
bobdobbs	but perhaps I don't actually know what it means that "origen/master is already up to date"	12:51
	← maleknet left	12:51
moritz	it means there's nothing to push	12:52
	→ tonyj joined	12:52
moritz	do a 'git log master' and a 'git log origin/master' and compare if the first commit of each is identicaly	12:52
bobdobbs	ok	12:52
moritz	if yes, it means the branches are identical, and a push does nothing, and all is fine.	12:52
bobdobbs	oh, I get it	12:53
	→ fuzzybunny69y1 joined	12:53
	→ gasbakid joined	12:53
	bobdobbs slaps own forehead	12:53
bobdobbs	I hadn't actually updated master	12:54
	bobdobbs returns to noob corner	12:54
	→ SporkWitch joined	12:55
	← yacks left	12:55
	fuzzybunny69y1 → yargy	12:55
	← SporkWitch left	12:56
	→ SporkWitch joined	12:56
	← yargy left	12:56
	→ yargy joined	12:56
	→ ThomasCle joined	12:57
	→ mizu_no_oto joined	12:59
	→ kewah joined	13:00
	← frgtn left	13:00
	→ gasbakid_ joined	13:00
	→ frgtn joined	13:01
	→ kas84 joined	13:01
	← frgtn left	13:01
	→ frgtn joined	13:01
	← gasbakid left	13:02
	→ bitkiller joined	13:02
	→ zapb_ joined	13:03
	← nettoweb left	13:03
	← bandroidx left	13:03
	← oso96_2000 left	13:04
	← gasbakid_ left	13:05
	← davividal left	13:05
	→ Squarism joined	13:05
	→ davividal joined	13:06
	→ rabbite joined	13:06
	→ luxgeek joined	13:06
	→ gasbakid_ joined	13:07
	→ dyng joined	13:07
	← yargy left	13:08
	← gasbakid_ left	13:09
	← BiggFREE left	13:10
	→ harish joined	13:10
	→ gasbakid_ joined	13:11
	← amortimer left	13:11
	← Fandekasp left	13:11
	→ cannonball joined	13:12
	← gasbakid_ left	13:13
	→ ItSANgo joined	13:13
	→ asQuirreL joined	13:13
Intensity	I did a "git rebase origin/master", and yet "git diff master" shows differences.	13:14
	→ sebhoss joined	13:14
moritz	Intensity: sure, if you have commits in addition to origin/master	13:14
	→ nettoweb joined	13:15
moritz	rebase != reset	13:15
	→ gasbakid joined	13:15
Intensity	Yep - yeah sorry I withdraw that last comment. My earlier issues are still outstanding though.	13:15
	← gasbakid left	13:16
	← rouf left	13:17
	← sriracha left	13:17
	→ rouf joined	13:18
	→ gasbakid joined	13:18
	→ yargy joined	13:19
	→ grilix_ joined	13:20
	avarab → avar	13:20
SergeyPenkin	Is there any graphical tool to view git diff?	13:20
	→ bandroidx joined	13:21
	← gasbakid left	13:21
_ikke_	gitk or git gui?	13:21
	→ konadr joined	13:22
moritz	or gitweb + browser, for that matter	13:22
	← johanhar left	13:22
	← grilix left	13:22
_ikke_	But it won't get any more graphical than it already is	13:22
	→ halu joined	13:23
	HedgeMage_ → HedgeMage	13:23
_ikke_	You can also try meld as a difftool	13:23
	→ oso96_2000 joined	13:23
	← yargy left	13:23
	→ gasbakid joined	13:23
	→ surfdue joined	13:23
SergeyPenkin	__ikke_, I mean a diff produced by the git-diff command. I would like to view all changes made in a particular branch, I run git diff dev...some_branch. Now I have to feed produced diff to some graphical tool for a nice look.	13:24
	→ BiggFREE joined	13:24
	← GT4066 left	13:25
	→ Gavrisimo joined	13:25
	← gasbakid left	13:25
	→ tvw joined	13:27
	→ gua_ould joined	13:28
	→ gasbakid joined	13:28
	← frgtn left	13:28
	→ jdahlin joined	13:28
	← jdahlin left	13:28
selckin	git difftool	13:28
	→ frgtn joined	13:28
	← halu left	13:29
	→ GT4066 joined	13:29
_ikke_	selckin: Define nice look?	13:30
	→ natechan joined	13:30
	→ Snibble joined	13:30
	← h0bbit_ left	13:30
	← gasbakid left	13:30
SergeyPenkin	selckin, yeah, define it	13:30
	→ halu joined	13:30
selckin	SergeyPenkin: fuck you too	13:31
	← nnyk_ left	13:31
	← konadr left	13:31
SergeyPenkin	Ha ha ha, what a jerk	13:31
	→ nnyk_ joined	13:31
	→ marhaban joined	13:31
	← marhaban left	13:31
	→ gasbakid joined	13:32
	← frgtn left	13:33
	← focusn1k left	13:33
	→ bklane joined	13:33
_ikke_	I obviously mean SergeyPenkin	13:33
	meant	13:33
	and selckin !fsck	13:33
gitinfo	[!profanity] Hey! This is a family-safe channel, so keep it frakking clean you fierfekker!	13:33
selckin	if you think frakking is cleaner then fuck you should have that looked at	13:34
	← lite_ left	13:34
	ChanServ set mode: +o	13:34
	← tommcdo left	13:34
	_ikke_ set mode: +q	13:34
	_ikke_ set mode: -o	13:35
	→ lite_ joined	13:35
	→ m0viefreak joined	13:35
	← gasbakid left	13:36
	← nnyk_ left	13:36
	→ tplaner joined	13:37
	→ gasbakid joined	13:38
	← selckin left	13:38
	← germanoak left	13:38
	→ Vinnie1991 joined	13:39
	→ chuckharmston joined	13:39
	→ ak5 joined	13:39
	ChanServ set mode: +o	13:39
	_ikke_ set mode: -q	13:39
	_ikke_ set mode: -o	13:39
	← lite_ left	13:40
	← nettoweb left	13:40
	→ breakingthings joined	13:40
deryni	osse: --abbrev=0 removes the '-#-gXXXXX' from the resulting tag. I would have expected it do the same for the '~#' in the name-rev output.	13:41
	osse: It doesn't. That's not a big deal it just surprised me.	13:41
	→ rouf_ joined	13:42
	→ matteo joined	13:42
	← Vinnie1991 left	13:44
	← rouf left	13:44
	→ glosoli joined	13:45
	→ macabre joined	13:45
	→ simesy joined	13:46
	→ decotii joined	13:46
jast	the -gXXXXX is just extra information for someone looking at the output, whereas the ~# actually adds more information that would otherwise be lost	13:46
	→ dsdeiz joined	13:46
	→ nettoweb joined	13:46
	→ TheBrainWork joined	13:46
	→ Ivo joined	13:47
	→ echo-area joined	13:48
	← freimatz left	13:48
	← simesy left	13:50
	← SporkWitch left	13:51
	← AlecTaylor left	13:51
	→ Hoksilato joined	13:52
	→ amortimer joined	13:54
	← danillonunes left	13:55
	→ dhruvasagar joined	13:55
	← takamichi left	13:56
	→ danillonunes joined	13:57
	→ sgambino joined	13:57
	→ Sigma joined	13:57
	→ yacks joined	13:57
	← nettoweb left	13:58
	→ takamichi joined	13:59
	→ CheckDavid joined	14:00
	← CheckDavid left	14:00
	→ CheckDavid joined	14:00
	← g3orge left	14:00
	← m0ltar left	14:00
	← knigitz left	14:01
	→ AaronMT joined	14:02
	→ ewnd9 joined	14:03
	→ frgtn joined	14:03
	← wrouesnel left	14:04
	→ devoldmx joined	14:05
	→ jerius joined	14:05
	→ FernandoBasso joined	14:07
	→ ojacobson joined	14:07
	→ delasteve joined	14:07
	← delasteve left	14:07
	→ Syrit joined	14:07
	← Syrit left	14:07
	← joelmo left	14:08
	→ delasteve joined	14:08
	← delasteve left	14:09
	← BiggFREE left	14:10
	← tplaner left	14:10
	→ phile joined	14:10
	← danillonunes left	14:11
	→ johanhar joined	14:12
	→ swair joined	14:12
	→ shinnya joined	14:12
	→ nnyk_ joined	14:12
	→ danillonunes joined	14:13
	← FernandoBasso left	14:13
sobersabre	hi.	14:13
	how can I know at which revision I am standing right now ?	14:14
	→ nurey joined	14:14
sobersabre	git show ?	14:14
	← mizu_no_oto left	14:14
m0viefreak	sobersabre: you want the SHA1 of your current HEAD?	14:14
sobersabre	I'm not sure it is HEAD.	14:15
	→ FernandoBasso joined	14:15
sobersabre	I tried git show, and it seems to be at the correct revision.	14:15
_ikke_	You are always on HEAD	14:15
sobersabre	isn't HEAD - the last revision of the repo ?	14:15
m0viefreak	that ^	14:15
_ikke_	no	14:15
m0viefreak	git rev-parse HEAD	14:15
sobersabre	ok.	14:15
m0viefreak	will give you just the SHA1	14:15
	→ joelmo joined	14:15
_ikke_	It's the rivision you are currently on	14:15
m0viefreak	but git-show will give you the same of course	14:15
	← devoldmx left	14:16
	← ayaz left	14:16
sobersabre	ok. cool.	14:16
	← dyng left	14:16
	→ dyng joined	14:16
	← Olipro left	14:17
	→ worblehat joined	14:18
	← alan5 left	14:18
	← asQuirreL left	14:18
Snibble	git branch -v has some pretty useful info related to current branch and commit SHA.	14:19
	→ Olipro joined	14:20
	← dyng left	14:21
	→ dyng joined	14:22
bluesm	Does big corporations dont use git because they are afraid that one hold whole copy of code ?	14:22
	→ hs366 joined	14:22
	← chimay left	14:22
	← ItSANgo left	14:23
_ikke_	Ask them :-)	14:23
	→ dougsland joined	14:23
_ikke_	Even with centralized version control, one holds a whole copy of the code	14:24
	→ hholtmann joined	14:24
	→ hellopat joined	14:24
	→ JeremyWei joined	14:24
	← jhottenstein left	14:24
	← fuzzybunny69y left	14:24
	→ codezomb joined	14:25
	← Olipro left	14:25
	← pixelgremlins_ba left	14:25
	← shoshin left	14:26
	← dyng left	14:27
grawity	yeah, it is trivial to svnsync the entire repo to your own PC	14:27
deryni	You don't actually. I believe P4, for example, lets you limit read access to parts of a project.	14:27
	→ pixelgremlins_ba joined	14:27
grawity	likewise, Git lets you limit read access to specific repositories :)	14:27
	← VictorCL left	14:27
deryni	Sure.	14:28
grawity	with some SCMs you might end up having one huge repo, and managing access by subtree	14:28
	with others, you have several smaller repos	14:28
deryni	Indeed.	14:28
	← cebor left	14:29
	→ fdel joined	14:29
	← takamichi left	14:30
	← rullie left	14:30
	→ cebor joined	14:30
	→ LuxuryMode joined	14:30
	→ gregsmith joined	14:30
	← gregsmith left	14:30
	→ joshbetz joined	14:30
	→ gregsmith joined	14:30
	→ bwreilly joined	14:30
	← glosoli left	14:31
	[emmajane] → emmajane	14:32
fdel	I use git grep '->foo' and I get an error: " error: unknown switch `>'" and the usage page	14:32
grawity	because options start with '-', yes	14:32
	use `git grep -- '->foo'` to avoid thi	14:32
	this*	14:32
	→ takamichi joined	14:33
moritz	(another reason to hate perl 5's method calls with ->)	14:34
	grawity facepalms	14:34
fdel	well there's worse with PHP I guess (the \ for package separator or similar)	14:34
deryni	'-e ->foo' is probably better.	14:35
	→ Oishikatta joined	14:35
	→ mmitchell joined	14:35
moritz	fdel: somehow PHP always manges to be worse in some aspect :-)	14:36
	→ Sigma[Mtp] joined	14:36
	→ Destos joined	14:37
	← Sigma left	14:37
	→ CKyle joined	14:38
	→ Dougie187 joined	14:38
	← joelmo left	14:38
deryni	I very nearly vomited on the stop when I first saw that PHP package separator.	14:38
	→ stormwild joined	14:38
_ikke_	package seperator? You mean namespace	14:39
	→ neo1691 joined	14:39
fdel	yeah that, couldn(t come on the name	14:39
	→ Olipro joined	14:39
	→ dyng joined	14:40
	← neo1691 left	14:40
	→ joelmo_ joined	14:40
	→ whaley joined	14:40
	← dyng left	14:41
	← SoftwareMechanic left	14:41
	→ dyng joined	14:42
	← dyng left	14:42
	→ dyng joined	14:42
	← Stygia left	14:43
	→ asQuirreL joined	14:43
	← gasbakid left	14:44
	→ gasbakid_ joined	14:45
	← pixelgremlins_ba left	14:45
	← ska-fan left	14:46
	→ zarubin joined	14:46
	→ simesy joined	14:46
	→ ska-fan joined	14:46
	→ alan5 joined	14:47
	→ halu_ joined	14:48
	→ hwrd\|work joined	14:48
	← CKyle left	14:48
	→ nettoweb joined	14:49
	← nettoweb left	14:49
	→ kukks joined	14:49
	← kukks left	14:49
	→ kukks joined	14:49
	← hwrd\|work left	14:50
	← simesy left	14:50
	→ CKyle joined	14:50
	← halu left	14:51
	← soee left	14:51
	← fdel left	14:51
	→ m0ltar joined	14:52
	← Dev1L left	14:53
	← johanhar left	14:53
	→ mizu_no_oto joined	14:53
	→ jonatasnona joined	14:54
	← pdimitrov left	14:54
	← pr0ggie left	14:55
	→ pr0ggie joined	14:55
	← abrkn left	14:55
	← jaseemabid left	14:56
	→ droogans joined	14:56
	→ tplaner joined	14:56
	→ neo1691 joined	14:57
	← rudak left	14:57
	→ bamj0rb joined	14:57
	gitinfo set mode: +v	14:57
osse	deryni: here the -gXXXX thing is never present, even if I do --abbrev=7 or 40. So in a way there's nothing to remove. Or do you see the -gXXXX when --abbrev != 0 ?	14:57
	← CKyle left	14:58
	→ Stygia joined	14:58
	← donmichelangelo left	15:00
	→ abrkn joined	15:00
	→ donmichelangelo joined	15:00
	→ mikecmpbll joined	15:02
	Sigma[Mtp] → Sigma	15:03
	← macabre left	15:03
	→ macabre joined	15:04
	← Olipro left	15:04
	← h_kon_ left	15:05
deryni	With --contains? No. -gXXX is a non-contains thing. But the suffix for describe is two pieces -# and -gXXXX. --abbrev=0 removes both. The --contains suffix is ~# and --abbrev=0 doesn't remove it.	15:05
	← armin_w left	15:05
	→ johnnyfuchs joined	15:06
	→ iamjarvo joined	15:06
	← saurabh left	15:06
	→ Sigma[Mtp] joined	15:07
	→ catcher joined	15:07
	← galaris left	15:07
	← nnyk_ left	15:07
	→ richgilbank joined	15:07
	← Sigma left	15:07
	Sigma[Mtp] → Sigma	15:07
	→ RogerWS joined	15:07
	← macabre left	15:08
	→ freimatz joined	15:09
	→ paulweb515 joined	15:09
	→ pdimitrov joined	15:09
	← papegaaij left	15:09
freimatz	is there a channel for sourcetree	15:10
	← mdiers left	15:11
	← robbyoconnor left	15:11
	← rabbite left	15:11
	← svector left	15:11
	→ Olipro joined	15:12
catcher	I'm using rebase to remove a commit. However, I'm only trying to remove the last commit, which means the message will be empty, and thus aborted.	15:12
	How do I get around this?	15:13
	← bklane left	15:13
	→ nnyk_ joined	15:13
_ikke_	catcher: Just rebase one extra	15:13
	or just do git reset --keep HEAD^	15:14
	← danillonunes left	15:14
	→ hyperair joined	15:14
catcher	_ikke_, ah, rebase 2 and pick the 2nd, makes sense	15:14
	← dyng left	15:14
	→ axl_ joined	15:14
	← paulweb515 left	15:15
catcher	I tried it with a single commented line, and now I have "no such file" on msgnum and end	15:15
	→ dyng joined	15:15
catcher	ah, rebase --abort	15:15
	→ Matt_R joined	15:15
alexander__b	does anyone have an idea on how to print a huge red "-------------------------" at the end/beginning of every prompt in git add -p? sometimes the chunks are so big and plenty that I have to spend time figuring out what's a part of the new chunk and what's old	15:15
	→ DaisyTheCow joined	15:16
	← CheckDavid left	15:16
	→ user258467 joined	15:16
	← Shapeshifter left	15:16
_ikke_	alexander__b: afaik, there is no way	15:16
alexander__b	_ikke_: seems like I need to consider writing a patch for git	15:17
	← skered- left	15:18
	← Chwing left	15:19
	← iamjarvo left	15:19
	← ThomasCle left	15:20
	← Norm_ left	15:20
	→ thiago joined	15:21
	← matanya left	15:21
	→ g0bl1n joined	15:24
	→ nettoweb joined	15:25
	← rchavik left	15:25
	← bwreilly left	15:25
	→ glosoli joined	15:25
	← glosoli left	15:25
	→ SocalNick joined	15:26
	→ glosoli joined	15:26
	→ germanoak joined	15:26
	← halu_ left	15:27
	→ paulweb515 joined	15:27
	→ thierryp joined	15:28
	← natechan left	15:28
	← brandonw left	15:29
	← Khisanth left	15:29
	→ snql joined	15:29
	← richgilbank left	15:29
	← jerius left	15:30
	→ halu joined	15:30
	← rikko left	15:30
	← kbart left	15:30
	→ rikko joined	15:30
	→ CheckDavid joined	15:31
	→ matanya joined	15:31
	← rikko left	15:31
	→ brandonw joined	15:32
	→ jerius joined	15:33
	→ marhaban joined	15:33
	→ phryk joined	15:34
	← brandonw left	15:34
	→ BoyanYordanov joined	15:34
	→ brandonw joined	15:34
	→ richgilbank joined	15:34
	← RogerWS left	15:34
	→ Guest63169 joined	15:36
	→ VictorCL joined	15:37
	→ Targen joined	15:37
	← Guest63169 left	15:37
	← marhaban left	15:37
	← Olipro left	15:37
	→ Cerise_ joined	15:38
	→ macabre joined	15:39
	← m0viefreak left	15:39
	← harobed_ left	15:41
	→ dreiss joined	15:41
	← CheckDavid left	15:41
	→ rabbite joined	15:42
	→ snag joined	15:42
	← FernandoBasso left	15:43
	→ Olipro joined	15:43
	→ Khisanth joined	15:43
	← joelmo_ left	15:43
	→ CheckDavid joined	15:46
	→ simesy joined	15:47
	← hs366 left	15:47
	← dyng left	15:47
	← mlechner left	15:47
	→ dyng joined	15:48
	← asQuirreL left	15:50
	→ rabbite1 joined	15:51
	→ m8 joined	15:51
	← avolz left	15:51
	M-ou-se_ → M-ou-se	15:51
	← simesy left	15:52
	← Raging_Hog left	15:52
	← ThomasLocke left	15:52
	← dyng left	15:52
	→ fridim_ joined	15:52
	← rabbite left	15:52
M-ou-se	Hey, Is there an easy way to clone/checkout a single file from a (remote) git repository (without cloning the entire tree or history)? i read about git archive, but that doesn't seem to work with github.	15:53
	→ Gamecubic joined	15:53
	→ iamjarvo joined	15:53
alindeman	M-ou-se: You can use raw.github.com, like https://raw.github.com/github/hub/master/README.md	15:54
	← Gavrisimo left	15:54
	← Stygia left	15:54
	← hyperair left	15:54
shruggar	note that raw.github is specifically a github option, not general git, but that sounds like what you need	15:54
alindeman	M-ou-se: In that URL, master is the branch name	15:54
	→ harobed_ joined	15:54
M-ou-se	it's a private repo, that https://-interface has no authentication, right?	15:54
	(and of course it would be better if there was a generic (not github-specific) way to do this.)	15:55
alindeman	M-ou-se: There definitely is not a generic git way	15:56
shruggar	not the one there. I looked into grabbing a single file from a private repo the other day, but eventually I cloned the whole thing (as I needed the whole thing later in the process)	15:56
	less efficient, but fit my needs well enough	15:56
M-ou-se	damnit. i'm helping people to move from svn, but they're using 'svn export' at some point to get a single file. seems like i can't migrate that properly	15:56
alindeman	M-ou-se: You can use the GitHub API authenticated. http://developer.github.com/v3/repos/contents/#get-contents	15:57
M-ou-se	if i'm going to do github-specific stuff, i'll use the github svn interface and svn export.	15:57
alindeman	M-ou-se: svn is also a decent option, yah	15:57
M-ou-se	i was hoping for a generic git way.	15:57
shruggar	M-ou-se, if a single file makes sense to operate on all by itself, maybe that single file ought to be in its own repository	15:57
alindeman	M-ou-se: Infrastructure wise, git as a decentralized vcs prevents that from working. You need some custom server component to pull out the relevant info. The GitHub API or the SVN bridge can do that, yah	15:58
M-ou-se	shruggar: yeah, i guess	15:58
	alindeman: makes sense	15:58
	← Squarism left	15:58
	← rabbite1 left	15:58
	→ rabbite joined	15:58
	→ danillonunes joined	15:59
shruggar	the most common problem I note when migrating repos from SVN to git is that things which were once considered to belong in the same repo, actually ought to be in separate repos (the other side of that is: sometimes it turns out that what were thought to be loosely-connected projects in a single repo, actually are the same project. It goes both ways during migrations)	15:59
	← tplaner left	16:00
	← calcifea left	16:00
	→ kermit joined	16:00
	→ MattMaker joined	16:00
	→ calcifea joined	16:00
	← richgilbank left	16:01
	← SocalNick left	16:01
shruggar	(though I have never seen that with a single file)	16:02
	→ BigBlueBacon joined	16:02
	← g0bl1n left	16:03
	→ kevwil joined	16:03
	← g0bl1n_ left	16:03
shruggar	...what is the file?	16:03
	→ aisbaa_ joined	16:03
	← jargon left	16:04
	← rob_w left	16:04
	→ richgilbank joined	16:04
	← threesome left	16:06
	→ pitzips joined	16:06
	← shinnya left	16:06
	← m0ltar left	16:06
	→ maestrojed joined	16:06
	→ Squarism2 joined	16:07
	→ dbs_bruv joined	16:07
	← DaisyTheCow left	16:07
	← thierryp left	16:08
	→ gasbakid__ joined	16:08
	← gasbakid_ left	16:08
	→ shoshin joined	16:08
	→ thierryp joined	16:08
dbs_bruv	hellllo. gentleman. i have two copies of the same remote repo. they have both diverged (don't ask). i want to merge the commits from repo A into repo B and employ some proper branching. can i use cherry pick or something? how do you generally approach this?	16:08
	← trusktr left	16:08
	→ Gardner joined	16:08
shruggar	how many people use each copy?	16:09
	("use" includes clone-from, fetch-from, etc)	16:09
dbs_bruv	it won't affect the users. at this stage it's all mine.	16:09
	basically, previous dev cloned a repo and created a bitbucket account for it. used it as a submodule and made commits to it but didn't track the master branch on github.	16:10
	so now i've pulled the up to date github version, am tracking the github version, but also have a remote on bitbucket to push changes to. but i want that guy's old commits!	16:10
	hope that makes it more clear and not less. :)	16:10
shruggar	why not just merge?	16:10
	← freeed left	16:11
dbs_bruv	merge repos?	16:11
	← quackgyver left	16:11
shruggar	merge one branch into another. like, a normal merge	16:11
	→ asQuirreL joined	16:11
	← cbreak-work left	16:12
dbs_bruv	because there's commits on master on repo A	16:12
	and repo B is the actual dev version of the framework i want to use with commits on master.	16:12
	→ konadr joined	16:13
shruggar	there's some key part of this I'm not understanding. What would a merge do that you don't want, or what do you want that a merge wouldn't do?	16:14
	→ herdingcat joined	16:14
	← cads left	16:15
	→ jumperswitch joined	16:15
	← sebhoss left	16:15
	← thiago left	16:15
	← rabbite left	16:16
	→ galaris joined	16:16
	→ MAAVF8S joined	16:17
	→ rikko joined	16:17
	← VictorCL left	16:17
	← Gardner left	16:18
	← dreiss left	16:18
	→ hashpuppy joined	16:18
	rm_work\|away → rm_work	16:18
	→ robbyoconnor joined	16:19
	→ SoftwareMechanic joined	16:20
	← dsdeiz left	16:20
	← dbs_bruv left	16:21
	← fridim_ left	16:21
	→ eaj joined	16:21
	← rath left	16:21
	← galaris left	16:22
	← CreativeEmbassy left	16:22
	← freimatz left	16:23
	← richgilbank left	16:23
	← neo1691 left	16:23
	→ jfinn joined	16:25
	→ boyan_yordanov joined	16:26
	← abrkn left	16:26
	← CaveJohnson left	16:26
	← chinychinchin left	16:27
	→ chinychinchin joined	16:27
	← ewnd9 left	16:28
thegorn_	anyone got any recommendations on a gui for git on linux?	16:28
	← ska-fan left	16:28
	→ d2dchat joined	16:29
bremner	I guess "none" isn't a helpful recommendation.	16:29
YoungFrog	I don't (I use git via command line a bit, and mostly via magit within emacs) but perhaps you should elaborate : what do you expect from a gui ?	16:29
shruggar	I haven't seen a git gui that I didn't hate	16:31
thegorn_	my situation is that I have used git for a long time, and i've got a repository using submodules, etc.., and i have another guy i'm working with that has never really used ANY source control at all	16:31
	there's actually some decent ones for windows i've seen that I can stand helping people with (they haven't renamed every git concept), but this pretty much needs to work on linux	16:31
	→ SocalNick joined	16:31
PerlJam	thegorn_: so ... teach him git CLI ?	16:31
	← kermit left	16:32
	→ joelmo joined	16:32
	→ dbuch joined	16:32
	→ CKyle joined	16:32
	← herdingcat left	16:33
thegorn_	PerlJam: i find git incredibly difficult to teach to people who give zero craps about source control	16:33
shruggar	what are your goals? If it just "He doesn't use anything, so get him to use git, because that's totes the best", or are there specific git features which you think he can benefit from the use of?	16:33
	→ richgilbank joined	16:33
	→ huli_ joined	16:33
	→ lavaman joined	16:33
	→ ska-fan joined	16:34
thegladiator_	git is more or less unixish , means cli ...	16:34
thegorn_	shruggar: no, i have a top-level project that uses submodules to pull in a specific version of linux kernel, u-boot, etc..	16:34
	one of the submodules is some userland code that he for the most part modifies, and for the last many years it has been under no source control	16:34
	→ BackEndCoder joined	16:34
shruggar	set up a literal git parable [ http://tom.preston-werner.com/2009/05/19/the-git-parable.html ], then eventually expose him to git as a handy tool to do all the things that he's already doing ;)	16:34
	→ natechan joined	16:34
	← kerrick left	16:35
	← noname001 left	16:35
thegladiator_	yes the parable , but ofcourse u need an inclination to read it	16:35
	→ fobius_ joined	16:35
	← Burer left	16:35
	→ mmlac-bv joined	16:35
	← gua_ould left	16:36
shruggar	I'm not saying "read the thing", I'm saying "keep dated zip-files in directories"	16:36
thegladiator_	totoisegit aint good?	16:37
	← mutex_ left	16:37
	→ Robarelli joined	16:37
	← ciampix left	16:37
	← chinychinchin left	16:37
	→ ezio joined	16:37
	← ezio left	16:37
	→ ezio joined	16:37
	→ zhost joined	16:38
	→ chinychinchin joined	16:38
	← dbuch left	16:39
	→ alex-foo joined	16:39
	→ johto joined	16:39
	→ mutex joined	16:39
alex-foo	is there a reason why refs/heads is so named instead of refs/branches ?	16:39
johto	hi, I would like to get a list of all commits where the diff includes a certain pattern. is that possible?	16:40
thegorn_	johto: git log -S<word>	16:40
	← codemagician left	16:41
thegorn_	git log -G<regex> too	16:41
	→ hyperair joined	16:41
	← JeremyWei left	16:42
	← psoo left	16:42
shruggar	alex-foo: because branch is a concept, and "head of branch" is a concept within that	16:42
jast	branches are implemented as a pointer to the head/tip of the branch	16:42
	which is stored in refs/heads/ :)	16:42
	→ shuaib joined	16:43
alex-foo	sure, it just seems to confuse everyone ever.	16:43
jast	that said, the name could just as well have been refs/branches/	16:43
thegladiator_	yes its a one to one relation	16:43
jast	but it simply didn't develop that way	16:43
thegladiator_	so interchangable	16:43
alex-foo	i like that the index is now being systematically renamed the 'stage' by most people	16:43
jast	and it's a bit late to change it	16:43
	← Snibble left	16:43
thegladiator_	it is staged now a days indexing doesnt make any sense	16:43
	staging makes more sense	16:44
jast	calling it 'index' still makes sense from a technical POV	16:44
alex-foo	as an aside, from where did the 'index' name come?	16:44
jast	it's an index of objects	16:44
	← shruggar left	16:44
alex-foo	jast: isn't it just a tree?	16:44
	← jerius left	16:44
jast	much like the index section of a book: names that are associated with objects	16:44
	nope. look at .git/index in a hex editor...	16:45
	it stores some additional information compared to tree objects	16:45
	→ neo1691 joined	16:45
alex-foo	for what purpose? optimization?	16:45
jast	that's one aspect of it	16:46
	← ezio left	16:46
alex-foo	i thought i understood this - i thought a git add was just adding a blob and putting it in a temporary staging tree	16:46
jast	but there are some flags that can be stored in the index, too	16:46
	and also stages (the different versions of a file in a merge conflict)	16:46
	← Octalot left	16:46
	→ ezio joined	16:46
jast	(examples of such flags: skip-worktree, assume-unchanged, intent to add)	16:46
thegladiator_	yes it puts in a temporary tree , so commit doesnt spent time computing things perhaps!	16:47
jast	no, it doesn't	16:47
	→ simesy joined	16:47
jast	the tree is created as part of 'git commit'	16:47
	→ Matrixiumn joined	16:47
jast	tree object, I should say	16:47
	after all the index describes a tree of sorts, too, just in a different way	16:48
thegladiator_	tree is static in way , no time stamps involved right ?	16:48
	→ sivano joined	16:48
jast	correct	16:48
	← worblehat left	16:48
alex-foo	what are those flags' purposes? i've never heard of them before	16:49
	→ diegoviola joined	16:49
jast	they're documented in man git-update-index afaik	16:49
gitinfo	the git-update-index manpage is available at http://jk.gs/git-update-index.html	16:49
	→ aspiers joined	16:49
jast	they're not exactly vital features for most use cases :)	16:49
	← matanya left	16:49
jast	stages, OTOH, are	16:49
alex-foo	i see	16:49
	→ kermit joined	16:50
thegladiator_	git staging is a convenient way of doing things imo , not required but having helps you work more naturally	16:50
jast	plus you wouldn't want to write a new bunch of tree objects every single time someone runs 'git add'	16:50
	← robbyoconnor left	16:50
jast	IMO that's enough of a rationale for the index	16:50
thegladiator_	yes	16:50
	← marthinal left	16:50
alex-foo	jast: so, an optimization then :)	16:50
jast	well, it also stores information that couldn't be stored anywhere else	16:50
	and while we're at it there are some more optimizations we do with it, too	16:51
	such as caching inode numbers and such, so we can do quick checks which files have been modified	16:51
thegladiator_	gits are used by humans , who have slow IO , so staging is a type of amortized time	16:51
alex-foo	but conceptually it's OK to think of the stage as another tree, if not by that exact name - right?	16:51
	→ DaisyTheCow joined	16:51
	← simesy left	16:51
alex-foo	i mean, this is how i teach others. whoops.	16:51
jast	sure, just stored completely differently	16:52
alex-foo	right, that'll do for me!	16:52
jast	implementation detail if you like	16:52
alex-foo	thanks	16:52
	→ m0ltar joined	16:52
jast	though if people ask what all this :2:foo business is about, you'll get a little problem with that explanation ;)	16:52
	or how git checkout --ours/--theirs work	16:52
	← jaimef left	16:53
alex-foo	i just assume some magic metadata somewhere is pointing to the right objects... but ok i see	16:53
jast	sure, that describes pretty much all parts of git :}	16:53
	← mizu_no_oto left	16:53
	← bitkiller left	16:54
thegladiator_	i shared the parable link within our company i found that very nice approach to teach git	16:54
	← konadr left	16:54
thegladiator_	thats how it should be taught and not via commands , its a education flaw if u teach commands	16:54
alex-foo	next question - when i push a branch to a remote server and then rebase, i'd like it if there was some warning that tells me i have 'published' the commits already and that it is unwise to rebase them. seems this should be possible by storing some metadata similar to refs/notes, no?	16:54
	→ jerius joined	16:54
	→ whunt joined	16:55
	← Streward left	16:55
thegladiator_	alex-foo, how can u say if its published definitively ? published is a tricky word	16:55
alex-foo	thegladiator_: sure, but in many common situations it's quite simply defined	16:55
	← ehmatthes left	16:55
	← cebor left	16:56
thegladiator_	suppose you are sharing work with a colleague and he used your original commits and then he went his way	16:56
alex-foo	thegladiator_: i guess i am talking about public and private branches - in practice this is generally a remote and a local repo	16:56
	→ marthinal joined	16:56
thegladiator_	git sees everything as distinct imo	16:56
	→ ianliu joined	16:57
	← sgambino left	16:57
alex-foo	example, i could tack on a new remote.$name.published=true git config option - and then when rebase attempts to rebase a tracking branch which would cause it to lose the commits it has in common with its remote branch, it would warn you	16:58
	or something	16:58
	← SergeyPenkin left	16:58
	→ cotton joined	16:58
	← asakura left	16:58
	→ cebor joined	16:58
jast	that doesn't sound all that useful in practice... after all, you'll often start developing new things on top of the published things	16:58
thegladiator_	i think it would be incredible complex	16:58
jast	and then when you rebase those, that is perfectly okay	16:58
	yet published is still set to true	16:59
	← guampa left	16:59
	→ jaimef joined	16:59
jast	to make this really good, it'd have to check which commits are on the remote and which aren't	16:59
	← Misan left	16:59
jast	as it is, right now 'git push' will complain at you when you try to push your altered history	16:59
alex-foo	jast: that would be done by looking at the remotes/$name/$branch ref no?	16:59
	→ CreativeEmbassy joined	16:59
jast	that's not sufficient, really... the remote could have changed in the meantime	16:59
thegladiator_	git is distributed entirely , it supports you doing your work and no meta datas there	16:59
	→ rlubke joined	17:00
	← user258467 left	17:00
ianliu	I did a bad rebase -i where I ended up loosing some commits. Is it possible to recover the lost commits? I did nothing after the bad rebase, so I'm hoping git keeps a backup for recovery?	17:00
	← shoshin left	17:00
	→ konadr joined	17:00
alex-foo	ianliu: look at git reflog $branchname	17:00
	← jerius left	17:00
jast	ianliu: sure does :) git log -g <your branch> shows you previous states your branch had	17:00
	← konadr left	17:00
	→ shoshin joined	17:00
jast	you can simply reset --hard to the previous one (discarding all uncommitted changes)	17:00
thegladiator_	metadatas are not the most intuitive thing to do unless its just commentish :)	17:00
	→ ewnd9 joined	17:00
	→ TomyLobo joined	17:01
jast	(-g shows the reflog, btw, so the two are mostly equivalent, except 'git reflog' shows them in reverse order, i.e. newest at the bottom. I don't find that very comfortable.)	17:01
	... and work day endeth. on my way home. bye! :)	17:02
	→ temptemp joined	17:02
thegladiator_	cya	17:02
	← mikecmpbll left	17:02
alex-foo	hm, my git reflog shows newest at top...	17:03
	← axl_ left	17:03
	→ Syrit joined	17:03
ianliu	jast: thanks!	17:03
	alex-foo: thanks!	17:04
	→ LBV_User joined	17:04
	← thierryp left	17:04
	→ mikecmpbll joined	17:04
thegladiator_	dont know however about rebasing being published I will think about that!	17:04
	→ sgambino joined	17:04
	→ guampa joined	17:04
	← shoshin left	17:04
	→ threesome joined	17:04
thegladiator_	its a good question	17:05
	→ mmcdaris joined	17:05
Syrit	guys, i need some advice please, in my exiting app i created a new gem file, now there is a repo created automatically inside this newly created gem folder, and when i push to github, it's not accessible, i think it's been pushed as symlink, what can i do about this ?	17:05
	← lmat left	17:05
	→ shoshin joined	17:06
	← shoshin left	17:06
	→ thiago joined	17:08
	→ axl_ joined	17:08
	→ ehmatthes joined	17:09
	← hoschi left	17:09
Syrit	in other words, how can i convert a git repo into a regular one ?	17:10
	← nnyk_ left	17:10
	← stormwild left	17:10
alex-foo	a regular what?	17:11
	→ yhager joined	17:11
alex-foo	also what do you mean by 'not accessible' - some github problem?	17:11
	→ devbug joined	17:11
YoungFrog	I have no idea what a gem file or a gem folder is. I don't have an idea either how a repo can be automatically created.	17:11
EugeneKay	Are you talking about submodules?	17:12
	← rurufufuss left	17:12
	← fobius_ left	17:12
Syrit	regular folder alex-foo	17:12
	alex-foo, it's visible as only a grey folder, can't open it in github ..	17:12
	→ Snibble joined	17:13
Syrit	EugeneKay, i don't know what my problem is called, have never faced this before	17:13
EugeneKay	So you have a symlink in your repo and you want it to be something else?	17:13
	→ notnot joined	17:13
	→ Skrypter joined	17:13
	← Droolio left	17:13
Syrit	all i want is, when i push, that the actually content and the complete folder contents are pushed as well EugeneKay	17:13
	← diegoviola left	17:14
EugeneKay	So you need to delete the symlink and then copy over the folder into your repo	17:14
	→ asakura joined	17:15
	← neo1691 left	17:15
Syrit	EugeneKay, am really sorry but i don't get it .. :(	17:15
	← yhager left	17:15
	→ arietis joined	17:16
	→ bwreilly joined	17:16
	← swair left	17:17
	→ yhager joined	17:17
Syrit	how can i delete the symlink ? and what is it in the first place, is it the .git file ? EugeneKay?	17:17
EugeneKay	It's the folder in your work-tree	17:17
	← johto left	17:18
	→ jerius joined	17:18
	→ cesarkawakami joined	17:18
Syrit	EugeneKay, i checkout a new branch, then copied the entier folder to a new folder called gems, then pushed, but that did not work	17:19
EugeneKay	You need to `git add` the folder, then `git commit` to reflect that change	17:19
Syrit	yes sure, i did `git add . `	17:20
	← edwardly left	17:20
	← Snibble left	17:20
Syrit	and git commit, then pushed, but it was again as a greyd folder in github	17:20
	→ Snibble joined	17:20
YoungFrog	are you s ure "greyd folder" means broken symlink ?	17:20
	→ nicedice joined	17:20
grawity	I think it can also mean a submodule that's not in .gitmodules	17:20
	← arand left	17:21
Syrit	how can i make sure if it's a submodule or symlink ?	17:21
	← whaley left	17:22
	→ rabbite joined	17:22
	→ DrShoggoth joined	17:22
grawity	git ls-tree HEAD	17:22
	← ianliu left	17:22
grawity	regular files have '100644 blob' as type; symlinks have '120000 blob'; directories have '040000 tree'; submodules have '160000 commit'.	17:22
	← howlymowly left	17:23
Syrit	oh i will try that grawity	17:23
	→ tang^ joined	17:24
	← aspiers left	17:24
Syrit	grawity, it's a submodule 160000 commit !	17:25
	← Gonzo89 left	17:26
	→ groglogic joined	17:26
	← oso96_2000 left	17:26
grawity	so it probably shows up as a grey folder on Github because Github doesn't know where the submodule's contents are	17:26
	← rabbite left	17:26
	← bandroidx left	17:27
	← srji left	17:27
	← fRAiLtY- left	17:27
	→ rabbite joined	17:27
	→ srji joined	17:27
Syrit	grawity, and, what can i do to include it and push it to github ?	17:28
	→ acharlieh joined	17:28
grawity	first you need to push the submodule as a separate repository to Github	17:28
	then add its URL to the parent repository using `git submodule add ...`	17:29
	(it will be added to .gitmodules – that's how Github makes submodule links clickable)	17:29
	→ delasteve joined	17:29
	← mikecmpbll left	17:30
	← donmichelangelo left	17:30
	→ donmichelangelo joined	17:30
Syrit	Thank you grawity, and is it possible to simply merge that submodule into the parent branch ?	17:30
	→ neo1691 joined	17:31
	← iamtakin1iteasy left	17:31
grawity	it's possible, yes	17:31
	although it takes several commands (see "subtree merge" https://help.github.com/articles/working-with-subtree-merge)	17:31
Syrit	git submodule deinit ?	17:31
	Thank you so much grawity	17:31
	← Sonderblade left	17:32
grawity	(it can be done in a simpler way than the article says, though)	17:32
	← snag left	17:32
	← freestyl3r left	17:32
	→ King_Hual joined	17:32
	← nettoweb left	17:33
	→ freestyl3r joined	17:33
	← kewah left	17:33
Syrit	how? grawity?	17:33
	→ jasonp joined	17:33
grawity	on the second thought, nevermind me	17:33
	← Dreamer3 left	17:33
Syrit	:D okay	17:33
	→ FrozenZia joined	17:34
	← abelsiqueira left	17:34
	← FrozenZia left	17:35
	→ nettoweb joined	17:35
	→ hs366 joined	17:36
	→ iamtakingiteasy joined	17:37
	← juril left	17:37
	→ daito joined	17:38
	→ cenuij_ joined	17:39
	→ Goopyo joined	17:39
Goopyo	Thoughts? http://www.pnegahdar.com/git-push-to-multiple-remotes-asynchronouslysimultaneously/	17:39
	← rabbite left	17:40
	→ fobius_ joined	17:40
EugeneKay	Pointless	17:40
	← fobius_ left	17:40
Goopyo	Is there another way?	17:40
EugeneKay	man git-config; ctrl-f pushurl	17:41
gitinfo	the git-config manpage is available at http://jk.gs/git-config.html	17:41
EugeneKay	Add multiple entries; `git push` will do them in sequence. Works fine.	17:41
	No extra scripts needed	17:41
	← Snibble left	17:42
Goopyo	I specifically mentioned that...	17:42
	← cenuij left	17:42
Goopyo	that no scripts are needed for pushing in sequence	17:42
	→ duke_ joined	17:42
	→ abrkn joined	17:42
	← daito left	17:42
	→ jhulten joined	17:42
	→ m0viefreak joined	17:42
	← cenuij_ left	17:43
EugeneKay	You're doing it with url, not pushurl	17:43
	← rafeca left	17:43
Goopyo	works with url too for me	17:43
Syrit	i am getting "You need to run this command from the toplevel of the working tree." when i run "git submodule deinit" ...	17:43
EugeneKay	`git fetch` won't ;-)	17:43
	← harobed_ left	17:43
EugeneKay	There's a reason there are separate variables	17:43
Goopyo	ah	17:44
duke_	hi, i'm having trouble getting rid of unstaged changes. even after git reset --hard the file still shows up as "modified"	17:44
EugeneKay	And that's why !blog posts suck	17:44
gitinfo	Blog posts, while helpful and informative, are quite often outdated, give bad advice, or are just plain wrong. Please don't rely solely upon them, or treat them as authoritative.	17:44
_ikke_	duke_: !rlf	17:44
gitinfo	duke_: [!crlf] to fix problems with line endings on different platforms, check out http://line-endings.gitrecipes.de/	17:44
	← ak5 left	17:44
_ikke_	duke_: 9 out of 10 times, that's the problem	17:44
duke_	_ikke_: ok, thanks	17:45
Goopyo	EugeneKay: http://www.pnegahdar.com/git-push-to-multiple-remotes-asynchronously/	17:45
	updated	17:45
	→ RogerWS_ joined	17:45
EugeneKay	That's better	17:45
Goopyo	thanks	17:45
	← delasteve left	17:46
	← tang^ left	17:46
	→ howlymowly joined	17:46
	→ tang^ joined	17:46
	← Vampire0 left	17:47
	→ abelsiqueira joined	17:47
	→ rabbite joined	17:47
	→ delasteve joined	17:47
	→ simesy joined	17:48
	→ Vampire0 joined	17:48
	← thomas_b left	17:49
	← sgambino left	17:49
	→ netoholic joined	17:50
	→ mribeirodantas joined	17:50
	→ sgambino joined	17:51
	← dfanjul left	17:51
	→ foucist joined	17:52
	← simesy left	17:52
	→ jnavila joined	17:52
	→ jfoy joined	17:52
	→ arand joined	17:53
	→ dbuch joined	17:53
foucist	sometimes i have the stituation where i make a commit, do a git pull upstream master, and then i want to amend the commit that i just made	17:53
	→ ezrafree joined	17:53
foucist	since it won't really affect the git history etc (since it's just part of a future pull request)	17:53
	how do you handle that?	17:53
	← boyan_yordanov left	17:53
	→ edwardly joined	17:53
_ikke_	foucist: The merge makes it tricky	17:53
foucist	or i can make another commit, and then squash the two? but there's a pile of commits in between because of the git pull/merge	17:53
	← rlubke left	17:54
foucist	i can reverse the merge too	17:54
	but it semes like this should be simpler	17:54
	seems like it'd be a common issue :P	17:54
	← BoyanYordanov left	17:54
foucist	i'd really like to be able to squash/amend commits out of order sometimes	17:54
_ikke_	get rebase	17:55
	git*	17:55
	← stepps left	17:55
_ikke_	git rebase -i to be exact	17:55
	← netoholic left	17:55
	Matrixiumn → CaveJohnson	17:57
	← bwreilly left	17:58
	→ galaris joined	17:59
	← YoungFrog left	17:59
	← jumperswitch left	17:59
	← delasteve left	18:00
de-Vri-es	hmm, why does git commit --fixup/--squash and rebase -i --autosquash use commit messages to idenfity commits, and not hashes?	18:00
	← curvedmark left	18:00
	→ babylon9 joined	18:00
de-Vri-es	doesn't really make sense... with the hash you can be sure it uniquely identifies a commit	18:00
	→ h0bbit_ joined	18:00
	→ dreiss joined	18:01
duke_	_ikke_: git rm --cached -r . did the trick	18:01
grawity	maybe because the message is easier to remember when doing `git commit -m 'fixup! foo'`	18:01
	← DaisyTheCow left	18:01
	← galaris left	18:01
	← rabbite left	18:02
	→ galaris joined	18:02
de-Vri-es	You still have to remember the message exactly then (or atleast the start)	18:02
	← thiago left	18:02
	→ joelm joined	18:02
	← galaris left	18:02
	← jfoy left	18:03
	→ Stygia joined	18:03
de-Vri-es	and you might unknowingly refer to the wrong commit because some other commit had a similar start	18:03
	→ galaris joined	18:03
bremner	it gives you the hash as well?	18:03
	→ alex69 joined	18:03
de-Vri-es	running git commit --fixup doesn;t add a hash :/	18:04
	→ delasteve joined	18:04
de-Vri-es	just the commit message of the referenced commit	18:04
	← delasteve left	18:04
	← alex69 left	18:04
bremner	ah, I see. I never use that.	18:04
	→ thiago joined	18:04
	← eaj left	18:04
	→ delasteve joined	18:04
	→ decimad joined	18:05
	← hellopat left	18:05
M-ou-se	fixup!<hash> does work for --autosquash	18:05
de-Vri-es	espeically since rebase -i --autosqiash does seem to accept hashes..	18:05
	→ eaj joined	18:05
	← srji left	18:05
	→ hellopat joined	18:05
M-ou-se	it's surprising that commit --fixup doesn't use a hash. i just made 10 commits with the same message, and it indeed picks the wrong one after git commit --fixup and git rebase -i --autosquash :(	18:05
	← MattMaker left	18:06
M-ou-se	(though, everybody who makes 10 commits with the same message should be shot)	18:06
	(unless it's to test something)	18:06
de-Vri-es	(like this)	18:06
	→ jfoy joined	18:06
M-ou-se	(don't shoot me)	18:06
	← jfoy left	18:06
	→ rnsanchez joined	18:06
	→ MattMaker joined	18:06
	→ infynyxx joined	18:06
	← mastro left	18:07
	→ rafaqueque joined	18:07
	→ skered- joined	18:07
	← skered- left	18:07
	→ mdiers joined	18:07
	← mmlac-bv left	18:08
	→ skered- joined	18:08
	← alorence left	18:08
	→ jfoy joined	18:08
	← eaj left	18:08
	← hellopat left	18:10
	→ netoholic joined	18:10
	→ cenuij joined	18:10
	→ chineduu joined	18:10
	→ Snibble joined	18:10
	← Intensity left	18:12
	→ darkangel joined	18:12
	← delasteve left	18:12
	← jfoy left	18:12
	← dbuch left	18:14
	← neo1691 left	18:14
	← chinychinchin left	18:14
	→ kcj joined	18:14
	→ bwreilly joined	18:14
	← Guest21101 left	18:15
	← kirin` left	18:15
	→ kirin` joined	18:16
	← ezio left	18:16
	→ ezio joined	18:16
	← ezio left	18:16
	→ ezio joined	18:16
	→ delasteve joined	18:17
	← Devastator_ left	18:18
	→ Devastator_ joined	18:18
	→ mfulz joined	18:18
	Devastator_ → Devastator	18:18
	← banisterfiend left	18:18
	← mfulz left	18:19
	→ banisterfiend joined	18:20
	← jaimef left	18:20
	→ shoshin joined	18:21
	← chineduu left	18:21
	→ lun__ joined	18:21
	→ chineduu joined	18:21
	← asQuirreL left	18:21
	← xerxas left	18:22
	← akitada left	18:22
	← heidar left	18:22
	← zero7 left	18:22
	← jab416171 left	18:22
	→ joelroa joined	18:22
	← jmcantrell left	18:22
	→ oojacoboo joined	18:22
	← ELLIOTTCABLE left	18:22
	← caseydriscoll left	18:22
	→ mikef joined	18:22
	→ petey joined	18:23
darkangel	Can someone explain in simple terms what difficulties a dev would experience if I push an amended commit after they pulled?	18:24
	← ThomasCompix left	18:25
	← bwreilly left	18:25
	← mehdi left	18:25
	← colstrom left	18:25
	← ChrisAnn left	18:25
	← HeN left	18:25
	← raghunayyar left	18:25
	← thunderbolt left	18:25
	← skelterjohn left	18:25
	← beawesomeinstead left	18:25
	← twisted` left	18:25
	→ mmlac-bv joined	18:25
	← chineduu left	18:26
	← dytrivedi left	18:26
	← tfnico left	18:26
canton7	darkangel, at some point they'd try to push, and that would fail as it wouldn't be a fast-forward push. so they'd pull, and that operation would merge together the version of the commit on his computer (the old one) and the new version from the remote. he probably wouldn't notice, would push, and then you've got history containing the two versions	18:26
	→ Misan joined	18:27
darkangel	canton7: I just want to change the Author field	18:27
canton7	doesn't matter	18:28
darkangel	Does the same thing apply?	18:28
	ok	18:28
canton7	it still changes the commit hash	18:28
	← scalability-junk left	18:28
	← jds left	18:28
	← chriswk left	18:28
	← titusjose left	18:28
	← steme_jomps_ left	18:28
	← pikpik left	18:28
	← scottrowe_ left	18:28
	← bluesm left	18:28
	← _rgn left	18:28
	← Roch_ left	18:28
	← shennyg left	18:28
	← GameGamer43 left	18:28
	← martisj left	18:28
	← xpirator left	18:28
	← ggherdov left	18:28
	← johnlcox left	18:28
darkangel	canton7: What can he do to fix this?	18:28
canton7	darkangel, see "recovering from upstream rebase" in man git-rebase	18:28
gitinfo	darkangel: the git-rebase manpage is available at http://jk.gs/git-rebase.html	18:28
	→ bwreilly joined	18:28
darkangel	canton7: Okay, thanks.	18:29
canton7	yours is probably the "easy case"	18:29
	← hashpuppy left	18:29
	→ Artpicre joined	18:30
	→ hashpuppy joined	18:30
	→ goshawk joined	18:30
	→ sfz joined	18:30
	→ erichynds joined	18:31
	→ neo1691 joined	18:31
	→ _rgn joined	18:31
	← banisterfiend left	18:31
darkangel	so confusing :(	18:31
	← khushildep left	18:32
canton7	try it with a couple of test repos	18:32
	← codezomb left	18:32
canton7	it all makes sense really :)	18:32
	→ matanya joined	18:33
	→ banisterfiend joined	18:33
darkangel	Ya I must do some time.	18:33
	→ drizzd joined	18:33
	→ ecube joined	18:33
	cworth` → cworth	18:33
	← intellix left	18:35
	→ tfnico joined	18:35
	← infynyxx left	18:35
	← matanya left	18:36
	→ beawesomeinstead joined	18:36
	→ anderse joined	18:36
darkangel	canton7: I actually think he hasn't pulled it. His branch (origin/hisname) is one commit before origin/master, does that sound right? I'm wanting to amend a merge commit.	18:36
	→ hellopat joined	18:37
	→ mizu_no_oto joined	18:37
darkangel	Since it's early days, I guess it's worth the risk. :)	18:37
canton7	if his history doesn't contain that commit, you're fine	18:37
	pretty easy to check: 'git log <branch containing merge>'	18:37
	→ \|PiP\| joined	18:38
	← cenuij left	18:38
	→ matanya joined	18:38
	→ hahuang65 joined	18:38
	→ alvaro_o joined	18:39
	→ snag joined	18:39
	→ rabbite joined	18:39
darkangel	ok	18:39
	← angelsl left	18:39
	← pandeiro left	18:39
	→ Roch_ joined	18:40
	→ dytrivedi joined	18:40
	→ jmcantrell joined	18:40
	→ SHyx0rmZ joined	18:41
	→ mikef_ joined	18:42
	→ thunderbolt joined	18:42
	emmajane → [emmajane]	18:42
	→ cenuij joined	18:42
	← cenuij left	18:42
	→ cenuij joined	18:42
	→ raonyguimaraes joined	18:43
	← mikef_ left	18:44
	← mikef left	18:45
	→ heidar joined	18:45
	→ infynyxx joined	18:45
	→ ELLIOTTCABLE joined	18:46
	Samual_ → Samual	18:46
	→ sriracha joined	18:47
	← germanoak left	18:47
	→ HeN joined	18:47
	→ shruggar joined	18:47
foucist	M-ou-se: or it should just be automatically squashed :P	18:47
	← BackEndCoder left	18:48
	→ simesy joined	18:48
	→ jab416171 joined	18:48
	→ tbmiller joined	18:48
	← kas84 left	18:49
	← shuaib left	18:49
	→ swair joined	18:49
	→ dbuch joined	18:49
	← groglogic left	18:50
	→ kas84 joined	18:50
	→ brita_ joined	18:51
	← delasteve left	18:51
	→ shuaib joined	18:51
	→ warthog19 joined	18:52
	← simesy left	18:52
	→ jrnieder joined	18:53
	→ shennyg joined	18:53
	→ Pyrogerg joined	18:54
	→ lithiumn joined	18:54
	→ groglogic joined	18:55
	← galaris left	18:55
	→ pikpik joined	18:55
	→ cfoellmann joined	18:55
	→ xerxas joined	18:55
	→ delasteve joined	18:55
	← delasteve left	18:57
	← Syrit left	18:57
	→ GameGamer43 joined	18:57
	→ ChrisAnn joined	18:58
	← swair left	18:58
	← GameGamer43 left	18:58
	→ GameGamer43 joined	18:58
	→ samholmes joined	18:58
	→ twisted` joined	18:58
samholmes	How do I bring up my merge conflicts tool again?	18:58
	→ scalability-junk joined	18:58
	← cfoellmann left	18:59
cbreak	mergetool...	18:59
	← BigBlueBacon left	18:59
	→ scottrowe_ joined	18:59
	→ caseydriscoll joined	18:59
	→ thomas_b joined	19:00
	→ rdnsget joined	19:00
	← rdnsget left	19:00
	→ titusjose joined	19:01
foucist	i find it really irritating when doing "git checkout <SHA> <file>" to recover an older version of the file and having to "git reset HEAD <file>" every time	19:01
	it shouldn't assume i'm gonna commit with it right away :P	19:01
	→ johnlcox joined	19:02
	← arietis left	19:02
	→ zero7 joined	19:03
	→ gdoteof joined	19:03
	← kas84 left	19:03
canton7	foucist, git show commit:path/to/file ;)	19:03
	→ ThomasCompix joined	19:04
	→ mfulz joined	19:04
	→ raghunayyar joined	19:04
cbreak	foucist: git checkout goes from the history through the index.	19:04
gdoteof	so i have a file that has some dev specific information in it, call it server.js it basicaly (among other things) points to which server it shoudl be pointed at.	19:04
	we are constantly overwriting each others as we work on it and point at different servers	19:04
	→ chriswk joined	19:04
cbreak	gdoteof: !config	19:04
gitinfo	gdoteof: [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas	19:04
gdoteof	and manually keep it out of commits	19:04
	← mizu_no_oto left	19:05
cbreak	gdoteof: basically: remove that file from the repository	19:05
	gdoteof: there's zero point committing config files	19:05
darkangel	What message should you give to merge commits?	19:05
	← shruggar left	19:05
darkangel	Is there some kind of convention/	19:05
	Is there some kind of convention/?	19:05
canton7	darkangel, describe what feature you're merging in	19:05
cbreak	darkangel: try writing a different one for each. Describing what you merged	19:05
	← kriks left	19:05
darkangel	Hmm, okay thanks.	19:05
gdoteof	cbreak: i tried that and absically agree. i have added it to my .gitignore and it still shows 'modified' when i do git status	19:06
	← mfulz left	19:06
	→ kriks joined	19:06
	← neo1691 left	19:06
canton7	you can't ignore tracked files	19:06
	→ mfulz joined	19:06
cbreak	gdoteof: you have to do what I told you: remove it from the repository	19:06
	git rm --cached -f file	19:06
gdoteof	before, i removed it from the repo and it deleted it from other peoples repos when they pulled	19:06
cbreak	yes	19:06
	that's normal	19:06
gdoteof	so they just have to recreate it once	19:06
	and its fine forever	19:06
cbreak	correct.	19:07
gdoteof	ok	19:07
cbreak	unless they force add it	19:07
	← oojacoboo left	19:07
cbreak	you can commit a template if you want	19:07
	← banisterfiend left	19:07
cbreak	so they just have to copy that	19:07
	← calcifea left	19:07
cbreak	(and change it, to fit their needs)	19:07
darkangel	Would it be like: Merge "commit message of commit" ... and what if there are multiple commits? ... Like "Merge "did this" and "did that" ... fk idk :P	19:07
	→ geekbri joined	19:07
	→ skelterjohn joined	19:07
cbreak	of course, if your program would create its own config file if it is missing, that'd be even better	19:07
	→ calcifea joined	19:07
	→ Narven joined	19:07
	→ quackgyver_ joined	19:08
cbreak	darkangel: "Merging the Pizza Branch" and after an empty line "Pizzas are the best food ever, how were we able to live without it?!"	19:08
gdoteof	cbreak: alright, thanks	19:08
	→ banisterfiend joined	19:08
darkangel	cbreak: "Merge branch/name" ... and then list the commits after an empty line?	19:09
	← ewnd9 left	19:09
	→ bluesm joined	19:09
	→ akitada joined	19:09
darkangel	Let me give the exact data ...	19:09
	→ ggherdov joined	19:09
darkangel	I'm merging from origin/david (for example)	19:10
	Two commits ...	19:10
	← ktosiek left	19:10
	← warthog19 left	19:10
darkangel	"Replaced welcome page with splash page" and "Splash page button"	19:10
cbreak	darkangel: listing commits is worthless	19:10
	darkangel: give an overview of the changes that you merge. That's useful.	19:10
	← alan5 left	19:10
cbreak	if someone wants the commits or the detail logs, they can use git log	19:11
	→ ktosiek joined	19:11
	→ \|Freeman\| joined	19:11
	→ jds joined	19:11
	→ germanoak joined	19:11
	← dbuch left	19:12
	→ colstrom joined	19:12
darkangel	cbreak: Like "Merge origin/david: Splash page"	19:12
	← abelsiqueira left	19:12
	→ martisj joined	19:13
	→ mehdi joined	19:13
	→ crazydiamond joined	19:13
	→ ShooterMG joined	19:13
	→ trungqtr_ joined	19:13
	→ galaris joined	19:13
	→ jfoy joined	19:14
	→ oojacoboo joined	19:14
	← h0bbit_ left	19:14
	← thiago left	19:15
	→ steme_jomps_ joined	19:15
	→ xpirator joined	19:15
	→ jaimef joined	19:17
	← chuckharmston left	19:18
	→ chuckharmston joined	19:18
	→ apipkin joined	19:19
	→ hwrd\|work joined	19:19
	→ tplaner joined	19:20
	→ warthog9 joined	19:20
samholmes	okay, I finished with the merge conflicts. However, there is one file that I need to make changes to manually because code was moved over there and the changes in REMOTE had to be added to this file that only existed on LOCAL. Soooo. How do I make sure these changes also get added to the merge commit?	19:21
	← Snibble left	19:21
osse	samholmes: edit the file and git-add it before commiting	19:21
	← Narven left	19:22
	→ neo1691 joined	19:22
samholmes	osse: Right. I figured as much. I keep forgetting, do I just `git commit` to finish the merge, or is there something extra I have to do? (sorry, I'm always a noob when it comes to merges)	19:23
	← chuckharmston left	19:23
	→ ScottO_1 joined	19:23
osse	samholmes: git commit should seal the deal	19:23
samholmes	okay. Thanks	19:23
	← calcifea left	19:24
	← ScottO_ left	19:24
	→ calcifea joined	19:24
	← shuaib left	19:24
osse	Heehee, from man git-commit: "Use git commit to seal the deal."	19:25
gitinfo	the git-commit manpage is available at http://jk.gs/git-commit.html	19:25
	→ nnyk_ joined	19:25
osse	shit, I meant the git-merge manpage	19:25
	← kermit left	19:25
	→ pantsman joined	19:26
	← pantsman left	19:26
	→ pantsman joined	19:26
	← warthog9 left	19:26
Remram	ok this is the second time I stumble on nested conflict markers	19:27
	what is going on	19:27
	how should I read them	19:27
	← gasbakid__ left	19:27
	← jason237 left	19:28
	← jfoy left	19:28
	← jaimef left	19:29
	← germanoak left	19:29
	→ shruggar joined	19:29
	→ jaimef joined	19:29
	→ foxmk joined	19:29
	← nurey left	19:30
	← oojacoboo left	19:30
	→ germanoak joined	19:30
osse	Remram: the stuff between <<<< and ==== is the contents of the file in the current branch. The stuff between ==== and >>>> is the contents coming from the other branch	19:30
	→ gasbakid__ joined	19:31
osse	Remram: maybe git-mergetool can help	19:31
	← cenuij left	19:32
	→ nurey joined	19:32
	→ kermit joined	19:32
osse	Remram: http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts	19:32
	→ oojacoboo joined	19:33
	→ halu_ joined	19:33
	→ jfoy joined	19:33
	← oojacoboo left	19:33
	← foxmk left	19:34
	→ foxmk joined	19:35
	← tvw left	19:35
	→ lresende joined	19:35
	→ rpg joined	19:35
	← halu left	19:36
	→ oojacoboo joined	19:37
	→ alan5 joined	19:37
	← raonyguimaraes left	19:38
	→ gua_ould joined	19:39
	→ krixxkraxx joined	19:39
	→ Snibble joined	19:39
	← galaris left	19:40
	← lresende left	19:40
	→ robbyoconnor joined	19:40
	← achadwick left	19:41
	← apipkin left	19:41
	← Stygia left	19:41
	→ Mode-M joined	19:42
	→ h0bbit_ joined	19:43
	← lun__ left	19:43
	→ mizu_no_oto joined	19:43
	→ Ziantos joined	19:44
	→ lun__ joined	19:44
	← Snibble left	19:44
	→ swair joined	19:45
	← darkangel left	19:46
	→ r0bby_ joined	19:47
	← SHyx0rmZ left	19:48
DolphinDream	can you merge a branch onto another branch while you are in yet a different branch ?	19:49
	→ simesy joined	19:49
	← robbyoconnor left	19:49
	← breakingthings left	19:50
	→ SHyx0rmZ joined	19:50
bremner	not really	19:50
	← cesarkawakami left	19:50
bremner	it you 100% know it will be fast forward, you can.	19:50
osse	DolphinDream: no. I've heard some chatter about "in-memory merges", but maybe those voice were in my head	19:51
DolphinDream	:) osse u should get urself checked	19:51
	gitinfo set mode: +v	19:51
	← takamichi left	19:52
	→ Snibble joined	19:52
DolphinDream	kewl.. just curious.. many times i'm on a branch and i need to switch back to master to merge the branch i'm on and then go back tot he branch	19:52
osse	it would be useful in several scenarios: performing merges in a bare repo; trivial merges, such as merging foo with origin/foo for a lot of different values of foo, etc.	19:52
moritz	no, that's quite normal for programmers	19:52
DolphinDream	it would have saved me some keystrokes to be able to merge branch onto master while i'm on the branch ;) perhaps it's best not to have this "feature" anyway	19:53
	→ oso96_2000 joined	19:53
	→ elasticdog joined	19:53
	→ d2dchat_ joined	19:53
	← simesy left	19:53
	→ tonyj_ joined	19:53
	→ Bigcheese_ joined	19:53
	← groglogic left	19:54
	← tonyj left	19:54
	← d2dchat left	19:54
Remram	osse: I have nested markers	19:55
	→ kamal__ joined	19:55
Remram	in the "merged parents" part, I have markers for "temporary branch 1"	19:55
	← krixxkraxx left	19:55
	→ galaris joined	19:55
	→ init joined	19:55
	← axl_ left	19:56
Remram	<< HEAD \|\| merged common ancestors << Temporary merge branch 1 \|\| merged common ancestors == >> Temporary merge branch 2 == >> otherbranch	19:56
	→ mikaelj_ joined	19:56
	→ etcetera joined	19:57
	← etcetera left	19:57
	→ armenb_ joined	19:58
Remram	my guess is that there are multiple bases somehow	19:58
	→ etcetera joined	19:58
	→ JakePee_ joined	19:59
osse	oh, I haven't encountered those before. Are you merging more than two branches?	20:00
	← matteo left	20:00
Remram	no, just two	20:00
	→ itamz_ joined	20:00
Remram	but there are branches that have been merged separately into them	20:00
	→ apipkin joined	20:01
	→ Cromulent joined	20:01
	→ maloik_ joined	20:02
	← itamz left	20:03
	→ mk_io_ joined	20:03
	→ JerseyMilker joined	20:04
	itamz_ → itamz	20:04
	→ plasticb1y joined	20:04
	← rabbite left	20:05
	→ kennon_ joined	20:05
	→ BiggFREE joined	20:05
	→ jceb_ joined	20:05
	→ akurilin2 joined	20:06
akurilin2	Hey folks, quick sanity check. Do most people use git pull --rebase when pulling? Seems like that'd end up with the cleanest history, right?	20:07
	→ Bucciarati_ joined	20:07
	← notnot left	20:07
	← temptemp left	20:07
canton7	it's certainly not uncommen	20:08
	there's a couple of config options to make it the default iirg	20:08
	→ max_well1r joined	20:08
	→ dserodio_ joined	20:08
Remram	I don't use git-pull, ever	20:09
	→ eaj joined	20:09
Snibble	I agree w/canton7. I don't know the exact breakdown, but I'd call git pull —rebase "not uncommon". Different workflows (like maybe Remram's) handle the same idea differently, though.	20:09
	→ Norm_ joined	20:09
	← lun__ left	20:09
	← Bigcheese left	20:09
	← MrDHat left	20:09
	→ drf joined	20:09
drf	ng again in the new folder?	20:09
	ugh...	20:09
	→ MrDHat joined	20:09
	← kamal_ left	20:09
drf	I have moved all of the files on my server to a new folder. Now I can't do git pull anymore. I'm wondering what I need to do to re-initialize the repo so that I can pull from the remote	20:09
	→ bandroidx joined	20:09
	← mikaelj left	20:09
drf	Anyone in here?	20:09
	← drf left	20:09
	← armenb left	20:09
	← Nazca left	20:09
	← tjj left	20:09
	→ tjj joined	20:09
	← alindeman left	20:09
	→ Nazca joined	20:09
	← MrDHat left	20:09
	← Bucciarati left	20:09
	← maloik left	20:09
	→ JTAA7UJY joined	20:09
	← plasticboy left	20:09
	← dserodio left	20:09
	← cwillu_at_work left	20:09
	← tchan left	20:09
	← bandroidx left	20:09
	← Philonous left	20:09
	BiggFREE → 92AAASC1P	20:09
	→ dpwrussell joined	20:09
	← joel_falcou left	20:09
	→ tjj_ joined	20:09
	← tjj left	20:09
	← max_weller left	20:09
	→ alindeman joined	20:09
	← jfoy left	20:09
	→ FernandoBasso joined	20:09
	→ cwillu_at_work joined	20:09
	← Nazca left	20:09
	→ Nazca joined	20:09
	← alindeman left	20:09
	→ alindeman joined	20:09
	→ BoyanYordanov joined	20:09
osse	Remram: can you post a snippet showing the markers? You can also write a mail to the mailing list	20:09
	→ joel_falcou joined	20:10
Remram	I think I solved the conflict somehow but hmm I'm really not sure what happened	20:10
	→ aspiers joined	20:10
	← hashpuppy left	20:10
	→ krixxkraxx joined	20:10
	← BoyanYordanov left	20:11
	← hwrd\|work left	20:11
	← galaris left	20:12
	← droogans left	20:12
	→ droogans joined	20:12
	← apipkin left	20:13
	→ jfoy joined	20:13
	dserodio_ → dserodio	20:13
	← dserodio left	20:13
	→ dserodio joined	20:13
	← lavaman left	20:13
	← neo1691 left	20:14
	← gua_ould left	20:15
	← eaj left	20:15
	← marthinal left	20:16
	← JerseyMilker left	20:17
	← GT4066 left	20:17
	→ jas4711 joined	20:18
	← foxmk left	20:18
	← victorbjelkholm left	20:18
	← Ziantos left	20:18
	← jonatasnona left	20:19
	→ foxmk joined	20:19
	→ jonatasnona joined	20:20
	← kcj left	20:20
	← joki left	20:20
	← r0bby_ left	20:21
	← undecim left	20:21
	← foxmk left	20:22
	→ raonyguimaraes joined	20:22
	← brita_ left	20:23
	→ Chiftin joined	20:24
	→ groglogic joined	20:25
	→ joki joined	20:25
	→ wrouesnel1 joined	20:26
	→ rabbite joined	20:26
	→ jumperswitch joined	20:27
	← mribeirodantas left	20:27
	← rafaqueque left	20:27
	← Bosox20051 left	20:28
	→ axl_ joined	20:28
	← paulweb515 left	20:30
	→ neo1691 joined	20:31
	← joelroa left	20:31
	→ harobed joined	20:31
	← harobed left	20:31
	→ harobed joined	20:32
	← harobed left	20:32
	→ harobed joined	20:32
	→ jrobichaud joined	20:33
	← jrobichaud left	20:34
	← snql left	20:34
	← luxgeek left	20:35
	→ foxmk joined	20:35
	→ r0bby_ joined	20:36
	← foxmk left	20:36
	← Misan left	20:36
	→ Misan joined	20:36
	→ foxmk joined	20:36
	← Mode-M left	20:36
	← foxmk left	20:37
	← h0bbit_ left	20:37
	→ foxmk joined	20:37
	→ plato joined	20:37
	← tang^ left	20:38
	← zarubin left	20:38
	← foxmk left	20:38
plato	hi guys. up until yesterday my repo was on a personal EC2 instance. Yesterday I bought a private repo on github.com and used git push --mirror https://github.com/... to copy over the entire repo from EC2	20:38
	→ tang^ joined	20:38
	→ foxmk joined	20:38
plato	on my local machine, I have some unstaged changes, and it is still pointing at EC2	20:39
	→ joelrobichaud joined	20:39
plato	how do I change the target for 'git push' and 'git pull' to point to the new repo, and could that screw up my unstaged changes?	20:39
	→ lavaman joined	20:40
	→ chrisirc joined	20:40
_ikke_	plato: You use git remote set-url <remote> <url>	20:40
plato	cool, that will persist? i should only have to do it once?	20:40
_ikke_	And it does nothing with your unstaged changes	20:40
	plato: correct	20:40
	→ robbyoconnor joined	20:40
plato	what is <remote> in that command? master ?	20:41
_ikke_	most often origin	20:41
plato	rgr, how can I confirm that it is?	20:41
	← Jackneilll left	20:41
	← r0bby_ left	20:41
_ikke_	git remote show origin	20:41
	← rabbite left	20:41
chrisirc	Hello. git status --short shows the paths relative to the CWD, which is what I want. git status -z shows the paths from the repository root, not what I want (but is a safe encoding). The man page says, that -z defaults to --porcelain unless a different format is given,	20:41
	→ chuckharmston joined	20:42
plato	ok, thanks _ikke_	20:42
chrisirc	but, git status -z --short still does not behave like --short does.	20:42
	← axl_ left	20:42
chrisirc	Is this a bug?	20:42
	← krixxkraxx left	20:42
chrisirc	Any way to get what I want?	20:42
	→ galaris joined	20:42
	← abrkn left	20:42
_ikke_	try git status -z .	20:43
	← Snibble left	20:43
chrisirc	_ikke_, still prints paths from root	20:43
	Although at least it restricts the listing to paths below CWD.	20:44
	Is there a way to get the path to CWD, from the working dir root?	20:45
	→ lavaman1 joined	20:45
	← lavaman left	20:45
chrisirc	So that I could strip it away myself safely.	20:45
	← ezio left	20:47
chrisirc	ah, git rev-parse --show-prefix	20:47
	→ rabbite joined	20:47
	← jerius left	20:47
	→ zarubin joined	20:48
	lavaman1 → lavaman	20:48
chrisirc	(Sigh, consistency is really not a strenth of git. There's no -z flag for git rev-parse, for example.)	20:48
	→ krimreaper joined	20:49
	→ ulkesh_work joined	20:49
	→ jerius joined	20:50
	ulkesh_work → ulkesh	20:50
krimreaper	is there a way to download a git repo that is being served via https ??? git clone says the repository is not found, but the .git dir and all it's files are definetely there	20:50
ToxicFrog	Are you sure you gave git clone the right URL?	20:51
	Can you view it in a browser, i.e. is the server actually serving it?	20:51
	→ lcoddocl joined	20:51
	← harobed left	20:51
	← nwertman left	20:51
chrisirc	krimreaper, serving over a standard http(s) server needs an index to be built (forgot which git command).	20:52
	← spudz left	20:52
chrisirc	git update-server-info I guess	20:52
	→ el3ctron_ joined	20:52
	← asakura left	20:52
chrisirc	yep	20:52
	→ tdm00 joined	20:52
	→ spudz joined	20:52
	→ calcifea_ joined	20:53
krimreaper	chrisirc, I don't have access to the server hosting the git repo to run that	20:53
	← calcifea left	20:54
	← alan5 left	20:54
	← Cromulent left	20:54
	← zarubin left	20:55
jrnieder	krimreaper: you can run it locally	20:55
	→ hwrd\|work joined	20:55
jrnieder	and then copy your files to the server with ftp or whatever as usual	20:55
	← galaris left	20:55
	→ krixxkraxx joined	20:56
	→ asakura joined	20:56
krimreaper	I don'y have the files, I am simply trying to download the files contained on the server in the ".git" dir which are being served via https	20:57
	→ alan5 joined	20:57
	← robbyoconnor left	20:57
chrisirc	krimreaper, well you could use wget -m -np to get the files, then clone from that locally.	20:58
	← SoftwareMechanic left	20:58
	← rabbite left	20:58
chrisirc	krimreaper, or you could ask the person who uploaded the files to fix them.	20:58
	→ SoftwareMechanic joined	20:59
chrisirc	(wget will download everything, unlike git which would use the (missing) index file to determine which files to retrieve.)	21:00
	← acharlieh left	21:00
krimreaper	would wget work without a directory listing ?	21:01
	← mmcdaris left	21:01
	→ Stygia joined	21:01
chrisirc	No, it needs apache or whatever style index.html files	21:01
	well, "foo/" contents listings.	21:01
	→ DaisyTheCow joined	21:01
	→ paulweb515 joined	21:02
	→ occup4nt joined	21:02
	← foxmk left	21:02
	→ delasteve joined	21:02
	→ str joined	21:02
krimreaper	hmmm thats not going to work	21:03
chrisirc	Or more to the point, it basically just needs any html file returned from the URL you provide,	21:03
	it will then just follow links in that file, as long as it's links to below that url.	21:03
	→ breakingthings joined	21:03
	← occupant left	21:04
	→ juanmabc joined	21:04
krimreaper	is there a script out there able to build a dir listing of all the files I need to download based on the files the git repo is expected to have ?	21:05
	→ hashpuppy joined	21:05
	← frgtn left	21:05
	← mfulz left	21:05
	→ mfulz joined	21:06
	→ thiago joined	21:06
	→ frgtn joined	21:06
	← tplaner left	21:06
	→ ezio joined	21:06
	← howlymowly left	21:06
juanmabc	you could git tar, and tar tvf	21:06
	← resmo left	21:07
chrisirc	Probably such a script is not possible in general. Also, it sounds like you're doing something illegal.	21:07
	← jonatasnona left	21:07
	← ulkesh left	21:07
	→ Snibble joined	21:07
	← LBV_User left	21:07
	→ _Harm_B_ joined	21:07
	→ jonatasnona joined	21:08
	→ apipkin joined	21:08
	→ Syrit joined	21:08
	← Robarelli left	21:08
	→ robbyoconnor joined	21:09
	→ Abbas- joined	21:09
	← Abbas- left	21:09
	→ Abbas- joined	21:09
	→ VictorCL joined	21:09
	→ axl_ joined	21:09
EugeneKay	man git-clone	21:09
gitinfo	the git-clone manpage is available at http://jk.gs/git-clone.html	21:09
thegorn_	krimreaper: without git update-server-info and directory listings, you are just out of luck	21:09
	← erichynds left	21:10
EugeneKay	You could read .git/HEAD and then through .git/objects, but you'd need at least a minimal ls to find the packfiles listing	21:10
	My advice? Contact the server admin	21:10
	← frgtn left	21:10
	← Squarism2 left	21:10
	→ Simon-- joined	21:11
thegorn_	you could brute force every possible pack file name </sarcasm>	21:11
	← Pyrogerg left	21:11
	← jonatasnona left	21:12
	→ eaj joined	21:12
	← Syrit left	21:12
	→ r0bby_ joined	21:13
krimreaper	thegorn_, lol	21:13
Simon--	trying to find remotes that contain a commit, git branch -a --contains <commit> isn't listing anything, but "git log <commit>" shows we're aware of the commit from somewhere.. derp?	21:13
	→ rpg_ joined	21:13
	→ axl__ joined	21:14
	← robbyoconnor left	21:15
	← Xethron left	21:15
	← rpg left	21:15
	← axl_ left	21:16
	axl__ → axl_	21:16
	← kaictl left	21:16
	→ shuaib joined	21:16
	← shuaib left	21:16
	← nnyk_ left	21:17
	← grilix_ left	21:17
	← zapb_ left	21:17
	→ mmcdaris joined	21:17
	← banisterfiend left	21:18
	→ Philonous joined	21:18
	← babylon9 left	21:18
	← arand left	21:18
	← Philonous left	21:18
	← dhruvasagar left	21:18
	→ admin_ joined	21:18
	→ nnyk_ joined	21:19
	← juanmabc left	21:19
	← rpg_ left	21:19
	← eaj left	21:19
	→ warthog9 joined	21:19
	→ abelsiqueira joined	21:19
	← Dougie187 left	21:19
	→ simesy joined	21:19
	→ resmo joined	21:20
	← calcifea_ left	21:20
	→ nwertman joined	21:20
	← Jeroi left	21:21
	← eijk left	21:22
	→ galaris joined	21:22
	← lithiumn left	21:22
	← r0bby_ left	21:22
	← krixxkraxx left	21:23
	[emmajane] → emmajane	21:23
	→ iamjarvo_ joined	21:23
	← iamjarvo_ left	21:23
bamj0rb	Simon--: Why not from there. Or from a no longer existent remote?	21:24
akurilin2	Hey folks. Is there a good resource to find out more about healthy git practices? I've been using the tool for years and have most of the basics done, and could probably use tips to make the most of it.	21:24
	← simesy left	21:24
	← jceb_ left	21:24
SamB	what's a good name for a dummy file just to make a directory exist?	21:24
	→ ulkesh_work joined	21:25
bamj0rb	akurilin2: It's largely personal preference. I like this: http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html.	21:25
	← krimreaper left	21:25
bekks	SamB: "mkdir shinydirectoryname".	21:25
Hello71	.gitignore	21:25
bekks	SamB: You dont need a file in there for a directory to exist.	21:25
bamj0rb	SamB: __EMPTY__?	21:25
Hello71	README	21:25
bamj0rb	bekks: You do for Git to track the directory.	21:25
Hello71	"this directory is for ..."	21:25
bamj0rb	bekks: More precisely, Git doesn't track files or directories. It tracks trees and blobs. It cannot track a "directory" without something inside of it.	21:26
	← iamjarvo left	21:26
	← Abbas- left	21:27
	← salamanderrake left	21:27
	→ Abbas- joined	21:27
	← gasbakid__ left	21:27
bamj0rb	Of course, you could always generate the directory at build time instead.	21:27
	ulkesh_work → ulkesh	21:28
	← Stygia left	21:28
Simon--	bamj0rb: why not from there? not sure what you mean..	21:29
	→ nilg joined	21:29
Simon--	bamj0rb: just trying to find out which of all of my remote branches have a particular commit..	21:29
bamj0rb	Simon--: You seem to think the change must have come from a remote. Why can't it have originated in the current repo?	21:29
	Simon--: git log <commit> only tells you that the commit exists in your current repo. Not that it exists in any remote branches.	21:30
Simon--	only because I know the author pushed it to his tree ;)	21:30
	his public tree..	21:30
	← PeterBooker left	21:30
bamj0rb	I suppose you could loop over remote branches and see if the commit exists on them? I would expect your git branch command to work though. :-/	21:30
Simon--	yah, this is why I'm confused	21:30
bamj0rb	Perhaps you need to fetch?	21:31
	→ calcifea_ joined	21:31
Simon--	git fetch --all has no changes ... in theory, if git branch -a --contains <x> lists nothing, git gc should nuke it?	21:31
	← User458764 left	21:32
	→ f0ster joined	21:32
	← oojacoboo left	21:32
f0ster	i have an old version of a public repo i am trying to update, for some reason there are conflicts, and i really dont care about anything in my local repo, how can I just completely reset to what is on the master head ?	21:33
bamj0rb	Only if no refs reference it or its decendents at all. Also, by default it only prunes up to like 2 weeks back.	21:33
	You mean the remote master?	21:33
	← lavaman left	21:33
bamj0rb	f0ster: git checkout $branch && git reset --hard $remote/$branch # WARNING: --hard will happily throw away any and all changes in your working directory or index.	21:34
	→ salamanderrake joined	21:34
	← str left	21:34
esc	sorry, I only ever come here with weird error messages, but	21:34
	http://bp.zetatech.org/705f6e5	21:34
	→ tpollard joined	21:34
f0ster	bamj0rb: perfect doesn't matter what is my working directory/index	21:34
	← pfFredd left	21:35
f0ster	bamj0rb: it says i have file si need to merge first (because i already tried to pull from origin master), error: you need to resolve your current index first	21:35
	→ oojacoboo joined	21:35
	→ lavaman joined	21:35
bamj0rb	o_O With --hard? Perhaps you need to just reset --mixed first (the default for reset)?	21:35
	← danillonunes left	21:36
	← johnnyfuchs left	21:36
	→ pfFredd joined	21:36
	← neo1691 left	21:37
bamj0rb	f0ster: (Of course, if you really want to just throw everything away and get a pure clone of upstream you can always rm -fR $path && git clone $url $path # ;)	21:37
	→ victorbjelkholm joined	21:37
	→ neo1691 joined	21:37
f0ster	hmm okay	21:38
	→ cenuij joined	21:39
bamj0rb	Protip: Perhaps quote $path to be safe. ;)	21:39
	← cenuij left	21:39
	→ cenuij joined	21:39
f0ster	yeah not sure why it's working, guess ill do it the fast way :)	21:39
	→ Bosox20051 joined	21:39
	← ezio left	21:39
bamj0rb	I think there's a merge --abort too.	21:40
	→ abrkn joined	21:40
	→ cfoellmann joined	21:41
	→ abbas3 joined	21:42
	← Abbas- left	21:42
	← mizu_no_oto left	21:43
	→ t0r joined	21:43
	→ takamichi joined	21:44
	← cfoellmann left	21:44
	← tbmiller left	21:46
	← tdm00 left	21:46
	← ngladitz left	21:46
	← Snibble left	21:46
	← kirin` left	21:46
	← benizi left	21:47
	← takamichi left	21:47
	→ Stygia joined	21:48
	→ Snibble joined	21:49
	→ benizi joined	21:49
	→ AWinterman joined	21:50
	→ Dougie187 joined	21:50
	← nnyk_ left	21:50
	→ kirin` joined	21:50
	← Bosox20051 left	21:51
	← swair left	21:52
	← m0ltar left	21:53
	← trungqtr_ left	21:53
	← kriks left	21:53
	→ trungqtran joined	21:53
	← abrkn left	21:54
	→ acharlieh joined	21:54
	← jnavila left	21:54
	→ ciampix joined	21:55
	← ulkesh left	21:55
	→ geekbri_ joined	21:55
bamj0rb	esc: Good luck. ;) I don't know anything about that. Is git-annex just a plain branch or is it actually related to git annex (which I forget what it does...)?	21:56
	← geekbri_ left	21:56
	→ kriks joined	21:56
	← joelrobichaud left	21:56
	← geekbri left	21:57
	← neo1691 left	21:57
	→ simesy joined	21:57
	→ SimonNa joined	21:58
bremner	that branch is special	21:59
	→ spaceonline joined	21:59
	→ tchan joined	22:00
	← trungqtran left	22:01
	→ amcsi joined	22:03
	← calcifea_ left	22:03
	→ mribeirodantas joined	22:05
	→ Robarelli joined	22:07
	← warthog9 left	22:09
	← infynyxx left	22:11
	← Snibble left	22:12
	→ jhermann joined	22:12
	← Matt_R left	22:13
	→ neo1691 joined	22:14
	→ johnnyfuchs joined	22:14
	→ calcifea joined	22:15
	→ eaj joined	22:15
	→ trungqtran joined	22:15
	← LuxuryMode left	22:16
	→ bakers joined	22:16
bakers	How do I list my local branches, and what they track (if anything) upstream	22:17
	← init left	22:18
	→ Exio4 joined	22:18
	← matanya left	22:19
	← koptein left	22:19
	← apipkin left	22:19
	→ infynyxx joined	22:19
	← trungqtran left	22:19
	← phile left	22:19
	→ adam_ joined	22:20
	→ banisterfiend joined	22:20
jrnieder	bakers: "git for-each-ref --format='%(refname) %(upstream)' refs/heads", maybe	22:20
	← resmo left	22:20
jrnieder	bakers: perhaps with :short, as in "git for-each-ref --format='%(refname:short) %(upstream:short)' refs/heads". Is this for use in a script or just to get an overview for yourself?	22:21
	← eaj left	22:21
bakers	jrnieder: For myself	22:22
	← Destos left	22:22
bakers	it seems like something like	22:22
jrnieder	bakers: ok, also see something like "git branch -vv"	22:22
bakers	git branch -v would include that	22:22
	jrnieder: Oh -vv has it	22:22
	nice	22:22
	← alan5 left	22:23
	← ciampix left	22:23
	→ fuzzybunny69y joined	22:24
	← staafl left	22:25
	← jhermann left	22:25
	← hellopat left	22:25
	← crazydiamond left	22:26
	← joelmo left	22:27
	← catcher left	22:27
	← snag left	22:28
	← breakingthings left	22:28
	← droogans left	22:28
	→ wintrmute joined	22:29
	← jumperswitch left	22:29
	← donmichelangelo left	22:30
wintrmute	id like to host git repos on my physical linux server for certain sensitive projects. any suggestions on gitosis vs. gitolite (or others)?	22:30
	→ crazydiamond joined	22:30
	→ donmichelangelo joined	22:30
	← m8 left	22:30
	← TomyLobo left	22:31
bremner	!gitosis	22:31
gitinfo	gitosis is no longer maintained and supported by the author; we usually recommend gitolite instead which has much better documentation and more features: http://github.com/sitaramc/gitolite -- if you're already stuck with gitosis we'll try to help, but no promises!	22:31
	→ jhermann joined	22:31
wintrmute	bremner, that would do it. thx	22:31
	→ tomaw joined	22:32
	→ Neptu joined	22:32
wintrmute	bremner, ive also seen gitorious and gitalist mentioned, any thoughts on those?	22:32
	→ asQuirreL joined	22:33
bremner	gitorious is more focussed on web front end. gitalist I don't know.	22:33
	← jokajak left	22:34
	← neo1691 left	22:34
	→ lmat joined	22:35
lmat	I do git checkout -b remote branch	22:35
	Then, git svn dcommit --dry-run and it says "Committing to <trunk url>"	22:35
	What gives ?	22:35
	I also tried git checkout --track -b <remote branch>	22:35
	oh... git checkout -b <local name> <remote name>	22:36
	sheesh	22:36
	yeah, that's it... maybe someday I'll get it	22:37
	← DaisyTheCow left	22:39
bamj0rb	wintrmute: If it's just for personal use then SSH is probably good enough.	22:39
	→ matanya joined	22:39
tang^	wintrmute: but do try out gitolite	22:40
	treat your machine as a server and you'll be used to server/desktop differences	22:40
wintrmute	bamj0rb, it is and thats probably sufficient... but its also a learning exercise and i cant resist ;)	22:41
	tang^, will do	22:41
	← SocalNick left	22:41
bamj0rb	Indeed. Just ... if you have trouble getting gitosis setup you can just get it working the easy way. ;)	22:41
	s/gitosis/gitolite/	22:41
	← leeN left	22:42
	→ Snibble joined	22:43
	← ojacobson left	22:43
	→ kcj joined	22:44
	← d2dchat_ left	22:44
lmat	I'm trying to grab up two commits (they aren't adjacent) and apply them to my working tree as one commit.	22:45
	Which command should I be looking at?	22:45
	← Snibble left	22:45
lmat	I've looked a bit at cherry-pick and rebase, but which one is best ? Is there a better way?	22:45
bakers	Is there a single command, that will create a local branch AND set it up to track the remote branch with the same name?	22:45
tang^	lmat: cherry-pick --no-commit	22:45
bakers	right now I create the branch, push it, and then do --set-upstream	22:45
lmat	tang^: Thanks.	22:45
	← germanoak left	22:45
	→ Pyrogerg joined	22:45
SamB	bakers: I think "git checkout <name>"	22:46
	← JSharpe left	22:46
	→ shuaib joined	22:46
bakers	SamB: error: pathspec 'blah' did not match any file(s) known to git.	22:46
	→ SocalNick joined	22:46
SamB	hmm, what version of git is that?	22:46
tang^	bakers: git checkout -b <branch>	22:47
	bakers: git push --set-upstream-to=origin <branch>	22:47
lmat	tang^: jackpot. Leaving out -n[o-commit] will have cherry-pick commit each one separately, right ?	22:47
tang^	lmat: yes	22:47
	← aard left	22:48
canton7	bakers, !local_branch_from_remote	22:49
gitinfo	bakers: The following commands are all equivalent, assuming <branch> doesn't yet exist: 'git checkout -b <branch> <remote>/<branch>', 'git checkout -t <remote>/<branch>', 'git checkout <branch>'. The latter invokes some magic.	22:49
	→ JSharpe joined	22:49
lmat	tang^: Thanks, thanks	22:49
	← anderse left	22:50
canton7	all of those will set the new branch to track the remote one, assuming the remote one is a remote-tracking branch, and not another local branch	22:50
	← chuckharmston left	22:50
	→ JSharpe_ joined	22:50
tang^	the latter invokes some magic if your branch only exists in one remote	22:50
	got caught by that one recently	22:50
canton7	hence the caveat "assuming <branch> doesn't yet exist"?	22:50
	← glosoli left	22:51
	← DonRichie left	22:51
bakers	canton7: http://www.fpaste.org/52236/13837782/	22:51
canton7	bakers, there's also push -u	22:51
	→ alan5 joined	22:51
canton7	bakers, output of 'git branch -a' ?	22:51
tang^	canton7: branch did not exist... but I had two remotes with the same branch I was interested in	22:51
	→ jokajak joined	22:52
bakers	canton7: http://www.fpaste.org/52237/13837783/	22:52
	← JSharpe left	22:52
canton7	tang^, ah yeah, it'll start with origin then fail iirc?	22:52
bakers	I just want to create a new branch locally, that's ALSO tracked remotely	22:52
	without three commands	22:52
	→ DonRichie joined	22:52
canton7	bakers, aah. I see what you mean	22:52
	emmajane → [emmajane]	22:52
canton7	create the branch, then push -u	22:52
	you're not going to get it below 2 commands: one to create and checkout the branch, the second to push it and set it as the upstream branch	22:53
tang^	canton7: no, I created a brand new local branch with that name	22:53
	I -> it	22:53
bakers	Ok that makes sense	22:53
	← dougsland left	22:53
	← lmat left	22:53
canton7	tang^, based on what?	22:53
	← Pyrogerg left	22:54
	← jerius left	22:54
	← kermit left	22:54
tang^	canton7: based on standard for git branch <branch> when you have no remotes	22:54
canton7	so HEAD? I find that really hard to believe	22:54
	→ Nickeeh joined	22:54
	← Nickeeh left	22:55
tang^	well, let me test that out again	22:55
canton7	I'm willing to bet it picked origin/<branch> as the starting point	22:55
	anyways, bedtime	22:55
	→ kermit joined	22:56
wintrmute	ack, 2-4gb ram for a gitorious server? maybe i will start with gitolite instead	22:57
	→ Dreamer3 joined	22:58
	→ hedho joined	22:59
	← MattMaker left	22:59
hedho	hi there could someone tell me how to fix this http://pastebin.com/261fNq82	22:59
tang^	canton7: nope, git checkout -b <branch> (which was in both origin and private) created a new <branch> off HEAD	23:00
	→ harobed_ joined	23:00
	← pantsman left	23:00
	← hedho left	23:00
	→ hedho joined	23:00
	→ apipkin joined	23:01
	← nwertman left	23:01
seanz	Random question: I've got a directory checked into a branch, but when I switch to a different branch, the directory appears as an untracked resource. Why would that happen?	23:02
	→ nwertman joined	23:02
	→ sfz_ joined	23:02
	→ rafaqueque joined	23:02
tang^	seanz: switching branches doesn't remove files unless the new branch knows/knew about them	23:02
	← natechan left	23:02
tang^	hedho: psychic debugging suggests that you haven't set up a SSH key for whatever git host you're trying to clone from	23:03
_ikke_	tang^: are you sure?	23:03
	→ danillonunes joined	23:03
	← groglogic left	23:03
	→ Nickeeh joined	23:03
seanz	tang^: Yes, but this directory is tracked in a different branch. git should be cleaning it up when switching to a different branch, like it does for all other files and dirs.	23:03
	→ hobodave joined	23:03
	← RogerWS_ left	23:03
tang^	_ikke_: well, now I'm not. I seem to have noticed that behaviour and it made sense this way	23:03
	← bamj0rb left	23:04
	← TheBrainWork left	23:04
_ikke_	afaik, git removes files and dirs if they aren't present in another branch	23:04
seanz	_ikke_: Exactly. So I'm wondering why it isn't doing so for this one.	23:05
tang^	actually, we have some tools that have been taking this effect into account... switch branches git clean -dxf to get rid of files left behind	23:05
	← acharlieh left	23:05
	← sfz left	23:05
tang^	because git is constantly leaving files untouched if the new branch doesn't know about them	23:05
	→ groglogic joined	23:05
_ikke_	Hard to tell without details	23:06
	← drizzd left	23:07
	→ sfz joined	23:07
	← rendar left	23:07
	← sfz_ left	23:07
seanz	_ikke_: Yeah, I hear you. I'm not sure what details to give.	23:08
	← delasteve left	23:08
_ikke_	Are you sure it is tracked in the other brach, and not ignored?	23:08
seanz	_ikke_: When I checkout the other branch, the directory and all related files reappear.	23:08
	I should mention I moved the dir in question out first, then checkout out the branch where it is tracked.	23:09
	It was back.	23:09
	← macabre left	23:09
_ikke_	And when you go to the other branch, they are untracked again?	23:09
	→ MacWinner joined	23:09
seanz	NOW they're gone.	23:09
	After I moved the "untracked" version out.	23:09
	So it's "fixed", but I don't know why it was broken.	23:10
_ikke_	me neither	23:10
	If it keeps happening, you might want to take it to the !mailing_list	23:10
gitinfo	The mailing list can be reached via [email@hidden.address] You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://j.mp/gitlist	23:10
seanz	_ikke_: Well, thanks for trying. :) I guess I'll revisit this if it happens again.	23:10
	_ikke_: Thanks. Will do.	23:10
	← SimonNa left	23:11
	← zorbash left	23:11
	→ delasteve joined	23:11
	→ Fandekasp joined	23:12
	← gregsmith left	23:12
	← devbug left	23:13
	← jasonp left	23:13
	→ sfz_ joined	23:13
	→ luxgeek joined	23:13
	← sfz left	23:14
	← mmlac-bv left	23:14
	→ eijk joined	23:15
	← alan5 left	23:15
	→ tvw joined	23:15
	→ pigeon joined	23:15
	← hholtmann left	23:16
	→ undecim joined	23:16
	← VictorCL left	23:16
	→ mmitchel_ joined	23:16
	← Pullphinger left	23:17
	→ felixsamora joined	23:18
	← felixsamora left	23:18
	→ eaj joined	23:18
	→ frgtn joined	23:19
	← ktosiek left	23:20
	← mmitchell left	23:20
	← mmitchel_ left	23:21
rudi_s	Hi. Can I ignore certain paths when running git diff a..b ?	23:21
	→ kaictl joined	23:21
	← sgambino left	23:23
	→ ktosiek joined	23:23
	→ grilix joined	23:23
	← pfFredd left	23:24
	→ pfFredd joined	23:24
	← CKyle left	23:25
	← eaj left	23:25
	← nwertman left	23:27
	← hs366 left	23:29
	→ felixsamora joined	23:30
	← felixsamora left	23:30
	← hyperair left	23:30
	← nurey left	23:30
	→ felixsamora joined	23:31
	← occup4nt left	23:31
	← felixsamora left	23:31
	← Misan left	23:31
	← johnnyfuchs left	23:32
	← DrShoggoth left	23:32
	→ felixsamora joined	23:32
	← felixsamora left	23:32
	→ felixsamora joined	23:33
	← felixsamora left	23:33
	← threesome left	23:33
	→ nwertman joined	23:33
	→ felixsamora joined	23:34
	→ zarubin joined	23:34
	← felixsamora left	23:34
	→ MattMaker joined	23:35
	← etcetera left	23:35
	→ occupant joined	23:35
	← crazydiamond left	23:35
	→ etcetera joined	23:35
	← alvaro_o left	23:36
	← melee left	23:37
	→ alvaro_o joined	23:37
	← eijk left	23:37
	← MacWinner left	23:39
	→ felixsamora joined	23:39
	← felixsamora left	23:40
	→ melee joined	23:40
	→ felixsamora joined	23:40
	← felixsamora left	23:40
	← delasteve left	23:41
	← Artpicre left	23:41
	→ felixsamora joined	23:41
	← felixsamora left	23:41
	→ madewokherd joined	23:42
	→ felixsamora joined	23:42
	← Gamecubic left	23:42
	← felixsamora left	23:42
	→ chuckharmston joined	23:43
	← sriracha left	23:43
	→ Zeam joined	23:43
	→ Gamecubic joined	23:44
Zeam	I am trying to commit some files in my repo and am getting a warning LF will be replaced by CRLF in ... then after a bunch of files it says "fatal: unable to read 9c186... really long hash"	23:45
abbas3	the warning is harmleess	23:45
Zeam	How do I fix it? I don't see a file anywhere with the hash name...	23:45
abbas3	need more info unable to read part	23:45
Zeam	thats all it says...	23:46
	→ crazydiamond joined	23:46
	← nwertman left	23:46
Zeam	"fatal: unable to read <insert hash here>"	23:46
abbas3	hmm .. maybe it cant connect to the remote repo	23:46
	I'm new to git myself so u have to wait for some pro	23:47
	→ felixsamora joined	23:47
	→ nwertman joined	23:47
	← pitzips left	23:47
	← felixsamora left	23:47
Zeam	it is a local repo	23:47
jrnieder	Zeam: !repro :)	23:47
gitinfo	Zeam: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will help immensely with troubleshooting.	23:47
	→ felixsamora joined	23:47
	← hedho left	23:48
Zeam	jrnieder: there isn't anything else to post...	23:48
jrnieder	you run "git commit" and the only output is "fatal: unable to read 9c186... really long hash"?	23:48
	and I can reproduce this in a new repository, by simply running "git commit"?	23:49
Zeam	it comes after a bunch of warnings about LF being replaced by CRLF	23:49
jrnieder	right, what I abbreviated with the !r* thing	23:49
	kenperkins_ → kenperkins	23:49
jrnieder	was that the details are incredibly important if you want people to help you	23:49
	http://www.chiark.greenend.org.uk/~sgtatham/bugs.html explains this better than I can	23:50
	even when you're not reporting a bug, or just a usability bug :)	23:50
	abbas3 → Abb_s	23:50
	← Zarthus left	23:50
Zeam	jrnieder: I don't think it is a bug, just trying to figure out how I can get past the error	23:51
	← Neozonz left	23:51
	← amcsi left	23:51
jrnieder	anyway, I've said what I wanted to. hopefully someone else can help	23:51
	← DonRichie left	23:51
	← grilix left	23:51
	→ DonRichie joined	23:52
	→ King_Hual` joined	23:52
	← King_Hual` left	23:53
	→ trusktr joined	23:54
	← King_Hual left	23:54
	← SoftwareMechanic left	23:56
	→ jason237 joined	23:56
	← kwmiebach left	23:57
	→ mmlac-bv joined	23:57
	→ kwmiebach joined	23:58
	← cenuij left	23:58
	→ Bosox20051 joined	23:58
	← CreativeEmbassy left	23:59

Logs Search ←Prev date Next date→

Channels Documentation