IRCloggy #git 2014-05-08

Provider of IRC logs since 2005.

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

	2014-05-08
	← Synthead left	00:00
	→ axl_ joined	00:01
	← axl_ left	00:01
	→ pbrobst joined	00:02
	← MacWinner left	00:03
	← mad left	00:03
bremner	I hope you mean for your personal settings	00:03
	→ CKyle joined	00:04
	→ gandalfcome joined	00:05
	← the_cybersphinx left	00:05
SamB	bremner: why, do you routinely push to git://{git,anonscm}.debian.org/ ?	00:07
	← bwreilly left	00:08
	→ the_cybersphinx joined	00:08
	← imachuchu left	00:08
SamB	hmm, it seems kind of like those options should be the other way around though	00:09
bremner	SamB: no, but distro wide defaults that assume that the main use of git on debian is debian packaging don't make sense to me.	00:09
SamB	bremner: they don't assume that	00:09
	→ Ornacia joined	00:09
	→ zumba_addict joined	00:09
djapo	hello world, i have two computers one of them is being masqueraded thru the other, it has internet access thru the other, should i just copy my ssh keys to the other machine so that i can git	00:09
	?	00:09
	← the_cybersphinx left	00:09
SamB	bremner: and I don't think pushInsteadOf has any useful purpose besides specifying a writable alias for a remote URL prefix?	00:09
bremner	SamB: ah, right. I see. well, I still wouldn't bother, but I can see your point.	00:09
SamB	though your reservations do lead me to see potential problems with this appraoch	00:10
	← pwnz0r left	00:11
	→ Zebroid joined	00:11
	→ o3o3o joined	00:13
	→ armyriad joined	00:13
	← o3o3o left	00:14
Mannequin	osse, still investigating, but I think the reason of my issue with less (and LESS= git log not working as expected) may be related to a "lesspipe" thing I installed for highlighting programming language in less	00:14
SamB	bremner: for example, if alioth gets changed again and that stops working, how would you override it in your ~/.gitinit ?	00:15
	er, ~/.gitconfig sorry	00:15
	← habanany left	00:16
bremner	SamB: ack. basically I just wouldn't want to encode volatile information into the package; the lag between upload and finishing support in stable can be _long_	00:16
	← Zebroid left	00:16
SamB	if the URL to be replaced were in the name of the option and the replacement were in the value, that would be fine ... but as it is ...	00:17
	→ deuti joined	00:17
	← JelmerD left	00:18
	← txomon\|home left	00:18
jrnieder	SamB: sounds to me like a nice feature request	00:18
	→ drale2k joined	00:18
	→ deuteriu_ joined	00:19
jrnieder	SamB: namely, there should be some way to advertise over git protocol "I don't like pushes; use this other URL when you want to push."	00:19
	→ JelmerD joined	00:19
SamB	jrnieder: hmm	00:19
jrnieder	SamB: it would take one extra roundtrip the first time, then the value could be cached, perhaps	00:19
SamB	by "cached" do you mean "added to .git/config"?	00:19
jrnieder	yeah	00:20
	← str left	00:20
SamB	so basically on first fetch	00:20
jrnieder	actually the whole "lazily get the value" idea is silly of me	00:20
SamB	or attempted push	00:20
jrnieder	it could just be part of what happens when you clone	00:20
	akim__ → akim	00:20
SamB	clone counts as first fetch :-P	00:20
jrnieder	nod	00:21
SamB	(of the first remote)	00:21
	→ scarabx joined	00:21
	← deuti left	00:21
	← tyreld left	00:23
SamB	of course then you'd get questions like "well what if that address goes bad, shouldn't we check the fetch address again to see what it says to do?"	00:23
jrnieder	yeah, same problem as URLs in .gitmodules have	00:23
	← CKyle left	00:23
djapo	what does git-remote-https died on signal 13 mean?	00:24
jrnieder	djapo: "kill -l" tells me signal 13 is SIGPIPE	00:24
	djapo: what platform are you on?	00:24
djapo	jrnieder: arch	00:24
SamB	which arch though?	00:24
jrnieder	archlinux, I assume ;-)	00:24
	→ codeFiend joined	00:24
	→ kukks joined	00:25
	← kukks left	00:25
	→ kukks joined	00:25
SamB	oh but that's listed as plain "13" anyway so	00:25
	I guess it doesn't matter which arch of arch that might be	00:25
	(I'm giving arch the benefit of the doubt WRT arch support)	00:25
jrnieder	http://thread.gmane.org/gmane.comp.version-control.git/246604 sounds possibly relevant	00:25
	→ hjalti joined	00:25
	← WaReZ_ left	00:26
	← hyperair left	00:27
djapo	arch linux	00:27
jrnieder	it was just a who's on first gag ;-)	00:27
	← dik_dak left	00:27
djapo	does the error mean i didn't finish cloning?	00:27
jrnieder	it means cloning failed, yeah	00:27
	if it's the bug I linked to then it should be fixed by 37f48427 (curl_multi_cleanup: ignore SIGPIPE better, 2014-05-05)	00:29
	which is not part of a libcurl release yet	00:29
	← asturel left	00:29
jrnieder	destined for 7.37.0	00:30
SamB	what, no bugfix release?	00:30
	→ asturel joined	00:30
jrnieder	I don't know how their bugfix releases work	00:30
	→ Dougie187 joined	00:30
SamB	ah.	00:30
jrnieder	I wouldn't be surprised if they're of the mostly security fixes kind	00:30
SamB	hmm, yeah, I guess dying to SIGPIPE isn't normally a security issue ...	00:31
	→ D9 joined	00:31
	→ kanja joined	00:32
djapo	it happens every time i try to clone django	00:33
	ill try an update and see if there are any fixes	00:33
kanja	I've been using git without much problem in a large team for a while, a new member just joined and suddenly everyone is getting a lot of merge conflicts with him. I understand what's happening on a file by file basis, but I'm curious why at a higher level this is happening, and I'm curious if anyone here has ideas.	00:34
	I'm wondering if the new guy is trying to do too much in a branch	00:36
	→ CKyle joined	00:36
	← whitby left	00:36
	→ Dougie2187 joined	00:36
	← xrlk left	00:38
	← CKyle left	00:38
	→ the_bz joined	00:39
	← veebers left	00:39
	→ veebers joined	00:39
	→ the_cybersphinx joined	00:40
	← harish left	00:40
	← EminenceHC left	00:40
	→ EminenceHC joined	00:41
	← freestyl3r left	00:41
	→ tokik joined	00:42
SamB	hmm, how do I make a commit with a given tree, totally ignoring the existing working tree?	00:42
	and index	00:42
	← the_bz left	00:43
	→ squawksdei joined	00:44
	← squawksdei left	00:44
	→ squawksdei joined	00:44
	← EminenceHC left	00:45
	← mikecmpbll left	00:45
	← nkouevda left	00:46
	← squawkspopuli left	00:46
	→ nkouevda joined	00:46
	← veebers left	00:46
	→ veebers joined	00:47
	→ xrlk joined	00:47
	→ Guest77241 joined	00:48
	← MattMaker left	00:49
	← aberrant left	00:49
	→ alexlind_ joined	00:50
	← nkouevda left	00:51
	→ aberrant joined	00:51
	← akim left	00:52
	← asturel left	00:52
	← trout left	00:52
	← aberrant left	00:53
	← VictorCL left	00:53
	→ asturel joined	00:53
	← shinnya left	00:53
	← alexlindenlevy left	00:53
	← ariscop left	00:54
	← veebers left	00:54
	→ lavaman joined	00:54
	← codeurge left	00:54
	← Destos left	00:55
	← lavaman left	00:56
	← dreiss left	00:57
	→ akim joined	01:00
	← freeman42 left	01:00
	→ rchavik joined	01:00
	→ Synthead joined	01:00
	← Guest77241 left	01:00
djapo	im still getting the error git-remote-https died on signal 13	01:01
	it says receiving objects 100% and receiving deltas 100%	01:02
	→ robzilla_ joined	01:02
	← richwestcoast left	01:02
djapo	thos that mean that it finished but some how the connection died after it finished? is it safe to use?	01:03
	→ daito joined	01:03
	→ richwestcoast joined	01:03
	← luc__ left	01:03
	← Neozonz\|Disc left	01:05
	← Rad- left	01:05
	← thiago left	01:06
	→ veebers joined	01:06
	→ nb_bez_ joined	01:06
	← betelgeu1e left	01:07
	← robzilla_ left	01:07
SamB	djapo: if you cd into there and you type "git fetch" and it succeeds, you should be fine	01:07
	→ variable joined	01:07
	→ paolooo joined	01:07
	→ fragamus joined	01:07
	← ErKa left	01:07
	← Bruno_ left	01:07
	→ dougsland_ joined	01:07
djapo	SamB: no errors,	01:07
	no print out either	01:08
	← daito left	01:08
SamB	okay, so, what does "git branch" say?	01:08
	→ zoso joined	01:08
	→ razrunelord joined	01:08
djapo	SamB: master	01:08
SamB	and do you see the files there?	01:09
djapo	SamB: yes	01:09
	→ diegoviola joined	01:10
SamB	well I guess you should be okay then	01:10
	← veebers left	01:10
	← quazimodo left	01:10
	→ Goplat joined	01:12
	→ Zebroid joined	01:12
	→ reaverb joined	01:13
	← razrunelord left	01:13
jrnieder	SamB: take a look at man git-commit-tree	01:15
gitinfo	SamB: the git-commit-tree manpage is available at http://jk.gs/git-commit-tree.html	01:15
	← paolooo left	01:15
	← Zebroid left	01:17
	← robustus left	01:17
	← codeFiend left	01:17
	← yosito left	01:19
	→ robustus joined	01:19
	← beyondcreed left	01:19
	← chrisshattuck left	01:19
	← ScottE left	01:23
	→ hyperair joined	01:23
	→ Vampire0_ joined	01:24
	→ ScottE joined	01:25
	→ axl_ joined	01:25
	← Vampire0 left	01:28
	← Hello71 left	01:28
	← lethjakman left	01:29
	→ Hello71 joined	01:30
	← axl_ left	01:31
	← CheckDavid left	01:32
	← _ikke_ left	01:33
	← alvaro_o left	01:33
	→ ErKa joined	01:34
	← bgerber left	01:34
	→ veebers joined	01:35
	← stellarhopper left	01:36
	→ _ikke_ joined	01:37
	← Zarthus left	01:37
	← jackh_ left	01:38
	← pheaver left	01:38
	← benonsoftware left	01:39
	→ zivester joined	01:39
	← richwestcoast left	01:39
	→ Zarthus joined	01:40
	→ earny joined	01:40
	← lucastt left	01:40
	→ richwestcoast joined	01:40
	→ k_sze[work] joined	01:40
	→ surge joined	01:40
	← fragamus left	01:41
	← zivester left	01:41
	surge → Guest95737	01:41
	→ digital-shokunin joined	01:41
	→ zivester joined	01:42
	→ luc__ joined	01:43
	→ EminenceHC joined	01:43
	← Synthead left	01:43
	→ deens joined	01:44
	← mortrca left	01:44
	← deens left	01:44
	→ deens joined	01:44
	← shruggar left	01:44
	→ axl_ joined	01:45
	← Guest95737 left	01:45
	← tokik left	01:45
	→ benonsoftware joined	01:46
	→ daito joined	01:46
	→ weiyang joined	01:47
	→ hgl joined	01:47
	← EminenceHC left	01:47
	→ thiago joined	01:48
	← Noldorin left	01:55
	→ Synthead joined	01:57
	→ bluesm joined	01:59
	→ pantsman joined	02:00
	← pantsman left	02:00
	→ pantsman joined	02:00
	← pbrobst left	02:00
	→ megawac joined	02:01
	→ harish joined	02:02
	→ Noldorin joined	02:02
	→ DolpheenDream joined	02:02
	← jamieshepherd left	02:03
	← Celm left	02:04
	← St_Marx left	02:06
	← JosephFerano left	02:07
	← gandalfcome left	02:08
	squawksdei → squawkspopuli	02:08
	→ gandalfcome joined	02:10
	→ bgerber joined	02:10
	← Gamecubic left	02:10
	← blosocool left	02:10
	→ woollyams joined	02:11
	→ JosephFerano joined	02:12
	← Garen left	02:13
	→ Zebroid joined	02:13
	→ Garen joined	02:14
	→ Gamecubic joined	02:15
	→ xcesariox joined	02:15
	← xcesariox left	02:15
	← Mitchbones left	02:15
	← pantsman left	02:15
	→ codeFiend joined	02:16
	← Zebroid left	02:18
	→ codeurge joined	02:19
	→ ariscop joined	02:19
	→ johnkevinmbasco joined	02:21
	← jcvfen left	02:22
	← madewokherd left	02:23
	← ErKa left	02:24
	→ fatalhalt joined	02:25
	← Xiti left	02:26
	← NfNitLoop left	02:26
	→ St_Marx joined	02:26
	← Lemony left	02:27
	← mj12albert left	02:27
	→ echo-area joined	02:27
	← fatalhalt left	02:28
	→ chrisshattuck joined	02:29
	← skinux left	02:30
	← FreezingCold left	02:32
	← recycle left	02:32
	→ Lyqyd joined	02:32
	← axl_ left	02:32
	→ JerryT joined	02:33
	← JerryT left	02:34
	→ becks__ joined	02:34
	← bgerber left	02:34
	→ JerryT joined	02:34
	← becks__ left	02:34
	→ eephillip joined	02:36
	← jovy88 left	02:36
	→ MattMaker joined	02:36
	← yaru22 left	02:37
	→ jovy88 joined	02:37
	← deuteriu_ left	02:38
	→ tokik joined	02:39
	← makubi left	02:40
	→ NfNitLoop joined	02:40
	← boombatower left	02:40
	← codeurge left	02:41
	← Synthead left	02:41
	→ makubi joined	02:41
	← bitkiller left	02:43
	→ recycle_ joined	02:43
	→ irqq joined	02:43
	← NfNitLoop left	02:45
	← zoso left	02:46
	→ knownasilya joined	02:48
	→ jackh joined	02:48
	← ifdm_ left	02:50
	→ yaru22 joined	02:51
	→ eletuchy_ joined	02:51
	→ checkit joined	02:53
	← eletuchy left	02:54
	← checkit left	02:54
	← mdpatrick left	02:54
	→ darkpassenger joined	02:55
	→ Synthead joined	02:55
	← eletuchy_ left	02:55
	→ axhiao joined	02:57
	← cannonball left	02:57
darkpassenger	Hi all I have a rather complex situation	02:58
	involving branches, merging, conflict and new files	02:58
	if anyone's up for a challenge...	02:58
reaverb	darkpassenger: Go for it.	02:59
	Even if I can't personally solve it having it all out makes it more likely for somebody else to take a stab at it.	02:59
darkpassenger	allright ,	03:00
	→ NfNitLoop joined	03:00
darkpassenger	There are some work done on the master branch, and I have made a pull request for a branch I worked on	03:00
	← nwertman left	03:00
	→ jxf joined	03:01
darkpassenger	there are new files in the master branch,	03:01
	there are new files in the pull request branch	03:01
	and I would like to merge.	03:01
	→ lithiumjake joined	03:01
darkpassenger	but it says there are conflicts and I rarely deal with conflict so I don't know how to proceed correctly without messing it up	03:02
	→ ifdm_ joined	03:02
	→ CKyle joined	03:03
	← amikiri left	03:03
	→ Sample joined	03:03
	→ mj12albert joined	03:04
	→ robzilla joined	03:04
	← mj12albert left	03:04
	→ mj12albert joined	03:04
	← irqq left	03:04
darkpassenger	so yeah..	03:04
reaverb	darkpassenger: So basically it's just a merge conflict?	03:05
	← weiyang left	03:05
darkpassenger	yes.	03:05
	← thiago left	03:07
darkpassenger	silly i know	03:08
reaverb	darkpassenger: Got to the files where there a conflicts and serach for <<<	03:08
	← robzilla left	03:08
reaverb	That'll take you straight to the conflict, they're suprisingly easy to resolve.	03:08
	Also, this is not really a "complex situation" :D	03:09
	→ thiago joined	03:09
darkpassenger	lol	03:09
	yeah I guess i dramatized	03:09
	→ pwnz0r joined	03:10
reaverb	darkpassenger: Ask if you need any help resolving the conflicts - you should be able to handle a couple on your own.	03:10
	← zivester left	03:11
	→ kerrick joined	03:11
	→ vipzrx joined	03:12
	→ Zebroid joined	03:14
	← k_sze[work] left	03:14
	→ BadProphet joined	03:14
	→ Xiti joined	03:16
	→ checkit joined	03:16
	← Sample left	03:17
checkit	Guys can someone please help me. I have a working copy of origin/master and I need to pull a production release to my server... HOW!?	03:17
	I'm using bitbucket fyi	03:17
	← Zebroid left	03:18
checkit	Anyone?	03:18
	← drale2k left	03:19
	← pwnz0r left	03:21
	→ k_sze[work] joined	03:22
	← Noldorin left	03:23
	→ mizu_no_oto joined	03:23
	→ diphtherial joined	03:24
reaverb	checkit: git pull <branch> probably?	03:24
	← skorgon left	03:25
	← St_Marx left	03:25
	← Segfault_ left	03:25
	← Exio4 left	03:25
	← asakura left	03:25
diphtherial	hey, a colleague of mine is having some inexplicable problems with a git pull on windows...specifically, she's getting the following message for some of the files: error: unable to create file data/k2_pin1.0_pout0.4/network23.dat (Permission de	03:25
reaverb	Don't know where this "production release" is so I can't really help you.	03:25
diphtherial	the rest of that line is "nied)"	03:25
	→ raijin joined	03:25
	← Synthead left	03:25
diphtherial	also, when she pulls she ends up with a ton of files that have been marked 'modified' even though afaict she hasn't changed them at all	03:26
reaverb	diphtherial: Maybe send your collegaue here, they're closer to the problem and will be better able to answer questions.	03:26
diphtherial	she's sitting next to me, and she knows very little about git or computers in general	03:26
	← vipzrx left	03:27
reaverb	diphtherial: Hmm, is this a home computer?	03:27
	→ bgerber joined	03:27
diphtherial	more or less; it's her work laptop	03:27
	→ weiyang joined	03:27
diphtherial	it's running windows 7	03:27
	← Ragnor left	03:27
	← Mannequin left	03:27
diphtherial	she's using msysgit's git bash console to do the pulling/status-ing	03:28
reaverb	diphtherial: Is there an admin account on there she can't access?	03:28
	→ Sample joined	03:29
diphtherial	her account's an admin account, i believe, and we just went through giving her full permissions on tree, replacing any existing ones	03:29
	i apologize in advance for this likely being a windows issue	03:29
	i'm slightly confused about how her working directory can be dirty immediately after a pull	03:29
	→ akshaysth joined	03:30
	→ drale2k joined	03:30
darkpassenger	ahem, binary file conflict between branches.... :(	03:30
	← nb_bez_ left	03:31
diphtherial	*on the source tree, sorry	03:31
	→ nkouevda joined	03:31
reaverb	diphtherial: Is this her first time pulling or has this worked in the past?	03:31
	← CKyle left	03:32
diphtherial	it's worked in the past, like for the past three weeks or so	03:32
	someone on a mac just committed a whole bunch of test files to the project and i assume her client's trying to swap the line endings	03:32
	← checkit left	03:32
diphtherial	which would explain why they're ending up dirty on arrival, i guess	03:32
	is there some way to disable that in git bash, and just pull them in "binary mode" or something? (i'm pretty new to git too, not sure if that makes sense)	03:33
reaverb	By "work in the past" you mean on her machine, correct?	03:33
	→ asakura joined	03:34
diphtherial	yes	03:34
reaverb	Have you tried git diff	03:34
	→ Exio4 joined	03:34
reaverb	before the pull	03:35
diphtherial	well, i tried status before the pull and there are a handful of untracked files, none of which are the ones that are dirty after the pull	03:35
	→ Segfault_ joined	03:36
diphtherial	is there an easy way to reverse the pull now? there's a ton of these dirty files sitting in her working directory now that we had to manually move out before	03:36
reaverb	dipptherial: The reverse the pull: git reset --hard <old SHA>	03:38
	s/The/to/	03:38
	→ Synthead joined	03:38
reaverb	It does look like this is a line endings problem.	03:38
	https://help.github.com/articles/dealing-with-line-endings#platform-windows	03:38
	← Gamecubic left	03:39
	← alexlind_ left	03:39
	→ St_Marx joined	03:39
	→ alexlindenlevy joined	03:39
darkpassenger	whats a file flag conflict ?	03:40
diphtherial	reaverb: ah, thanks, that's what i'd figured	03:40
	i wonder what the correct setting here should be...i thought she'd had it on autocrlf=true	03:40
	← Sample left	03:41
reaverb	diphtherail: Check it.	03:41
diphtherial	alright, it's true	03:41
	→ vipzrx joined	03:42
darkpassenger	damn	03:43
	← eephillip left	03:43
	→ Sample joined	03:43
diphtherial	so, if her collaborator's using OS X, it's likely that the line endings are just LFs, which (if autocrlf is true) will be converted to CRLFs on pull	03:43
	→ codeurge joined	03:44
reaverb	diphtherial: There's some way or the other to make the line endings work in git.	03:44
	→ Ragnor joined	03:44
	← alexlindenlevy left	03:44
diphtherial	i'm surprised that the client doesn't recognize that it changed the line endings itself and now thinks they're all dirty, even though they'll be converted back to their original LFs when she pushes	03:44
	and i'm really surprised this problem didn't occur sooner	03:45
	→ codeurge_ joined	03:45
SamB	diphtherial: the solution is perhaps to forswear notepad	03:45
	← codeurge_ left	03:46
diphtherial	well, she's using pycharm which is usually good about line endings	03:46
	→ codeurge_ joined	03:46
	→ skorgon joined	03:46
diphtherial	and in this case it's the git client that's changing the line endings; she hasn't even had a chance to edit the files yet	03:46
darkpassenger	what does "deleted in source but changed in destination" mean in terms of merging ?	03:47
SamB	diphtherial: yes, the other part of the solution is to turn off autocrlf	03:47
darkpassenger	its a file I have commited but then removed before my next commit, it shouldnt be conflicting , right ?	03:47
	← blarson left	03:48
	→ Gamecubic joined	03:48
SamB	I said "notepad" because notepad is the only piece of software I can think of that can't deal with Unix line endings	03:48
	← codeurge left	03:49
	← Sample left	03:49
	→ EminenceHC joined	03:51
	← codeurge_ left	03:51
	→ jayrobot joined	03:52
	← weiyang left	03:52
	← kukks left	03:52
	← codeFiend left	03:52
	← Dougie2187 left	03:53
	← mizu_no_oto left	03:54
	← Dougie187 left	03:55
diphtherial	SamB: so what you're telling me is that autocrlf should really be off by default	03:56
	← EminenceHC left	03:56
	← BuSerD_ left	03:56
SamB	diphtherial: probably, given that those of us who we'd expect to understand it so frequently find ourselves puzzled by the results	03:57
	→ polyzen joined	03:57
	→ codeurge joined	03:58
	→ blarson joined	03:58
	← skorgon left	04:00
	→ mizu_no_oto joined	04:00
	→ skorgon joined	04:00
	→ weiyang joined	04:00
	← codeurge left	04:00
	← BadProphet left	04:00
	← lithiumjake left	04:01
offby1	I always say: line endings was one thing that Subversion got right.	04:02
	svn set-prop svn:eol-style native, and there's an end to it	04:02
	← darkpassenger left	04:03
	→ zoso joined	04:04
	→ mh2104 joined	04:05
cfedde	programmers are pretty good at solving the problems their tools cause.	04:06
	← mizu_no_oto left	04:07
	← megawac left	04:07
	← mh2104 left	04:08
	← akshaysth left	04:08
	→ Tommy[D]_ joined	04:10
	← scarabx left	04:11
	→ mdub joined	04:12
	→ clandest joined	04:12
	← pigeon left	04:12
	→ beautifulmind joined	04:13
	← Tommy[D] left	04:13
	→ adamgall joined	04:13
	← woollyams left	04:14
	→ Zebroid joined	04:14
	→ xcesariox joined	04:15
	← beautifulmind left	04:15
	← daito left	04:17
	→ beautifulmind joined	04:17
	← the8thbit left	04:17
	← richwestcoast left	04:17
	→ BadProphet joined	04:17
	← polyzen left	04:18
	→ richwestcoast joined	04:18
	← Zebroid left	04:19
	← Ziber left	04:20
	→ Ziber joined	04:20
	→ jonmorehouse joined	04:21
jonmorehouse	how would I create a git alias that passes its arguments to a shell command?	04:21
	here's what I have so far ...	04:21
	clp = !sh -c 'cd $HOME/.public && echo "$@"'	04:21
	← howitdo left	04:22
thiago	create a shell function	04:23
	clp = !f() { sh -c 'cd $HOME/.public && echo "$@"'; }; f	04:23
jonmorehouse	thiago: perfect. I actually found a cleaner solution imo	04:24
	clp = !sh -c 'cd $HOME/.public && hub clone "$@"' -	04:24
	the - at the end does the trick :)	04:24
	→ dreiss joined	04:24
	→ pigeon joined	04:25
	← Devastator left	04:25
	→ mh2104 joined	04:26
thiago	jonmorehouse: hint: use shell scripts instead	04:26
	just put a script called git-clp somewhere in $PATH	04:26
	→ Devastator joined	04:28
	→ nwertman joined	04:29
	→ yosito joined	04:29
offby1	,thiago++ as we say in #emacs	04:30
thiago	gitinfo: !karma	04:30
gitinfo	gitinfo: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them. Try ".karma <nick>" or ".topkarma", but please do it via private message to avoid mass highlighting people.	04:30
	← Devastator left	04:30
	→ Devastator joined	04:30
	→ kcj joined	04:30
	← tokik left	04:31
	← yosito left	04:31
	← ValicekB left	04:32
	→ certainstrings joined	04:32
	← House left	04:32
	→ House joined	04:32
	← BadProphet left	04:34
	→ BadProphet joined	04:34
	← chrisshattuck left	04:35
	← SegFaultAX left	04:37
	← johnkevinmbasco left	04:37
milki	.karma Eugene	04:37
gitinfo	the Genuine Real Life Karma™ REST API results are back! eugene: 10 (1 in past 30 days) (0 given out)	04:37
milki	that seems small	04:38
Eugene	I am too high for this conversation	04:38
	Also	04:38
	.karma EugeneKay	04:38
gitinfo	the Genuine Real Life Karma™ REST API results are back! eugenekay: 59 (0 given out)	04:38
milki	ah	04:38
	→ ValicekB joined	04:38
	→ revyd joined	04:38
milki	.karma	04:39
gitinfo	the karma of the given users is shrouded in the mists of uncertainty.	04:39
milki	.karma milki	04:39
gitinfo	the Genuine Real Life Karma™ REST API results are back! milki: 54 (1 in past 30 days) (0 given out)	04:39
	→ SegFaultAX joined	04:39
milki	:o	04:39
	← astrofog left	04:40
	→ zumba_ad_ joined	04:40
	← dsdeiz_ left	04:42
	→ Sample joined	04:42
	→ Skrypter joined	04:42
	← joelm left	04:42
	← zumba_addict left	04:43
	→ dsdeiz joined	04:43
	← Skrypter_ left	04:44
	← House left	04:45
	← mh2104 left	04:45
	→ House joined	04:45
	→ tokik joined	04:45
reaverb	Heh, zero given out.	04:45
	.karma gitinfo	04:46
gitinfo	the Genuine Real Life Karma™ REST API results are back! gitinfo: 16 (0 in past 30 days)	04:46
	← sword left	04:46
	→ saurabh joined	04:47
House	hey all, i'm looking at git for sydadmin & ops. im looking for some blog posts or any discussion about how to decide what does into repos, etc. all my scripts in different folders? in different repos? separated by language, etc? i'm clueless on the pros&cons	04:47
	← akim left	04:48
	← karpoff left	04:48
	→ watabou joined	04:49
	← chris_thomson left	04:49
	→ howitdo joined	04:49
	← howitdo left	04:49
	→ howitdo joined	04:49
offby1	there's got to be lots of stuff written about this ... and yet I can't offhand point to anything :-\|	04:51
Eugene	House - usually a git repo is a "project", or some compileable subdivision there of	04:52
	House - or, for example, a purpose, like some DNS zones	04:52
	Plus you personally may have one to manage homedir scripts/configs, another for notes....	04:53
offby1	House: the first thing I can think of is: make your repositories such that if someone wants any piece of a repository, they probably want all of it -- but no more	04:53
	→ xsbeats joined	04:53
offby1	pretty vague, I realize	04:53
	← mdub left	04:54
	→ EminenceHC joined	04:55
House	thanks for the responses anyway. i guess it's probably better to make a bit of a mess and then work out what's logical for me	04:56
	→ Kicer86 joined	04:56
offby1	You could err on the side of making them too large, and then split them up later; or you could err on the side of making them too small, and then combine them later. Unfortunately I don't know which of those two is easier.	04:57
	→ joelm joined	04:58
	variable → constant	04:58
	→ woollyams joined	05:00
	← EminenceHC left	05:00
	→ davegb3 joined	05:00
	← xintron left	05:00
	← davegb3 left	05:01
	→ marthinal joined	05:02
	← hellopat left	05:03
	Keridos → Keridos_off	05:04
	→ lyubenblagoev joined	05:05
	← woollyams left	05:07
	← diphtherial left	05:07
	← ezekielnoob left	05:08
	→ Naoe-Kanno joined	05:08
	← watabou left	05:09
	← Gamecubic left	05:09
	← SHyx0rmZ left	05:10
	→ woollyams joined	05:11
	→ delight joined	05:12
	← Naoe-Kanno left	05:13
	→ daito joined	05:13
	→ MagePsycho joined	05:15
	→ Zebroid joined	05:15
	← Tuna-Fish left	05:15
	← House left	05:16
	← certainstrings left	05:17
	→ Tuna-Fish joined	05:19
	← Zebroid left	05:20
	→ kulkarp joined	05:24
	← surfdue left	05:26
	← BadProphet left	05:26
	→ EminenceHC joined	05:26
	→ ghostlines joined	05:30
	→ Celm joined	05:31
	→ lite_ joined	05:31
	→ jceb joined	05:31
	← weiyang left	05:32
	→ surfdue joined	05:32
	← lite_ left	05:32
	← SegFaultAX left	05:33
	→ lite_ joined	05:34
	← ghostlines left	05:34
	→ ferreum158 joined	05:34
	→ ghostlines joined	05:34
	← MattMaker left	05:36
	→ SegFaultAX joined	05:36
	→ cilly joined	05:36
	← Sample left	05:36
	→ mad joined	05:37
	→ sanjayu joined	05:37
	← EminenceHC left	05:37
	→ EminenceHC joined	05:38
	← jceb left	05:38
	→ codeFiend joined	05:41
	← clandest left	05:41
	→ lite__ joined	05:41
	← lite_ left	05:41
	← Synthead left	05:42
	← woollyams left	05:42
	← EminenceHC left	05:42
	→ ThomasLocke joined	05:43
	→ shingshang joined	05:44
	← Celm left	05:44
	← ghostlines left	05:44
	← dougsland_ left	05:45
	← richwestcoast left	05:45
	→ richwestcoast joined	05:46
	→ teran joined	05:46
	→ Xethron joined	05:46
	← Xethron left	05:46
	→ Xethron joined	05:46
	← kcj left	05:49
	← veebers left	05:49
	→ FilipNortic joined	05:50
	← starkhalo left	05:50
	→ oodavid joined	05:52
	← teran left	05:52
	← reaverb left	05:52
	→ teran joined	05:53
	→ Kayra joined	05:54
	← tpollard left	05:55
	→ LeMike joined	05:56
	← DolpheenDream left	05:57
	→ hoschi joined	05:57
	← Zarthus left	05:59
	→ Zarthus joined	05:59
	← St_Marx left	06:00
	→ goTAN joined	06:01
	← djapo left	06:02
	→ St_Marx joined	06:02
	← joelm left	06:02
	→ Zebroid joined	06:03
	→ hellopat joined	06:03
	→ joelm joined	06:04
	→ woollyams joined	06:05
	← revyd left	06:05
	← beautifulmind left	06:06
	→ maveneag_ joined	06:06
	→ papegaaij joined	06:07
	← hellopat left	06:08
	← SegFaultAX left	06:11
	→ lyubenblagoev_ joined	06:11
	← oodavid left	06:11
	→ SegFaultAX joined	06:12
	→ MattMaker joined	06:14
	← Zebroid left	06:14
	← lyubenblagoev left	06:15
	→ cbreak-work joined	06:15
	→ h0bbit joined	06:16
	← cilly left	06:18
	← RyPeck left	06:19
	→ roelmonnens joined	06:19
	→ jluc joined	06:21
	→ ice9 joined	06:24
	→ hoijui joined	06:24
	gitinfo set mode: +v	06:24
ice9	if I deleted a file from the repo, can I restore it without reset the whole repo?	06:25
thiago	yes	06:25
	type git status. It will tell you what to do.	06:26
nnyk_	Morning #git	06:26
	please, how can I view what changed in a particular commit?	06:27
milki	git show <commit>	06:28
	→ anry joined	06:29
	→ elbeardmorez joined	06:29
nnyk_	milki: that will show me the commit message. I want to see the 'diff'	06:29
milki	sounds like your commit doesnt have a diff	06:30
	are you sure theres a diff?	06:30
thiago	is it a merge commit?	06:30
milki	git log --stat -1 <commit> will tell you what files changed	06:30
nnyk_	thiago: no its not	06:31
thiago	git show will show the diff	06:31
	← knownasilya left	06:32
nnyk_	correction... milki, that command showed its a merge commit	06:33
	→ HelperW joined	06:33
nnyk_	oops!	06:33
	→ beautifulmind joined	06:34
nnyk_	thanks thiago, milki. Appreciate it!	06:34
	← anry left	06:34
	→ anry joined	06:34
	← beautifulmind left	06:36
	→ beautifulmind joined	06:36
	→ BadProphet joined	06:37
	→ nfroidure joined	06:40
	→ ciampix joined	06:40
	← BadProphet left	06:42
	← Sonderblade left	06:42
	← squawkspopuli left	06:42
	→ djapo joined	06:43
	← drale2k left	06:43
djapo	is there a way to not type my ssh passphrase every time i push to github or bitbucket?	06:44
milki	djapo: google ssh-agent	06:44
	→ Celm joined	06:45
	→ FunkyAss joined	06:46
	→ drale2k joined	06:47
	→ twb joined	06:47
	← Lyqyd left	06:47
twb	So I'm a monster.	06:47
	→ jceb_ joined	06:47
twb	Given a list of branches foo bar baz ... quux, I want a script that'll repeatedly try to merge all combinations, finally leaving a result that has as many as possible in an octopus merge	06:47
	← xsbeats left	06:47
	← Xethron left	06:48
	← Goplat left	06:48
	← Luke-Jr left	06:48
	← danecando left	06:49
	← sanjayu left	06:49
	← ice9 left	06:50
	← Celm left	06:50
	→ toomanysecrets joined	06:50
grumbel_	twb: I don't understand, doesn't git checkout foo; git merge bar baz ... create such a merge?	06:51
	→ Luke-Jr joined	06:51
twb	grumbel_: not if there's a conflict	06:51
	→ intellix joined	06:51
	→ sanjayu joined	06:51
	← bambams_ left	06:51
twb	so suppose foo and baz conflict, if I just stop adding branches when I get a conflict, I'd never try to merge quuuux which might merge cleanly	06:51
grumbel_	ah, so you want to try out all combinations that merge without conflict?	06:52
	or better, find the largest number of branches that merge without confligt	06:52
twb	Yeah find the maximum set of branches that merge cleanly as octopus	06:52
grumbel_	twb: This might help. If will iterate over the power set of your branches, and you can stop whenever a merge was without conflict: http://stackoverflow.com/questions/15742005/the-logic-behind-bash-power-set-function	06:53
	← xSmurf left	06:54
twb	blerg	06:54
	→ hkon_ joined	06:55
	← jonmorehouse left	06:56
	← vipzrx left	06:58
	→ vipzrx joined	06:58
	→ vurma joined	06:58
	→ MafooUK joined	07:01
	← kburdett left	07:04
	→ kenneth joined	07:04
	← rchavik left	07:04
	→ EminenceHC joined	07:05
	→ mishok13 joined	07:05
	→ blackmesa joined	07:06
	← Luke-Jr left	07:06
	→ kburdett joined	07:07
	→ Luke-Jr joined	07:08
	→ xintron joined	07:08
	→ Gavrisimo joined	07:08
	→ cruig joined	07:09
	← EminenceHC left	07:09
	← cruig left	07:11
	→ lb joined	07:12
	→ ghostlines joined	07:12
	→ pantsman joined	07:13
	← pantsman left	07:13
	→ pantsman joined	07:13
	→ pwnz0r831 joined	07:13
	→ razrunelord joined	07:13
	→ dangerousdave joined	07:14
	→ Gizburdt joined	07:15
	→ Zebroid joined	07:15
	← pwnz0r831 left	07:17
	← razrunelord left	07:18
	→ Ardenzi joined	07:18
	← adkins2 left	07:19
	→ jargon joined	07:19
	← Zebroid left	07:20
	→ Asiajey_ joined	07:20
	← Asiajey left	07:20
	→ shruggar joined	07:20
	→ hafeez3000 joined	07:20
	← maveneag_ left	07:21
	← blackmesa left	07:21
	→ rchavik joined	07:21
	← Luke-Jr left	07:23
	→ Luke-Jr joined	07:23
	→ PeterBooker joined	07:24
	→ cagfernandes joined	07:25
	→ teran_ joined	07:25
	→ gua_ould joined	07:26
	← teran left	07:29
	← nnyk_ left	07:29
	→ cvanball joined	07:29
	→ User458764 joined	07:29
	← codeFiend left	07:32
	→ franzip joined	07:32
	← dangerousdave left	07:33
	← joki left	07:33
	→ watermel0n joined	07:34
	← maxorator left	07:35
	→ Macaveli joined	07:35
	→ irqq joined	07:35
	→ maxorator joined	07:36
	→ lyubenblagoev__ joined	07:36
	← daito left	07:36
	→ a-l-e joined	07:36
	→ daito joined	07:37
	← Kicer86 left	07:37
	→ jagob joined	07:38
	← richwestcoast left	07:38
	→ joki joined	07:39
	→ richwestcoast joined	07:39
	← lyubenblagoev_ left	07:39
	← teran_ left	07:40
	→ teran joined	07:40
	User458764 → User458764_NotHe	07:40
	→ Balliad joined	07:41
	← daito left	07:41
	← jceb_ left	07:42
	→ nilg` joined	07:42
	← User458764_NotHe left	07:42
	← shruggar left	07:44
	→ irqq_ joined	07:44
	← toomanysecrets left	07:44
	← richwestcoast left	07:44
	→ richwestcoast joined	07:45
	→ fragamus joined	07:46
	← cvanball left	07:47
	← thiago left	07:47
	← irqq left	07:48
	← nilg` left	07:48
	← fragamus left	07:50
	← richwestcoast left	07:50
	← ariscop left	07:50
	→ richwestcoast joined	07:51
	← beautifulmind left	07:51
	→ hellopat joined	07:52
	← Gizburdt left	07:53
	→ cvanball joined	07:54
	← richwestcoast left	07:56
	← mishok13 left	07:56
	← hellopat left	07:56
	→ jceb_ joined	07:56
	→ richwestcoast joined	07:57
	← Arkaniad left	07:57
	→ Not_Whatever joined	07:57
	→ toomanysecrets joined	07:58
	→ mishok13 joined	07:59
	→ lavong joined	07:59
	← shafox left	08:00
	← richwestcoast left	08:01
	→ harobed joined	08:02
	→ moritzs joined	08:02
	→ Gizburdt joined	08:02
	→ richwestcoast joined	08:02
	→ psoo joined	08:02
	→ oodavid joined	08:03
	→ Manny joined	08:04
	← psoo left	08:05
	← richwestcoast left	08:05
	→ richwestcoast joined	08:05
	→ psoo joined	08:05
	→ EminenceHC joined	08:07
	→ robzilla joined	08:08
	→ Exancillatus joined	08:09
	← pantsman left	08:10
	→ daito joined	08:10
	→ matteo joined	08:11
	→ mikecmpbll joined	08:11
	← goTAN left	08:12
	← EminenceHC left	08:12
	→ goTAN joined	08:12
	← robzilla left	08:12
	← richwestcoast left	08:13
	→ richwestcoast joined	08:13
	← watermel0n left	08:13
	→ razrunelord joined	08:14
	← recycle_ left	08:14
	→ Zebroid joined	08:16
	→ gerard0 joined	08:17
	→ shafox joined	08:18
	← richwestcoast left	08:19
	← razrunelord left	08:19
	← jceb_ left	08:19
	→ maveneagle joined	08:19
	← Zebroid left	08:21
	← HelperW left	08:22
	← D9 left	08:22
	→ HelperW_ joined	08:22
	→ shruggar joined	08:22
	→ AOP_ joined	08:22
	→ g0bl1n joined	08:23
	← g0bl1n left	08:23
	→ g0bl1n joined	08:23
	← Gavrisimo left	08:23
	→ VictorCL joined	08:24
	← Internet13 left	08:24
	→ richwestcoast joined	08:24
	← Skrypter left	08:24
	→ Skrypter joined	08:25
	← mishok13 left	08:26
	→ xlinkz0 joined	08:27
	→ mishok13 joined	08:28
	→ Internet13 joined	08:28
	← dreiss left	08:29
	← richwestcoast left	08:29
	← Skrypter left	08:30
	→ Xethron joined	08:30
	← Xethron left	08:30
	→ Xethron joined	08:30
	← jxf left	08:30
	← woollyams left	08:32
	→ jceb_ joined	08:32
	→ the_bz joined	08:33
	→ richwestcoast joined	08:33
	← hjalti left	08:33
	← vipzrx left	08:33
	→ vipzrx joined	08:34
	→ welly joined	08:35
	← richwestcoast left	08:35
	→ gain joined	08:35
	→ richwestcoast joined	08:35
	← vipzrx left	08:36
	→ kstuart_ joined	08:37
	← kstuart left	08:37
	← Okaria left	08:37
	→ rishabh_ joined	08:38
	← kermit left	08:39
	→ diegovio1 joined	08:39
	← diegoviola left	08:39
	→ kermit joined	08:40
	→ Okaria joined	08:40
	← richwestcoast left	08:40
	← kulkarp left	08:41
	→ richwestcoast joined	08:41
	← intellix left	08:44
	→ vire joined	08:45
	→ ArSn joined	08:45
	→ Celm joined	08:45
	← lyubenblagoev__ left	08:47
	→ squawkspopuli joined	08:47
	← squawkspopuli left	08:47
	→ squawkspopuli joined	08:47
	→ intellix joined	08:47
	← richwestcoast left	08:47
	← blahdodo left	08:47
	→ richwestcoast joined	08:48
	← richwestcoast left	08:49
	→ richwestcoast joined	08:49
	← Celm left	08:50
	← SegFaultAX left	08:51
	← delight left	08:51
	← pikaren left	08:52
	→ SegFaultAX joined	08:53
	← kerrick left	08:53
	← maveneagle left	08:53
	← teran left	08:54
	→ maveneagle joined	08:54
	→ rob_w joined	08:54
	→ teran joined	08:54
	→ freimatz joined	08:54
	← VictorCL left	08:54
	→ DocGroove joined	08:55
	← drale2k left	08:57
	→ teran_ joined	08:57
	→ DoniRS joined	08:59
	← diegovio1 left	09:00
	← jceb_ left	09:00
	→ ZinovaS_w5 joined	09:00
	→ VictorCL joined	09:00
	← teran left	09:01
	← richwestcoast left	09:01
	→ hjalti joined	09:01
	→ Guest77241 joined	09:01
	→ richwestcoast joined	09:01
	→ Sonderblade joined	09:01
	← Sonderblade left	09:02
	→ Sonderblade joined	09:02
	→ Zebroid joined	09:03
	gitinfo set mode: +v	09:03
ZinovaS_w5	hi, is there a way to configure git so that it could perform just read-only operation on local repo? repo file permissions cant be changes...	09:03
tobiasvl	huh?	09:04
	your local repo?	09:04
twb	ZinovaS_w5: chmod -R a-r *	09:04
	ZinovaS_w5: git relies on the OS to enforce access control	09:04
tobiasvl	twb: surely you mean a-w	09:04
	← jovy88 left	09:04
twb	oops	09:04
jast	if you can't change permissions and want to "disencourage" git from changing stuff, there aren't many options	09:04
	but one thing you can do is prevent 'git add' and friends from working: touch .git/index.lock	09:05
	→ schulung joined	09:05
ZinovaS_w5	will try, thanks	09:05
grumbel_	ZinovaS_w5: other options: (1) install hooks that reject anything, (2) access the repo only through a read-only URL (git://)	09:05
	→ jovy88 joined	09:06
	← shafox left	09:06
	← richwestcoast left	09:06
twb	of course they can also just clone the whole thing, then edit that	09:06
	If your threat model considers that a Bad Thing, you're screwed	09:07
jast	I'm curious, btw: what's your goal with this?	09:07
	→ richwestcoast joined	09:07
	← Zebroid left	09:08
	→ Xiti` joined	09:08
ZinovaS_w5	main point here is that IDE takes path to git (probablu options can be incejted) and I dont want IDE to be able to modify or lock repo (only cli interface is used for commit/push)	09:08
	→ jottr_ joined	09:08
	→ robzilla joined	09:08
ZinovaS_w5	IDE git integrations pulls by itself randomly and does not have any configuration ....	09:09
	but blame in IDE looks better then cli ;)	09:09
	← ferreum158 left	09:09
tobiasvl	but git is distributed	09:10
	locking a local repo makes little sense imo	09:10
osse	the Blame has to look REAAALLY good for that to be worth it :O	09:10
	← Xiti left	09:11
	← robzilla left	09:13
grumbel_	not sure how such a solution would block only the IDE and not the cli, though	09:13
	→ kriks joined	09:14
	← Sonderblade left	09:14
	→ Octalot joined	09:14
tobiasvl	run the IDE as a special user that doesn't have write access :P	09:14
	→ razrunelord joined	09:15
	→ jceb_ joined	09:15
	→ EminenceHC joined	09:16
	← Tuna-Fish left	09:16
	→ dangerousdave joined	09:17
	→ nfk joined	09:17
	← h0bbit left	09:18
twb	osse: xfaces with targets painted over them	09:18
	← hkon_ left	09:18
	→ jatt joined	09:19
twb	http://code.google.com/p/gource/ can use xfaces; I need to sort that out for Ork RSN.	09:19
	← jatt left	09:19
	→ jatt joined	09:19
	← razrunelord left	09:20
twb	tobiasvl: or you could LD_PRELOAD or use a fuse rofs wrapper, to just discard write attempts to that VFS tree	09:20
	→ ezekielnoob joined	09:20
	← EminenceHC left	09:20
	← hafeez3000 left	09:20
twb	ZinovaS_w5: fixing the IDE sounds like the best plan, though.	09:20
	→ cvanball_ joined	09:21
	→ nnyk_ joined	09:21
	→ ferreum158 joined	09:22
	← VictorCL left	09:23
	← cvanball left	09:23
	→ martinklepsch joined	09:23
	← the_bz left	09:23
	→ Sonderblade joined	09:24
	← Sonderblade left	09:24
	→ the_bz joined	09:25
	← twb left	09:25
	→ jackneill joined	09:25
	← jackneill left	09:25
	→ jackneill joined	09:25
	← schulung left	09:25
	← DocGroove left	09:26
ZinovaS_w5	twb, made a quick wraper script to pass only commaned that have --version\|log\|show\|blame as first argument to real git	09:26
	← nnyk_ left	09:26
ZinovaS_w5	will see how that works in longer term	09:26
	← g0bl1n left	09:27
	→ VictorBjelkholm joined	09:30
	→ beautifulmind joined	09:32
	→ endiruna joined	09:33
	→ ndee_ joined	09:33
	→ hafeez3000 joined	09:33
	→ ariscop joined	09:34
	← nkouevda left	09:35
	← renatow left	09:35
	→ nkouevda joined	09:36
	← harobed left	09:36
	← jeffasinger left	09:37
	← ndee_ left	09:38
	→ Zariel_ joined	09:38
	→ hkon_ joined	09:39
	← nkouevda left	09:40
	→ hellopat joined	09:40
	→ freestyl3r joined	09:41
	← Baluse left	09:42
	← hellopat left	09:45
	→ Celm joined	09:46
	← harish left	09:46
	← mishok13 left	09:48
	← surfdue left	09:49
	→ mishok13 joined	09:50
	← Celm left	09:50
	← jottr_ left	09:50
	→ Sound joined	09:50
	← himikof left	09:51
	← jackh left	09:51
	→ himikof joined	09:51
	← hebz0rl left	09:53
	→ surfdue joined	09:54
	← richwestcoast left	09:55
	→ richwestcoast joined	09:55
	← Manny left	09:58
	→ kulkarp joined	09:58
	→ hebz0rl joined	09:59
	← surfdue left	09:59
	→ surfdue joined	09:59
	← MagePsycho left	09:59
	→ Manny joined	10:00
	→ daedeloth joined	10:00
	← Exancillatus left	10:01
	→ nbrosnah_ joined	10:01
	← nbrosnah_ left	10:01
	→ h0bbit joined	10:02
	→ Zebroid joined	10:04
	← surfdue left	10:05
	→ canton7-mac joined	10:07
	← Zebroid left	10:08
	→ robzilla joined	10:09
	→ woollyams joined	10:10
	→ JrCs joined	10:10
osse	ZinovaS_w5: if your IDE "auto-pulls" wouldn't you then gets lots of errors?	10:10
	→ surfdue joined	10:11
	← Gizburdt left	10:13
	← robzilla left	10:13
	→ thevishy joined	10:14
	← thevishy left	10:14
	→ thevishy joined	10:14
	→ razrunelord joined	10:16
ZinovaS_w5	osse: i just return exit code 0 on other subcommands and ide thinks its ok ;)	10:18
	→ EminenceHC joined	10:19
	← echo-area left	10:19
	← Kayra left	10:19
	← razrunelord left	10:20
	← Manny left	10:20
	→ Kayra joined	10:21
	← EminenceHC left	10:23
	← richwestcoast left	10:24
	→ King_Hual joined	10:24
	→ richwestcoast joined	10:25
	← bunbury left	10:26
	→ nnyk_ joined	10:27
	← sanjayu left	10:27
	→ bobdobbs joined	10:29
	→ Gamecubic joined	10:29
	← bhldev__ left	10:30
	→ bhldev__ joined	10:30
bobdobbs	I'm working on a project that I haven't worked on for a while. I want my remote version to be in the same state as my local version. I made some changes locally, and then did 'git push'. I got this back:	10:30
	http://pastebin.com/0JshNMVj	10:30
	← tokik left	10:31
tobiasvl	bobdobbs: it means the remote has some changes that you don't have locally (or that you've changed the history)	10:31
	← richwestcoast left	10:31
	← paulweb515 left	10:31
	→ Exancillatus joined	10:31
bobdobbs	I see	10:32
tobiasvl	so do what it says; 'git pull' the remote changes first	10:32
	→ richwestcoast joined	10:32
bobdobbs	I think I already did that	10:32
	I do it again anyway	10:32
goTAN	is there a way to have a branch A tracking a branch B so that whenever I push in B, A also gets those changes?	10:32
osse	bobdobbs: Note: a git pull will do a merge.	10:32
	bobdobbs: Ie. your lcoal version will become a combination of your local and remote versions	10:33
	→ achadwick joined	10:33
bobdobbs	damn. tried a git pull, but I've got conflicts	10:33
osse	goTAN: you can make A a symbolic reference to B	10:33
tobiasvl	bobdobbs: yeah, those need to be resolved	10:34
	← intellix left	10:34
bobdobbs	tobiasvl: is there that I can just forcefully push, adding my own code to remove, no matter what?	10:35
goTAN	hm what I basically want is one master branch where the release version is pushed , and then different master branches for specific platforms which only have some minor changes like compiler settings some gfx chanes etc but should still have the changes I pushed in master.	10:35
tobiasvl	bobdobbs: sure, 'git push --force', but that will !rewrite history	10:35
gitinfo	bobdobbs: Rewriting public history is not recommended. 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 <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	10:35
goTAN	if that makes sense	10:35
bobdobbs	tobiasvl: I'm the only person working on this project. so I'll give that a try	10:36
	→ carbon joined	10:36
grumbel_	goTAN: for an automatic solution, you'll probably need some scripting (using hooks, for example)	10:36
bobdobbs	tobiasvl: cool! that did it!	10:36
tobiasvl	bobdobbs: then go right ahead (as long as you're sure you don't have anything at the remote that you want to keep)	10:37
	great	10:37
bobdobbs	thanks	10:37
goTAN	hm	10:37
grumbel_	goTAN: The more typical workflow is probably to have all platforms in a single branch, and use defines, makefiles etc. for specific platform settings	10:37
	→ stamina joined	10:37
	← richwestcoast left	10:38
goTAN	grumbel_: hm yea but I also have different art assets	10:38
	→ richwestcoast joined	10:39
	→ Error404NotFound joined	10:39
osse	goTAN: I think you will have to do that manually (ie. rebase or merge the master-* branches)	10:39
zoso	Hi, I need help with merging history from a repository. I have two repositories, A and B, B is a clone of A. Both repositories have gone through changes independently, and now I want to merge changes of B to A. How do I go about achieving this?	10:39
osse	but it's scriptable	10:39
goTAN	yea	10:39
osse	zoso: in A, add B as a remote, then fetch from it. Then merge whatever you wish	10:39
grumbel_	goTAN: I see, but deployment / packaging tools can usually select those per-platform	10:40
	→ Hounddog joined	10:40
zoso	osse, thanks :)	10:40
	← xrlk left	10:40
	← hoijui left	10:41
	→ Bruno_ joined	10:41
	← kyb3r_ left	10:42
	← Exancillatus left	10:42
	→ Gizburdt joined	10:43
	← nasomi left	10:44
	→ Exancillatus joined	10:44
	← Gizburdt left	10:45
	→ Gizburdt joined	10:45
	→ sanjayu joined	10:46
	→ loveablelobster joined	10:46
	→ Xeroa joined	10:47
	← hyperair left	10:47
	→ nwertman_ joined	10:47
	→ philp joined	10:48
	→ nephyrin` joined	10:49
	→ amikiri joined	10:49
	→ arunpandianp__ joined	10:49
	→ adkins joined	10:50
	→ PaulePan1er joined	10:50
	→ twem2_ joined	10:50
zoso	How can I find out difference of commits between two remotes?	10:50
	→ robins joined	10:50
	→ boblee_ joined	10:50
	→ tureba_ joined	10:50
	→ ec_ joined	10:50
	→ drodger joined	10:51
osse	zoso: depends on how you want the info to be presented	10:51
	→ jiriki- joined	10:51
	→ cfedde_ joined	10:51
	→ jcvfen joined	10:51
	→ njsg__ joined	10:51
	→ pdtpatri1k joined	10:51
	→ DANtheBE- joined	10:51
	→ d1b_ joined	10:51
	→ salparad1se joined	10:51
	→ rawtaz_ joined	10:51
tobiasvl	zoso: fetch from both remotes and diff the remote branches, basically	10:51
	← jcvfen left	10:51
	→ sea-gull- joined	10:52
	→ Jupelius_ joined	10:52
	← teran_ left	10:53
	→ teran joined	10:53
	→ mtj_- joined	10:53
	→ jokajak` joined	10:54
	← lite__ left	10:54
	→ iAsterisk_ joined	10:54
	→ cworth` joined	10:54
	→ quantsini_ joined	10:54
	→ specing_ joined	10:54
	→ yomi_ joined	10:54
	→ Orginator joined	10:54
	← Orginator left	10:54
	→ Brando753-o_O_o joined	10:54
	← kriks left	10:54
	→ helgikrs1 joined	10:54
	→ Gitzilla_ joined	10:54
	→ Orginator joined	10:55
	→ tarkus joined	10:55
	← Orginator left	10:55
	→ Purveyor joined	10:55
	→ jamieshepherd joined	10:55
	→ unCork joined	10:55
	← Levex left	10:55
	→ Levex joined	10:55
	orwell.freenode.net set mode: +v	10:55
	← specing left	10:55
	← JPT left	10:55
	← iAsterisk left	10:55
	← Cork left	10:55
	← mtj_ left	10:55
	← nwertman left	10:55
	← twem2 left	10:55
	← boblee left	10:55
	← Brando753 left	10:55
	← meatmanek left	10:55
	← Yomi left	10:55
	← cworth left	10:55
	← jokajak left	10:55
	← tureba left	10:55
	← DANtheBEASTman left	10:55
	← ec left	10:55
	← quantsini left	10:55
	← Entomo left	10:55
	← pdtpatrick left	10:55
	← MissionCritical left	10:55
	← Rylee left	10:55
	← philp_ left	10:55
	← Orginator_ left	10:55
	← njsg left	10:55
	← salparadise left	10:55
	← ping_pong left	10:55
	← jaeckel left	10:55
	← Jupelius left	10:55
	← roflin left	10:55
	← rawtaz left	10:55
	← Gitzilla left	10:55
	← jiriki left	10:55
	← d1b left	10:55
	← arunpandianp left	10:55
	← robinsmidsrod left	10:55
	← wakd left	10:55
	← cuqa left	10:55
	← helgikrs left	10:55
	← cfedde left	10:55
	← flexd left	10:55
	← D4v33 left	10:55
	← zz_ag4ve left	10:55
	← basfdasae23 left	10:55
	← nephyrin left	10:55
	unCork → Cork	10:55
tarkus	After stash apply my files contain strings like <<<< Updates upstream... how to fix that?	10:55
	specing_ → specing	10:55
	→ Rylee_ joined	10:55
	→ jcvfen joined	10:56
	→ mnathani1 joined	10:56
	gitinfo set mode: +v	10:56
adkins	hey guys, i want to clone from my private debian server to a windows machine using pageant which has the pprivate key loaded. i get: http://pastebin.com/7f86imzy (of course i replaced USER,IP and PORT with the correct values) . Well its not working as you can see at pastebin. i followed instructions like here http://www.bitsandpix.com/entry/git-setup-msysgit-install-with-pageantplink-from-putty/ .any help?	10:56
	Brando753-o_O_o → Brando753	10:56
	→ basfdasae23 joined	10:56
	→ D4v33 joined	10:56
	→ roflin joined	10:56
	→ ping_pong joined	10:56
	→ DolpheenDream joined	10:56
	→ JPT_ joined	10:56
	→ cuqa joined	10:56
	→ jaeckel joined	10:57
	→ MagePsycho joined	10:57
	→ flexd joined	10:57
	→ Orginator joined	10:57
	→ wakd joined	10:57
	← basiclaser left	10:58
osse	tarkus: you're in a merge conflict	10:58
	→ carandraug joined	10:58
zoso	tarkus, those lines represent merge conflicts, go through the code and find out what changes you want to keep, and then save the file and commit your changes	10:58
	→ basiclaser joined	10:59
	← Olipro left	10:59
	→ Tuna-Fish joined	11:00
	→ cybersphinx joined	11:00
	→ meatmanek joined	11:00
	← rawtaz_ left	11:01
	→ Gooder` joined	11:01
	→ Olipro joined	11:01
	→ rawtaz joined	11:01
	→ Devastatr joined	11:02
	→ ZinovaS_w5_ joined	11:02
	→ Jiffy_ joined	11:02
	→ MutantMahesh joined	11:02
	← MutantMahesh left	11:02
	→ MutantMahesh joined	11:02
	← MutantMahesh left	11:02
	→ MutantMahesh joined	11:02
	← martinklepsch left	11:02
zoso	osse, I think I am not being clear enough about my problem. I want to find out by how many commits is a branch of a remote lagging by from another branch of a remote.	11:02
	→ [BNC]l1kw1d joined	11:03
tarkus	zoso, is there a way to resolve this conflict by using some tool?	11:03
tobiasvl	it diff branch..remote/branch	11:03
tarkus	doing it manually will be a pain	11:03
tobiasvl	*git	11:03
	→ Octalot_ joined	11:03
	→ makubi_ joined	11:04
	→ dobalina joined	11:04
	→ saorge_ joined	11:04
	← njsg__ left	11:04
	→ lbn_ joined	11:04
	→ njsg joined	11:04
	← Ragnor left	11:04
osse	zoso: git rev-list remote1/branch..remote2/branch	11:05
	→ ec joined	11:05
	→ Zebroid joined	11:05
	→ Ragnor joined	11:05
zoso	tobiasvl, osse thanks :)	11:05
osse	zoso: git rev-list --count remote1/branch..remote2/branch	11:05
	← vmiklos left	11:05
	→ vmiklos joined	11:05
	→ Mission-Critical joined	11:06
	← Zariel_ left	11:06
osse	zoso: git rev-list --count --left-right remote1/branch...remote2/branch	11:06
	← richwestcoast left	11:07
	→ richwestcoast joined	11:07
	→ biertie joined	11:07
	→ jojva joined	11:08
zoso	tarkus, umm, depends on what you want, if you don't care about the conflicts, you can just checkout the file in question from a remote branch, which you think is the right one. Then another way is to really go and fix the conflicts using a editor.	11:08
	← Zebroid left	11:09
	→ drale2k joined	11:09
	→ lemonjel1y joined	11:10
	→ robzilla_ joined	11:10
osse	If it could be done reliably using a tool then Git would have done the job itself :P	11:10
	→ Authenti1ator joined	11:11
	← nnyk_ left	11:12
	← Kayra left	11:12
	→ martinklepsch joined	11:12
	→ Kayra joined	11:13
	← richwestcoast left	11:13
	→ carandraug_ joined	11:13
	← cvanball_ left	11:13
	Mission-Critical → MissionCritical	11:14
	→ richwestcoast joined	11:14
	← robzilla_ left	11:15
	→ lite_ joined	11:15
	→ pikaren joined	11:15
	→ Zariel_ joined	11:16
	← carandraug_ left	11:16
	→ razrunelord joined	11:16
	← shruggar left	11:18
	→ marek_ joined	11:19
	→ carandraug_ joined	11:19
	→ EminenceHC joined	11:20
	← grep0r left	11:20
	← marek_ left	11:20
	→ nardev joined	11:20
	← razrunelord left	11:21
	→ tvw joined	11:21
	→ arlekin joined	11:22
arlekin	hi all	11:22
gitinfo	arlekin: 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.	11:22
	→ Kartagis joined	11:22
Kartagis	I'd like a raisin bran please	11:22
	← wakd left	11:23
	← Orginator left	11:23
	← Purveyor left	11:23
	← ec_ left	11:23
	← sanjayu left	11:23
	← hebz0rl left	11:23
	← carandraug left	11:23
	← beautifulmind left	11:23
	← jackneill left	11:23
	← Octalot left	11:23
	← DoniRS left	11:23
	← rob_w left	11:23
	← cagfernandes left	11:23
	← ciampix left	11:23
	← ZinovaS_w5 left	11:23
	← MattMaker left	11:23
	← LeMike left	11:23
	← mad left	11:23
	← Devastator left	11:23
	← makubi left	11:23
	← JosephFerano left	11:23
	← Vampire0_ left	11:23
	← the_cybersphinx left	11:23
	← garvank left	11:23
	← saorge left	11:23
	← W0rmDr1nk left	11:23
	← rigid left	11:23
	← jason237 left	11:23
	← Alenah left	11:23
	← Jiffy left	11:23
	← Authenticator left	11:23
	← ERROH left	11:23
	← jojva` left	11:23
	← Gooder left	11:23
	← Mendenbarr left	11:23
	← kaendfinger left	11:23
	← tsunamie left	11:23
	← lbn left	11:23
	← bdesmet left	11:23
	← lemonjelly left	11:23
	← l1kw1d left	11:23
	← rethus left	11:23
	← Caius left	11:23
	← Averell left	11:23
	← niax left	11:23
	← EminenceHC left	11:24
	→ grep0r joined	11:25
	← luc__ left	11:25
osse	Kartagis: I think we're out... But we have beer.	11:26
	And various opiates	11:26
	← k_sze[work] left	11:26
	← arlekin left	11:26
	← Gamecubic left	11:27
	→ nnyk_ joined	11:27
	→ momomomomo joined	11:27
	→ harish joined	11:27
Kartagis	toss me a Bud	11:28
	→ hellopat joined	11:28
	→ arlekin joined	11:28
arlekin	hi	11:28
zoso	Is there a way, I can push a range of commits to a remote.	11:28
	→ jason237 joined	11:29
osse	zoso: you can only push a certain commit and everything that leads up to it	11:29
	zoso: if you have A - B - C - D, then you can push A, or A - B, or A - B - C, etc. But not B - C	11:30
zoso	osse, after that can I prune the history, is there no way I can not have certain commits?	11:30
arlekin	what if i want to have synced local repo with remote one but i want to achieve that by manually changes rather than merging commits	11:30
	?	11:30
osse	zoso: rewrite the history to contain only those commits ,then push	11:30
zoso	I see :)	11:31
	thanks :)	11:31
	→ digitalextremist joined	11:31
carandraug_	I made a question a few minutes ago but connection has been really bad. I'm unsure if someone answered	11:31
	so apologies for the repeat, I'll make it again.	11:31
	hi! I'm not that flexible with git yet, I'm more used to hg and have an issue that is probably easy to solve and I'm just being stupid. I cloned a repo, and made changes in one the branches. It seems that anonymous branches are not really a thing in git so I want to rename it, go back to the diverging point, and continue from there. How can I do this?	11:31
_ikke_	carandraug_: The question didn't arrive the first time	11:31
	← Kayra left	11:32
arlekin	i guess u could just create barnch	11:32
	*branch	11:32
carandraug_	_ikke_, well. Here it is for the first time, then. Thank you	11:32
	← hellopat left	11:32
	← arlekin left	11:33
	→ GODDOG joined	11:33
carandraug_	arlekin, but the branch already exists (it actually diverged upstream)	11:33
	→ arlekin joined	11:34
	zz_anildigital → anildigital	11:35
arlekin	hello there	11:35
carandraug_	arlekin, hello	11:35
_ikke_	carandraug_: git fetch; git checkout -B <name> origin/<name>	11:35
	→ Christer joined	11:35
_ikke_	Hmm, no that's not the diverging point	11:36
	gitinfo set mode: +v	11:36
arlekin	how can i merge local repo with remote one in a way that i will make changes in local manually and they will just sync ?	11:36
_ikke_	..	11:36
Christer	Hi, when trying to use git --amend , it just freezes the terminal window. Any idea why this would happen? Thanks :)	11:37
	→ Vampire0_ joined	11:37
	← carbon left	11:37
carandraug_	_ikke_, I will be happy with going to what is the "HEAD" in upstream. I want to keep my changes. In hg I would just keep it as anoymous, in git I'm not sure how to handle this	11:37
_ikke_	carandraug_: In git you just give the branch a name	11:37
	← Xethron left	11:37
	anildigital → zz_anildigital	11:37
_ikke_	So you know where to find it instead of having to check all the anonymous heads	11:38
	→ wakd joined	11:38
	→ Purveyor joined	11:38
_ikke_	carandraug_: so git branch <new_name> to create a new branch on the current commit	11:38
	← franzip left	11:38
	→ DoniRS joined	11:38
	← mikecmpbll left	11:38
carandraug_	_ikke_, I ran your command and I lost my branch :s	11:39
	← stfn left	11:39
_ikke_	carandraug_: Which one?	11:39
osse	Christer: see if it has started your editor in the background or something	11:39
	→ hebz0rl joined	11:39
	→ Orginator joined	11:39
	← Orginator left	11:39
	→ rob_w joined	11:39
_ikke_	carandraug_: Which command did you run?	11:40
	→ franzip joined	11:40
	→ Orginator joined	11:40
	→ MattMaker joined	11:40
carandraug_	_ikke_, git checkout -B develop origin/develop	11:40
	→ _tpavel joined	11:40
	→ rigid joined	11:40
carandraug_	"develop" is like their "master" it seems	11:40
	which printed "error: Not tracking: ambiguous information for ref refs/remotes/origin/develop Reset branch 'develop' Your branch is up-to-date with 'origin/develop'. " and puff, I can't see my branch anymore	11:41
	← martinklepsch left	11:41
_ikke_	carandraug_: You mean the commits on the branch?	11:42
	→ mikecmpbll joined	11:42
	← adkins left	11:42
	→ martinklepsch joined	11:42
	← saurabh left	11:42
carandraug_	_ikke_, yes. I'm also using a GUI (gitg) to help me while I get used to it, and I can't find it there either	11:42
	→ chiromante joined	11:42
	← ziro`_ left	11:42
	→ W0rmDr1nk joined	11:43
	← h0bbit left	11:43
_ikke_	carandraug_: does git show @{1} show you the last commit?	11:43
Christer	osse: it didnt - But i did it from git bash instead of cygwin. And there it worked. (opening vim first for commit msg)	11:43
moritz	well, -B replaces existing branches	11:44
	← richwestcoast left	11:44
	→ richwestcoast joined	11:44
moritz	if you don't want that, don't use -B	11:44
	→ Kayra joined	11:44
carandraug_	_ikke_, ah! Yes, it does. Where is this thing?	11:44
arlekin	how can i merge local repo with remote one in a way that i will make changes in local manually and they will just sync ?	11:44
_ikke_	carandraug_: git branch <new_name> @{1}	11:44
	zz_anildigital → anildigital	11:45
_ikke_	arlekin: Your question is not clear to me	11:45
carandraug_	_ikke_, that worked. BUt what did I just do?	11:45
_ikke_	carandraug_: branches in git are like bookmarks in hg	11:46
	→ fragMental joined	11:46
grumbel_	arlekin: Not sure what you mean; are you probably looking for git rebase?	11:46
	← _tpavel left	11:46
_ikke_	carandraug_: with checkout -B you recreated the current branch on another commit	11:47
	But git also keeps references to checked out commits in a thing called the reflog	11:47
	→ Celm joined	11:47
	→ jackneill joined	11:47
grumbel_	arlekin: there are typically two strategies to merge remote and local changes; rebasing your local changes on top of the remote changes (-> linear history), or creating a merge commit	11:47
_ikke_	So even if you loose the reference to a commit, you can still get it back via the reflog	11:47
	→ Averell joined	11:48
	→ cagfernandes joined	11:48
	→ mad joined	11:48
	→ JosephFerano joined	11:48
	→ garvank joined	11:48
	→ Alenah joined	11:48
	→ ERROH joined	11:48
	→ Mendenbarr joined	11:48
	→ kaendfinger joined	11:48
	→ tsunamie joined	11:48
	→ rethus joined	11:48
	→ Caius joined	11:48
_ikke_	@{1} points to the second most recent entry in the reflog, so, the commit you had checked out before the current	11:48
arlekin	grumbel_: im quite certain im not, trick is, i have some commits in my remote (bitbucket) which i want to apply to local repo, BUT for some reasons i cannot just merge them in, so i wonder if there is method to adjust two repo states manually	11:48
	→ lsiv568 joined	11:48
	→ rnsanchez joined	11:48
	→ niax joined	11:48
	← Jupelius_ left	11:48
tobiasvl	arlekin: what reasons are those?	11:48
	→ Jupelius joined	11:49
	→ Xethron joined	11:49
	← Xethron left	11:49
	→ Xethron joined	11:49
	← jagob left	11:49
	→ Gamecubic joined	11:49
	→ blackmesa joined	11:49
arlekin	tobiasvl: its just that it changes models in my django project and i need to make some adjustments in south for it in meantime	11:49
grumbel_	arlekin: you could fetch, cherry-pick the remote changes, and then force push the new history	11:49
	← tsunamie left	11:49
fragMental	Hi, I want to put a project under git that consists of a lot of subdirectories that are mostly independent of each other, and only contain few files (<10 in most cases). I was thinking about what would be the best way to do this. I don't really want to make a separate repo for each subdir. What do you think of this approach: make a branch for every subdir, only commit on those branches and then merge back into	11:49
	master (and maybe require commitmessages to start with a [subdir] tag)?	11:50
	→ _tpavel joined	11:50
carandraug_	_ikke_, I need to read more on the internals about this reflog	11:50
	→ tsunamie joined	11:50
arlekin	grumbel_: im preety newbie to git, though i already cherypicked stuff and such, but i dont have a problem with a way to merge, just dont wanna do it all at once	11:51
carandraug_	if this had been a much older commit, is there some way to find all the "dead ends" that don't belong to a branch? And if there's many commits in such branch, are they still connected in the reflog?	11:51
	← Celm left	11:51
arlekin	grumbel_: maybe i should torn my commits to few smaller ones and then went through it step by step....	11:51
_ikke_	carandraug_: Entries in the reflog will expire some time	11:52
	← richwestcoast left	11:52
	→ richwestcoast joined	11:52
_ikke_	carandraug_: The age of the commit itself doesn't matter for the reflog, if you had it checked out recent	11:52
	← Gege left	11:52
carandraug_	so bottom line, I should always name my things	11:52
_ikke_	yes	11:52
carandraug_	ok. Coming up with names takes almost as much time as the actual coding	11:53
_ikke_	It's common in git to use branches for certain features	11:54
	→ anli_ joined	11:54
	→ SpaghettiCat_ joined	11:54
_ikke_	feature/add-friend-dialogue	11:54
	→ jagob joined	11:55
Kwpolska	it’s common in programming to speak US English: feature/add-friend-dialog	11:55
	anildigital → zz_anildigital	11:55
_ikke_	Kwpolska: Was doubting about it	11:55
	gitinfo set mode: +v	11:55
anli_	I have a directory with some files, now I want to create a git clone of it and a repo that was cloned from in another directory, can I do that in a single step?	11:55
	← SpaghettiCat_ left	11:55
	→ SpaghettiCat joined	11:56
SpaghettiCat	Hello, I have a commit history that looks like this: http://pastie.org/9155461 What do the "^2", "^2^", "^2~2" parts mean?	11:56
carandraug_	_ikke_, in my specific case, I'm just adding very small things. Plus, I'm also using github. So I need to make a branch, 3 lines of code, put it on github and make a pull request.	11:57
	← richwestcoast left	11:57
	→ Joost_ joined	11:57
	→ richwestcoast joined	11:57
_ikke_	SpaghettiCat: ^2 means the second parent	11:57
	SpaghettiCat: see also man gitrevisions	11:58
	← DolpheenDream left	11:58
gitinfo	SpaghettiCat: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html	11:58
_ikke_	carandraug_: Why do you make those changes?	11:58
	← lsiv568 left	11:58
SpaghettiCat	Ahh, thanks for that	11:58
	← moondoggy left	11:59
	→ shruggar joined	11:59
	← the_bz left	12:00
	← amikiri left	12:00
carandraug_	_ikke_, the one I'm doing right now is adding a method to access one attribute	12:01
	zz_anildigital → anildigital	12:01
	→ claudfernandes joined	12:01
	→ the_bz joined	12:01
	→ sniperliu joined	12:01
	← Bruno_ left	12:02
	← richwestcoast left	12:02
_ikke_	feature/add-attribute-getter	12:02
	→ mikecmpb_ joined	12:03
	← Kayra left	12:03
carandraug_	_ikke_, basically yes.	12:03
	→ richwestcoast joined	12:03
carandraug_	I think this is more a github complaint really	12:03
	→ Kayra joined	12:03
_ikke_	It's not required to create a special branch for it though	12:03
	→ midnightmagic_ joined	12:04
	← biertie left	12:04
	← Olipro left	12:04
	← rishabh_ left	12:04
	← bluesm left	12:04
	← Joost` left	12:04
	← skasturi left	12:04
	← HicksD left	12:04
	← ramlev left	12:04
	← pekster left	12:04
	← nepochal left	12:04
	← BtbN left	12:04
	← ToaNii left	12:04
	← Asenar left	12:04
	← nhmood left	12:04
	← midnightmagic left	12:04
	← ggherdov_ left	12:04
	← Someguy123 left	12:04
	← kalz left	12:04
	← supermat left	12:04
	← dytrivedi left	12:04
	← edk left	12:04
	← i_ron left	12:04
	← JStoker left	12:04
	← ohcibi left	12:04
	← xnox left	12:04
	← breiti left	12:04
	← LostDatagram left	12:04
	← souther left	12:04
	← ketas left	12:04
	← sdh_ left	12:04
	← shihan left	12:04
	← WakiMiko left	12:04
	← tgummerer left	12:04
	← dr_lepper left	12:04
	← Nickeeh left	12:04
	← Arokh left	12:04
	← diminoten left	12:04
	← Maple__ left	12:04
	← Fuxx left	12:04
	← AlexanderS left	12:04
	← Ywa left	12:04
	← Bombe left	12:04
	← Keridos_off left	12:04
	← nnyk_ left	12:04
	→ lsiv568 joined	12:04
_ikke_	Although we usually recommend it	12:04
	Joost_ → Joost`	12:04
carandraug_	I can't just add a pull request to an issue. So that discourages me from discussing it before asking the pull request	12:04
	← zumba_ad_ left	12:04
	→ zumba_addict joined	12:04
	← mikecmpbll left	12:05
_ikke_	You can refer to a pull request in an issue though	12:05
	→ Someguy123 joined	12:05
jast	pull requests are also issues	12:05
	it's all a bit weird	12:05
	→ Zebroid joined	12:05
jast	I'd probably have designed it differently, but then again I've never felt the need to design a platform like that :)	12:06
	← jluc left	12:06
carandraug_	_ikke_, Yes. But there's still two ticket numbers.	12:06
	that's just a design thing, personal rant	12:06
	and not really a git issue	12:06
	→ Zebroid_ joined	12:07
	← Zebroid left	12:07
	← arlekin left	12:08
	← zumba_addict left	12:09
	← stamina left	12:10
	→ aspiers joined	12:10
	→ robzilla_ joined	12:11
	← endiruna left	12:11
	← toomanysecrets left	12:11
	← Zebroid_ left	12:11
	← cagfernandes left	12:11
	← Gamecubic left	12:12
	→ kbart joined	12:13
	← the_bz left	12:13
jast	carandraug_: that's okay, personal rants are never entirely absent from this channel :)	12:14
	← robins left	12:14
	→ davividal joined	12:14
	← richwestcoast left	12:14
	← lbn_ left	12:14
	→ ziro` joined	12:14
	← davividal left	12:14
	→ robinsmidsrod joined	12:14
	→ richwestcoast joined	12:15
	← moritzs left	12:15
	← robzilla_ left	12:15
	→ hellopat joined	12:16
	→ nnyk_ joined	12:16
	→ beautifulmind joined	12:16
	← franzip left	12:16
	→ franzip joined	12:17
	→ intellix joined	12:17
	→ razrunelord joined	12:17
	← deens left	12:18
	bremner rants about jast's cheerful nature	12:18
	← axhiao left	12:18
	→ Arokh joined	12:18
	→ Olipro joined	12:18
	→ diminoten joined	12:18
	→ biertie joined	12:18
	→ rishabh_ joined	12:18
	→ bluesm joined	12:18
	→ skasturi joined	12:18
	→ HicksD joined	12:18
	→ ramlev joined	12:18
	→ pekster joined	12:18
	→ nepochal joined	12:18
	→ BtbN joined	12:18
	→ ToaNii joined	12:18
	→ Asenar joined	12:18
	→ nhmood joined	12:18
	→ ggherdov_ joined	12:18
	→ kalz joined	12:18
	→ supermat joined	12:18
	→ dytrivedi joined	12:18
	→ edk joined	12:18
	→ i_ron joined	12:18
	→ JStoker joined	12:18
	→ ohcibi joined	12:18
	→ xnox joined	12:18
	→ breiti joined	12:18
	→ LostDatagram joined	12:18
	→ souther joined	12:18
	→ ketas joined	12:18
	→ sdh_ joined	12:18
	→ shihan joined	12:18
	→ WakiMiko joined	12:18
	→ tgummerer joined	12:18
	→ Nickeeh joined	12:18
	→ Maple__ joined	12:18
	→ Fuxx joined	12:18
	→ AlexanderS joined	12:18
	→ Ywa joined	12:18
	→ Bombe joined	12:18
	→ Keridos_off joined	12:18
	← babilen left	12:18
	→ deens joined	12:18
jast	hi bremner :) what a wonderful day it is!	12:18
	← ArSn left	12:18
	← Not_Whatever left	12:18
	← Olipro left	12:19
	← kalz left	12:19
	← ggherdov_ left	12:19
	← bluesm left	12:19
	← ketas left	12:19
	→ ketas joined	12:19
	→ dr_lepper joined	12:19
	← hellopat left	12:20
	← drale2k left	12:20
	← hjalti left	12:20
	→ ArSn joined	12:20
	→ lbn joined	12:21
	→ sohail joined	12:21
	← sohail left	12:21
	→ sohail joined	12:21
	→ Olipro joined	12:21
	→ bluesm joined	12:22
	← razrunelord left	12:22
	→ cannonball joined	12:22
	← deens left	12:23
	→ kalz joined	12:24
	← bluesm left	12:24
	→ CheckDavid joined	12:24
	← SpaghettiCat left	12:25
	← daito left	12:26
	← MattMaker left	12:26
	→ daito joined	12:26
	→ Gege joined	12:26
	→ xsbeats joined	12:27
	→ ggherdov_ joined	12:27
	→ Gamecubic joined	12:27
	→ stfn joined	12:27
	→ Baluse joined	12:27
	← hkon_ left	12:28
	← dangerousdave left	12:29
	← EdGruberman left	12:29
	→ konadr joined	12:30
	← daito left	12:30
	← jovy88 left	12:31
	→ EdGruberman joined	12:31
	← Brando753 left	12:31
	→ mjsmith2 joined	12:31
	→ rjhunter joined	12:31
	→ jovy88 joined	12:32
	→ MattMaker joined	12:32
	← rfoust left	12:34
	→ dipendra joined	12:34
	← Gamecubic left	12:34
	→ hellopat joined	12:35
	→ mizu_no_oto joined	12:36
	← supermat left	12:36
	→ Brando753 joined	12:36
	← _Vi left	12:37
	→ supermat joined	12:37
	← Kayra left	12:38
	← nilg left	12:38
	← mad left	12:38
	→ hkon_ joined	12:39
	→ Kayra joined	12:39
	← mizu_no_oto left	12:39
	→ monbro joined	12:40
	→ scampbell joined	12:41
	← richwestcoast left	12:41
	→ richwestcoast joined	12:41
	→ tgkokk joined	12:42
	← cagedwisdom left	12:42
	→ marlun joined	12:43
marlun	Is there an official git-hg just like there's a git-svn?	12:43
	← blackmesa left	12:43
	→ lithiumjake joined	12:45
	← sniperliu left	12:45
	→ the_bz joined	12:46
	→ ntio joined	12:46
tobiasvl	marlun: not official, but there is https://github.com/cosmin/git-hg	12:46
	← richwestcoast left	12:46
	← tgkokk left	12:47
m0viefreak	marlun: git comes with a hg remote helper	12:47
	→ richwestcoast joined	12:47
m0viefreak	check out the contrib/remote-helpers directory	12:47
tobiasvl	marlun: however, I believe you can just push with git to a remote hg repo that has hg-git	12:47
m0viefreak	put git-remote-hg somewhere in your path	12:47
	and use prefix your URLs with hg::	12:47
	→ Celm joined	12:47
tobiasvl	m0viefreak: ah, that's nice	12:48
	there's also https://github.com/buchuki/gitifyhg	12:48
	← mjsmith2 left	12:48
m0viefreak	yeah, all those are not really recommended	12:48
tobiasvl	yeah, I bet. I didn't know about git-remote-hg	12:49
	← rjhunter left	12:49
Christer	After using git commit --amend, it seems to remove my hook. and it comes up with a message lige "mv .git/COMMITMSG_EDIT.tmp......" cannot be moved to COMMITMSG_EDIT. If i restart my computer, its ok again. is there any way i can do the same kind of "reset" that happens after a computer restart without restarting ?	12:50
	← kburdett left	12:50
marlun	will checkout contrib/remote-helpers thanks!	12:51
	→ moritzs joined	12:51
	→ Gamecubic joined	12:51
	← kbart left	12:51
	→ blackmesa joined	12:52
	→ DolpheenDream joined	12:52
	← Celm left	12:52
	→ k_sze[work] joined	12:52
	→ kburdett joined	12:53
	→ bartman`` joined	12:54
	← franzip left	12:54
	→ franzip joined	12:54
	mikecmpb_ → mikecmpbll	12:56
	→ IrishPrime joined	12:56
	← maveneagle left	12:56
	← Christer left	12:56
	→ rgr joined	12:56
	→ joelmo joined	12:56
	← k_sze[work] left	12:57
	→ paulweb515 joined	12:57
	→ revoNxt joined	12:57
	← Kayra left	12:58
	→ mh` joined	13:00
	← mh` left	13:00
	← Gamecubic left	13:00
	→ livingstn joined	13:01
	← dsdeiz left	13:02
	→ rfoust joined	13:02
	→ juvenal joined	13:02
	← teran left	13:02
	→ Kayra_ joined	13:02
	← richwestcoast left	13:03
	→ richwestcoast joined	13:04
	← Zariel_ left	13:04
	→ tmcmahon joined	13:05
	→ Zariel_ joined	13:05
	→ shinnya joined	13:05
	← Zariel_ left	13:05
	← lite_ left	13:06
	← harish left	13:06
	→ Zariel_ joined	13:06
	→ cjwilburn joined	13:07
	→ Gamecubic joined	13:07
	→ harish joined	13:08
	→ Zebroid joined	13:08
	→ sniperliu joined	13:09
	→ LeMike joined	13:09
	→ qwyeth joined	13:10
	← woollyams left	13:10
	→ setra joined	13:12
	← gandalfcome left	13:12
	← Zebroid left	13:12
setra	hellopat, why does git not lock on the serverside if 2 parties push. so the larger upload(push) will fail all the time if they were done simultaneously	13:13
	hide, why does git not lock on the serverside if 2 parties push. so the larger upload(push) will fail all the time if they were done simultaneously	13:13
	Why does git not lock on the serverside if 2 parties push. so the larger upload(push) will fail all the time if they were done simultaneously	13:13
	← Xethron left	13:13
	→ Kronuz joined	13:14
	← tmcmahon left	13:14
	→ Xethron joined	13:15
	← Xethron left	13:15
	→ Xethron joined	13:15
tobiasvl	setra: we got you the first two times	13:15
	→ hyperair joined	13:15
setra	sorry, but I always addressed members, but I just wanted to be polite and say hi	13:16
	→ tgkokk joined	13:16
tobiasvl	hello!	13:16
	setra: it doesn't need to lock, because the latter push will be rejected anyway (unless it can be fast-forward merged, in which case why would you want a lock?)	13:16
	→ bitkiller joined	13:16
tobiasvl	the second push will be rejected because it doesn't contain the history from the first push	13:17
	see also the reply to http://stackoverflow.com/questions/4643998/how-git-works-when-two-peers-push-changes-to-same-remote-simultaneously	13:17
setra	tobiasvl, because if A has a couple of small changes and does a push, and B will have a slow internet connection with a large change, he will never be able to push, because all the time he tries, B will get rejected and need a pull before next try	13:17
	→ FortySix2 joined	13:18
	→ razrunelord joined	13:18
	→ ehmatthes joined	13:18
	← FortySix2 left	13:19
	← sniperliu left	13:19
	→ hjalti joined	13:19
	← richwestcoast left	13:19
	← binarydog left	13:20
	→ richwestcoast joined	13:20
	→ jeffasinger joined	13:20
	← ziro` left	13:21
	→ zivester joined	13:22
	→ sniperliu joined	13:22
	← Gizburdt left	13:22
	← razrunelord left	13:23
	anildigital → zz_anildigital	13:23
	→ FortySix2 joined	13:23
	← vivien_m` left	13:24
	← kanja left	13:25
	→ sanjayu joined	13:26
	← richwestcoast left	13:26
	← MutantMahesh left	13:26
	→ GT4066 joined	13:26
	→ richwestcoast joined	13:27
	→ Sicp joined	13:27
	← Asiajey_ left	13:28
	← Exancillatus left	13:28
	→ Asiajey joined	13:28
	← Asiajey left	13:28
	→ Asiajey joined	13:28
	← Kayra_ left	13:28
	← cjwilburn left	13:29
	← tgkokk left	13:30
	→ cjwilburn joined	13:30
	→ mh` joined	13:30
	← mh` left	13:30
j416	can I somehow grep -v using git log --grep ?	13:30
dowwie	!localrepo	13:31
	!help	13:31
gitinfo	What do you need help with? Something with git? Tell us what's going on, and please be specific. For information on how to abuse me (I'm a bot!), see http://jk.gs/git/bot . Please be gentle.	13:31
	← AOP_ left	13:31
	→ polyzen joined	13:31
j416	I want to find all commits that are missing a reference to an issue in our issue tracker	13:32
	→ WormDrink joined	13:32
j416	by 'grep -v'-ing them from the log	13:32
	→ carlosgoce joined	13:32
	→ EminenceHC joined	13:33
osse	j416: you could do git rev-list HEAD, then git rev-list --grep=foo HEAD, and subtract one list from the other. It'll be a bit ugly perhaps	13:33
	But maybe it's ok for you purpose	13:33
	← cjwilburn left	13:34
j416	it'll only be a handful of commits mostly so it's not a real issue if it's a bit slow, but it would be elegant if I could somehow.. git log --not --grep foo	13:34
	← Error404NotFound left	13:34
j416	hm	13:34
	← xsbeats left	13:34
	juvenal → juvenal_away	13:34
osse	comm -23 <(git rev-list HEAD \| sort) <(git rev-list --grep=foo HEAD \| sort)	13:35
	BAM!	13:35
	→ xsbeats joined	13:35
	← lsiv568 left	13:35
	← the_bz left	13:35
osse	in tha faaaace!	13:35
	→ AaronMT joined	13:35
	→ d33tah joined	13:36
	← Xeroa left	13:36
d33tah	hi again :)	13:36
	→ ojacobson_ joined	13:36
	← EveBird left	13:36
	← ojacobson_ left	13:36
	→ bunbury joined	13:36
	→ tgkokk joined	13:37
	← Kronuz left	13:37
d33tah	i've got two commits in my git history. one is pushed, the other i made by mistake and i'd like to erase it completely from history. git rebase -i won't let me as it only shows one line and if i remove it, it assumes that there's nothing to do. how can i get rid of this commit?	13:37
	← EminenceHC left	13:37
osse	j416: ping. just in case you didn't see my latest suggestion. I think that'll do the trick	13:37
d33tah	ah, git reset --hard HEAD~1 helped	13:38
_ikke_	d33tah: !next	13:38
gitinfo	d33tah: Another satisfied customer. NEXT!	13:38
_ikke_	:-)	13:38
	→ Dougie187 joined	13:38
	→ MattStratton joined	13:39
	→ cjwilburn joined	13:39
	← jeffasinger left	13:40
	← ojacobson left	13:40
dowwie	push.default matching vs simple?	13:40
	→ Gizburdt joined	13:40
	← xsbeats left	13:40
	→ Destos joined	13:41
	→ xsbeats joined	13:41
_ikke_	dowwie: upstream	13:41
j416	osse: sorry, thanks	13:41
	osse: what's comm?	13:41
	→ matheus23 joined	13:41
osse	no need to apologise	13:41
j416	wtf I have a command named 'comm' o_O	13:41
	j416 manpages	13:41
osse	j416: it's a fairly standard program that compares files	13:41
_ikke_	j416: A diff like tool	13:42
j416	apparently	13:42
	:D	13:42
	thanks	13:42
osse	I didn't know about it until relatively recent either	13:42
_ikke_	Me either	13:42
j416	neither?	13:42
_ikke_	Both work	13:42
j416	o_O	13:42
osse	you can use either :P	13:42
_ikke_	:P	13:42
	You can use either either or neither	13:43
	→ _Vi joined	13:43
	← ingu_cloud_ left	13:43
osse	but neither neither nor either means or	13:43
	→ dsdeiz joined	13:43
dowwie	_ikke_: sorry, I'm not well versed yet -- what is upstream	13:43
	→ ascarter joined	13:44
	← ascarter left	13:44
_ikke_	man git config lists all of them	13:44
gitinfo	the git-config manpage is available at http://jk.gs/git-config.html	13:44
	← MattMaker left	13:44
	← cjwilburn left	13:44
	← brandonw left	13:44
	→ lsiv568 joined	13:44
	→ ascarter joined	13:44
dowwie	k	13:44
j416	osse: and also I want those to show as the git log format	13:45
	default* format	13:45
	→ mh` joined	13:45
	← mh` left	13:45
	→ cjwilburn joined	13:45
osse	j416: I'd do that in a seperate step	13:45
	→ Kronuz joined	13:46
	← Kronuz left	13:46
osse	hmm, never mind. git show $(comm -23 <(git rev-list HEAD \| sort) <(git rev-list --grep=foo HEAD \| sort))	13:46
	aw yiss	13:46
	→ Error404NotFound joined	13:47
	→ binarydog joined	13:47
	→ jeffasinger joined	13:47
j416	I never knew git show took multiple arguments, nice!	13:48
	thanks	13:48
	→ xudongz joined	13:48
osse	I found out just now	13:48
j416	:D	13:48
	→ rudisimo joined	13:48
j416	you're welcome	13:48
	→ danecando joined	13:49
	→ brandonw joined	13:49
osse	they won't be in sorted order though	13:49
	← LeMike left	13:49
osse	well, actually, they'll be sorted according to the lexical sorting of the SHAs	13:49
	← danecando left	13:49
	→ fr33 joined	13:50
	→ danecando joined	13:50
	→ Kayra joined	13:50
	← chiromante left	13:51
	→ Guest42013 joined	13:52
	← bunbury left	13:52
	← richwestcoast left	13:52
	→ mjsmith2 joined	13:52
	→ richwestcoast joined	13:52
	← WormDrink left	13:52
	← dancat left	13:52
	→ reaverb joined	13:53
osse	j416: sooo.... did it work ?	13:53
	→ the_bz joined	13:55
	→ bunbury joined	13:55
j416	osse: still experimenting :)	13:55
	:D	13:55
	← rfoust left	13:55
	→ rfoust joined	13:56
	← tvw left	13:56
	→ crelix joined	13:56
	← fragMental left	13:56
	→ tvw joined	13:57
	← intellix left	13:57
	→ aero joined	13:57
	← sohail left	13:58
	← momomomomo left	13:58
	← Macaveli left	13:59
	→ Exancillatus joined	13:59
	→ airportyh joined	14:00
	→ starkhalo joined	14:00
	← Zariel_ left	14:00
	→ vanillajohn joined	14:02
airportyh	hello all, I have a weird problem where on a digitalocean vps trying to git clone a http url from github will just hang, but https works just fine. Does anyone have any idea what might be causing this?	14:02
j416	osse: apparently it has been discussed by the top committers, but I don't know what came of it in then end. agh.	14:02
	osse: I'll go with your solution, it is the least ugly one for now. thanks	14:02
osse	j416: What's "it" ?	14:02
j416	I'll report my success	14:02
	osse: ah, -v for git log --grep	14:03
	(or "--grep-not")	14:03
	→ gripp9k joined	14:03
	→ fragMental joined	14:03
	→ Zariel_ joined	14:04
	← kenneth left	14:04
	← MattStratton left	14:04
	→ MutantMahesh joined	14:04
	← MutantMahesh left	14:04
	→ MutantMahesh joined	14:04
	← MutantMahesh left	14:04
	→ MutantMahesh joined	14:04
	← richwestcoast left	14:04
	→ richwestcoast joined	14:05
	→ the8thbit joined	14:05
	→ Cheaterman joined	14:06
	← Cheaterman left	14:06
	→ Cheaterman joined	14:06
Cheaterman	Hello ^__^	14:06
	← Ardenzi left	14:06
	← hkon_ left	14:06
gitinfo	Welcome to #git, a place full of helpful gits. If you have a question, feel free to just go ahead and ask—somebody should answer shortly. For more info on this channel, see http://jk.gs/git/ Take backups (type !backup to learn how) before taking advice.	14:07
	→ acharlieh joined	14:07
	← lithiumjake left	14:07
	← aero left	14:08
Cheaterman	Don't hit me (I know git isn't a deployment tool), but I'd like to use git to version-control various "flavours" of my project. The idea is that I have a skeleton that I deploy for customers, but I'm still developing the skeleton itself, so it'll require re-integration sometimes, and I figured I could facilitate this with git.	14:08
	→ aero joined	14:08
	→ intellix joined	14:08
	offby1 hits Cheaterman	14:08
offby1	ok, now I'll read what he said	14:08
Cheaterman	:DDDD	14:08
	→ Zebroid joined	14:08
jast	you could probably just put the base skeleton in git, and fork the individual things off of it	14:08
Cheaterman	So I'm gonna look up documentation on how to create a non-bare repo as "master" and use it as remote for the others	14:09
	locally	14:09
	Yes that's the idea	14:09
offby1	that doesn't sound entirely insane.	14:09
jast	why use a non-bare?	14:09
	← rgr left	14:09
Cheaterman	However forking has already happened, in case this might be an issue	14:09
	→ jnavila joined	14:09
	← aero left	14:09
jast	well if there's common history it should all work out reasonably	14:09
Cheaterman	The project is a web project, I need the sources to be available for the "skeleton", it's used as a demo	14:09
	I love git <3 thanks jast for your encouragements	14:10
jast	okay, so basically you want the physical files to be updated when pushing?	14:10
	→ spuz joined	14:10
	→ prutz joined	14:10
	→ aero joined	14:10
	→ MattStratton joined	14:10
Cheaterman	Hmm nah I was thinking of making it like the "sub" projects do a "pull request" kind of	14:10
	While I would commit on the main project like it was a local clone	14:10
	→ m0nkmaster joined	14:10
	← offby1 left	14:10
Cheaterman	(I'm developing on the server itself with git)	14:10
	(vim*)	14:10
jast	okay, but pushing to non-bares is rather iffy	14:11
Cheaterman	That's why I'm pulling from them insted	14:11
	instead*	14:11
	I figured it would be simpler?	14:11
jast	well, depends	14:11
	pull will work, yes	14:11
	your customer deployments are on different machines?	14:11
spuz	What is the best way to do this? Current state: master: A-B-C; mybranch: A-B-C-D-E; Desired state: master: A-B-C; mybranch: A-B-C-E'	14:11
Cheaterman	If that's really an issue, I can have a bare repo, and make the "demo" one of the cloned repos, it's not excessively problematic	14:12
masak	spuz: 'git checkout mybranch; git rebase -i master'	14:12
	← zivester left	14:12
	→ robzilla_ joined	14:12
spuz	masak: and then remove commit D?	14:12
Cheaterman	jast: Nope everything is on the same VM	14:12
masak	spuz: right.	14:12
spuz	ok fairly easy	14:12
masak	spuz: could also acheive the same with '--onto D' instead of '-i', methinks.	14:13
spuz	masak: ah ok that's probably what I wanted to know	14:13
	← Zebroid left	14:13
spuz	I was wondering how it would be done without -i	14:13
	← richwestcoast left	14:13
jast	Cheaterman: do you ever want to get changes from the deployments back to the skeleton? because if you're committing the deployment-specific stuff, getting only the skeleton changes back into the main skeleton repo will be more difficult than is practical	14:13
	← Exancillatus left	14:13
jast	spuz: sure, but it's much easier to get wrong	14:13
Cheaterman	Anyways I'm very glad you think git is (if not the right tool) appropriate for what I want	14:13
	jast: never ever!	14:14
spuz	yeah, good to know though	14:14
	← Guest42013 left	14:14
Cheaterman	Deployments will always go one-way, customer-specific stuff stay in their "own repo"	14:14
osse	spuz: a third way, just for shits and giggles. create a new branch based on master, cherry-pick E, then force-rename that branch to mybranch	14:14
jast	spuz: IIRC, git rebase D --onto C	14:14
	but I tend to get this wrong about 1 out of 5	14:14
	→ WormDrink joined	14:14
spuz	yeah same here	14:14
	→ allay joined	14:14
	← Devastatr left	14:15
	→ Devastatr joined	14:15
jast	Cheaterman: okay, in that case what you proposed seems perfectly reasonable	14:15
	→ b4rbz joined	14:15
Cheaterman	Thanks a lot for confirming jast, I'll start looking up some documentation now	14:15
	→ treehug88 joined	14:15
jast	there's not much that needs to be done, really	14:15
	you can just add a non-bare as a remote	14:15
	git remote add mybase /path/to/skeleton	14:15
	→ richwestcoast joined	14:16
Cheaterman	That is, from direct filesystem access, without git:// or ssh://	14:16
	← Samual left	14:16
jast	yes, for example	14:16
Cheaterman	(which I never did so far)	14:16
jast	works exactly the same way	14:16
Cheaterman	Okay perfect	14:16
	Sounds fairly simple indeed	14:16
	← deryni left	14:16
	→ ErKa joined	14:16
	← jnavila left	14:16
	← MutantMahesh left	14:16
Cheaterman	I'll probably ask more when I get to resolve the conflicts	14:16
	It'll for sure be way simpler now, because ATM I'm deploying with cp and vim	14:17
	(with all the issues and inconveniences you can imagine)	14:17
	← vire left	14:17
	← robzilla_ left	14:17
	← cheguvera left	14:17
	→ richwest_ joined	14:17
Cheaterman	(oh and working without backup too so if I'm erasing some customer integration, I have to type it again... you get the idea)	14:18
	(git will be my salvation)	14:18
	→ deryni joined	14:18
	→ aberrant joined	14:18
Cheaterman	So again thanks a lot jast	14:18
	← p8952 left	14:19
	← richwestcoast left	14:20
	→ p8952 joined	14:20
	← p8952 left	14:20
	→ p8952 joined	14:20
	← JerryT left	14:20
	← richwest_ left	14:20
	→ Guest42013 joined	14:20
	→ richwest_ joined	14:20
	← monbro left	14:20
	→ richwestcoast joined	14:20
	← aero left	14:20
	← richwest_ left	14:21
	→ bwreilly joined	14:21
	← richwestcoast left	14:21
	← beautifulmind left	14:21
	→ axl_ joined	14:22
	→ m0ltar joined	14:22
	PaulePan1er → PaulePanter	14:23
	→ CKyle joined	14:24
	← sniperliu left	14:24
	→ Zebroid joined	14:24
	← papegaaij left	14:25
	← gerard0 left	14:25
	← dipendra left	14:25
	→ lurraca joined	14:27
	← airportyh left	14:27
	→ gerard0 joined	14:28
Cheaterman	<richwestcoast> ello friendly gits.... I have a question, i'm currently setting up a development environment. The host is where i keep the main repository, the second server is local(without a public IP) which is the development server. Now my question - if i wanted to keep the two servers repositories synced; is this a good idea or bad idea?	14:28
	(He's having a pain to register @ freenode apparently so I'm asking his question)	14:29
	→ sparr joined	14:29
	→ richwestcoast joined	14:29
richwestcoast	Hello friendly gits.... I have a question, i'm currently setting up a development environment. The host is where i keep the main repository, the second server is local(without a public IP) which is the development server. Now my question - if i wanted to keep the two servers repositories synced; is this a good idea or bad idea?	14:29
j416	osse: git log --no-walk --no-merges $(comm -23 <(git rev-list origin/master..HEAD \| sort) <(git rev-list -E --grep 'refs #[0-9]{4}' origin/master..HEAD \| sort))	14:29
	that's what I ended up with	14:30
	thanks :)	14:30
	→ guns joined	14:30
j416	but I'll probably butcher it so that I can exit code 1 if there were commits, otherwise 0	14:30
Cheaterman	j416: git isn't a deployment tool :D	14:31
	(just like su doesn't know about the wheel group!)	14:31
osse	j416: nice	14:31
	← Zariel_ left	14:31
	→ Zariel_ joined	14:33
	gitinfo set mode: +v	14:33
	→ Ardenzi joined	14:33
jeffasinger	so I think I've found the issue I'm having. In my .gitattributes, I have the line "* text eol=lf", but some of the checked in files have CRLF line endings, which causes them to show up as modified no matter what, how do I fix that?	14:33
j416	Cheaterman: so?	14:33
	Cheaterman: how else do you propose I do sanity checks for my commit messages before deploy? :)	14:34
jast	jeffasinger: commit the fixed files once	14:34
	← WormDrink left	14:34
	→ betelgeu1e joined	14:34
	→ EminenceHC joined	14:34
	→ WormDrink joined	14:34
	→ airportyh joined	14:34
	← dsdeiz left	14:34
jast	richwestcoast: I'm not sure about the roles of the two machines yet. both are purely for hosting the repository, not the machines you're actually working on?	14:35
Cheaterman	j416: I do not!!! Your command is VERY nice as osse said :) I'm just making a pun!	14:35
	→ vipzrx joined	14:35
	← hafeez3000 left	14:35
	← m0nkmaster left	14:35
j416	Cheaterman: cheater	14:35
	→ hafeez3000 joined	14:35
Cheaterman	j416: (it's even more ironic that I myself will use git as a deployment tool soon enough, and came here for this very reason :P)	14:35
	← goTAN left	14:35
j416	Cheaterman: you know what though	14:36
Cheaterman	You tell me?	14:36
osse	Cheaterman be punnin'	14:36
j416	Cheaterman: git isn't a deploy tool	14:36
richwestcoast	jast: maybe ill do a git hook which pushes the master branch to live	14:36
	when ever it changes	14:36
Cheaterman	Hehehehehe :D I know right j416!!! I've read the manpage about the hooks	14:36
	and first remark is "KEEP IN MIND GIT IS NOT A DEPLOYMENT TOOL"	14:36
jast	obtw, not sure if you got this, but Git is not designed to replace a deployment system	14:37
richwestcoast	is git not a deployment system?	14:37
masak	Cheaterman: remember though, Git is not a deployment tool.	14:37
Cheaterman	It can call it though - it can integrate within the toolchain	14:37
	richwestcoast looks at Cheaterman :D	14:37
Cheaterman	richwestcoast: nope it's not	14:37
richwestcoast	looks at Cheaterman	14:37
	dreams dashed	14:38
Cheaterman	lulz richwestcoast don't expect me to deny what these guys say	14:38
	→ m0nkmaster joined	14:38
	→ thedodd joined	14:38
richwestcoast	:P for our purposes its def not life threatening >:D	14:38
Cheaterman	They beat me with experience, and they are RIGHT (at least more often than myself)	14:38
	I read the docs about it and everything says "GIT IS NOT A DEPLOYMENT TOOL" :D	14:38
	No that's true	14:38
	But as mentoined, it's better to integrate git within a toolchain	14:38
	use a deployment tool for deployment	14:39
	and git as a VCS	14:39
	→ akim joined	14:39
Cheaterman	that is, a very clever VCS that can call the deployment tool itself	14:39
	but not a standalone tool that does both	14:39
osse	In my book, anything that can run a shell script is a {anything} tool	14:39
richwestcoast	yep yep, i reckon i have my answer now. im gonna push changes to master to live	14:39
	→ Odd_Bloke joined	14:39
richwestcoast	with a lovely hook	14:39
Cheaterman	osse: Very good point, that makes git able to call a pizza	14:39
	→ xSmurf joined	14:40
Cheaterman	You could make a hook that whenever you push, it calles a python script from the shell, that in turn orders a pizza	14:40
richwestcoast	thanks guys for your patience	14:40
osse	if non-fast-forward: extra cheese	14:40
richwestcoast	nice!!!!!	14:40
Cheaterman	exactly osse XDDD	14:40
richwestcoast	pizza all day	14:40
	using bitcoin?	14:40
	:D	14:40
osse	dogecoin	14:40
	such pizza	14:41
jast	gitcoin	14:41
richwestcoast	much happiness	14:41
	← bgerber left	14:41
richwestcoast	ok thanks little git-monsters	14:41
osse	http://www.carcrushing.com/wp-content/uploads/2014/04/Doge-nascar-03.jpg	14:41
	→ offby1 joined	14:41
Odd_Bloke	I'm writing a pre-commit hook and want to run a command over only the files that are being included in this commit. I'm using `git diff --cached --name-only` which works fine unless I `commit --all` in which case nothing seems to be cached.	14:42
	Is it possible to detect that this is a `commit --all` and switch to just looking at all changed files?	14:42
	(Or is there another, better thing that I could be doing?)	14:42
	← salparad1se left	14:42
jast	possibly the other hooks (prepare-commit-msg and commit-msg) do have the changes staged/cached	14:44
	worth a try if choosing one of those hooks doesn't conflict with your goal	14:44
	→ davividal joined	14:44
	→ dik_dak joined	14:45
	→ G__81 joined	14:45
	→ alexlindenlevy joined	14:45
G__81	hi i sent a patch to a project and i have got some comments and i want to change certain things in the patch + add more to it. How do i edit the patch which shows in my git log?	14:46
	→ nilg joined	14:46
jast	G__81: is it the topmost commit in 'git log'?	14:46
	→ kanja joined	14:46
	← sanjayu left	14:46
G__81	the patch that i want to edit is the most recent checkin	14:46
	jast yes	14:46
jast	oh, good, that's the simplest case	14:46
	there are two ways to do this. one way is to just make your changes, add and commit --amend them (modifies the existing commit instead of creating a new one)	14:47
	the other is to run 'git reset --soft HEAD~'; this removes the commit but leaves its changes in your working dir)	14:47
G__81	jast, oh ok so i can edit the .c file, make changes and do git commit --amend	14:47
jast	hmm, do we have a trigger about this? !amend	14:47
gitinfo	Use `git commit --amend` to combine your current staged changes with those in the previous commit. If you have already pushed the last commit, this counts as a !rewrite	14:47
offby1	I wonder if it'd be better to simply add another commit with the improvements	14:48
	then regenerate the patch as needed	14:48
jast	G__81: yes, 'git add' the changes before you run the amend though, otherwise they don't get included	14:48
	→ Darvein joined	14:48
G__81	jast, oh ok thanks a lot let me try it right away	14:48
jast	generating one patch from two commits doesn't work with format-patch	14:48
	← Sicp left	14:48
jast	so that's a reason against making another commit	14:48
	→ WaReZ_ joined	14:49
	→ zumba_addict joined	14:49
	→ Celm joined	14:49
	→ chris_thomson joined	14:49
	← ascarter left	14:49
	← guns left	14:49
	→ jxf joined	14:49
	← MagePsycho left	14:50
	← frankdogg left	14:50
	← nardev left	14:51
	→ frankdogg joined	14:52
	→ dsdeiz joined	14:52
offby1	ah true indeed	14:52
	→ akim_ joined	14:52
	→ tranzfuse joined	14:52
	← blackmesa left	14:52
offby1	unless you rebase, which is effectively what you're suggesting	14:53
	← Celm left	14:53
	← akim left	14:53
	← rfoust left	14:53
	→ mizu_no_oto joined	14:54
	← Sound left	14:55
	→ blackmesa joined	14:55
	→ becks__ joined	14:55
G__81	jast, cool thanks a lot, it works so i have now done git format-patch-1 and have the changes. To send the updated changes is it again git send-email with the patch name?	14:55
	← Vooloo left	14:56
	→ rfoust joined	14:56
jast	yeah. on git's own development list it's common to use a [PATCH v2] prefix for the second iteration	14:56
	← lurraca left	14:56
Odd_Bloke	jast: commit-msg looks like it should probably work. Thanks!	14:56
jast	I believe there's an option to change the prefix	14:56
	Odd_Bloke: good luck :)	14:56
	→ bgerber joined	14:57
	← tgkokk left	14:57
	← gerard0 left	14:57
G__81	jast, yeah its on the same development list.	14:57
	← FilipNortic left	14:58
	← Odd_Bloke left	14:58
	→ toomanysecrets joined	14:58
G__81	it shows like this in the subject [PATCH] [PATCH v2] foo......	14:59
jast	yeah, I think there's an option to make it put something else in front instead of the [PATCH], and you can pass e.g. [PATCH v2] for that option	14:59
	← garvank left	15:00
jast	no, there isn't	15:00
	what I've done in the past is editing the patch file prior to sending it	15:00
G__81	jast, oh ok thanks i would edit it and send it as you say :)	15:01
	← jceb_ left	15:01
	→ thiago joined	15:02
	← joelm left	15:02
	← chris_thomson left	15:02
	→ garvank joined	15:02
	← JanC left	15:02
	→ JerryT joined	15:03
	← JerryT left	15:03
	← adamgall left	15:03
	→ JerryT joined	15:04
	→ ascarter joined	15:05
	← bwreilly left	15:05
	→ teran joined	15:06
	← jatt left	15:06
	→ codeurge joined	15:06
	← roelmonnens left	15:07
	→ roelmonnens joined	15:07
	← irqq_ left	15:07
	→ lite_ joined	15:07
	← m0ltar left	15:08
	← FortySix2 left	15:08
	← lavong left	15:08
	← the8thbit left	15:09
	← tureba_ left	15:10
	← hafeez3000 left	15:10
	→ tureba joined	15:10
	→ watermel0n joined	15:10
	→ irqq joined	15:10
	→ Exancillatus joined	15:10
	← teran left	15:10
	← vanillajohn left	15:10
	← roelmonnens left	15:11
	← identity left	15:11
	← lite_ left	15:12
	→ vanillajohn joined	15:12
	→ FortySix2 joined	15:13
	→ robzilla_ joined	15:13
	← Gizburdt left	15:14
	← Guest42013 left	15:14
	← cbreak-work left	15:14
	← robzilla_ left	15:15
	← Exancillatus left	15:15
	→ robzilla_ joined	15:15
	← alexlindenlevy left	15:15
	→ alexlindenlevy joined	15:16
	→ Guest42013 joined	15:16
	→ JanC joined	15:17
	→ lavaman joined	15:17
	← axl_ left	15:17
	→ Jeana joined	15:18
	→ axl_ joined	15:18
	→ ziro` joined	15:18
	← ThomasLocke left	15:18
j416	osse: this is what happened https://github.com/jsageryd/.config.d/commit/878ca694443f7057f57dab0d0e424039f2721d52	15:18
	← lavaman left	15:18
	← shinnya left	15:18
	→ lyubenblagoev joined	15:18
	← sparr left	15:18
	→ razrunelord joined	15:20
	← alexlindenlevy left	15:20
	→ checkit joined	15:20
j416	and of course I made a mistake; blergh. --no-merges is in the wrong place, oh well. :)	15:20
	← armyriad left	15:21
	→ armyriad joined	15:21
osse	j416: hmm, is that tr -d ' ' necessary?	15:21
	oh wc-l	15:21
	→ momomomomo joined	15:22
checkit	Hey guys... So I'm a git newb but I've been getting by pretty well but I'm stuck at the moment. I have my origin/master repo on bitbucket and I've committed all of my local development changes. I want to merge orgin/master into a "production" branch (I think) and pull those production changes down to you staging server. HOW?	15:22
	← psoo left	15:23
lov	checkit: Git isn't typically used to !deploy	15:23
gitinfo	checkit: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html	15:23
lov	having a "production" branch isn't a bad idea though	15:24
j416	osse: I gave the function to a friend.. guess what happened	15:24
	← razrunelord left	15:24
checkit	lov: Thanks. So How would you typically deploy your project to a production environment?	15:24
osse	j416: WW3 ?	15:24
j416	osse: "why didn't you simply use uniq?"	15:24
	lol	15:24
	(git rev-list HEAD; git rev-list --grep foo HEAD) \| sort \| uniq -u	15:25
	tada..	15:25
osse	j416: that's a good point	15:25
	cworth` → cworth	15:25
	← thevishy left	15:26
	← rob_w left	15:27
	← makubi_ left	15:27
	aismail points checkit to http://gitolite.com/deploy.html	15:27
	→ kalypso joined	15:29
	← scampbell left	15:29
	→ makubi joined	15:29
	← MattStratton left	15:30
	→ mattstratton joined	15:30
osse	j416: here are some more: http://mywiki.wooledge.org/BashFAQ/036 :P	15:30
	← GODDOG left	15:30
	← gain left	15:31
	→ ingu_cloud_ joined	15:31
j416	hah	15:31
	osse is satisfied that his approach is the preferred one	15:32
	→ FreezingCold joined	15:33
j416	I liked not having to use <()	15:33
	it's a fairly new addition	15:33
	and a bashism	15:33
Jeana	how do I upgrade git? it seems my terminal commands all give me git version 1.8.5.2 (Apple Git-48).. I’m trying through macports but I keep getting all sorts of errors… I downloaded and installed the dmg from git-scm.com but that’s not changing the version number when I do git —version	15:33
j416	Jeana: you may have better luck in a channel for osx with that question as it is not related to git but more to your OS	15:34
	Jeana: but linger here in case someone cares to answer anyway. :)	15:35
	← HelperW_ left	15:35
Jeana	hmm ok.. thanks.	15:35
	← jagob left	15:35
osse	j416: well, bash has had it since the beginning. zsh and ksh also have it.	15:35
	so it's basically an anything-but-posix-ism, a type of -ism there are many of	15:36
	← pikaren left	15:36
j416	really	15:36
	I felt fairly sure it was added in bash 3 or so	15:37
	← kermit left	15:37
j416	but I may very well be wrong	15:37
	it's not in sh anyway. :)	15:37
	← gua_ould left	15:38
	← Gamecubic left	15:39
	← lb left	15:39
osse	it'll be in most of them :p	15:39
	← intellix left	15:39
j416	I'll use uniq -u anyway.	15:40
	it kind of looks simpler	15:40
	guessing the speed would be about the same	15:40
	← CKyle left	15:40
j416	not that it matters in this case	15:40
	→ Bruno_ joined	15:40
osse	j416: the problem with uniq -u is that using -u is like using a bashism	15:40
	ehh, never mind	15:41
	posix specifies -u	15:41
	← ghostlines left	15:41
	→ jimi_ joined	15:41
	→ aerocarbine joined	15:41
	→ teran joined	15:41
	← teran left	15:41
jimi_	I have installed git bash for windows. I checked out a repo, and after checking out, I do a "git status" and it shows TONS of files as "deleted" ... shouldnt it show nothing?	15:41
aerocarbine	^I have the same question.	15:42
	→ teran joined	15:42
	→ bwreilly joined	15:43
jimi_	aerocarbine, as me?	15:43
	→ CKyle joined	15:43
_ikke_	jimi_: Is it under changes staged for cmomit?	15:44
	← joelmo left	15:44
aerocarbine	jimi_ : Yes.	15:44
_ikke_	commit	15:44
	← FortySix2 left	15:44
jimi_	_ikke_, it shouldnt be.. i literally did a "git clone http:// ... " and then "git status" inside the newly created folder	15:44
	_ikke_, but yes, it's under "to be committed"	15:45
	→ Samual joined	15:45
_ikke_	jimi_: Sound like your index is either gone or corrupt	15:45
	sounds*	15:45
	Not sure why it happened	15:45
	git reset should fix it though	15:45
	→ Gamecubic joined	15:45
jimi_	_ikke_, oh ok, trying now. I did it on my linux machine, without the same issue. Wondering if it's a file name or length issue in windows or something maybe	15:45
	→ chrisshattuck joined	15:46
jimi_	_ikke_, ah, i see.. i just did a checkout again and it says unable to create a few files, invalid argument	15:46
	→ recycle joined	15:46
aismail	Jeana: when you type "which git" in the terminal, what does it tell you ?	15:47
Jeana	aismail: /usr/bin/git	15:47
	← blackmesa left	15:47
	→ identity joined	15:47
	← identity left	15:47
	→ identity joined	15:47
	← betelgeu1e left	15:47
aismail	when you build git from source and install it, make sure you go to /usr/bin and symlink git to point to the newly installed one.	15:47
jimi_	_ikke_, its because it has ":" in the name ha	15:48
_ikke_	That explains a lot	15:48
	→ kermit joined	15:49
	← xsbeats left	15:49
	→ luc_ joined	15:49
jimi_	aerocarbine, is that the same issue you are having as well?	15:49
	→ betelgeu1e joined	15:49
	→ fragMent1 joined	15:49
	→ Celm joined	15:49
j416	osse: :P	15:50
	→ bambams__ joined	15:50
	← frankdogg left	15:50
j416	osse: fwiw I reverted to the comm version, maybe I like it better.	15:50
aerocarbine	jimi_ : I faced the same problem few months ago. Then, i gave up.	15:50
	→ Celm_ joined	15:50
	← vurma left	15:51
aerocarbine	jimi_ : Anyway, your's was a typo, right?	15:51
	→ frankdogg joined	15:51
	← fragMental left	15:51
jimi_	aerocarbine, nope, mine was because a file name contained characters that windows doesnt support	15:51
aerocarbine	jimi_ : oh. okay.	15:51
	← thiago left	15:52
aismail	Jeana: if you installed git from macports, I recommend that you try to upgrade git from there first.	15:52
	→ m0ltar joined	15:52
	← fragMent1 left	15:53
aismail	e.g. sudo port update && sudo port upgrade git-core	15:53
Jeana	aismail: I think I’m finally having luck there. even my macports was having an updating issue	15:53
	→ fragMental joined	15:54
Jeana	aismail: I had to install commandline tools for xcode, and now macports is updated, and now I might be able to update git now	15:54
	→ xsbeats joined	15:54
	← Celm left	15:54
	→ ngladitz joined	15:54
	← ngladitz left	15:54
	→ ngladitz joined	15:54
	← ehmatthes left	15:54
aismail	ok. good to know.	15:54
	← CKyle left	15:55
	← allay left	15:55
	→ FortySix2 joined	15:55
	→ blackmesa joined	15:55
	← claudfernandes left	15:56
	← vipzrx left	15:56
jimi_	tab completion on git bash laaaaaags	15:57
	→ Nicholas_Rishel joined	15:57
	→ dfinly joined	15:57
	← mishok13 left	15:57
	→ elektronisk joined	15:57
	← dfinly left	15:57
	← konadr left	15:58
	→ deens joined	15:59
	→ guns joined	15:59
	← richwestcoast left	16:00
	→ CKyle joined	16:00
	← Octalot_ left	16:00
	← akushner left	16:00
	← elektronisk left	16:00
	← lsiv568 left	16:01
	→ elektronisk joined	16:01
	← xudongz left	16:02
	→ Gizburdt joined	16:02
	→ teran_ joined	16:02
	← ferreum158 left	16:02
	← Asandari left	16:05
	→ guilhermewop joined	16:05
	← Gizburdt left	16:05
	→ dreiss joined	16:05
	→ Gizburdt joined	16:05
	← teran left	16:06
	← teran_ left	16:06
	← hebz0rl left	16:07
	← MafooUK left	16:09
	→ blosocool joined	16:09
	← polyzen left	16:09
	← D4v33 left	16:09
	→ causasui joined	16:10
	← kadoban left	16:10
	→ lucastt joined	16:11
	→ Asandari joined	16:11
	→ Gizburdt_ joined	16:11
	← luc_ left	16:11
	→ alexlindenlevy joined	16:12
causasui	merge conflict in my gitconfig so I can't mergetool. I need a "mrw" gif	16:12
	← oodavid left	16:12
	→ samsamm777 joined	16:12
	→ D4v33 joined	16:13
	← Gizburdt_ left	16:13
	← Gizburdt left	16:13
	→ freez_ffm joined	16:14
	→ adamgall joined	16:14
	← toomanysecrets left	16:14
	→ D4v33_ joined	16:15
	→ Gizburdt joined	16:15
	← rchavik left	16:15
	← alexlindenlevy left	16:15
	← _tpavel left	16:16
	→ alexlindenlevy joined	16:16
	← Khisanth left	16:16
	← Xethron left	16:16
	→ RyPeck joined	16:16
	← hellopat left	16:16
	→ roelmonnens joined	16:17
	→ erikruthven joined	16:17
	← FortySix2 left	16:18
	← D4v33 left	16:18
	→ tyreld joined	16:18
	→ HelperW joined	16:18
	← nnyk_ left	16:19
	← dreiss left	16:20
	→ razrunelord joined	16:20
	← jargon left	16:21
	← roelmonnens left	16:21
	← irqq left	16:22
	← armyriad left	16:22
	→ armyriad joined	16:23
	← nwertman_ left	16:24
	→ vijay13 joined	16:24
	← freez_ffm left	16:24
	→ imachuchu joined	16:24
	← D4v33_ left	16:24
	← ArSn left	16:25
	← razrunelord left	16:25
	→ FortySix2 joined	16:26
lmat	I'm having trouble here... what's the right way to deal with colleagues that you think are wrong ?	16:26
	Not just wrong "about something", but wrong every time he opens his mouth ? ... even before he opens his mouth.	16:27
	→ Skrypter joined	16:27
lov	lmat: my solution was to quit and work for google instead	16:27
	I've found my new employer delightfully free of those sorts.	16:27
jimi_	why would files show modified after checking them out in windows? file permissions?	16:27
	← checkit left	16:28
lov	... now I am that person :(	16:28
	← cjwilburn left	16:28
moritz	jimi_: line endings messup, probably	16:28
	→ cjwilburn joined	16:28
	→ beyondcreed joined	16:28
	← beyondcreed left	16:28
	→ beyondcreed joined	16:28
	→ luc_ joined	16:28
	→ Khisanth joined	16:29
	← kermit left	16:29
	← dsdeiz left	16:29
	← Gizburdt left	16:30
	← Balliad left	16:30
	→ Sicp joined	16:30
	← Sicp left	16:30
	→ Sicp joined	16:30
	← mikecmpbll left	16:30
jimi_	moritz, I added * -crlf to my gitatrributes files, but they still show. Looking at it in a tool like windiff shows no difference, so i think you might be right about line endings	16:30
	← CKyle left	16:30
	→ primitive joined	16:30
	→ CareBear\ joined	16:30
	← Sicp left	16:31
	→ kenneth joined	16:32
	→ allay joined	16:32
	← rishabh_ left	16:32
	← cjwilburn left	16:33
	← lucastt left	16:33
	→ cjwilburn joined	16:33
lmat	lov: haha	16:33
	→ Macaveli joined	16:35
	→ thiago joined	16:35
lov	it's definitely a problem though, and sometimes it's unfixable.	16:36
	← Xiti` left	16:36
lov	that was a small part of what made me leave my last job; one of the leads was blatantly wrong about a lot of things, and it was really annoying me.	16:36
	→ D9 joined	16:36
	→ cjwilbur_ joined	16:36
	→ lucastt joined	16:36
lmat	lov: I'm thinking that I should just duck down and not rock the boat ?	16:36
	lov: But my boss is also somewhat confrontational asking questions and such. I keep thinking, "I really don't want to answer that."	16:37
	← samsamm777 left	16:37
	→ D4v33_ joined	16:37
	→ razrunelord joined	16:37
	→ kermit joined	16:37
	→ CKyle joined	16:37
	→ jceb joined	16:37
	← xlinkz0 left	16:38
	← Skrypter left	16:38
	→ ojacobson joined	16:38
lov	is it your boss that's always wrong, or your colleague?	16:38
	→ Skrypter joined	16:38
lmat	lov: Well hard to say. We have a "technical lead" who I think is properly a "colleague", and we both have the same boss.	16:38
	lov: So the technical lead sort of ...well leads the way.	16:39
lov	aha.	16:39
	→ thaifood joined	16:39
lmat	lov: My other thought is to just ... win. Put myself in a higher position so that I can correct these problems.	16:39
thaifood	hi	16:39
lmat	lov: Then I remember that I don't care enough for my employer (I work for the government)	16:39
	lov: I am sort of on an exit strategy. I guess run ins like this should help me increase my zeal for exiting.	16:40
	lov: I'm not headed toward Google, though... I'm not educated enough.	16:40
	← ezrafree left	16:40
	← cjwilburn left	16:40
	← luc_ left	16:41
thaifood	when i pull my git repo on my redhat server it shows all the files modified. My last commit was from my centos box with autocrlf = input in the config. Any ideas what is causing all the files to show modified please ?	16:41
osse	lov: do you work with boring stuff?	16:41
	← bdavenport left	16:41
lmat	thaifood: Stop modifying line endings ?	16:41
	← FreezingCold left	16:41
thaifood	lmat, i didn't have anything before so i just added autocrlf = input trying to fix it	16:42
	going from centos to redhat	16:42
	is there something I can do to fix it please ?	16:42
lmat	thaifood: What's broken ?	16:42
	← airportyh left	16:43
thaifood	i want it so when i clone the repo that it doesn't show any files modified	16:43
lmat	thaifood: earlier you said pull, do you mean "clone" now ?	16:43
thaifood	sorry this is a clone	16:44
	→ nwertman joined	16:44
	← canton7-mac left	16:44
	← spuz left	16:44
	← SegFaultAX left	16:45
lmat	thaifood: So, you mkdir newdir; cd newdir; git clone <url>; and you want the output to be something like "nothing changed" ?	16:45
thaifood	yes	16:45
lmat	no.	16:45
	→ bdavenport joined	16:45
lmat	thaifood: "change" is not a useful concept when you're cloning a repo.	16:46
thaifood	so i have to do another commit to prevent git status from showing every file changed ?	16:46
lov	lmat: it's less a matter of education and more a matter of experience and competence. I only have a BS in CS.	16:46
	→ kadoban joined	16:46
	→ offby1` joined	16:46
lmat	thaifood: Clone is to creation as pull is to change. (?)	16:46
lov	osse: sort... of.	16:46
	I'll say that it's relatively quiet, which suits me fine :)	16:47
lmat	lov: Yeah, I know. I think the real deal is that I want to be self-employed rather than work for even Google.	16:47
thaifood	but clone comes with the git commits which show clearly that nothing has changed	16:47
	→ SegFaultAX joined	16:47
lov	lmat: fair enough.	16:47
thaifood	lmat so i need to do a commit to get it to stop showing all of the files as changed	16:48
	← matteo left	16:48
	→ FreezingCold joined	16:48
	← anry left	16:48
	→ anry joined	16:48
thaifood	For linux boxes, this is correct ? [core] autocrlf = input	16:49
	← elektronisk left	16:49
lov	thaifood: if you know you haven't modified anything, you can do "git reset --hard HEAD", which will bring your workspace to the state of your HEAD commit. This is not reversable, do not do this if you are not certain."	16:49
	→ mikecmpbll joined	16:49
thaifood	lov, perfect	16:50
	that's exactly what i needed	16:50
osse	lov: what I had in mind is that because of how popular Google is an an employer they end up in a situation where they set brilliant people to do even the most mundane tasks	16:50
thaifood	is "get reset --hard" the same as with HEAD ?	16:50
osse	(supposedly)	16:50
	← Jeana left	16:50
lmat	I think my coworker sees everything as relationships... When I say something, his response isn't, "Is that right or wrong?" but rather "Is that friendly or attacking?" or something like that.	16:50
lov	osse: it's a valid complaint, I'll say that. That said, there's 20% time if you have a good idea :)	16:51
thaifood	lmat, haha that's funny, tell him it is a predator	16:51
	← WormDrink left	16:51
	→ akushner joined	16:51
	← lucastt left	16:51
lmat	You know... one thing I could use to my advantage is that my boss thinks very highly of me. If my boss sees me performing poorly under this leader, things may change ?	16:52
lov	osse: I'm definitely not working on what I kind of hoped I would be when I started, but I'm happy with how things turned out. I ended up on a very low stress team, and there's no pressure to pull all nighters or work weekends or anything like that.	16:52
	← erikruthven left	16:52
lmat	lov: Ah, very good. On what do you work ?	16:52
lov	Not being in an on-call rotation is a really great thing for me, since I have an awful commute.	16:52
lmat	lov: I'm guessing you must be production support for adsense...	16:52
lov	hah, nowhere near close.	16:52
lmat	:AP	16:53
	→ the8thbit joined	16:53
lmat	:P	16:53
thaifood	is "git reset --hard" the same as with HEAD ?	16:53
	← blosocool left	16:53
lmat	Or maybe I just need to talk to my boss...	16:53
	thaifood: HEAD is implied.	16:53
osse	thaifood: yes	16:53
lov	I do iPhone development for a public product which I won't specify, because I don't want to get bugged about it :)	16:53
thaifood	thank you guys	16:53
lmat	lov: good idea ;-)	16:53
lov	it's an interesting change since I've been doing Android development since Android started, and never did iOS before.	16:53
	← rivarun left	16:53
lmat	lov: I don't have a cellphone, anyway ;)	16:53
	→ erikruthven joined	16:54
thaifood	For linux boxes, this is correct ? [core] autocrlf = input	16:54
	← erikruthven left	16:54
	← Kayra left	16:54
	← mizu_no_oto left	16:54
	→ tang^ joined	16:55
	→ roelmonnens joined	16:55
	→ dougsland_ joined	16:55
	← D9 left	16:56
	zz_anildigital → anildigital	16:56
	← bdavenport left	16:56
thaifood	maybe ? hehe	16:57
	← FortySix2 left	16:57
	→ brandon80__ joined	16:57
	→ codeFiend joined	16:58
	→ Kayra joined	16:58
	← gripp9k left	16:59
	→ FortySix2 joined	17:00
	← m0ltar left	17:00
lmat	thaifood: I have never used that option.	17:00
	→ leeN joined	17:00
lmat	thaifood: So I would say, "no, don't put that". :)	17:00
	thaifood: Oh, and I use a linux machine.	17:01
lov	http://git-scm.com/book/en/Customizing-Git-Git-Configuration#Formatting-and-Whitespace	17:01
	← momomomomo left	17:01
lov	it's probably fine to do, especially if you're going to worry about windows clients	17:01
osse	thaifood: set the 'text' attribute to auto in .gitattributes. That's all you need. Stay away from autocrlf and safecrlf	17:01
thaifood	lov, that's where i got it	17:01
Eugene	You shouldn't need to touch core.autocrlf on a *nix box(or with an editor that defaults to LF)	17:01
osse	or so I've heard	17:01
lov	but yeah, don't touch it unless you need to.	17:01
Eugene	And on Windows, the correct approach is to use a LF-aware editor, eg Notepad++	17:01
	← akushner left	17:01
	→ willnorris joined	17:01
thaifood	ok so i can just have nothing	17:01
	← FortySix2 left	17:01
thaifood	is sublime text lf aware ?	17:02
	← offby1 left	17:02
	offby1` → offby1	17:02
	← Kayra left	17:02
Eugene	I have no idea; never used it myself. But probably	17:02
	→ akushner joined	17:02
jeffasinger	thaifood: Yes	17:02
	→ bluesm joined	17:02
Eugene	You need to make it the default, too	17:02
thaifood	Eugene: there is a setting ?	17:02
	← CKyle left	17:03
	← welly left	17:03
jeffasinger	If you open a file with LF endings, it will recognize that, you can change the default_line_ending setting for new files	17:03
lmat	lov: Do you use Microsoft Windows ?	17:03
	→ lucastt joined	17:03
thaifood	ok	17:04
	→ chris_thomson joined	17:05
lov	lmat: you realize that windows is banned within google, yes? :)	17:06
	← lucastt left	17:07
	→ Sample joined	17:07
	← Tuna-Fish left	17:07
	← brandon80__ left	17:08
	→ sluther joined	17:08
	→ StoneCypher joined	17:09
	→ lucastt joined	17:09
	→ dreiss joined	17:09
	← aspiers left	17:09
	gitinfo set mode: +v	17:09
StoneCypher	git is declining to show me the diff of a file because it thinks the file is a binary. i assume this is because it's minified css, and is therefore on one line. is there a way to get git to show me just the different piece?	17:10
	normally i want this behavior to stay what it is; i want to see in that file just once as a one time thing	17:10
	← willnorris left	17:10
	→ cjz joined	17:10
	← Zariel_ left	17:11
	← thaifood left	17:11
	→ Zariel_ joined	17:11
	← zoso left	17:11
	→ cathedral joined	17:11
	→ hebz0rl joined	17:12
	← blackmesa left	17:12
	→ CKyle joined	17:12
osse	StoneCypher: try --word-diff	17:12
	→ Noldorin joined	17:12
osse	StoneCypher: but consider not committing generated files	17:12
	← batrick left	17:13
StoneCypher	i would like to not commit generated files, but organizational momentum, etc	17:13
	--word-diff doesn't seem to have made a change	17:13
	→ batrick joined	17:13
	→ markjwill joined	17:14
StoneCypher	oh it takes an argument	17:14
lmat	lov: I didn't know that! Are you saying "you realize windows is banned" then "Yes, I use Windows" ? ;-)	17:14
	→ bdavenport joined	17:14
osse	StoneCypher: maybe try difftool	17:14
StoneCypher	osse: /me doesn't have difftool	17:15
osse	+	17:15
	← bdavenport left	17:15
osse	?	17:15
	← rfoust left	17:15
	← the_bz left	17:15
	→ bdavenport joined	17:15
	→ nnyk_ joined	17:16
	→ willnorris joined	17:16
	← lucastt left	17:16
	→ xMYTHICx joined	17:17
	→ jcvfen_ joined	17:17
	← finster left	17:17
	gitinfo set mode: +v	17:17
	← jcvfen left	17:17
	→ ferreum joined	17:18
	→ lucastt joined	17:18
	← markjwill left	17:19
	← pen left	17:19
	← willnorris left	17:19
lapache	hello, how to know which commits/tags/branch not pushed yet ?	17:19
cathedral	If I clone a git repository into a local directory, make changes without committing any of them, and then delete the whole directory with no backups, am I correct in assuming that the repo is gone with no way to recover anything?	17:19
	→ NimeshNeema joined	17:20
osse	cathedral: yes	17:20
	cathedral: I assume you've checked the recycle bin/trash	17:20
	← achadwick left	17:21
cathedral	osse: I didn't actually delete it, just making sure I understand how it works.	17:21
	Thank you	17:21
osse	cathedral: cool.	17:21
	gitinfo set mode: +v	17:22
skorgon	even if you committed those cahnges they'd be gone	17:22
osse	cathedral: it is possible to make Git use a .git directory that is outside the directory you're working in though	17:22
	I can think of 4 different ways :p	17:23
	← sluther left	17:23
	← freimatz left	17:23
	→ InsanelyADHD joined	17:24
	← ziro` left	17:24
	→ aartist joined	17:24
	← shingshang left	17:25
	→ Tuna-Fish joined	17:27
	← CKyle left	17:28
	← martinklepsch left	17:28
	← hgl left	17:28
	→ Scott6 joined	17:29
	→ richwestcoast joined	17:29
	← allay left	17:30
	← moritzs left	17:31
	→ Shusshu joined	17:31
	← aerocarbine left	17:32
	← dingbat left	17:32
	→ dark_splinter joined	17:33
	← Shusshu left	17:33
	→ mewm joined	17:33
	← GT4066 left	17:33
	← m0nkmaster left	17:34
	← l0x3py left	17:34
	→ endiruna joined	17:35
	→ CKyle joined	17:35
sjmikem	I stupidly killed a git svn fetch, and now get "error: could not lock config file .git/svn/.metadata: File exists" when I try to restart it	17:35
	how to recover?	17:35
	midnightmagic_ → midnightmagic	17:36
osse	probably delete that file	17:36
sjmikem	Tried that	17:36
osse	So it complains that it exists eve if it doesn't ?	17:36
	← kenneth left	17:37
	→ lithiumjake joined	17:37
sjmikem	so I delete the .metadata file, verify that it's gone, and run the command again. The error appears, and the .metadata file reappears	17:38
dowwie	or a private (company) project, is it generally good practice to force gpg signatures with the commit tags?	17:39
	→ tgkokk joined	17:40
	← tgkokk left	17:40
	→ SilverBln joined	17:40
	→ HSaka joined	17:41
	← tvw left	17:42
	← paulweb515 left	17:43
	← ingu_cloud_ left	17:43
	← watermel0n left	17:44
	← JosephFerano left	17:44
	← shruggar left	17:44
lapache	i have modified files (seems to be added) but not commited, git diff doesn't show me the changes :( do i missed something ?	17:44
osse	lapache: yes, you're missing --staged	17:45
	dowwie: I think it's more important for open source	17:45
	→ rivarun joined	17:45
sjmikem	Ah, I needed to delete .metadata.lock too	17:45
	← vijay13 left	17:45
dowwie	osse: yeah	17:46
ohcibi	sjmikem: you shouldnt have deleted .metadata i guess 8-))	17:46
sjmikem	I did, just not the corresponding .lock file	17:46
	the error message was misleading	17:46
	→ watermel0n joined	17:46
	← SilverBln left	17:46
	← CKyle left	17:47
	→ BuSerD joined	17:47
	← carandraug_ left	17:47
sjmikem	seems to be ok now, I assume .metadata is reconstructable?	17:48
	→ Nathan2055 joined	17:48
	→ lsiv568 joined	17:48
	→ m0nkmaster joined	17:49
	← Ardenzi left	17:50
	← thedodd left	17:50
	→ LeMike joined	17:51
	← Nathan2055 left	17:51
	← revoNxt left	17:51
	← LeMike left	17:52
	← lsiv568 left	17:52
	→ jnewt joined	17:53
	← armyriad left	17:53
	→ LeMike joined	17:53
	← LeMike left	17:53
	← Zariel_ left	17:53
	→ revoNxt joined	17:53
jnewt	i can't seem to get my remote location for cloning set up on my laptop to match what i have on my desktop. my clone on my desktop looks something like this git clone alias:repo.git	17:53
	the alias expands to ssh://[user@server.com:port]	17:54
	→ thedodd joined	17:54
	→ LeMike joined	17:54
	← lucastt left	17:54
cathedral	If I clone a remote master into a local directory and make changes, can I update my local master clone to account for changes synced by other people to the remote master? Would I do this using rebase?	17:54
	← guns left	17:54
	← xMYTHICx left	17:54
	→ xMYTHICx joined	17:54
	← bitkiller left	17:55
	← StoneCypher left	17:55
jnewt	i tried to setup the laptop in the same manner. however, i get cloning into 'reponame'... ssh: could not resolve hostname alias: name or service not known	17:55
	→ lucastt joined	17:55
	← m0nkmaster left	17:56
lapache	osse: thank you	17:56
skorgon	cathedral, rebase or merge. depends on how you want your history to look like	17:56
	← _Vi left	17:57
cathedral	skorgon: I want the history to be linear	17:57
	→ aard_ joined	17:58
	← Error404NotFound left	17:58
	→ tgkokk joined	17:59
	→ Kayra joined	17:59
	anildigital → zz_anildigital	18:00
	→ beatdown joined	18:00
	← xcesariox left	18:00
	← Kayra left	18:00
	→ Kayra joined	18:01
	→ pbrobst joined	18:01
	← tgkokk left	18:01
	→ lsiv568 joined	18:02
	← G__81 left	18:02
	→ tm512_ joined	18:02
	← pbrobst left	18:02
	← tm512 left	18:02
beatdown	I've configured my GLOBAL user.mail and user.name. But when I commit git says: Your name and email address were configured automatically based on your username and hostname. How can I make it take the GLOBAL config? (git v.1.7.12)	18:02
	← lucastt left	18:03
osse	beatdown: what does 'git config user.email' say while inside the repo?	18:04
	← xMYTHICx left	18:04
	→ tranzfuse1 joined	18:04
jimi_	git diff doesnt show any diff of a file, but git status shows its modified, other than file permission mode, what else could that be?	18:04
skorgon	cathedral, well, then you need to rebase. but you cannot influence the remote which still may merge	18:04
	→ lite_ joined	18:04
osse	jimi_: it has been staged and you need git diff --staged	18:04
lmat	lov: Okay, I'm writing a letter to my (our mutual) boss.	18:04
beatdown	osse: my gmail account, the same that is configured under GLOBAL and the one that I want to use	18:04
skorgon	Jiffy_, is it staged?	18:04
	argh, wrong nick and too late. i go home	18:05
jimi_	osse, it says its not staged	18:05
	← Kayra left	18:05
	← tranzfuse left	18:05
	← MissionCritical left	18:06
osse	beatdown: and you commit via a regular 'git commit' ?	18:06
	jimi_: try 'LESS= git diff'	18:06
	→ tgkokk` joined	18:07
	→ sq-one joined	18:07
	← mikecmpbll left	18:07
beatdown	osse: yes, git commit -m	18:07
	→ pbrobst joined	18:07
	← lithiumjake left	18:08
osse	beatdown: do you have any hooks?	18:08
	← tgkokk` left	18:08
	→ bob14 joined	18:08
	→ tgkokk joined	18:08
	→ knownasilya joined	18:08
osse	and is the error repeatable?	18:08
	ehh, reproducible	18:08
beatdown	osse: I don't think so, because I don't know what hooks are... :\	18:08
	Keridos_off → Keridos	18:08
osse	then you don't	18:08
beatdown	osse: I'll try again to see if it's reproducible, hold a minute	18:09
	← tm512_ left	18:09
	→ mikecmpbll joined	18:09
	→ tm512 joined	18:09
	← BuSerD left	18:09
	← kulkarp left	18:09
	← Asandari left	18:09
	← ascarter left	18:09
	← Kamilion left	18:10
	← asturel left	18:11
	← stealthii left	18:11
	→ cruig joined	18:11
jimi_	osse, im on windows git bash	18:11
	→ BuSerD joined	18:11
	→ lite__ joined	18:11
osse	jimi_: doesn't matter	18:11
	← HelperW left	18:11
	→ lithiumjake joined	18:11
	← the8thbit left	18:11
jimi_	osse, it says sh.exe comman not found	18:12
	← LeMike left	18:12
	← raijin left	18:12
	→ HelperW joined	18:12
	→ asturel joined	18:12
osse	jimi_: don't include the quotes	18:12
	→ ascarter joined	18:12
	→ dancat joined	18:12
	→ the_cybersphinx joined	18:12
	← ascarter left	18:12
jimi_	osse, do i need the filename after? if not it says missing operand	18:12
	→ Asandari joined	18:12
beatdown	osse: yes, it's reproducible via: mkdir foo; cd foo; git init; touch bar; git add .; git commit -m "hello"	18:12
osse	jimi_: what exactly are you typing in ?	18:13
	← blarson left	18:13
	← tirengarfio left	18:13
	→ ascarter joined	18:13
	← kstuart_ left	18:13
	← ascarter left	18:13
jimi_	osse, LESS=git diff	18:13
beatdown	it's weird, isn't it?	18:13
osse	jimi_: insert the space you removed	18:13
	← carlosgoce left	18:13
	→ blarson joined	18:13
	→ kstuart joined	18:13
	→ carlosgoce joined	18:13
	→ finster joined	18:14
	← finster left	18:14
	→ finster joined	18:14
	→ ascarter joined	18:14
	← Ivo left	18:14
	← setra left	18:14
	→ boombatower joined	18:14
	← chrisshattuck left	18:14
jimi_	lots of ESC[m on the screen	18:14
	← cybersphinx left	18:14
	← lsiv568 left	18:14
osse	jimi_: do you see the diff at least ?	18:15
	→ Kamilion joined	18:15
jimi_	osse, ya, of all the files	18:15
osse	jimi_: try LESS=FRSX git diff	18:15
	→ blackmesa joined	18:15
	→ chrisshattuck joined	18:15
	→ Ivo joined	18:15
	← lite_ left	18:15
	← HelperW left	18:16
jimi_	osse, it looks like its tabs or whitespace	18:16
	← lite__ left	18:16
	→ Sonderblade joined	18:16
	→ paulweb515 joined	18:16
	← Sonderblade left	18:16
osse	what do you mean	18:17
	→ raijin joined	18:17
	← loveablelobster left	18:17
	→ stealthii joined	18:17
	→ Sonderblade joined	18:17
	→ MissionCritical joined	18:17
jimi_	osse, it looks like the changes are like tabs or something, i dont see actual changes	18:18
	→ mechanize joined	18:18
osse	jimi_: to Git those are changes just as much as any other	18:18
	→ mishok13 joined	18:18
	→ Error404NotFound joined	18:19
jimi_	osse, but they aren't changes, like no one changed them? could it be something between windows and linux?	18:19
	→ tirengarfio joined	18:19
	→ pantsman joined	18:19
	← pantsman left	18:19
	→ pantsman joined	18:19
	→ xMYTHICx joined	18:19
	← jovy88 left	18:19
osse	jimi_: some program rewrote your line endings perhaps	18:19
	→ D9 joined	18:20
osse	jimi_: if you don't want those changes use git checkout -- file to get rid of them	18:20
	→ jovy88 joined	18:20
jimi_	ty	18:21
	→ armyriad joined	18:21
	→ momomomomo joined	18:21
	← HSaka left	18:21
	← Asenar left	18:22
	→ FortySix2 joined	18:22
osse	beatdown: before git commit, what does 'git config --get-all user.name' say ?	18:22
	← acharlieh left	18:24
beatdown	osse: I issued your command with user.mail instead of user.name. And it display the global setting	18:24
osse	beatdown: and only one, right?	18:25
	→ Asenar joined	18:25
beatdown	yes	18:25
osse	try with name too	18:25
	→ kulkarp joined	18:25
beatdown	osse: only one too	18:25
	← betelgeu1e left	18:26
osse	beatdown: what does 'declare -p GIT_AUTHOR_NAME' say? Ditto for GIT_AUTHOR_EMAIL	18:26
	← bob14 left	18:26
	← endiruna left	18:26
	→ m0ltar joined	18:27
	← xMYTHICx left	18:27
beatdown	osse: not found	18:28
	→ agrajag42 joined	18:28
osse	then I must give up	18:28
	← blackmesa left	18:29
	→ jonmorehouse joined	18:29
	→ Gizburdt joined	18:30
	→ kenneth joined	18:30
beatdown	osse: ok, thanks! :) I've found something: it's only putting the wrong e-mail. I changed user.name globally and it uses it when commit. I think I got it... just let me check...	18:31
	← WaReZ_ left	18:32
	← chrisshattuck left	18:32
	→ harobed_ joined	18:32
	← harobed_ left	18:32
	→ freeman42 joined	18:33
	→ harobed_ joined	18:33
	← harobed_ left	18:33
	→ allay joined	18:33
	→ snql joined	18:33
	→ harobed_ joined	18:34
	← harobed_ left	18:34
	→ harobed_ joined	18:35
	← harobed_ left	18:35
	→ m0nkmaster joined	18:35
beatdown	osse: I got user.mail in .gitconfig, not user.email	18:35
	→ harobed_ joined	18:35
beatdown	LOL	18:35
	osse: thank you very much	18:35
	→ LucasTT joined	18:36
osse	beatdown: but you said 'git config user.email' showed your email :P	18:36
	→ pwnz0r joined	18:36
	← mechanize left	18:37
osse	The lesson to learn here is: Always copy-paste shell commands given to you by strangers	18:37
	← kermit left	18:37
	← Gizburdt left	18:38
lov	beatdown: type this: "sudo shutdown now"	18:38
	→ betelgeu1e joined	18:38
skorgon	right: http://thejh.net/misc/website-terminal-copy-paste	18:38
	→ Gizburdt joined	18:38
osse	hwh	18:39
	heh	18:39
	also always accept candy	18:39
	and smell their napkins	18:39
nyuszika7h	lov: that's too obvious, don't you think? :P	18:39
skorgon	doesn't shutdown need to be passed a target?	18:40
	← jimi_ left	18:40
beatdown	byeee	18:40
	← dowwie left	18:41
	→ acharlieh joined	18:41
skorgon	also, today it is systemctl poweroff :P	18:41
	← pwnz0r left	18:41
	← thedodd left	18:41
osse	I just press the button and it does the right thing	18:41
	→ fragamus joined	18:42
	← Guest42013 left	18:42
	← Gizburdt left	18:43
	→ Gizburdt joined	18:43
	← Error404NotFound left	18:43
	→ endiruna joined	18:44
TheJH	skorgon: :)	18:44
	→ moritzs joined	18:44
	→ teran joined	18:45
	→ blackmesa joined	18:45
	← kenneth left	18:45
	← kstuart left	18:45
	→ xMYTHICx joined	18:45
	← Celm_ left	18:46
	→ JosephFerano joined	18:48
	← xMYTHICx left	18:49
	← dougsland_ left	18:50
ajf-	I accidentally added two files I'm still working on 2 commits ago. How can I take them out of there and bring them back to Modified stage	18:51
	*State	18:51
	?	18:51
	→ Silex joined	18:51
	← m0nkmaster left	18:51
	→ CKyle joined	18:51
	→ Celm joined	18:52
	→ xMYTHICx joined	18:53
	→ _tpavel joined	18:53
lov	skorgon: try it and see :D	18:54
	→ mordocai joined	18:54
skorgon	ajf-, rebase -i and edit the faulty commit. (does !fixup cover this?)	18:55
gitinfo	ajf-: 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!	18:55
	← xMYTHICx left	18:55
	→ xMYTHICx joined	18:55
	→ nkouevda joined	18:55
	→ revyd joined	18:55
	← xMYTHICx left	18:56
	← sgen left	18:56
	→ xMYTHICx joined	18:56
	← razrunelord left	18:56
	→ CorySimmons joined	18:57
	← CorySimmons left	18:57
	→ CorySimmons joined	18:58
	← CorySimmons left	18:58
	← FortySix2 left	18:58
	→ FortySix2 joined	18:59
	→ CorySimmons joined	18:59
	← primitive left	18:59
	← revyd left	18:59
	← Darvein left	19:00
	→ dowwie joined	19:01
	← LucasTT left	19:01
	← teran left	19:01
	← pbrobst left	19:01
	→ Kayra joined	19:01
	→ teran joined	19:02
	← CodeShar_ left	19:03
dowwie	I'm trying to set up version control using a local repository on my workstation. I init'd a bare repo, cloned it in another directory, added files, committed them, and pushed -- how do I see whether its residing in the master repo at this point?	19:03
	← mattstratton left	19:03
	→ xcesariox joined	19:03
	→ CodeShark joined	19:03
	← teran left	19:03
	← EminenceHC left	19:04
	→ revyd joined	19:04
	→ teran joined	19:04
	← albel727 left	19:04
	→ EminenceHC joined	19:04
	→ Apocalisp joined	19:05
	← Kayra left	19:06
	→ albel727 joined	19:06
nkouevda	dowwie: from your (non-bare) repo, git branch -av will show what commit remotes/origin/master is on	19:06
	sounds like it should match the local master	19:07
	← acharlieh left	19:07
	→ kermit joined	19:08
dowwie	yes I see my commit	19:08
	thanks nkouevda	19:08
	← EminenceHC left	19:09
	← digital-shokunin left	19:09
	← tgkokk left	19:09
	→ lsiv568 joined	19:09
	← nilg left	19:10
	→ rgr joined	19:10
	→ LBV_User joined	19:11
	← CKyle left	19:11
	→ Darvein joined	19:12
	← SegFaultAX left	19:12
	→ Kicer86 joined	19:12
	→ primitive joined	19:13
	→ SegFaultAX joined	19:13
	→ ezrafree joined	19:13
	→ Exancillatus joined	19:13
	← fragamus left	19:15
	→ staafl joined	19:15
	→ mad joined	19:17
	← xMYTHICx left	19:18
	→ acharlieh joined	19:18
	← lmat left	19:18
	← Exancillatus left	19:18
	← hyperair left	19:19
	→ Arctico joined	19:20
	→ rishabh_ joined	19:21
	→ LucasTT joined	19:21
	→ kenneth joined	19:21
	← jpierre03 left	19:22
	← aard_ left	19:22
	← NimeshNeema left	19:24
	→ yhager joined	19:24
	→ CKyle joined	19:25
	→ m0nkmaster joined	19:25
	→ pheaver joined	19:26
	→ GeoAleyPerMer joined	19:27
	← SegFaultAX left	19:27
	→ fragamus joined	19:27
	← m0ltar left	19:28
	→ SegFaultAX joined	19:28
	← roelmonnens left	19:28
	→ saorge joined	19:29
	← kalypso left	19:30
	← lsiv568 left	19:31
	→ ziro` joined	19:31
	→ blahdodo joined	19:31
	→ thedodd joined	19:31
	← saorge_ left	19:32
	← daedeloth left	19:33
	→ lsiv568 joined	19:33
	← teran left	19:33
	→ teran joined	19:34
	← cjwilbur_ left	19:35
	→ cjwilburn joined	19:36
	→ cjwilbur_ joined	19:37
	← felixjet_ left	19:37
	← teran left	19:38
	← a-l-e left	19:38
	→ teran joined	19:38
	← mad left	19:38
	← grep0r left	19:38
	← jonmorehouse left	19:39
	→ mad joined	19:39
	← harobed_ left	19:39
	→ felixjet joined	19:39
	← ascarter left	19:39
	← Gizburdt left	19:40
	← przemkovv left	19:40
	← cjwilburn left	19:40
	← mad left	19:40
	→ WaReZ joined	19:40
	→ mad joined	19:41
	← jackneill left	19:42
	← Kicer86 left	19:42
	← m0nkmaster left	19:43
	← blackmesa left	19:44
	→ martinklepsch joined	19:44
	→ chrisshattuck joined	19:45
	→ cavallari joined	19:46
cavallari	Hi	19:46
	how can I generate a public SSH key in windows?	19:46
	← teran left	19:46
	→ grep0r joined	19:46
canton7	cavallari, if you've got git bash, 'ssh-keygen'	19:46
	→ teran joined	19:46
canton7	otherwise, puttygen can export ssh keys	19:47
	← felixjet left	19:47
	→ alvaro_o joined	19:48
	← CKyle left	19:48
	← ziro` left	19:49
	→ CKyle joined	19:50
	→ fatalhalt joined	19:50
	→ ziro` joined	19:50
	→ jonmorehouse joined	19:51
	→ blackmesa joined	19:51
	lyubenblagoev → lyubenblagoev_	19:51
	← ziro` left	19:51
	lyubenblagoev_ → lyubenblagoev	19:51
	← causasui left	19:52
	← teran left	19:53
	→ felixjet joined	19:53
	→ m0ltar joined	19:54
	→ kballou joined	19:55
	→ harobed joined	19:55
	← harobed left	19:55
	← reaverb left	19:56
	← nnyk_ left	19:56
	→ harobed joined	19:56
	← harobed left	19:56
	← oojacoboo left	19:57
	→ harobed joined	19:57
	← fragamus left	19:57
	← Korvin left	19:59
	← chrisshattuck left	19:59
	→ przemkovv joined	19:59
	→ Kayra joined	19:59
	← IrishPrime left	19:59
	← fr33 left	20:00
	→ razrunelord joined	20:00
	← FortySix2 left	20:01
	← CorySimmons left	20:01
	→ EminenceHC joined	20:01
	← pheaver left	20:02
	→ m0nkmaster joined	20:02
	→ chrisshattuck joined	20:03
	→ coz joined	20:04
	→ Arkaniad joined	20:05
identity	Hello. I manage my dotfiles using git, and within those dotfiles, I also include .oh-my-zsh which itself is a git repository. This resulted in some rather strange results at some point, because oh-my-zsh tries to automatically update. In a fit of idiocy, I simply deleted the .git directory from .oh-my-zsh.	20:05
	← Kayra left	20:05
identity	Now I would like to somehow .. reinitialize the .oh-my-zsh subfolder to.. i don't know, a submodule? Or some such	20:05
	so that I can include it in my dotfiles and update it.	20:05
	Is there a way for me to do this?	20:05
	← Sleepy63 left	20:05
	← felixjet left	20:05
	→ Korvin joined	20:06
	Korvin → Guest55603	20:06
	← cruig left	20:07
	→ teran joined	20:07
	← axl_ left	20:08
	← cfedde_ left	20:08
	→ nilg joined	20:08
	← _tpavel left	20:10
	← jcvfen_ left	20:11
	← allay left	20:11
	→ Gizburdt joined	20:11
	← PeterBooker left	20:12
	← lsiv568 left	20:13
	→ axl_ joined	20:13
	← hoschi left	20:13
	← acharlieh left	20:14
	→ jcvfen joined	20:14
	← jamieshepherd left	20:14
	→ teran_ joined	20:14
	→ clandest joined	20:14
	→ testerbit joined	20:14
	→ MattMaker joined	20:15
	→ Skrypter_ joined	20:15
	← Skrypter left	20:15
	→ bs867230 joined	20:15
	← testerbit left	20:16
	→ testerbit joined	20:16
	← jason237 left	20:16
	← bs867230 left	20:16
testerbit	I'm new to github, trying to push but getting this error: Permission denied (publickey).	20:16
	fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists. -- What is the issue?	20:16
	← axl_ left	20:18
	← teran left	20:18
	→ pheaver joined	20:18
Wader	add your ssh key to your github account or use the https links and login with your username/password	20:18
	→ reaverb joined	20:18
canton7	followed https://help.github.com/articles/generating-ssh-keys ?	20:18
	(excluding the github for windows bit)	20:18
	→ oojacoboo joined	20:18
	← Guest55603 left	20:20
	→ Guest55603 joined	20:20
	→ acharlieh joined	20:20
	← dobalina left	20:20
	Guest55603 → Korvin	20:20
	← ferreum left	20:21
xender	Where does Git store HEAD reflog?	20:21
	→ lsiv568 joined	20:22
	→ someplace joined	20:22
	← lsiv568 left	20:22
canton7	.git/logs	20:22
	'git reflog' shows it	20:22
	← reaverb left	20:23
	→ blackmes1 joined	20:23
	→ immerzeel joined	20:24
	← blackmesa left	20:25
	→ shinnya joined	20:25
	← Macaveli left	20:26
	← LBV_User left	20:27
	← CKyle left	20:27
	← posicks left	20:29
	→ reaverb joined	20:29
	← rudisimo left	20:29
	← DolpheenDream left	20:29
cavallari	I´ve made ssk-keygen	20:30
	→ irqq joined	20:30
cavallari	but always when I try to push...	20:30
	give me this error:	20:30
	Permission denied (publickey).	20:30
	→ eletuchy joined	20:31
osse	cavallari: try 'ssh <the url you're pushing to>'	20:32
	← Skrypter_ left	20:32
canton7	cavallari, did you add the key to github, per the instructions/	20:32
	→ Skrypter joined	20:32
	→ cjz1 joined	20:32
	← xsbeats left	20:32
	← Asiajey left	20:33
canton7	cavallari, is it stored in the right place? what's the output of 'ls ~/.ssh' ?	20:33
	← kenneth left	20:33
	→ mdpatrick joined	20:33
	→ bs867230 joined	20:33
cavallari	just "known_hosts" now	20:34
	oh no	20:34
	← djapo left	20:34
cavallari	there are two more files	20:34
	id_rsa and id_rsa.pub	20:34
	← cjz left	20:34
	← matheus23 left	20:34
cavallari	there is the pub key	20:34
	→ djapo joined	20:34
	← teran_ left	20:34
	← bs867230 left	20:34
	← thegatta_ left	20:34
	→ kenneth joined	20:34
	← jnewt left	20:34
	→ kyb3r_ joined	20:35
	← Arkaniad left	20:35
	← Gizburdt left	20:35
cavallari	I dont know if this is right, i´ve read on github helps...	20:35
	→ vire joined	20:35
cavallari	but i´ve tryed: ssh [email@hidden.address]	20:36
	→ Gizburdt joined	20:36
cavallari	just say that no addess associated with name	20:36
	→ LBV_User joined	20:36
	← chris_thomson left	20:36
canton7	answer my past 2 questions	20:36
	→ veebers joined	20:36
canton7	ah, you did	20:37
	→ Goligo joined	20:37
	← kanja left	20:37
	→ setra joined	20:37
canton7	did you add your key to github?	20:37
	yes or no?	20:37
	you need to upload it using a web interface thingy	20:37
	← clandest left	20:37
cavallari	yes, i added	20:37
	→ Exancillatus joined	20:38
canton7	pastie the output of 'ssh -vvv [email@hidden.address]	20:38
	→ posicks joined	20:38
	← oojacoboo left	20:38
	← acharlieh left	20:38
cavallari	well, there are too much lines to paste	20:39
	← Skrypter left	20:39
	← GodEater left	20:39
cavallari	there is a line saying that i am successfully authenticated, but github does not provide shell access	20:39
	← kenneth left	20:39
	→ ascarter joined	20:40
	← Gizburdt left	20:40
canton7	cavallari, I said pastie, not paste ;) ie.e. use a pastebin	20:40
	but if you successfully authenticated, then great	20:40
	← ascarter left	20:40
canton7	it means the repo you were trying to access doesn't exist	20:40
cavallari	i cant copy that, dont know how	20:40
	→ Skrypter joined	20:40
cavallari	it exists	20:41
	→ Zariel_ joined	20:41
canton7	www.pastie.org	20:41
	for one	20:41
	→ acharlieh joined	20:41
canton7	'ssh -vvv [email@hidden.address] > file.txt', then open file.txt	20:41
	→ GodEater joined	20:41
	← GodEater left	20:41
	→ GodEater joined	20:41
canton7	or icon in top left -> mark -> select -> enter	20:41
	→ ascarter joined	20:41
canton7	or maybe you don't own that repo?	20:41
dowwie	dumn question but I'm going to ask it anyway-- a remote repository is never on your local workstation, correct?	20:42
	← LBV_User left	20:42
	→ kenneth joined	20:42
	← snql left	20:42
	→ LBV_User joined	20:43
	← posicks left	20:43
cavallari	canton7: file.txt is in blank	20:43
	=(	20:43
	← SegFaultAX left	20:44
	→ pbrobst joined	20:44
	← endiruna left	20:44
	→ oojacoboo joined	20:44
	← grep0r left	20:44
	← danecando left	20:45
	← rgr left	20:45
canton7	'ssh -vvv [email@hidden.address] 2> file.txt', then open file.txt, rather	20:45
	← marthinal left	20:45
canton7	dowwie, not necessarily	20:45
	cavallari, but you successfully auth'd, so that's ok	20:46
	cavallari, what git command are you running?	20:46
	→ jpierre03 joined	20:46
	→ SegFaultAX joined	20:46
cavallari	canton7	20:47
	http://pastie.org/9157048	20:47
	I am trying a simple push	20:47
	← reaverb left	20:47
	← setra left	20:47
lov	cavallari: I'm inclined to think that you added the wrong remote ;)	20:48
	→ CKyle joined	20:48
lov	(see line 182)	20:48
	→ grep0r joined	20:48
ojacobson	git remote -v	20:48
lov	also, #github	20:49
	→ Dreamer3 joined	20:49
	← [BNC]l1kw1d left	20:50
canton7	cavallari, what git command are you running?	20:50
	so yeah, you probably don't own that rpeo	20:50
	*repo	20:50
	→ thegattaca joined	20:50
	← Hounddog left	20:50
cavallari	I own that repo	20:50
	git remote add orgin [email@hidden.address]	20:50
	← Zariel_ left	20:51
	→ yosito joined	20:51
	→ l1kw1d joined	20:52
	→ Mitchbones joined	20:52
fragMental	To paste from the commandline, the easiest way is: <command> \| curl -F 'sprunge=<-' http://sprunge.us	20:52
	← jceb left	20:52
	← LBV_User left	20:53
	→ chris_thomson joined	20:53
	→ Kayra joined	20:54
	← Goligo left	20:54
canton7	cavallari, 'git remote -v' output	20:55
	→ jason237 joined	20:55
	← razrunelord left	20:55
	← Mendenbarr left	20:56
	→ Mendenbarr joined	20:56
	← CKyle left	20:56
	← immerzeel left	20:57
	← zackiv31 left	20:58
cavallari	origin ssh://git@github.com/andrecavallari/Pannel.git (fetch)	20:58
	origin ssh://git@github.com/andrecavallari/Pannel.git (push)	20:58
	← juvenal_away left	20:58
	→ zackiv31 joined	20:58
cavallari	This was a Try	20:58
	the original is:	20:59
	origin [email@hidden.address] (fetch)	20:59
	origin [email@hidden.address] (push)	20:59
	← chris_thomson left	20:59
cavallari	D:\server\cakephp\app\Plugin\Pannel>git commit -m "Test"	20:59
	On branch master	20:59
	nothing to commit, working directory clean	20:59
	=(	20:59
	← sq-one left	20:59
	← watermel0n left	21:00
	← Scott6 left	21:00
	← zackiv31 left	21:00
	← cavallari left	21:01
	→ Arkaniad joined	21:01
	→ Lemony joined	21:01
	← yaru22 left	21:01
	→ zackiv31 joined	21:01
	← Bruno_ left	21:01
	← zackiv31 left	21:02
	→ Skrypter_ joined	21:03
	← agrajag42 left	21:03
	→ zackiv31 joined	21:03
	← cannonball left	21:03
	→ jacobt joined	21:03
	→ chris_thomson joined	21:04
	← Skrypter left	21:04
	→ hellopat joined	21:04
	→ lavaman1 joined	21:04
	← chris_thomson left	21:05
canton7	cavallari, you have id_rsa and id_dsa. the latter looks invalid. make sure you uploaded the right stuff to github	21:05
	← biertie left	21:05
	→ biertie joined	21:05
canton7	maybe?	21:05
	biertie → bdesmet	21:05
	← oojacoboo left	21:07
	← lithiumjake left	21:07
	→ FortySix2 joined	21:08
	← hellopat left	21:08
	→ jnavila joined	21:09
	→ razrunelord joined	21:09
	→ Goligo joined	21:11
	→ Gizburdt joined	21:12
	← testerbit left	21:13
	← kermit left	21:13
	→ yaru22 joined	21:14
	→ kermit joined	21:14
	← zumba_addict left	21:14
	→ nnyk_ joined	21:14
	→ zumba_addict joined	21:15
	→ bs867230 joined	21:15
	→ watabou joined	21:15
	← akim_ left	21:16
	← jeffasinger left	21:16
	← Gizburdt left	21:16
	← Skrypter_ left	21:16
	→ akim_ joined	21:16
	→ babilen joined	21:16
	← m0nkmaster left	21:17
	← irqq left	21:17
	← Darvein left	21:17
	← cjwilbur_ left	21:17
	← mishok13 left	21:18
	→ Skrypter joined	21:18
	→ lithiumjake joined	21:18
	← zumba_addict left	21:19
	← razrunelord left	21:19
	→ Xethron joined	21:19
	← Xethron left	21:19
	→ Xethron joined	21:19
	← jpierre03 left	21:19
	→ joelmo joined	21:20
	← beatdown left	21:20
	→ Darvein joined	21:20
	← jovy88 left	21:21
	← ojacobson left	21:22
	→ tpollard joined	21:22
	← b4rbz left	21:22
	→ nnyk joined	21:23
	← Darvein left	21:23
	→ cagedwisdom joined	21:23
	← nnyk_ left	21:25
	← Mitchbones left	21:26
	→ EveBird joined	21:26
	← kulkarp left	21:26
	← FunkyAss left	21:27
	← johnflux__ left	21:27
	→ CKyle joined	21:28
	← liri__ left	21:28
	→ tophyr joined	21:28
tophyr	why would 'git blame' for a file show it entirely as Not Committed Yet, but git status shows nothing to commit, working directory empty?	21:28
	→ coasterz joined	21:29
osse	tophyr: is it ignored?	21:29
tophyr	nope, if i delete it, git status shows "deleted: ..."	21:29
	if i check it back out, status goes back to normal, and blame says NCY again	21:30
	← Arctico left	21:30
	← nnyk left	21:30
	← FreezingCold left	21:30
	← coasterz left	21:31
	→ testerbit joined	21:32
	→ Padawan joined	21:32
	→ nafg_ joined	21:33
	gitinfo set mode: +v	21:33
	→ m0nkmaster joined	21:34
Padawan	how do i update my local repository that i once git cloned?	21:34
	← bluesm left	21:34
	← jason237 left	21:34
	→ Overboost joined	21:34
tophyr	Padawan: pull	21:35
	→ R0b0t1 joined	21:35
	← pheaver left	21:35
	→ razrunelord joined	21:36
	← cjz1 left	21:36
	→ cjz joined	21:36
R0b0t1	Hello, using gitolite on windows server 2008 r2. I add a user's key but they don't get access to the specified repository. This seems to be due to: https://stackoverflow.com/questions/7529660/gitolite-not-updating-authorized-keys-file however applying the listed fix doesn't fix it. Anyone knowledgeable?	21:36
	→ pheaver joined	21:37
tophyr	ahh it's line-ending changes. somebody is a-screwin up crlf	21:37
	← Goligo left	21:37
	→ Goligo_ joined	21:37
skorgon	Padawan, git fetch	21:38
	→ jpierre03 joined	21:39
	← Padawan left	21:39
	→ Padawan_ joined	21:39
	← Sonderblade left	21:39
	→ cjz1 joined	21:40
	← pheaver left	21:41
	→ scelis joined	21:42
Joost`	skorgon: is it not preferable to advocate git pull instead of git fetch && git merge?	21:42
	← GeoAleyPerMer left	21:42
osse	Joost`: no	21:43
	← m0nkmaster left	21:43
osse	Joost`: in fact, there has been heated debates lately on the mailing list about what to do with pull	21:43
jrnieder	heated for no good reason :)	21:43
scelis	i have an enormous stash that i accidentally created with ignored files (I meant to only do untracked). As expected, stash pop fails. However, I want to get a few files out of this stash without doing a git clean. Is there anyway to pull just a couple files out of the stash? git checkout stash@{0}:PATH doesn't seem to work	21:43
	← vanillajohn left	21:43
osse	jrnieder: that's true	21:43
	← cjz left	21:43
	→ the8thbit joined	21:45
scelis	hmmm, its not elegant but 'git show stash@{0}:PATH > PATH' works	21:46
	← SegFaultAX left	21:46
	← Overboost left	21:47
	← franzip left	21:47
dowwie	I'm struggling here.	21:47
	→ SegFaultAX joined	21:47
dowwie	I can really use some help...	21:47
	← CKyle left	21:48
	→ Gizburdt joined	21:48
	← AaronMT left	21:48
	← prutz left	21:48
skorgon	Joost`, i think no. also 'update the repo' is quite fuzzy. in my definition it doesn't cover any merging or rebasing, but only fetch	21:49
dowwie	I don't know the proper way to set up a local repository on my workstation. I created a base repo and learned how to branch and merge into it. However, it's not clear to me whether I should be setting up that base repo as a remote and pushing too?	21:49
	→ delight joined	21:49
	jacobt → oojacoboo	21:49
	← Padawan_ left	21:49
	← RyPeck left	21:49
	← martinklepsch left	21:50
	← Kayra left	21:50
	← livingstn left	21:50
R0b0t1	got it	21:50
	← R0b0t1 left	21:50
	→ Rastus_Vernon joined	21:51
	← blackmes1 left	21:52
	← richwestcoast left	21:52
	← ValicekB left	21:52
	← cathedral left	21:52
	← moritzs left	21:52
	→ richwestcoast joined	21:52
	→ ezekielnoob2 joined	21:52
	→ martinklepsch joined	21:53
dowwie	what is the scope of a main branch -- is it the main branch in my working directory or in the master repo?	21:54
	→ Overboost joined	21:54
	← mjsmith2 left	21:55
	→ blackmes1 joined	21:55
	← delight left	21:56
	← ezekielnoob left	21:56
cbreak	dowwie: there's no main branch	21:57
	← ngladitz left	21:57
SamB	dowwie: if it just says "main" or "refs/heads/main" that's in yours	21:57
	← FortySix2 left	21:57
dowwie	oh ok its in mine	21:57
	→ nnyk joined	21:57
skorgon	cbreak, how do you know. he could have created one	21:57
SamB	if it says something involving, say, "origin/main" that's in the remote called (in this example) "origin"	21:57
dowwie	here's what I've done so far..	21:57
	→ pheaver joined	21:58
SamB	same with "refs/remotes/origin/main"	21:58
	← crelix left	21:58
	→ ValicekB joined	21:58
	← nilg left	21:59
	← King_Hual left	22:00
	→ FortySix2 joined	22:00
	← pantsman left	22:00
dowwie	1) create a base repo 2) create a new git working directory (git clone the base repo) 3) I check out a new branch 4) I create a simple file, add it, commit it	22:00
	akim_ → akim	22:00
	→ FreezingCold joined	22:01
dowwie	what I've been reading about is that with branches you gotta think about merging / rebasing	22:01
	← bs867230 left	22:01
dowwie	so I'm confused about where merging will get me and whether I need to declare a remote and push?	22:02
	I'm trying to version control my own project. I am the only contributor. I am not using github/bitbucket yet.	22:02
	← vire left	22:03
	← SegFaultAX left	22:03
	→ dsdeiz joined	22:03
	← Zebroid left	22:03
	→ SegFaultAX joined	22:03
dowwie	any help would really be appreciated.. I sincerely tried to read the docs and tutorials online	22:04
	→ pantsman joined	22:04
	← pantsman left	22:04
	→ pantsman joined	22:04
dowwie	I have not been lazy about trying to figure this out	22:04
	← yosito left	22:04
	→ Zebroid joined	22:04
SamB	dowwie: you do not need to push anywhere, but if you were to push somewhere then you would have less reason to worry about accidentally losing the stuff you had pushed	22:05
	← aberrant left	22:05
SamB	to declare a remote, you'd need another repository	22:05
	→ danecando joined	22:05
	→ _Vi joined	22:05
	← tophyr left	22:05
dowwie	is that what the base repo is for?	22:05
	→ axl_ joined	22:06
SamB	dowwie: oh, yeah, it is	22:06
	sorry, I'm a bit of a space-cadet :-)	22:06
	← Gooder` left	22:06
SamB	dowwie: so, "git remote -v" should list that as "origin"	22:06
	twice, presumably	22:07
dowwie	yeah it is	22:07
	so have I done this setup right so far -- cloning the base?	22:08
	→ allay joined	22:08
	← Zebroid left	22:09
ELLIOTTCABLE	is there a way to force a push to ignore the output of the before-push hook?	22:10
	← fatalhalt left	22:11
	← babilen left	22:11
skorgon	dowwie, FYI: github has a !tutorial that covers basic usage quite well	22:11
gitinfo	dowwie: A list of interactive git tutorials: http://try.github.com	22:11
	← acharlieh left	22:11
dowwie	thanks I will try that next	22:12
	← Dougie187 left	22:12
	← allay left	22:12
	← Destos left	22:13
jrnieder	ELLIOTTCABLE: try --no-verify	22:13
	← MattMaker left	22:14
	← FortySix2 left	22:15
	→ kukks joined	22:15
	← kukks left	22:15
	→ kukks joined	22:15
	→ allay joined	22:15
	← ariscop left	22:15
	← pantsman left	22:19
	→ kierandunne11 joined	22:20
	→ endiruna joined	22:20
	→ mizu_no_oto joined	22:23
	→ moritzs joined	22:24
	→ MacWinne_ joined	22:24
	→ moritzschaefer joined	22:25
	→ mollitz joined	22:25
	← JerryT left	22:25
	← mollitz left	22:25
	→ reaverb joined	22:25
	← moritzschaefer left	22:25
	← Gamecubic left	22:26
	← dsdeiz left	22:26
	→ Gamecubic joined	22:27
	→ moritzschaefer joined	22:29
	← momomomomo left	22:30
	→ mollitz joined	22:30
	← moritzs left	22:31
	→ moritzs joined	22:31
	← moritzs left	22:31
	→ moritzs joined	22:31
	← moritzs left	22:31
	← mollitz left	22:31
	← SegFaultAX left	22:32
	→ moritzs joined	22:32
	← bwreilly left	22:33
	→ Dougie187 joined	22:33
	→ RyPeck joined	22:33
	← Overboost left	22:34
	→ cruig joined	22:34
	→ Zebroid joined	22:34
	← Zebroid left	22:36
	→ Zebroid joined	22:36
	→ kanja joined	22:36
	← kanja left	22:36
	→ bwreilly joined	22:36
	← axl_ left	22:37
	→ amcsi joined	22:37
	← davividal left	22:37
	→ bitkiller joined	22:37
	← amcsi left	22:37
	→ amcsi joined	22:38
	→ SegFaultAX joined	22:38
	← reaverb left	22:39
	→ HD625B joined	22:39
	→ whitby joined	22:40
	← adamgall left	22:40
	→ simonsmith joined	22:40
	← Zebroid left	22:41
	← simonsmith left	22:41
	→ blinkdesign joined	22:41
	→ godgodgodgo joined	22:41
	→ Overboost joined	22:42
	← rishabh_ left	22:42
	→ MattMaker joined	22:43
	← dik_dak left	22:43
	→ nilg joined	22:44
	← HD625B left	22:45
	→ HD625B joined	22:45
	→ cavallari joined	22:46
cavallari	hi people	22:46
	← chrisshattuck left	22:46
	← m0ltar left	22:46
cavallari	how to add a origin using ssh key?	22:47
	public ssh key	22:47
skorgon	just specify the URL using ssh. usually something like ssh://<user>@<host>/path/to/repo	22:48
	← hebz0rl left	22:48
skorgon	once you have that it's up to having ssh configured properly to find your key	22:48
	← tranzfuse1 left	22:50
cavallari	I´ve configured my ssh key	22:51
	I am trying to add github repo	22:51
	but doesnt go	22:51
	← rnsanchez left	22:51
	→ hellopat joined	22:52
	→ rnsanchez joined	22:53
	← blinkdesign left	22:53
	← harobed left	22:53
	→ jovy88 joined	22:53
	← mizu_no_oto left	22:55
	→ mizu_no_oto joined	22:56
	← Lemony left	22:56
	← hellopat left	22:56
	→ lhunath joined	22:57
	← scelis left	22:57
rom1504	cavallari: git remote add origin git@github:user/repo	22:58
lhunath	I'm having trouble with git difftool. regardless what tool I select, I always get diff -cc output on stdout rather than a launching tool. how do I debug what's going on?	22:58
cavallari	rom1504: this didnt work =(	22:58
	← mizu_no_oto left	22:59
Cheaterman	Say I want to track software locally - I have different implementations for different customers	22:59
	I created a repo in the "base" project	22:59
	Now I'm in a subproject, I "git remote add origin /path/of/main/project"	22:59
	← Ragnor left	22:59
	→ markjwill joined	22:59
Cheaterman	Then git fetch	22:59
osse	lhunath: that is a known bug.	22:59
	lhunath: the mechanism that figures out that a --cc diff is needed kicks in before checking for external tools...	23:00
Cheaterman	Now how do I create the commit for the local integration?	23:00
	← markjwill left	23:00
	← Xethron left	23:00
lhunath	osse: interesting. do you have a reference or know whether this has been fixed or has a workaround?	23:01
	← testerbit left	23:01
	→ hellopat joined	23:02
	← fejjerai left	23:02
	← zizzfizzix left	23:02
	→ dsdeiz joined	23:02
	→ clandest joined	23:02
	← Lunatrius left	23:02
	← razrunelord left	23:02
	← danecando left	23:02
osse	lhunath: I have a reference consisting of my own mail to the mailing list about and the small discussion that followed. I know it hasn't been fixed yet	23:03
	← nilg left	23:03
ajf-	I have a wp installation. I just added github.com/wordpress/wordpress.git as remote and I want to update wp by fetching and merging. I'm getting lots of conflicts even though I haven't modified anything. What merge strategy should I use ?	23:03
	← allay left	23:05
ajf-	I'm currently trying git merge --no-commit --squash wordpress/3.9-branch	23:05
lhunath	does this break git difftool for everybody or only under specific circumstances?	23:05
	← Exancillatus left	23:05
osse	lhunath: if you want a >2 -way diff I'm afraid you'll have to invoke it yourself using <( ) and whatnot	23:05
rom1504	cavallari: what do you mean it didn't work ?	23:06
osse	lhunath: it's only when the commit is a merge commit	23:06
rom1504	did it print "this didn't work" so you decided to shut down the computer and go cry ?	23:06
	← codeFiend left	23:06
osse	and always then.	23:06
	→ ariscop joined	23:07
	← jnavila left	23:07
	← moritzs left	23:07
	← Gizburdt left	23:07
	→ alexlind_ joined	23:08
osse	lhunath: which in essence means only when you're in a merge conflict. There is git-mergetool though	23:08
	→ testerbit joined	23:08
	→ reaverb joined	23:08
osse	lhunath: the discussion was shorter than I remember, but it has been mentioned later at one point too: http://git.661346.n2.nabble.com/Suggestion-for-difftool-behaviour-during-a-merge-conflict-td7579621.html	23:08
	← clandest left	23:08
	← apocawaka left	23:09
	→ razrunelord joined	23:10
	← primitive left	23:10
	→ DolpheenDream joined	23:11
lhunath	osse: thanks!	23:11
	→ Lunatrius joined	23:11
	← alexlindenlevy left	23:12
	← alexlind_ left	23:12
	← elbeardmorez left	23:12
	← MattMaker left	23:12
	← ErKa left	23:14
osse	lhunath: this is the other one but there might be more: http://thread.gmane.org/gmane.comp.version-control.git/185990 - Btw, I think that David Aguilar fellow is our beloved David-A from #bash but I'm too shy to ask :p	23:14
	→ sparr joined	23:15
	← razrunelord left	23:15
	← tarkus left	23:16
	→ razrunelord joined	23:17
cavallari	what can I do with this error:	23:17
	Permission denied (publickey).	23:17
	fatal: Could not read from remote repository.	23:17
	Please make sure you have the correct access rights	23:17
	and the repository exists.	23:17
tang^	cavallari: look at the document I pointed you at in #github	23:20
	← HD625B left	23:20
	← Segfault_ left	23:20
	← SegFaultAX left	23:21
	→ Segfault_ joined	23:21
cavallari	tang^: Iam reading	23:22
	← amcsi left	23:22
	→ kyb3r__ joined	23:22
	→ megawac joined	23:23
	← mewm left	23:24
	← kyb3r_ left	23:25
	← bwreilly left	23:26
	← freestyl3r left	23:26
	← testerbit left	23:27
lhunath	osse: I'll ask him some time, I've been talking about the new guide with him.	23:28
	→ SegFaultAX joined	23:28
	→ bwreilly joined	23:29
	→ Balliad joined	23:29
	← reaverb left	23:32
	← endiruna left	23:33
	→ nDuff joined	23:35
	→ mizu_no_oto joined	23:35
	← blackmes1 left	23:36
nDuff	I'm trying to get a bare list of changed files within a given subdirectory between two trees. To do this, I'm currently using git diff-tree --name-only first_commit second_commit -- /path/to/directory. However, it's returning to me the parent directory, and not a list of files which changed under the parent given. What would be the correct way to accomplish what I'm doing here?	23:37
	← jovy88 left	23:37
	→ Zebroid joined	23:37
	← razrunelord left	23:37
	← betelgeu1e left	23:37
	→ MattMaker joined	23:37
	→ jovy88 joined	23:38
cavallari	how can i get a SSH Agent to work on my pc?	23:39
	→ betelgeu1e joined	23:39
	nDuff discovers that git diff --name-only works fine.	23:41
nDuff	cavallari, that depends on which ssh implementation you're using for the tunnel.	23:41
	← Zebroid left	23:41
nDuff	cavallari, ...if you're using cygwin sshd, then it has its own agent. If you're using Putty's plink, then you'll want to use pageant. Etc.	23:42
	→ MattMake_ joined	23:43
rom1504	cavallari: you need to add your public key into github	23:43
	that's what your error above is about	23:43
nDuff	cavallari, ...if you're using a Java library for interacting with git, then that library's agent support will differ; etc.	23:43
	→ reaverb joined	23:43
nDuff	oh, there was an actual error message given?	23:44
osse	nDuff: for reasons I don't know the details of properly regarding Git's own glob/filter-y feature, it makes a difference whether you write '-- directory' or '-- directory/'	23:44
	← betelgeu1e left	23:45
	← revyd left	23:45
	← yaru22 left	23:46
	← MattMaker left	23:46
	→ betelgeu1e joined	23:47
	← treehug88 left	23:47
	→ Lyqyd joined	23:47
	← thedodd left	23:47
osse	hmm, not that it would give you the precise result you wanted anyway (without the -r option at least)	23:47
	← codeurge left	23:47
	→ treehug88 joined	23:48
osse	My usual approach, which I believe is the correct one, is to use the "plain" git diff until I find out I have a reason to use any of the other diff-*	23:48
	← treehug88 left	23:48
	← jleclanche left	23:49
	→ Exancillatus joined	23:50
	→ jleclanche joined	23:50
	← mad left	23:52
	← jleclanche left	23:53
	← kierandunne11 left	23:53
	→ mad joined	23:53
	→ jleclanche joined	23:53
	← anry left	23:54
	← OnkelTem left	23:57
	→ MattMaker joined	23:57
	← bwreilly left	23:57
	← jleclanche left	23:57
	→ jleclanche joined	23:58
	→ mad_ joined	23:58
	← mad left	23:58
	← Goligo_ left	23:58
	→ OnkelTem joined	23:59
	→ yaru22 joined	23:59
	← Exancillatus left	23:59

Logs Search ←Prev date Next date→

Channels Documentation