IRCloggy #git 2013-08-15

Provider of IRC logs since 2005.

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

	2013-08-15
	Arokh → Arokh[Off]	00:00
	→ hobodave joined	00:01
	← dmarkham left	00:01
	→ rednaks joined	00:01
	← steveoh left	00:02
	← endiruna left	00:03
	← whaley left	00:03
	← frgtn left	00:05
	← aarwine left	00:06
	→ endiruna joined	00:06
	← endiruna left	00:07
	→ aarwine joined	00:11
	→ endiruna joined	00:11
	→ echo-area joined	00:11
	← verysoftoiletppr left	00:11
	→ bobdobbs` joined	00:11
	← ColKurtz left	00:11
	← alexwhitman left	00:11
	← arnej left	00:11
	← gusnan left	00:11
	→ suy joined	00:11
	→ arnej joined	00:11
	← bobdobbs left	00:11
	← m0viefreak left	00:11
	← dreiss left	00:11
	→ verysoftoiletppr joined	00:11
	← bandroidx left	00:12
	→ tinti_ joined	00:12
	→ bandroidx joined	00:12
	← bandroidx left	00:12
	→ bandroidx joined	00:12
	→ ColKurtz joined	00:12
	→ jgornick joined	00:13
	→ alexwhitman joined	00:14
	← luxgeek left	00:14
	← savr left	00:14
	→ dmarkham joined	00:15
	← EF0 left	00:15
	→ savr joined	00:16
	← ojacobson left	00:17
	← glosoli left	00:17
	← Roots47 left	00:19
	← hobodave left	00:19
	→ Gitzilla joined	00:21
	← dmarkham left	00:22
	← iliketurtles left	00:22
	← endiruna left	00:23
	← rednaks left	00:24
	→ Nicholas_Rishel joined	00:24
	→ dmarkham joined	00:25
	← simesy_ left	00:26
	← insejn left	00:27
	← scripty left	00:29
	→ michaela_ joined	00:30
	← michaelarestad left	00:30
	→ nucatus joined	00:31
	← fdel left	00:32
	← vince_prignano left	00:32
	← bmac_ left	00:34
	← refried_ left	00:35
	← nucatus left	00:36
	→ epta joined	00:37
	→ rickruby joined	00:37
	→ srcerer joined	00:38
	← harish left	00:39
	← michaela_ left	00:40
	→ simesy joined	00:40
	→ michaelarestad joined	00:41
	← rickruby left	00:42
	← tjbiddle left	00:42
	← _iron left	00:43
	← Swayz left	00:45
	← michaelarestad left	00:45
	→ hyperair joined	00:46
	← tplaner left	00:47
	→ ameagher joined	00:48
	← ology left	00:48
	← rfoust left	00:49
	← Tuna-Fish left	00:49
	← amcsi left	00:49
	→ Roots47 joined	00:50
	→ rfoust joined	00:51
	← garbagecollectio left	00:52
	← dkpi left	00:52
	→ Tuna-Fish joined	00:53
	← BitPuffin left	00:53
	← simesy left	00:53
	→ umib0zu joined	00:56
	→ simesy joined	00:56
	← goshawk left	00:57
	→ Goplat joined	00:57
	→ bmac_ joined	00:58
	← freestyl3r left	00:58
	→ tplaner joined	00:58
	← Destos left	00:59
	→ Dougie187 joined	00:59
	← sershe left	00:59
	→ weiyang joined	01:00
	← ColKurtz left	01:01
	← Roots47 left	01:01
	← Joshi3s` left	01:01
	← Milossh left	01:01
	← jfoy left	01:01
	→ Joshi3s` joined	01:02
	→ Roots47 joined	01:02
	← bmac_ left	01:02
	→ spaceonline joined	01:03
	→ lavaman joined	01:03
	→ intripoon joined	01:03
	← spaceonline left	01:04
	→ k_sze[work] joined	01:04
	← Suprano left	01:04
	→ mizu_no_oto joined	01:06
	← HerrK left	01:06
	← intripoon_ left	01:06
	→ Milossh joined	01:06
	← lavaman left	01:08
	→ Marenz joined	01:09
	→ Suprano joined	01:10
	← simesy left	01:11
	→ Davey joined	01:11
	→ v0n joined	01:13
	← nadirvar_ left	01:14
	← maroloccio left	01:14
	→ tmcmahon joined	01:14
	→ unomystEz joined	01:15
	← Marenz left	01:15
	→ sershe joined	01:16
unomystEz	hey all.. as sad as it may sound, our repo has a mix of crlf and lf line endings, one of our team members set gitattributes to include '* text=auto' and committed it to our branch, since then a few merges took place from the parent branch to our branch with the gitattribute set and unfortunately these merged files' line endings changed to unix style.. we have since removed the git attribute and merges are fine now but every so often we get massive con	01:16
	flicts due to line endings when merging in...	01:16
	is there a way to revert our files (with our changes intact) to the same line endings as the parent branch for the files affected?	01:17
	← thiago left	01:18
	→ Vampire0_ joined	01:18
	← dmarkham left	01:18
iveqy	unomystEz: no and yes, you could do a rebase and edit the errornous commits	01:19
	unomystEz: more seriously though, it looks like you've a problem with your review process	01:19
	→ natechan joined	01:19
	← AaronMT left	01:19
iveqy	unomystEz: a rebase will give you new commits and !public applies	01:19
gitinfo	unomystEz: [!rewriting_public_history] Rewriting public history is usually bad. Everyone who has pulled the old history have to do work (and you'll have to tell them to). If you must, you can use `git push -f` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	01:19
unomystEz	iveqy, it's actually a local branch, and yes, the offender is a new employee and intern and kinda screwed us	01:19
	review process is changing though	01:20
	→ iliketurtles joined	01:20
	← zivester left	01:20
unomystEz	so if our branch is called master2 and it's branched from master, you're saying to do a `git rebase origin/master`?	01:21
	from master2 that is	01:21
iveqy	unomystEz: if they just are on a local branch, there can't be very many. I'd suggested a git rebase -i	01:21
	no	01:21
	→ Muuuh joined	01:21
Muuuh	Hello	01:21
iveqy	I would say: git checkout master2 && git rebase -i HEAD~<whatever number>	01:21
gitinfo	Muuuh: 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.	01:21
	→ pandeiro joined	01:22
	← Vampire0 left	01:22
unomystEz	<whatever number> points to the commit where master2 was branched from master or where the gitattribute was introduced and all subsequent merges from master?	01:23
	← FernandoBasso left	01:23
unomystEz	iveqy, sorry if I have trouble following, I'm doing my best to learn git	01:23
	← stuff left	01:23
iveqy	unomystEz: http://git-scm.com/book/en/Git-Tools-Rewriting-History	01:23
	→ danecando joined	01:24
unomystEz	ah	01:24
Muuuh	Issuing a "git status" on two different shells gives different results. One one I'm ssh'ing into a linux box where the files are, the other one is msysgit bash, working directory set to samba shared folder of said linux box. First shows files with "changes not staged for commit", the second one doesn't show them. I'm puzzled.	01:26
	→ trungqtran joined	01:28
	← flaguy48 left	01:29
	→ luc_ joined	01:30
	→ simesy joined	01:31
	→ nucatus joined	01:32
	← pitzips left	01:32
	← looper left	01:35
	→ tanema joined	01:36
	← nucatus left	01:36
	← tplaner left	01:36
	→ harish joined	01:36
	→ frgtn joined	01:36
	→ jfoy joined	01:37
	→ dsdeiz joined	01:37
	→ looper joined	01:39
	← tmcmahon left	01:41
	← ledestin left	01:44
	← jfoy left	01:44
	← Noldorin left	01:44
	→ Noldorin joined	01:47
iveqy	Muuuh: still did you edited the files on the windows machine?	01:48
	← mdhopkins left	01:50
	→ frogonwheels joined	01:51
	→ vansonhk_ joined	01:52
	← normanrichards left	01:52
	← kesroesweyth left	01:52
	← Nicholas_Rishel left	01:53
	← relipse left	01:53
	← mizu_no_oto left	01:54
	→ relipse joined	01:54
Muuuh	iveqy: yes	01:54
	→ vansonhk__ joined	01:54
	← vansonhk_ left	01:54
	vansonhk__ → vansonhk_	01:54
Muuuh	iveqy: but I'm sure I had commited the changes	01:54
	→ rpg joined	01:54
Muuuh	iveqy: should I avoid editing on the win machine ?	01:55
iveqy	Muuuh: no, you should be aware of that git is a disk intense program not intended to be used over a network	01:56
	Muuuh: and that it might sync badly or slowly	01:56
Muuuh	hmmm	01:56
	← tinti_ left	01:56
Muuuh	not too sure I understand... does git "monitor" the folder ?	01:57
iveqy	Muuuh: check the timestamps on the files that are marked as changed, are the timestamps the same on the windows machine and the linux machine?	01:58
Muuuh	hold on	01:58
	← joki left	01:58
	→ daito joined	01:59
	→ thiago joined	01:59
Muuuh	hmm... interestingly enough, no. They have 3 hours difference	01:59
	← vansonhk_ left	01:59
Muuuh	ahhh... time is not set properly on the linux box...	02:00
	→ pantsman joined	02:00
	→ yeboot joined	02:00
iveqy	do I need to say that it's a not recommended setup? ;)	02:00
	there's a lot of this kind of errors that git can't do anything about	02:01
	→ vansonhk_ joined	02:01
yeboot	is there a way to edit the commit message in vim? I'd rather be presented with a vim screen	02:01
	← jhulten left	02:01
iveqy	yeboot: yes	02:01
	yeboot: set your $EDITOR enviroment variable or just set core.editor	02:02
	→ joki joined	02:03
Muuuh	iveqy: ok, timezone was wrong on linux box... timestamps are now the same in both shells, but I still get the same discrepency when running "git status" on both	02:04
	← zerocool left	02:04
	← CheckDavid left	02:05
iveqy	Muuuh: are the timestamps in the future on the linux box?	02:05
yeboot	thanks iveqy	02:05
	← vansonhk_ left	02:05
	← joshsmith left	02:05
Muuuh	iveqy: they were, yes, but now they are ok	02:06
iveqy	Muuuh: why do you have this strange setup?	02:06
	→ Nicholas_Rishel joined	02:06
Muuuh	strange ?	02:06
	Aside from the timezone being whacked, what do you find strange about having files on a linux server ?	02:07
	→ sarcasticsimba joined	02:07
	sarcasticsimba → vigs	02:07
iveqy	Muuuh: I find it strange to have a disk intense distributed tool like git, running over a network	02:07
Muuuh	I don't understand. What is "running over a network" ?	02:08
iveqy	samba is a network file system	02:08
	→ rickruby joined	02:08
Muuuh	I have files on the linux box, I edit them from the windows box. This doesn't require git as far as I know.	02:09
	→ normanrichards joined	02:09
iveqy	Muuuh: but you run git on the windows box	02:09
yeboot	iveqy: there's nothing wrong with running git over a network	02:09
Muuuh	iveqy: yes, samba is a network file system, but I don't see how git has anything to do with me editing the file over samba	02:09
	→ cads joined	02:09
iveqy	yeboot: yes, it's slow as hell	02:09
	Muuuh: it have nothing to do with it, but you say that you're running git on the windows box too, that is running git over a network	02:10
yeboot	wait Muuuh are you just using the samba as a remote or as the location of the git repo	02:10
Muuuh	slow ? Is git doing anything in the background ?	02:10
yeboot	iveqy provided you have a local clone and are using the network to manage remotes, using a network is fine	02:10
Muuuh	yeboot: git repo... the remote is on github	02:10
	→ Guest6856 joined	02:10
iveqy	Muuuh: no, but a file access to a samba share is _much_ slower than a file access to the local harddrive	02:10
	← iliketurtles left	02:10
	← threesome left	02:10
yeboot	iveqy that might not be a concern to him	02:11
iveqy	yeboot: yes of course, that's the way git is intended to be used	02:11
Muuuh	iveqy: it's fast enough for me. Local LAN. Editing is perfectly fine. I just don't understand why both shells show different results	02:11
	Guest6856 → diegoviola	02:11
iveqy	yeboot: and it's obviously is because he have sync problems	02:11
	→ nkambo joined	02:11
	→ girishr joined	02:11
Muuuh	could have been because of the wrong timezone	02:12
	j416_ → j416	02:12
iveqy	Muuuh: probably a syncing issue, samba is probably setup to do some clever trick to make things look fast for you	02:12
Muuuh	they do have the same timestamp though	02:12
iveqy	Muuuh: but yeah, the timestamp issue can still be a problem if you've strange timestamps anywhere	02:12
Muuuh	they are physically the same files	02:12
	I fail to see how locally editing the file on the linux box is going to be any different than editing it on the windows box	02:13
iveqy	Muuuh: yes but what about the timestamps under .git?	02:13
	← guzzlefry left	02:13
Muuuh	iveqy: how do I find out ?	02:13
iveqy	Muuuh: look at them?	02:13
	← rickruby left	02:13
Muuuh	hold on	02:14
	ok... I'm pretty green with git	02:15
	← v0n left	02:15
iveqy	Muuuh: when you edit a file on windows, the flow is file -> samba cache -> network -> smbd -> ext4 -> harddisk, when you edit a file on the linux machine it more like: ext4 -> harddisk	02:15
Muuuh	iveqy: agreed, but I've edited those file like an hour ago !	02:15
iveqy	Muuuh: you've a lot of more things to configure and make sure they work, and you've a lot more steps that can give you problem	02:15
Muuuh	I sure hope the samba cache is flushed by now ;-)	02:15
	← rurufufuss left	02:15
iveqy	Muuuh: yeah, but you'd 3 hours wrong on your timezone	02:16
pekster	Why not just clone onto the Windows box?	02:16
Muuuh	iveqy: right, so how do I update the timestamp in .git ?	02:16
pekster	Wouldn't that just make this all go away?	02:16
iveqy	pekster: yes it would	02:16
	Muuuh: touch them	02:17
Muuuh	pekster: it might, but why clutter my laptop when I can have those files on a local server ?	02:17
pekster	Because git's not really designed to be used how you're using it	02:18
	And you appear to be running into some classic cross-platform issues with the setup	02:18
	→ Destos joined	02:18
EugeneKay	I left my h@ on again :-/	02:19
	EugeneKay set mode: -o	02:19
Muuuh	pekster: so, what you're saying is that when one has a local repo, he should only edit it on the machine where the repo is physically located ?	02:20
iveqy	EugeneKay: how would you convience someone that using a git repo on a samba share from both linux and windows simutaniously is a bad idea?	02:21
EugeneKay	With a cluebat.	02:21
Muuuh	Does it really matter how the file is edited ?	02:21
	ok.. now we're going to resort to insults	02:22
iveqy	Muuuh: didn't I explained that to you at 04:19?	02:22
	← Guest54726 left	02:22
	← pantsman left	02:22
Muuuh	iveqy: no	02:23
	→ tinti_ joined	02:23
pekster	Could be issues with your git config on the systems too	02:23
iveqy	Muuuh: 04:19 < iveqy> Muuuh: when you edit a file on windows, the flow is file -> samba cache -> network -> smbd -> ext4 -> harddisk, when you edit a file on the linux machine it more like: ext4 -> harddisk	02:23
	04:19 < iveqy> Muuuh: you've a lot of more things to configure and make sure they work, and you've a lot more steps that can give you problem	02:23
pekster	You're getting "different results" on "different systems" -- stop using different git configurations then	02:23
Muuuh	iveqy: 04:19 has no meaning to me whatsoever	02:23
pekster	Very simple really	02:23
	See git-config(1) for details	02:23
iveqy	Muuuh: it has, for example if you export your mtime setting wrong on samba, you'll have problems	02:24
	→ tiglog joined	02:24
Muuuh	pekster: ahh.. now we're getting somewhere	02:24
	→ rickruby joined	02:24
pekster	Yet another reason why what you're doing is a Bad Idea™	02:24
iveqy	Muuuh: you'll have a samba cache on your windows machine that break things	02:24
	Muuuh: let's say it like this. Yes it _should_ be possible to do the way you to, but in reality there's so many pitfalls that it's stupid to do. You're already experiencing them	02:25
Muuuh	iveqy: please drop the use of insults. I'm trying to get facts here, not opinions	02:26
iveqy	Muuuh: I haven't insulted you at all. and I've gived you plenty of facts	02:26
	Muuuh: for example have you touched all your files in .git yet?	02:26
Muuuh	the files are on the linux box because that's where I have node installed, and I won't install node on Windows	02:27
	→ Nitrodex joined	02:27
Muuuh	iveqy: no, I haven't touched anything yet cause I'm not sure that manually editing/updating stuff in .git is safe	02:27
	Nitrodex → Guest83359	02:27
iveqy	this sounds familiar, was it you that where here a few days ago with problems about this?	02:27
Muuuh	iveqy: no, first time ever on this channel	02:27
iveqy	Muuuh: I haven't told you to edit or update anything, I've told you to touch them	02:28
	type man touch in your terminal if you don't know what touch is	02:28
Muuuh	well, touch will update the timestamp, won't it ?	02:28
iveqy	Muuuh: okay, well, you're not the only one trying this setup and gets bitten by it..	02:28
	yes it will	02:28
Muuuh	Ok, so should one manually "touch" the contents of .git ?	02:29
	← Fritz7 left	02:29
Muuuh	isn't .git to be "touched" only by git itself ?	02:29
	s/touched/manipulated	02:29
	← daito left	02:29
iveqy	depends on if you might have some problems with the timestamps in there (since your 3 hour error)	02:29
Muuuh	ok.. let me try	02:29
pekster	touch doesn't modify files; it modifes the filesystem metadata (as the manpage you were referenced tells you)	02:30
	← tinti_ left	02:30
	→ daito joined	02:30
iveqy	Muuuh: and yes, ideally, but if you ask what you should do with git, you shouldn't do this at all	02:30
	→ nucatus joined	02:32
Muuuh	ok, all files in .git now have the current time	02:32
iveqy	Muuuh: it can also be a problem with msysgit, I know they had problems with samba shares before and it hasn't been supported at all in all versions	02:32
	→ outcoldman joined	02:33
	← mdiers1 left	02:33
Muuuh	Ok. What options do I have then ?	02:33
	← simesy left	02:33
Muuuh	I need those files on the linux server to be able to use node, but it's only a server, it doesn't have any GUI, so I need to edit on the Windows box (I prefer Sublime Text)	02:34
	← daito left	02:34
Muuuh	So should I keep two copies of the repo ?	02:34
	remember, the remote is on github	02:35
iveqy	I strongly suggest to have your development enviroment on one machine.	02:36
jiangenj	In client, if setting url.insteadOf in gitconfig, the git fetch can be redirected. But it needs each client to have the setting.	02:36
	right?	02:36
	→ zivester joined	02:36
	← dougsland left	02:36
	→ Dreamer3 joined	02:36
iveqy	but since you ask, edit stuff in windows, then wait for a few seconds, and then run the git commands on linux	02:36
jiangenj	But is there a way to set on server side to forward the connections to some other servers	02:36
iveqy	jiangenj: yes, for each client	02:36
	← nucatus left	02:37
iveqy	jiangenj: yes there's, look in the manual for your httpd or sshd server	02:37
jiangenj	can you more clear? I'm using git-daemon	02:37
iveqy	jiangenj: are you pushing to git-daemon?	02:38
	→ mizu_no_oto joined	02:38
jiangenj	no, I meant git clone/fetch operation	02:38
	→ simesy joined	02:38
jiangenj	because the concurrent connections is big	02:38
	→ garbagecollectio joined	02:39
iveqy	jiangenj: okay, but you want git to forward the fetch to an other machine?	02:39
	why?	02:39
	→ dreiss joined	02:39
	→ dsdeiz_ joined	02:40
jiangenj	yes, my server cannot afford too big connections	02:40
	← dsdeiz left	02:40
jiangenj	And I don;t want each client to set gitconfig	02:40
iveqy	jiangenj: you need a load balancer, git is not it	02:41
	lookup nginx for exmaple	02:41
jiangenj	Assume I have 24 cores server, how much the max-connections it supports?	02:41
	nginx is a web service, I think? or it's load balancer	02:41
iveqy	jiangenj: the bottle neck is the disc IO not the CPU's	02:42
	nginx can be used as a load balancer, but of course there's other alternatives	02:42
EugeneKay	Muuuh - I'm not really sure wtf you're doing, but it sounds like you're trying to work with a git repo via a samba CIFS share on a Windows box?	02:42
	jiangenj - I don't know wtf you're doing either, but see !publish	02:43
gitinfo	jiangenj: [!publish_github] Publishing git repos via git-daemon or gitweb is not for the faint of heart. Consider using Github as a free place to post your work, and let them worry about administration.	02:43
jiangenj	so how to test the max-connections?	02:43
	!publish_github	02:43
gitinfo	Publishing git repos via git-daemon or gitweb is not for the faint of heart. Consider using Github as a free place to post your work, and let them worry about administration.	02:43
	← sparq_ left	02:43
jiangenj	nice point of load balancer, will investigate, thanks	02:44
iveqy	jiangenj: make up a test scenario and run it. As I said, it depends on your operating system, your file system, your disc IO etc.	02:44
jiangenj	OK, understood	02:44
iveqy	jiangenj: there's no way I can tell you how many max-connections there can be to a 24 core server	02:45
EugeneKay	A gajillion	02:45
	If you're worried abotu the max connections on a git server, urdoinitrong	02:45
	→ EdGruberman joined	02:46
	← EdGruberman left	02:46
	→ EdGruberman joined	02:46
Muuuh	iveqy: well, it seems others are reporting similar issues with samba, so I guess I should stick to running git commands on the linux box directly and never on the WIndows box.	02:47
pekster	Yes, that will solve difference in git configuration between the two	02:48
iveqy	Muuuh: ... yes, I didn't said it was a stupid idea just to mess with you	02:48
Muuuh	heh... this is IRC	02:48
	→ mdiers1 joined	02:48
	→ FreezingCold joined	02:48
	← lindenle left	02:49
EugeneKay	Yup, which means either he's stupid or you are. In this case, sounds like the latter. :-p	02:49
	← umib0zu left	02:51
	← hahuang61 left	02:52
	→ umib0zu joined	02:52
	→ daito joined	02:52
	← idoru left	02:53
HedgeMage	EugeneKay: You forgot the third option: both.	02:53
	HedgeMage ducks	02:53
	EugeneKay gooses	02:53
iveqy	HedgeMage: he said or, not xor ;)	02:54
	enjoi duck hunt - bang bang i win	02:54
Muuuh	So the real problem seems to be not in the remote editing of the files, but in the remote running git commands over samba, right ?	02:54
iveqy	Muuuh: both, but you're less likely to have problems with only editing	02:55
	← mmattice left	02:55
Muuuh	iveqy: I'll test this for a few days and see	02:55
	← danecando left	02:55
	→ pfranz joined	02:56
	← frgtn left	02:56
	→ bmac_ joined	03:00
	← trungqtran left	03:00
	→ v0n joined	03:00
	→ frgtn joined	03:01
	← rbento left	03:01
	→ Swayz joined	03:02
	← donmichelangelo left	03:03
	← simesy left	03:04
	→ donmichelangelo joined	03:04
	← mizu_no_oto left	03:05
	← realeyes left	03:06
	← deuterium left	03:06
	→ acharlieh joined	03:07
	→ realeyes joined	03:08
	→ jceb joined	03:09
	← dreiss left	03:09
	→ dreiss joined	03:10
	← sh4rm4 left	03:10
	→ sh4rm4 joined	03:11
	← alvaro_o left	03:11
	← savr left	03:12
	→ idoru joined	03:12
	→ mmattice joined	03:14
	← tanema left	03:14
	→ mizu_no_oto joined	03:16
	EugeneKay says a few words about girlfriend	03:18
	← acharlieh left	03:19
	→ simesy joined	03:20
	← Nicholas_Rishel left	03:21
	→ Gwyxx joined	03:23
	→ Nicholas_Rishel joined	03:24
	← plumpkin left	03:25
	→ GODDOG joined	03:26
	← umib0zu left	03:26
	← shinnya left	03:26
	← kukks left	03:27
	← v0n left	03:27
	← HenryG left	03:29
	→ preflex_ joined	03:29
	→ Marquisk2 joined	03:30
	offby1 speaks of himself in the third person	03:30
	← preflex left	03:31
	preflex_ → preflex	03:31
	EugeneKay makes offby1 wear a silly hat	03:32
	ChanServ set mode: +v	03:32
	← Dreamer3 left	03:32
	→ nucatus joined	03:33
	→ michaelarestad joined	03:34
	offby1 wonders what "v" is	03:34
	→ hahuang61 joined	03:35
	← pfranz left	03:35
pekster	"Voice", or allows the weilder to speak (chat) when the channel is moderated (or +m.) It's more commonly used as a gratitous status symbol	03:35
	→ Dreadnaught joined	03:35
pekster	gratuitious? The whiskey is impacting my spelling now :)	03:36
	Best not push anymore questionable commits tonight	03:37
	← nucatus left	03:37
	← bmac_ left	03:38
	← Nicholas_Rishel left	03:38
	→ sparq_ joined	03:39
frogonwheels	pekster: .. another advantage of git - you can make whiskey impaired commits, and fix 'em up when you're sober before pushing up :)	03:40
pekster	Hey, even cvs did that!	03:40
	(just... more poorly.)	03:40
	offby1 is shocked, shocked	03:41
	→ s2013 joined	03:41
pekster	I already pushed an early commit to github before the whiskey even touched my lips, but I blame the bottle being opened	03:41
	silly var+="thing" not being POSIX-compliant	03:41
	→ Cromulent joined	03:42
iveqy	actually, cvs storing model is so simple that you can do almost anything with it	03:42
	← bitkiller left	03:42
	← Dougie187 left	03:42
iveqy	the problem is doing anything at all is really cumbersome	03:42
pekster	Yes, like convert it to svn or git :P	03:42
	→ rchavik joined	03:43
	← rchavik left	03:43
	→ rchavik joined	03:43
	← Marquisk2 left	03:44
	→ chrisshattuck joined	03:45
	→ MrRoot joined	03:45
	← rchavik left	03:48
k_sze[work]	What's the proper way to edit the commit message of a commit that is even before HEAD (not pushed out yet)	03:49
	← Swayz left	03:50
	→ Nicholas_Rishel joined	03:50
	← diegoviola left	03:51
	→ hhuuggoo joined	03:51
hhuuggoo	how do you use git subtree to include a repo that is using submodules?	03:51
	← cigarshark left	03:51
	← guampa left	03:51
ameagher	That sounds painful	03:52
	→ kesha_ joined	03:52
	← rpg left	03:52
	← ecube left	03:55
	→ ecube joined	03:56
hhuuggoo	we pullled a library in using subtree	03:56
	and then they started using submodules	03:56
	← frgtn left	03:56
	→ insejn joined	03:57
	← Someguy123 left	03:59
	→ beautifulmind joined	04:03
	→ Someguy123 joined	04:03
	← beautifulmind left	04:05
	→ towski joined	04:05
	→ chuckharmston joined	04:05
	→ beautifulmind joined	04:08
	→ AWinterm_ joined	04:08
	← natechan left	04:09
	← Someguy123 left	04:09
	→ JohnBat26 joined	04:10
	← Cromulent left	04:10
	← chuckharmston left	04:10
	→ bitkiller joined	04:10
	← ewnd9 left	04:11
	← jefflyne left	04:11
	← Z3tta left	04:13
	→ Kneecaps joined	04:14
	→ enr joined	04:14
	← Nicholas_Rishel left	04:14
	← bitkiller left	04:15
	← mizu_no_oto left	04:18
	← MrRoot left	04:18
	← enr left	04:19
	→ Tommy[D]_ joined	04:19
	← Destos left	04:20
	→ rohan32 joined	04:22
	← AWinterm_ left	04:22
	← Tommy[D] left	04:22
rohan32	hi! ive done quite a few local changes and commits but i want to edit the commit message for one of my previous commits before pushing	04:23
	it isn't my last commit though so i don't think i can use the --amend option, can i?	04:23
	thanks to anyone who can help in advance :)	04:23
	→ tanema joined	04:24
huoxito	rohan32, git rebase -i	04:25
	← dreiss left	04:25
	→ chuckharmston joined	04:25
huoxito	rohan32, `git rebase -i HEAD~3` in case you want to edit the last three commits I guess	04:25
	← chuckharmston left	04:26
	← huoxito left	04:26
	← tanema left	04:29
frogonwheels	rohan32: I !sausage make my commits all the time.	04:30
gitinfo	rohan32: [!sausage_making] Some developers like to "hide the sausage making", transforming their commits before presenting them to the outside world. See http://sethrobertson.github.com/GitBestPractices/#sausage and !perfect	04:30
pekster	Well, that said it is nice to have clear commit messages, so if one rebases a local branch to make it clear what a change does, that's probably "good"	04:30
	→ Z3tta joined	04:31
frogonwheels	rohan32: and yes, you need to specify the parent commit of the first one to edit in a rebase	04:31
	← dsdeiz_ left	04:31
	rohan32 → rohan32\|afk	04:33
frogonwheels	pekster: I think making clear commit messages before pushing is the no-brainer 'good' sausage making.	04:33
	→ nucatus joined	04:33
	→ Swayz joined	04:34
frogonwheels	pekster: Personally, I find sausage-making to save time in the end - since it makes reviewing history a LOT easier.	04:34
	← matanya left	04:34
	→ AWinterm_ joined	04:37
	→ pfranz joined	04:37
	← nucatus left	04:38
	→ subhojit777 joined	04:39
	← the_cybersphinx left	04:39
	→ Guest23754 joined	04:40
	← chrisshattuck left	04:43
	→ hoschi joined	04:45
	rohan32\|afk → rohan32	04:45
	← Muuuh left	04:47
	→ Muuuh joined	04:49
	← Kneecaps left	04:50
	→ lavaman joined	04:52
	→ irqq joined	04:54
	Guest23754 → diegoviola	04:54
	← rodyhaddad left	04:57
	← bobdobbs` left	04:57
	→ rodyhaddad joined	04:57
	← tchan left	04:58
	→ bits8mybytes joined	05:00
	← bits8mybytes left	05:00
	← normanrichards left	05:00
	← harish left	05:02
	← hyperair left	05:02
	→ khushildep joined	05:03
	← SeySayux left	05:05
	→ onethfour3 joined	05:06
	← onethfour left	05:06
	→ sqlnoob joined	05:06
	onethfour3 → onethfour	05:06
	← Ivo left	05:07
	rohan32 → rohan32\|afk	05:08
	→ St_Marx joined	05:08
	← akurilin left	05:08
	→ tchan joined	05:08
	← tchan left	05:08
	→ tchan joined	05:08
	← s2013 left	05:09
	← daito left	05:09
	← n8chur_ left	05:09
	← Swayz left	05:11
	→ n8chur_ joined	05:11
	→ Guest___ joined	05:11
	← Guest___ left	05:11
	→ SeySayux joined	05:11
	→ Guest___ joined	05:12
	Guest___ → Darkco	05:12
	← kesha_ left	05:13
	← kerrick left	05:13
	→ kerrick joined	05:14
	← k_sze[work] left	05:14
	← Gamecubic left	05:16
	→ gittish joined	05:18
	← nsanden left	05:20
	← Darkco left	05:21
	← nicedice_ left	05:21
	→ khushildep_ joined	05:21
	→ dsdeiz joined	05:23
	← michaelarestad left	05:23
	→ matanya joined	05:24
	→ michaelarestad joined	05:24
	← khushildep left	05:24
	khushildep_ → khushildep	05:24
	← yacks left	05:24
	→ ntus1017 joined	05:25
	→ e66 joined	05:28
	← stairmast0r left	05:28
	← michaelarestad left	05:28
	← verysoftoiletppr left	05:28
	→ shruggar joined	05:32
	← mdiers1 left	05:33
	← tpollard left	05:33
	→ daito joined	05:33
	→ mdiers1 joined	05:33
	→ nucatus joined	05:34
	→ arietis joined	05:34
	→ stairmast0r joined	05:35
	← mdiers1 left	05:35
	→ Caritade joined	05:35
	→ a-l-e joined	05:35
	← PaulCapestany left	05:36
	← nucatus left	05:37
	← AWinterm_ left	05:38
	→ ThomasLocke joined	05:39
	← gittish left	05:39
	→ ojacobson joined	05:39
	← stairmast0r left	05:39
	← girishr left	05:42
	→ s2013 joined	05:42
	← garbagecollectio left	05:42
	→ garbagecollectio joined	05:44
	→ Vinnie_win joined	05:44
	← ntus1017 left	05:45
	← Roots47 left	05:45
	← s2013 left	05:45
	→ texasmynsted1 joined	05:45
	→ dc5ala joined	05:46
	→ iliketurtles joined	05:47
	← iliketurtles left	05:47
	← Davey left	05:47
	← texasmynsted left	05:48
	→ iliketurtles joined	05:48
	← pandeiro left	05:48
	→ rurufufuss joined	05:50
	→ Davey joined	05:51
	← Davey left	05:53
	→ marthinal joined	05:53
	→ michaelarestad joined	05:54
	← texasmynsted1 left	05:54
	← cads left	05:54
	→ dreiss joined	05:54
	→ ayaz joined	05:55
	← sainaen left	05:55
	→ cads joined	05:56
	→ texasmynsted joined	05:57
	← michaelarestad left	05:58
	← ojacobson left	05:58
	← shruggar left	05:59
	← garbagecollectio left	06:00
	← diegoviola left	06:00
	→ rath joined	06:01
	→ ayaz_ joined	06:01
	← ayaz_ left	06:01
	→ fragje joined	06:02
	→ AWinterm_ joined	06:02
	→ k_sze[work] joined	06:03
	← enjoi left	06:03
	→ ncd\|leeN joined	06:03
	→ papegaaij joined	06:04
	→ sainaen joined	06:06
	→ Balliad joined	06:07
	← DrShoggoth left	06:08
	← AWinterm_ left	06:08
	→ ndim joined	06:10
	← babilen left	06:11
	→ dvor joined	06:12
	← vigs left	06:12
	→ jefflyne joined	06:13
	→ ErKa joined	06:14
	← Balliad left	06:14
	← khushildep left	06:15
	← kardan left	06:17
	→ kardan joined	06:17
	← robbyoconnor left	06:18
	← sparq_ left	06:18
	→ babilen joined	06:22
	→ yacks joined	06:23
	← albel727 left	06:24
	→ Sigma[Mtp] joined	06:25
	← sainaen left	06:26
	→ albel727 joined	06:28
	→ michaelarestad joined	06:29
	→ boblu joined	06:30
	→ robbyoconnor joined	06:30
	→ Raging_Hog joined	06:32
	← scorphus left	06:32
	→ wrouesnel joined	06:33
	← arietis left	06:33
	→ emergion joined	06:34
	← michaelarestad left	06:34
	→ nucatus joined	06:35
	← towski left	06:35
	→ raf joined	06:35
	Sigma[Mtp] → Sigma	06:36
	← GODDOG left	06:36
	→ arand joined	06:37
	→ gittish joined	06:39
	← nucatus left	06:39
	→ cbreak-work joined	06:41
	→ nova_ joined	06:42
	→ alue42 joined	06:42
	→ v0n joined	06:43
	→ GODDOG joined	06:44
	← GODDOG left	06:44
	← rurufufuss left	06:45
	← Goplat left	06:46
	← ziddey left	06:47
	← mfilipe left	06:48
	→ mfilipe joined	06:48
	→ rendar joined	06:48
	→ pduin joined	06:49
	← rendar left	06:50
	→ rendar joined	06:50
	→ arietis joined	06:50
	→ fRAiLtY- joined	06:52
	→ dfanjul joined	06:52
	→ KhashayaR joined	06:53
	← KhashayaR left	06:53
	rohan32\|afk → rohan32	06:54
	→ KhashayaR joined	06:54
	← KhashayaR left	06:54
	→ KhashayaR joined	06:54
	← KhashayaR left	06:54
	← Sigma left	06:55
	→ KhashayaR joined	06:55
	← KhashayaR left	06:55
	← mckendricks left	06:55
	← cads left	06:55
	→ KhashayaR joined	06:55
	← KhashayaR left	06:55
	→ Sigma joined	06:56
	→ KhashayaR joined	06:56
	← KhashayaR left	06:56
	→ rchavik joined	06:56
	→ KhashayaR joined	06:56
	← KhashayaR left	06:56
	← matanya left	06:57
	→ ziddey joined	06:57
	→ KhashayaR joined	06:57
	← KhashayaR left	06:57
	→ AWinterm_ joined	06:57
	→ KhashayaR joined	06:57
	← KhashayaR left	06:57
	→ KhashayaR joined	06:58
	← KhashayaR left	06:58
	→ KhashayaR joined	06:58
	← KhashayaR left	06:58
	→ KhashayaR joined	06:59
	← KhashayaR left	06:59
	→ KhashayaR joined	06:59
	← KhashayaR left	06:59
	→ KhashayaR joined	07:00
	← KhashayaR left	07:00
	→ michaelarestad joined	07:00
	→ plumpkin joined	07:00
	← michaelarestad left	07:00
	→ KhashayaR joined	07:01
	← KhashayaR left	07:01
	→ michaelarestad joined	07:01
	→ KhashayaR joined	07:01
	← KhashayaR left	07:01
	→ KhashayaR joined	07:02
	← KhashayaR left	07:02
	→ KhashayaR joined	07:02
	← KhashayaR left	07:02
	rohan32 → rohan32\|afk	07:02
	→ KhashayaR joined	07:03
	← KhashayaR left	07:03
	→ KhashayaR joined	07:03
	← KhashayaR left	07:03
	→ matanya joined	07:04
	→ KhashayaR joined	07:04
	← KhashayaR left	07:04
	→ KhashayaR joined	07:04
	← KhashayaR left	07:04
	→ aladdinwang joined	07:04
	→ KhashayaR joined	07:05
	← KhashayaR left	07:05
	→ KhashayaR joined	07:05
	← KhashayaR left	07:05
	← michaelarestad left	07:06
	→ KhashayaR joined	07:06
	← KhashayaR left	07:06
	→ KhashayaR joined	07:06
	← KhashayaR left	07:06
	→ KhashayaR joined	07:07
	← KhashayaR left	07:07
	→ KhashayaR joined	07:07
	← KhashayaR left	07:07
	→ KhashayaR joined	07:08
	← KhashayaR left	07:08
	→ KhashayaR joined	07:08
	← KhashayaR left	07:08
	→ KhashayaR joined	07:09
	← KhashayaR left	07:09
	← dfanjul left	07:10
	→ KhashayaR joined	07:10
	← KhashayaR left	07:10
	→ bvi joined	07:10
	→ lb1a joined	07:10
	← ziddey left	07:10
	→ h0bbit joined	07:10
	→ KhashayaR joined	07:10
	← KhashayaR left	07:10
	→ KhashayaR joined	07:10
	← KhashayaR left	07:10
	→ KhashayaR joined	07:11
	← KhashayaR left	07:11
	→ KhashayaR joined	07:11
	← KhashayaR left	07:12
	→ KhashayaR joined	07:12
	← KhashayaR left	07:12
	← arand left	07:12
	→ KhashayaR joined	07:13
	← KhashayaR left	07:13
	← ncd\|leeN left	07:13
	→ KhashayaR joined	07:13
	← KhashayaR left	07:13
	← moondoggy left	07:13
	→ KhashayaR joined	07:14
	← TandyUK left	07:14
	← KhashayaR left	07:14
	→ TandyUK joined	07:14
	→ KhashayaR joined	07:14
	← KhashayaR left	07:14
	← jefflyne left	07:14
	← iliketurtles left	07:15
	→ moondoggy joined	07:15
	→ KhashayaR joined	07:15
	← KhashayaR left	07:15
	← heinrich5991 left	07:15
	→ KhashayaR joined	07:15
	← KhashayaR left	07:15
	← Sigma left	07:15
	→ KhashayaR joined	07:16
	← KhashayaR left	07:16
	→ maasdesigner1 joined	07:16
	← thiago left	07:16
	→ KhashayaR joined	07:16
	← KhashayaR left	07:16
	→ dfanjul joined	07:16
	→ rednaks joined	07:16
	→ heinrich5991 joined	07:16
	→ KhashayaR joined	07:17
	← KhashayaR left	07:17
	→ crane_work joined	07:17
	→ KhashayaR joined	07:17
	← KhashayaR left	07:17
	→ KhashayaR joined	07:18
	← KhashayaR left	07:18
	→ KhashayaR joined	07:18
	← KhashayaR left	07:18
	→ up_the_irons joined	07:19
	→ ziddey joined	07:19
	→ KhashayaR joined	07:19
	← KhashayaR left	07:19
	→ KhashayaR joined	07:20
	← KhashayaR left	07:20
	→ KhashayaR joined	07:20
	← KhashayaR left	07:20
	→ KhashayaR joined	07:21
	← KhashayaR left	07:21
	← Dreadnaught left	07:21
	→ LimeBlast joined	07:21
	→ KhashayaR joined	07:21
	← KhashayaR left	07:21
	← v8energy left	07:21
	→ LekeFly joined	07:21
	→ KhashayaR joined	07:22
	← KhashayaR left	07:22
	← plumpkin left	07:22
	→ KhashayaR joined	07:22
	← KhashayaR left	07:22
	← ukgamer left	07:22
	← Kronuz left	07:22
	→ KhashayaR joined	07:23
	← KhashayaR left	07:23
	← pfranz left	07:23
	→ KhashayaR joined	07:23
	→ rudak joined	07:23
	← KhashayaR left	07:23
	← heinrich5991 left	07:23
	← jceb left	07:24
	→ KhashayaR joined	07:24
	← KhashayaR left	07:24
	→ ukgamer joined	07:24
	→ JonasF joined	07:24
	→ wolog joined	07:24
	→ Kronuz joined	07:24
	→ KhashayaR joined	07:24
	← KhashayaR left	07:24
	→ aChatir joined	07:24
	→ KhashayaR joined	07:25
	← KhashayaR left	07:25
	→ KhashayaR joined	07:25
	← KhashayaR left	07:25
	→ iliketurtles joined	07:26
	→ KhashayaR joined	07:26
	← KhashayaR left	07:26
	← Tuna-Fish left	07:26
	→ KhashayaR joined	07:26
	← KhashayaR left	07:26
	← maasdesigner1 left	07:27
	→ KhashayaR joined	07:27
	← KhashayaR left	07:27
	→ KhashayaR joined	07:27
	← KhashayaR left	07:27
	→ KhashayaR joined	07:28
	← KhashayaR left	07:28
	→ KhashayaR joined	07:28
	← KhashayaR left	07:28
	← alue42 left	07:28
	rohan32\|afk → rohan32	07:28
	→ KhashayaR joined	07:29
	← KhashayaR left	07:29
	→ KhashayaR joined	07:29
	← KhashayaR left	07:29
	→ Tuna-Fish joined	07:29
	→ KhashayaR joined	07:30
	← KhashayaR left	07:30
	→ KhashayaR joined	07:30
	← KhashayaR left	07:30
	→ sidus joined	07:31
	→ KhashayaR joined	07:31
	← KhashayaR left	07:31
	→ whaley joined	07:31
	→ michaelarestad joined	07:31
	← Cassiel left	07:32
	→ KhashayaR joined	07:32
	← KhashayaR left	07:32
	→ KhashayaR joined	07:32
	← KhashayaR left	07:32
	→ KhashayaR joined	07:32
	← KhashayaR left	07:32
	→ kewah joined	07:32
	→ Cassiel joined	07:33
	→ KhashayaR joined	07:33
	← KhashayaR left	07:33
	→ KhashayaR joined	07:33
	← KhashayaR left	07:33
	→ KhashayaR joined	07:34
	← KhashayaR left	07:34
	rohan32 → rohan32\|afk	07:34
	← n8chur_ left	07:34
	→ KhashayaR joined	07:34
	← KhashayaR left	07:34
	→ KhashayaR joined	07:35
	← KhashayaR left	07:35
	← ErKa left	07:35
	→ nucatus joined	07:35
	← michaelarestad left	07:35
	→ KhashayaR joined	07:35
	← KhashayaR left	07:35
	→ KhashayaR joined	07:36
	← KhashayaR left	07:36
	→ heinrich5991 joined	07:36
	→ KhashayaR joined	07:36
	← KhashayaR left	07:36
	→ KhashayaR joined	07:37
	← KhashayaR left	07:37
	→ KhashayaR joined	07:37
	← KhashayaR left	07:37
	← nucatus left	07:38
	→ deckTrout joined	07:38
	→ polymar joined	07:38
	→ KhashayaR joined	07:38
	← KhashayaR left	07:38
	→ KhashayaR joined	07:38
	← KhashayaR left	07:38
	← Joshi3s` left	07:39
	→ KhashayaR joined	07:39
	← KhashayaR left	07:39
	← v0n left	07:39
	→ KhashayaR joined	07:39
	← KhashayaR left	07:39
	→ danicampa901 joined	07:40
	→ KhashayaR joined	07:40
	← KhashayaR left	07:40
	← FreezingCold left	07:40
	→ maxmanders joined	07:40
	→ KhashayaR joined	07:40
	← KhashayaR left	07:40
	→ arand joined	07:41
	→ KhashayaR joined	07:41
	← KhashayaR left	07:41
	← Raging_Hog left	07:41
	← insejn left	07:41
	→ KhashayaR joined	07:41
	← KhashayaR left	07:41
	→ KhashayaR joined	07:42
	← KhashayaR left	07:42
	→ noname001 joined	07:42
	→ insejn joined	07:42
	→ KhashayaR joined	07:42
	→ Balliad joined	07:42
	← KhashayaR left	07:42
	→ KhashayaR joined	07:43
	← KhashayaR left	07:43
	→ tvw joined	07:43
	→ yassine joined	07:43
	← CodeShark left	07:43
	→ KhashayaR joined	07:43
	← KhashayaR left	07:43
	← iliketurtles left	07:43
	→ KhashayaR joined	07:44
	← KhashayaR left	07:44
	→ KhashayaR joined	07:44
	← KhashayaR left	07:44
	→ KhashayaR joined	07:45
	← KhashayaR left	07:45
	→ KhashayaR joined	07:45
	← KhashayaR left	07:45
	→ KhashayaR joined	07:46
	← KhashayaR left	07:46
	← AWinterm_ left	07:46
	← insejn left	07:46
	→ KhashayaR joined	07:46
	← KhashayaR left	07:47
	→ abrkn\ joined	07:47
	→ KhashayaR joined	07:47
	← KhashayaR left	07:47
	→ KhashayaR joined	07:48
	← KhashayaR left	07:48
	→ KhashayaR joined	07:48
	← KhashayaR left	07:48
	→ KhashayaR joined	07:49
	← KhashayaR left	07:49
	← alexwhitman left	07:49
	→ Guest____ joined	07:49
	→ KhashayaR joined	07:49
	← KhashayaR left	07:49
	← maxmanders left	07:49
	→ alexwhitman joined	07:50
	→ KhashayaR joined	07:50
	← KhashayaR left	07:50
	→ Sonderblade joined	07:50
	← jayrobot left	07:50
	→ KhashayaR joined	07:50
	← KhashayaR left	07:50
	← Sonderblade left	07:50
	← abrkn left	07:51
	→ Sonderblade joined	07:51
	→ KhashayaR joined	07:51
	← KhashayaR left	07:51
	→ threesome joined	07:51
	→ KhashayaR joined	07:51
	← KhashayaR left	07:51
	→ KhashayaR joined	07:52
	← KhashayaR left	07:52
	← TandyUK left	07:52
	→ TandyUK joined	07:52
	→ KhashayaR joined	07:52
	← KhashayaR left	07:52
	→ mdiers1 joined	07:52
	→ vince_prignano joined	07:52
	→ KhashayaR joined	07:53
	← KhashayaR left	07:53
	← aChatir left	07:53
	→ Sigma joined	07:53
	→ KhashayaR joined	07:53
	← KhashayaR left	07:53
	← whaley left	07:54
	→ KhashayaR joined	07:54
	← KhashayaR left	07:54
	→ KhashayaR joined	07:54
	← KhashayaR left	07:54
	→ Raging_Hog joined	07:55
	← ziddey left	07:55
	← dreiss left	07:55
	→ KhashayaR joined	07:55
	← KhashayaR left	07:55
	→ KhashayaR joined	07:55
	← KhashayaR left	07:55
	← Vinnie_win left	07:56
	→ KhashayaR joined	07:56
	← KhashayaR left	07:56
	→ Plummer joined	07:56
	→ KhashayaR joined	07:57
	← KhashayaR left	07:57
	→ KhashayaR joined	07:57
	← KhashayaR left	07:57
	→ KhashayaR joined	07:58
	← KhashayaR left	07:58
	→ Vinnie_win joined	07:58
	→ KhashayaR joined	07:58
	→ acharlieh joined	07:58
	→ jon_r joined	07:59
	→ konadr joined	08:00
	← beautifulmind left	08:00
	← deckTrout left	08:00
	← yassine left	08:00
	→ michaelarestad joined	08:01
	→ maxmanders joined	08:03
	← TandyUK left	08:03
	→ TandyUK joined	08:03
	→ trusktr joined	08:04
	→ blinkdesign joined	08:06
	← michaelarestad left	08:06
	→ aChatir joined	08:07
	← aChatir left	08:07
	← Caritade left	08:09
	← Raging_Hog left	08:09
	← acharlieh left	08:09
	→ OOPMan joined	08:09
	→ khushildep joined	08:10
	← rchavik left	08:11
	← mdiers1 left	08:12
	r04r\|away → r04r	08:12
	→ jkremser joined	08:12
	← jkremser left	08:12
	→ jkremser joined	08:12
	Arokh[Off] → Arokh	08:12
	→ fdel joined	08:13
	← mdiers left	08:13
	→ insejn joined	08:15
	← TandyUK left	08:15
	→ TandyUK joined	08:16
gonzzor	I work with a couple of projects which all share some submodules, which are rather large. Is there a way to configure git to automatically set up --reference when doing clone and/or submodule init?	08:17
	→ Mode-M joined	08:17
	← cenuij left	08:17
milki	gonzzor: use git config alias.newcommand and define your own set of commands	08:19
	← hahuang61 left	08:20
gonzzor	milki: Thanks	08:21
	→ hahuang61 joined	08:22
	← jon_r left	08:22
	→ rchavik joined	08:23
	← onethfour left	08:23
	→ mdiers joined	08:24
	→ mdiers_ joined	08:24
	→ tatsuya_o joined	08:24
	→ jim0thy_ joined	08:24
	← TandyUK left	08:32
	→ michaelarestad joined	08:32
	→ TandyUK joined	08:32
	← michaelarestad left	08:32
	→ michaelarestad joined	08:32
	← OOPMan left	08:33
	→ OOPMan joined	08:36
	← michaelarestad left	08:37
	← kerrick left	08:43
	→ kerrick joined	08:44
	→ nicholasruunu joined	08:44
	← nicholasruunu left	08:44
	→ nicholasruunu joined	08:45
	→ BitPuffin joined	08:45
	→ SamB_ joined	08:46
	← SamB left	08:46
	← khushildep left	08:46
	← Guest____ left	08:46
	← rchavik left	08:46
	← simesy left	08:49
	→ crazydiamond joined	08:49
	rohan32\|afk → rohan32	08:50
	← arand left	08:51
	→ AllInOne joined	08:52
	← AllInOne left	08:54
	→ arand joined	08:55
	→ hyperair joined	08:55
	→ khushildep joined	08:56
	← arietis left	08:57
	→ achadwick joined	08:57
	rohan32 → rohan32\|afk	09:00
	r04r → r04r\|away	09:01
	→ jadedIRCwarrior joined	09:02
	→ michaelarestad joined	09:03
	→ avar joined	09:03
	← avar left	09:03
	→ avar joined	09:03
jadedIRCwarrior	Hi. How come git can tell when you've made a file modification through the "add ." command, without you having made any commits?	09:03
	← michaelarestad left	09:03
jadedIRCwarrior	I.e. it says "modified file", but aren't you supposed to decide when that's to happen through commit?	09:03
	→ michaelarestad joined	09:03
	→ rchavik joined	09:03
canton7	git has something called the index/staging area. The idea is that you add things to the index with 'git add', then 'git commit' takes the index and turns it into the next commit	09:05
	→ mikecmpbll joined	09:06
canton7	so you can make a commit containing only a subset of the changes in your working copy	09:06
luto	working=>stage=>commit \o/	09:06
	→ nucatus joined	09:06
canton7	'git status' tells you what's just in the working copy, or what's in the index as well	09:06
	← michaelarestad left	09:08
	→ yassine joined	09:10
	← nucatus left	09:11
	← LekeFly left	09:12
	→ _goTAN joined	09:12
jadedIRCwarrior	canton7: Yeah but what I mean is, if you add a file with git add, then replace it with another and do git add again, it'll sense the file change and return with a message stating that the file has been modified	09:13
	shouldnt commit be responsible for modifications?	09:14
	while add manages the indexing?	09:14
	→ LekeFly joined	09:14
	← Aww left	09:14
	← babilen left	09:15
canton7	jadedIRCwarrior, it does? pastie please.	09:15
	In general, 'modifications' refer to changes made locally since the last commit	09:15
	→ fuzzybunny69y joined	09:15
jadedIRCwarrior	Wow, you expect me to do a bunch of work to get help?!? GEEZ	09:15
	Ok I'm kinda paraphrasing here but	09:16
	→ enr joined	09:16
	→ jefflyne joined	09:16
jadedIRCwarrior	i copied a file into my working dir, did "git add .", renamed the file, copied another file into the dir and named it to the same thing as the first file	09:17
	then did "git add ." again	09:17
	after which it told me that the file had been modified and another one had been added	09:17
	← hahuang61 left	09:17
jadedIRCwarrior	so im thinking, shouldnt it just add the other file, and let me do the modification with commit?	09:17
	← nova_ left	09:17
	→ nova_ joined	09:18
	→ rhombus joined	09:19
canton7	it's telling you the truth. the file which you replaced was 'modified', while the renamed one was 'added'	09:19
	(from a filenames point of view)	09:19
	← Kabaka left	09:20
	→ babilen joined	09:20
	← enr left	09:21
canton7	I'd like to see exactly how it was "telling you" though. Is this 'git status' output? messages printed to stdout when you ran 'git add .'?	09:21
	→ dkpi joined	09:21
	→ Raging_Hog joined	09:21
	← Sonderblade left	09:21
	← rchavik left	09:22
	→ andrepadez joined	09:22
	→ Sonderblade joined	09:22
rhombus	What happens if I do 'git checkout HEAD~1'	09:23
	?	09:23
canton7	you detach your HEAD - so it doesn't point to a branch any more, but instead points to a commit	09:24
	→ Kabaka joined	09:24
canton7	any commits you make now won't be on a branch, so they're not referenced by anything, and might be lost	09:24
	← andrepadez left	09:24
canton7	(as git will warn you, quite loudly)	09:24
	oh, and your HEAD now points to HEAD~1	09:24
rhombus	canton7: ok, that was going to be my next question.	09:24
	canton7: ok, then how do I move my HEAD back in my branch such that it is not detached? As in, I want to move back to a previous state and run some tests?	09:25
canton7	'git checkout <branchname>'	09:25
	oh, 'back in' not 'back on'	09:25
rhombus	canton7: right	09:26
canton7	create a new branch at HEAD~1, and checkout that	09:26
	'git checkout -b mytempbranch HEAD~1'	09:26
rhombus	canton7: ah, ok -- then, when done, delete said branch if it's no longer needed	09:26
canton7	sure	09:26
	if you're not planning to commit, a detached HEAD is fine	09:26
rhombus	canton7: right, of course	09:26
canton7	and is particularly useful for going back and inspecting the state of a previous commit, running tests, etc	09:26
rhombus	canton7: will git fail if I try and commit when head is detached? Or just warn me and merrily proceed?	09:27
canton7	it'll warn you when you first the detach the HEAD, and is silent after that iirc	09:27
rhombus	canton7: those commits, would they show up in a graph?	09:28
	canton7: it sounds like a recipe for disaster	09:28
canton7	until you checkout something else, they're referenced by HEAD, so they'll show up	09:28
rhombus	canton7: or at least, for a very big mess :)	09:28
canton7	after that, they're referenced by the reflog, so they're recoverable	09:28
	!gitg	09:28
rhombus	canton7: but wouldn't show up in a regular commit graph, I take it	09:28
canton7	hmm, what was that trigger...	09:29
	!gka	09:29
gitinfo	For a better way to view the reflog, try: gka() { gitk --all $(git log -g --format="%h" -50) "$@"; }; gka	09:29
canton7	that'll show stuff in the reflog too	09:29
rhombus	canton7: ok	09:29
canton7	as long as they're referenced by HEAD, they'll show up in git log --graph and gitk	09:29
rhombus	canton7: until such time as I checkout another branch	09:29
canton7	the point is, once you go and checkout something else, they're no longer referenced by HEAD, so won't show up in gitk etc	09:30
	(unless you get gitk to show reflog entries too)	09:30
rhombus	right	09:30
canton7	yeah. useful, powerful, but take care	09:30
rhombus	canton7: I liked your solution with the temporary branch, there's little excuse for not using it, given how easy it is to create and delete branches in git	09:31
canton7	sure. by all means, if you're not comfortable with detaching the HEAD. ultimately it's one command more :P	09:31
	s/one/only one	09:31
rhombus	canton7: and I know from experience that a mere inspection can quickly turn into making changes -- a moment of inattention and you've got human sacrifice, cats and dogs sleeping together, mass hysteria	09:32
canton7	hahaha	09:33
rhombus	or even living	09:33
	:)	09:33
	→ r0dn3y joined	09:33
	→ m0viefreak joined	09:34
	→ michaelarestad joined	09:34
	← michaelarestad left	09:34
	→ michaelarestad joined	09:34
	← dkpi left	09:37
	→ rurufufuss joined	09:38
	→ Aww joined	09:38
	→ rchavik joined	09:38
	← dc5ala left	09:38
	← michaelarestad left	09:39
	← Milossh left	09:39
	← r0dn3y left	09:42
	→ marhaban joined	09:42
	→ CodeShark joined	09:44
	→ mechanicalduck joined	09:46
	→ DoniRS joined	09:48
	→ ntus1017 joined	09:48
	← CodeShark left	09:49
	→ kesha_ joined	09:50
	→ CheckDavid joined	09:51
	← crazydiamond left	09:52
	→ aChatir joined	09:53
	→ flapenguin joined	09:56
	← raf left	09:56
	→ GODDOG joined	09:56
	← TandyUK left	09:57
	← jkremser left	09:57
	→ TandyUK joined	09:57
	→ raf joined	09:57
	→ r0dn3y joined	09:58
	← weiyang left	09:58
	→ mklappstuhl joined	09:59
	← echo-area left	09:59
	→ amitz joined	09:59
amitz	can i limit who can delete a remote branch?	09:59
	any hook for that?	09:59
r0dn3y	amitz: Are you talking about on your local dev machine?	10:00
amitz	no, on our git central server. I'm managing the git central server.	10:01
	← konadr left	10:01
	→ crazydiamond joined	10:01
	→ hahuang61 joined	10:01
	→ konadr joined	10:01
amitz	basically, is there a pre-receive hook and indicator that the operation requested is a branch delete?	10:02
	→ beautifulmind joined	10:02
	→ nsanden joined	10:03
	← DoniRS left	10:03
r0dn3y	amitz: that one I'm not sure about.	10:03
	← LekeFly left	10:03
	→ maasdesigner1 joined	10:04
	← beautifulmind left	10:04
	← fragje left	10:04
	maasdesigner1 → maasdesigner	10:04
	→ michaelarestad joined	10:05
	← michaelarestad left	10:05
	← aharris6 left	10:05
	→ michaelarestad joined	10:05
r0dn3y	amitz: what are you using for a git server? Just git running on the server with ssh keys of each of the developers allowing them to interact with it, or are you using something like gitorious or gitosis?	10:07
	← irqq left	10:08
amitz	gitlab	10:09
	← michaelarestad left	10:10
r0dn3y	amitz: I've just recently looked at that a bit.	10:11
amitz	i'm in research phase now, after the fact. heh. so is that possible in gitlab? I also want to enforce a rule where only limited people can push to a branch. normal git can use that pre-receive hook but i assume gitlab can be configured to be able to do that?	10:12
r0dn3y	amitz: If i remember correctly, the repo permissions in gitlab are as follows: individual users can be set to denied, Pull, or push/pull.	10:12
	But those are repo wide, not branch specific.	10:13
amitz	push/pull to specific branch or whole repo?	10:13
	ah dang	10:13
	← fuzzybunny69y left	10:13
amitz	what is gitlab actually? a wrapper to normal git, or it changes git function?	10:13
	← tiglog left	10:13
sonOfRa	isn't gitlab just a hosting provider?	10:14
amitz	the local version	10:14
	← TandyUK left	10:15
	→ TandyUK joined	10:15
	→ deuterium joined	10:15
	← dfanjul left	10:16
	← kewah left	10:16
	← deuterium left	10:16
amitz	that is, if it's a wrapper, if restrict on the normal git, the gitlab itself will follow the restriction naturally.	10:17
	if i restrict on the normal git	10:17
	← jefflyne left	10:17
	→ deuterium joined	10:18
	→ beautifulmind joined	10:18
	← r0dn3y left	10:18
	← outcoldman left	10:19
	← deuterium left	10:19
	→ Cromulent joined	10:20
stack	how do you handle reindentation of whole files without loosing history?	10:20
	← Cromulent left	10:20
quackgyver	Does "origin" have different meanings depending on whether its used as a command parameter or in a path	10:21
	i.e. "origin" and "origin/"	10:21
	← cannonball left	10:22
	← nsanden left	10:22
	← nicholasruunu left	10:23
	→ raf_ joined	10:24
	← raf left	10:24
	→ dfanjul joined	10:25
lemonjelly	quackgyver: if you want to specify a path unambiguously, you cam put after a "--" at the of the command. e.g. git log -- origin	10:25
quackgyver	What does it mean to specify a path unambgiguously?	10:26
	→ nicholasruunu joined	10:27
	← xequence left	10:28
	← Cassiel left	10:28
	← zhurai left	10:29
	→ ismlages joined	10:30
	→ angelsl joined	10:31
	← marhaban left	10:32
	→ the_cybersphinx joined	10:35
quackgyver	Anyway, again, does anyone know if the term "origin" has different meanings depending on the context in which it's used? Such as when used in a command (i.e. git blah origin) compared to in a path (i.e. "origin/blah/blah")?	10:36
	→ michaelarestad joined	10:36
	← michaelarestad left	10:36
	→ michaelarestad joined	10:36
luto	I don't know any git-specific paths that contain origin	10:36
	it's an remote most of the time	10:37
	and it can have branches => origin/master	10:37
	← vince_prignano left	10:37
	→ m0ltar joined	10:38
	→ deuterium joined	10:38
quackgyver	what do you mean by "it can have branches => origin/master"?	10:38
	I don't now what that means.	10:38
luto	you know branches?	10:38
quackgyver	yes, but I don't understand what you're trying to tell me with that sentence	10:39
	← babilen left	10:39
luto	origin is just an other git-repo. On some server most of the time	10:39
quackgyver	Yes, I know, that's not what I'm saking.	10:39
luto	and that other git repo can also have branches, like like yours	10:39
quackgyver	asking*	10:39
luto	just*	10:39
quackgyver	I'm asking if origin has different meanings depending on whether it's used as a command, or whether it's used when pointing to a path	10:39
	as a prefix	10:39
luto	define path	10:39
quackgyver	git checkout origin/branch	10:39
luto	that is no path. That's a branch on origin	10:40
	→ LekeFly joined	10:40
	← yassine left	10:40
	← luc_ left	10:40
luto	a path would be: git checkout -- src/foo.c	10:40
	note the --	10:40
canton7	quackgyver, 'origin' is the name of a remote. 'origin/master' is a remote-tracking branch. Remote-tracking branches are read-only records of the states of remote branches. They're updated by 'git fetch'	10:40
luto	and canton	10:40
canton7	So 'origin/master' is a local branch, which reflects the state of the branch 'master' on 'origin', and is updated by 'git fetch'	10:41
	'origin' on its own is the name of the remote	10:41
	→ brick joined	10:41
	← michaelarestad left	10:41
	→ marhaban joined	10:41
quackgyver	canton7: I appreciate your clarification, but I still have to ask, can "origin" change its meaning depending on whether it's used in conjunction with a command, or as a branch prefix?	10:42
	because my coworker suggested that origin/branch points to one's own repo	10:42
cbreak-work	quackgyver: origin/foo can be many things	10:42
	→ tehroflmaoer joined	10:42
cbreak-work	most of the times it's the short form for refs/remotes/origin/foo	10:42
	so, a remote tracking branch for the origin remote's foo branch	10:43
canton7	I think you missed by point. The origin in 'origin/master' is convention - it's convention that the remote-tracking branches for the remote 'origin' start with 'origin/'	10:43
	← hyperair left	10:43
cbreak-work	but it could just as well be refs/heads/origin/foo, which is a local branch called origin/foo	10:43
canton7	they're not linked, apart from a piece of configuration in .git/config	10:43
	← mdiers left	10:43
cbreak-work	I think that's actually required by the default remote fetch ref spec	10:43
quackgyver	I'm really confused right now, so, just to cut to the chase and clarify: when doing "git checkout origin/branch_name-here", what are you actually doing in effect?	10:44
canton7	you're checking out a branch called 'origin/branch_name-here'	10:44
cbreak-work	and I am not sure how git checkout finds the remote for a remote tracking branch. It could just assume.	10:44
canton7	(a local branch)	10:44
quackgyver	canton7: And where is that branch located?	10:44
	ok	10:44
	so "origin/" is not a git concept at all?	10:44
cbreak-work	quackgyver: you can't do anything with branches that are not local apart from fetching their history	10:45
quackgyver	its literally part of the path name?	10:45
cbreak-work	yes.	10:45
canton7	it is part of the path name, very literally	10:45
quackgyver	Ah	10:45
cmn	but that's an implementation detail right now	10:45
	← k_sze[work] left	10:45
cmn	it's part of the reference name	10:45
quackgyver	cmn: So it actually is a reference then?	10:45
cmn	and not all references are on the filesystem even now	10:45
	← raf_ left	10:45
	← tehroflmaoer left	10:45
quackgyver	and therefor it is a git concept?	10:45
	or what	10:45
	now I'm confused agian.	10:45
canton7	but there's some configuration which says that the branches which start with 'origin/' are updated the reflect the states of the (remote) branches on the 'origin' remote when you run 'git fetch'	10:45
cmn	yes, remote-tracking branches are references	10:45
cbreak-work	quackgyver: it is as much a git concept as google.com is an internet explorer concept	10:46
canton7	(all branches are references, to commits)	10:46
quackgyver	canton7: Thanks, that sounds exactly like what I thought it was	10:46
cmn	I'm pointing out that the fact that it sometimes refers to part of a filename is irrelevant	10:46
	→ tehroflmaoer joined	10:47
cbreak-work	quackgyver: man gitrevisions	10:48
gitinfo	quackgyver: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html	10:48
quackgyver	canton7: Okay so, I've always assumed that "origin" points to the master branch of the remote from which you checked out your repo, an will therefor config your local repo to have a few connections to the origin repo so as to make certain commands easier. I also assumed that origin/branch was therefor a reference to branches in the origin repo, so as to give	10:48
	you a chance to be able to differentiate local branches from origin ones	10:48
	Would you agree that my assumption is correct?*	10:48
cbreak-work	no	10:48
	origin on its own as a ref refers to a local branch origin	10:49
	or a tag with the name origin	10:49
	← marhaban left	10:49
canton7	you cannot reference remote branches from your local repo. you can't checkout a branch which is on another machine. instead, you have a local "remote-tracking" branch which is set to the the same as a remote branch by 'git fetch', and you can checkout that	10:50
quackgyver	I don't understand what you just told me. Is "local branch origin" a noun?	10:50
	:/	10:50
cbreak-work	quackgyver: only far down, in alternative 6 it could mean what you said	10:50
	quackgyver: yes	10:50
	← LekeFly left	10:50
quackgyver	OKay	10:50
cbreak-work	with adjectives in front	10:50
	local is an adjedtive	10:50
	→ fragje joined	10:50
cbreak-work	branch is the noun	10:50
	and origin is the name, also a noun I suppose	10:50
	quackgyver: honestly, read the man page :)	10:51
	ref names are explained there	10:51
quackgyver	So	10:52
	on one hand I'm being told that "origin/" has no meaning to git and that it's not related to some sort of concenpt, and that its literally just part o the path name	10:52
	and on the other im told that its a ref and that i should look it up	10:52
	I'm confused.	10:52
	of*	10:52
canton7	branches are refs. other things are refs, too	10:53
	← dfanjul left	10:53
quackgyver	Ok but what about "origin/"?	10:53
cbreak-work	quackgyver: does google.com have a meaning in internet explorer?	10:53
quackgyver	I feel like I'm getting a lot of unrelated as well as conflicting information.	10:54
	So I'm a bit confused.	10:54
cbreak-work	quackgyver: you're just not thinking straight :(	10:54
quackgyver	I wish you'd just answer my question from within the scope of which I'm asking it. I get really confused when three people are throwing terms and concepts at me, and often not directly explaining how they relate to my question	10:54
	while somehow expecting me to inherently understand what they mean	10:55
	→ tanema joined	10:55
quackgyver	I'm not trying to sound argumentative	10:55
	Just explaining why I'm confused.	10:55
	← aladdinwang left	10:55
quackgyver	I know about most (not all) of the stuff you've told me.	10:55
	I'm just confused about the meaning of origin/	10:55
	in comparison to origin (without the trailing slash)	10:56
cbreak-work	quackgyver: it can mean many different things depending on context...	10:56
cmn	when you pass 'origin' to a few commands, they'll accept that as refering to 'origin/HEAD'	10:56
cbreak-work	the word origin has no special meaning in git apart from it being a default value for a name	10:56
quackgyver	name?	10:56
	→ kewah joined	10:56
cbreak-work	origin/ can mean a directory called origin in your repository	10:56
	→ LekeFly joined	10:56
quackgyver	cmn: And origin/HEAD is in a remote repo, yes?	10:57
cbreak-work	it can mean no...	10:57
cmn	no	10:57
quackgyver	ok	10:57
canton7	it can, but it's unlikely to	10:57
tinyhippo	quackgyver: origin is basically the name of a remote repository	10:57
	→ marhaban joined	10:57
tinyhippo	for 99% of use cases	10:57
cbreak-work	quackgyver: git remove shows you the remote repositories	10:57
	your repository might not have any	10:57
cmn	git remote*	10:57
cbreak-work	if it is a clone, then the default name for its source remote is "origin"	10:58
quackgyver	Okay see this is where I get confused. I'm told by one person that "origin/HEAD" does in fact not point to a remote repo, then I have another one telling me that "origin" is the name of a remote repo in 99% of the cases. How am I supposed to make sense of this?	10:58
cbreak-work	but you can easily change that	10:58
	→ frgtn joined	10:58
cbreak-work	quackgyver: you have to start to think	10:58
quackgyver	cbreak-work: About what?	10:58
cbreak-work	about what we say	10:58
	different things can have the same or similar names	10:58
quackgyver	Yes, that's what I asked from the beginning.	10:59
cbreak-work	as I said above, the meaning of words depends on the context	10:59
quackgyver	So, "origin" when used on its own in, say, a command, is not at all the same thing as "origin/" when used in conjunction with a branch name and as part of said branch name	10:59
cmn	you never use "origin/" on its own	11:00
quackgyver	I never said so?	11:00
	:\|	11:00
cmn	by convention, you prefix the branches from a remote with its name	11:00
tinyhippo	quackgyver: given the context of your question, I will assume that origin is the name of your remote repo. therefore origin/something is a branch on that remote repo called something	11:00
cmn	almost	11:00
	it's the local copy	11:00
cbreak-work	mkdir origin/foo	11:01
	now it's a directory...	11:01
	← marhaban left	11:01
quackgyver	tinyhippo: Yes, that is what I am assuming is the case, and I'm trying to get some clarificaiton but I'm pretty much completely confused now	11:01
cbreak-work	git branch origin/foo, now it's a local branch	11:01
	quackgyver: you think about totally the wrong things	11:01
quackgyver	cbreak-work: Why?	11:01
	and how	11:01
cbreak-work	because you think that origin is something special	11:01
	it is not.	11:01
	it's a name.	11:01
	→ babilen joined	11:01
cbreak-work	it's like asking who Hans is.	11:02
	there are thousands of them.	11:02
	they are all different.	11:02
quackgyver	cbreak-work: That's like saying "func()" is just text.	11:02
	→ enr joined	11:02
cbreak-work	what you have to think about is what it is in the context of your repository	11:02
	quackgyver: it is.	11:02
	it might do totally different things in different contexts.	11:02
	← enr left	11:02
	→ enr joined	11:03
	→ _iron joined	11:04
	← mklappstuhl left	11:04
cbreak-work	if you want to find out what it does in your repository, you'll have to learn the rules git uses to parse its text	11:04
	so you have to read up on the command you use, and find out what it expects	11:04
	does it expect a remote name and a branch name like git pull?	11:04
	or does it expect a ref name like git merge?	11:04
	or does it expect a file name like git add?	11:04
canton7	in general, the only commands which deal with remotes are pull/fetch, push, 'git remote', 'git ls-remote', and maybe a couple more	11:05
	→ glosoli joined	11:05
cbreak-work	yeah. special things like git archive	11:05
	→ freestyl3r joined	11:05
canton7	in general they're the commands to do with 1) configuring remotes, and 2) moving data to/from remotes	11:05
cbreak-work	wonder if git submodule accepts a remote as URL...	11:05
	← mikecmpbll left	11:06
quackgyver	cbreak-work: I don't ask people questions so they can answer me from the POV that everything can - if you wish to present it as such - be ambiguously interchangeable, and that my question is therefor invalid. That's already a given and I don't really need to be informed of the many ways in which it's possible to invalidate what I'm saying with such	11:06
	intellectual loopholes.	11:06
	From my perspective I'm asking you what time it is, and you're ranting back at me about how my question is invalid because due to timezones the current time could be anything!!	11:06
	I'm just trying to get help in understanding this one single concept and	11:06
	I'm not even really trying to be argumentative	11:06
	but this is not an effective discussion	11:06
	→ mikecmpbll joined	11:06
cbreak-work	quackgyver: stop being dense :/	11:06
	← sam113101 left	11:06
canton7	hey hey now	11:06
quackgyver	Thanks.	11:06
cbreak-work	if you ask an incomplete question, you'll get nebulous answers	11:06
	that's just how it is	11:07
canton7	cbreak was saying that something can take on different meanings depending on context, not that your entire question was invalid	11:07
	→ michaelarestad joined	11:07
cbreak-work	if you want to ask what origin means, at least tell us which damn command you want to use	11:07
	← michaelarestad left	11:07
	→ wald0 joined	11:07
	→ nucatus joined	11:07
	→ michaelarestad joined	11:07
	← kcj left	11:07
quackgyver	canton7: I understand this, but the way in which my original question was replied to, and the way in which it has turned into an irrelevant discussion which may be valid from a git/tech philosophical perspective but still ignores the fact that I'm continuously trying to get back to my very specific core question	11:08
wald0	how i can create "temporal fixes" in git? i mean, a commit that i can remove in the future like it never existed (not like having another to revert, so 2 trashy commits flying around and annoying)	11:08
quackgyver	is sort of ridiculous	11:08
mikejw	what do I do when I see this 'CONFLICT (file/directory)'?	11:08
quackgyver	and now i'm being called dense for trying to just clarify things.	11:08
	That's real nice.	11:08
	← babilen left	11:08
canton7	quackgyver, mind repeating your specific core question? The stuff I@ve seen has been fairly vague	11:08
cbreak-work	wald0: make it on a branch	11:09
	wald0: never merge it	11:09
mikejw	does anyone here use git submodules and stay a sane human beings?	11:09
cbreak-work	mikejw: semi - sane	11:09
mikejw	:)	11:09
wald0	cbreak-work: mmh, but if i want to "still continue" working on the master one ? (and use the temporal fix until its fixed by the author) ?	11:09
	→ simesy joined	11:10
cbreak-work	wald0: you can rebase your changes around if you work alone	11:10
	→ \|Freeman\| joined	11:10
cbreak-work	or you can rewrite history to remove the fix later on	11:10
	→ zhurai joined	11:11
quackgyver	canton7: In my environment I see "origin" being used as either parameters in commands or as part of branch names that are located on what I believe is a remote repo. My assumption was that origin points to the remote repo from which I first checked out my own local dev repo, and that the purpose of "origin" is to therefor act as a pointer or reference to the	11:11
	remote endpoint which has some kind of centralized significance, and which you may want to compare your local changes to through tracking. My friend on the other hand stated that while "origin" points to the origin repo, "origin/" as part of a branch name (or a prefix to branches rather) is a reference to something different	11:11
	← michaelarestad left	11:11
quackgyver	canton7: And my assumption just keeps getting plucked apart to the point where I can't even get the topic back on track again.	11:12
	→ mmitchell joined	11:12
	→ sam113101 joined	11:12
wald0	could be nice if rebasing will not affect other devs :), that could be a really nice fature for git	11:12
quackgyver	assumption = my assumption about the meaning of origin as seen in my environment	11:12
	← nucatus left	11:12
quackgyver	and as stated in my question in here	11:12
canton7	quackgyver, to avoid a return to the situation where we start commenting on different parts of your statement, do you have a specific question you want to start with?	11:12
	→ dfanjul joined	11:14
	← simesy left	11:14
cbreak-work	quackgyver: your assumption is wrong. It is in fact as I told you repeatedly: the name totally depends on context.	11:14
canton7	while you're thinking, he's a summarised run-down. it's not 100% correct, but bear with me. 'origin' is an alias for a url. you can push stuff to that url, and you can fetch stuff from it	11:15
	when you run 'git fetch', git accesses that url, and fetches all of the branches from it. it then creates local brances mirroring those branches on origin. by convention, these branches start with 'origin/', to indicate that they reflect branches on 'origin'	11:16
	they're read-only - you can't modify them directly	11:16
	→ kcj joined	11:16
canton7	so if origin has a branch called 'foo', 'git fetch' will create a local branch called 'origin/foo' which mirrors it	11:16
	from then on, if you access 'origin/foo' through any means, you're accessing that local, mirror branch	11:17
quackgyver	canton7: Yes I have a question. I want to know why some of my coworkers say that "origin" (as in the very concept of origin) is a reference to the remote central repo which you got your local dev repo from, while another one states that "origin" is in fact not pointing to a remote endpoint, but rather a local read-only set of references to changes made on	11:17
	the remote central repo that I previously thought that "origin" referred to. The reason why I need to clarify this is because I have for some reason lost the entire contents of a couple of local branches, and I thought I could get them back from origin, whereas the latter coworker told me that since "origin" is really just points to my local repo, there's no	11:17
	need to start poking around in the remote one.	11:17
	-is	11:18
cbreak-work	it's context dependent...	11:18
quackgyver	cbreak-work: Kindly pull out of the conversation because you're not going to contribute with anything constructive. I'm not saying that as an insult, but to save all of us time.	11:18
	Thanks.	11:18
cbreak-work	if you don't want answers, ask somewhere else.	11:19
	→ pen joined	11:19
canton7	saying 'origin' refers to the local repo is incorrect. 'origin' refers to a url, which points at a remote repo	11:19
	however, the states of all branches on the 'origin' repo - the remote repo - are stored locally	11:19
cbreak-work	origin as ref refers to a remote tracking branch, most likely.	11:19
canton7	in branches beginning with 'origin/'	11:19
cbreak-work	to refs/remotes/origin/HEAD	11:19
quackgyver	cbreak-work: I feel that canton7 is better suited for setting me straight due to having a better sense of where I'm coming from, and he probably will if there is a misunderstanding. This means that you will get your wish through.	11:19
	→ frankstallone joined	11:19
quackgyver	or she.	11:19
canton7	he :P	11:19
luto	they!	11:19
bremner	quackgyver: please just ignore people rather than telling them not to talk to you	11:20
canton7	we!	11:20
quackgyver	it.....	11:20
luto	or it?	11:20
quackgyver	bremner: Just ignore me if it bothers you!	11:20
	Just kidding. ;-)	11:20
	canton7: Yeah I thought as much	11:20
	← daito left	11:21
quackgyver	canton7: Okay, so "origin/" actually signified a local set of repos which mirror their remote counterparts?	11:21
	This answers my next question, which is what remotes/origin/branch means	11:21
canton7	(now, as cbreak said, there are exceptions - in some cases, where a git command is expecting a branch (not a remote), 'origin' can be resolved to a local branch of that name (created with e.g. 'git branch origin'), etc)	11:21
cbreak-work	-> ref	11:21
canton7	"origin/" is a common prefix for branches which mirror their remote counterparts	11:21
cbreak-work	that's why I said above it depends on what the program expects	11:21
quackgyver	canton7: Thanks, that's exactly the answer I need.	11:22
	Really appreciate it.	11:22
cbreak-work	and only after you know what it expects you can even begin to think about how it is interpreted	11:22
canton7	yeah, i'm steering clear of the word 'ref' for now, but yeah	11:22
	→ simesy joined	11:22
	← gerard0 left	11:23
quackgyver	canton7: So I guess remotes/ then refers to branches that are actually located remotely?	11:23
canton7	quackgyver, there's an extra detail: remote-tracking branches are stored in refs/remotes, which local "normal" branches are stored in refs/heads/	11:23
	this keeps the remote-tracking branches nicely separate from your local branches	11:23
	s/which local/while local	11:23
	→ flaguy48 joined	11:23
	→ Fritz7 joined	11:23
quackgyver	canton7: All of my branches are tracked remotely because when I create them I add "origin/master" at the end	11:23
	→ raf joined	11:23
quackgyver	of the command	11:23
canton7	what do you mean by that? what command?	11:24
quackgyver	git checkout -b branchname origin/master	11:24
canton7	don't get remote-tracking branches confused with 'tracking', as a concept	11:24
quackgyver	Oh ok	11:24
canton7	so that created a new branch (in refs/heads/branchname), start at the same point as refs/remotes/origin/master	11:24
	branchname will not get automtically updated by 'git fetch'. it is not a remote-tracking branch	11:25
	→ jkremser joined	11:25
canton7	however. time for a new, separate concept...	11:25
	← raf left	11:25
	← jkremser left	11:25
	→ jkremser joined	11:25
cbreak-work	as I said twice already, branches are local.	11:25
	you can't do almost anything with those that aren't	11:25
	→ gerard0 joined	11:25
quackgyver	canton7: Is there a possibilty that I could've done something, say perhaps to HEAD, that makes it seem as if my branches are empty and lack any changes, despite them actually being there?	11:26
canton7	there can exist a piece of configuration which creates a relationship between two branches (one is said to be 'tracking' the other, of have the other as its 'upstream')	11:26
quackgyver	I'm asking because suddenly a lot of branches are empty	11:26
canton7	this is used when you run 'git pull' with no other arguments, among others	11:26
	→ Someguy123 joined	11:26
	Someguy123 → Someguy12	11:26
canton7	quackgyver, HEAD is only a pointer to the currently-checked-out branch - doing something to it wouldn't affect all branches	11:26
	now what actually are the symptoms?	11:26
quackgyver	canton7: Well it was just a wild guess	11:26
	canton7: Well, I pushed some branches which a friend a couple of steps down the line in the workflow accidentally rolled back	11:27
	so in accordance with standard procedures i was going to push them again, except these branches are now empty in my local repo	11:28
canton7	'rolled back' meaning he overwrote them (push -f), or he made changes which undid your changes?	11:28
	again, define 'empty'	11:28
quackgyver	canton7: I don't actually know because I have no information about the specifics of which commands they use.	11:28
	empty = no commits when comparing the branch to master	11:28
canton7	the symptoms are quite different - do your commits still exist in the remote repo?	11:29
	aha, so the branches are the same as master	11:29
quackgyver	canton7: I don't know! That's why I started asking about these concepts, because I have no idea where to look	11:29
	my cowokrer tells me to leave it be because if i dont have it locally, i dont have it a tall	11:29
	while i suspect that they may be located on origin	11:29
	so i was trying to figure out who's right	11:29
canton7	what branch did you make the changes on?	11:29
quackgyver	They were new ones created by me	11:30
canton7	ok, so you had a local branch, created by you, with your changes on. what exactly did you do to push those changes?	11:30
	→ freeed joined	11:30
arand	Hmm, when merge conflict markers are already checked in and published, is there any simple way to do an "incremental re-merge" in order to clean things up in a new commit? And make use of git-aware merging?	11:30
canton7	(there's still a little bit of ambiguity, which I need to get rid of)	11:30
	→ aharris6 joined	11:31
	← Someguy12 left	11:31
	→ ledtc joined	11:31
quackgyver	canton7: I created these branches with git checkout -b branchname origin/master, then added my files or committed my changes to the branches using "git add" and "git commit". When my branches were done, i pushed them to origin with "git push origin" (or "git push origin branchname", i cant remember)	11:31
	gitinfo set mode: +v	11:32
canton7	ok, thus creating a new branch on origin called 'branchname'	11:32
quackgyver	this was a couple of weeks ago, and between now and then, my local branches for these projects have become empty	11:32
	canton7: Yes, but my coworker keeps insisting that origin is local	11:32
	and that if i dont see my changes, they're therefore not there	11:32
ledtc	Hello, im about to setup my git system. I need some one to talk me through it, any have some spare time ? :	11:32
canton7	let's just make completely sure they're 'empty' - pastie the output of 'git log --graph --oneline --decorate master branchname'	11:33
	← flapenguin left	11:33
	→ PainBank joined	11:33
canton7	put 'origin/master' on the end of that command too, why not	11:33
quackgyver	okay one sec	11:33
	ill try	11:33
	i hard refreshed my HEAD at that point, if that is relevant somehow	11:34
luto	haha, still the origin thing going on in here?	11:34
quackgyver	anyway, testing, one ec	11:34
canton7	cool	11:34
	luto, progress is being made!	11:34
luto	\o/	11:34
	quackgyver: may I ask where you are from? svn?	11:34
quackgyver	"are from" and "svn" in the same sentence? :p	11:34
	fdel → Nexos	11:35
luto	yes!	11:35
	svn-land	11:35
quackgyver	haha	11:35
luto	also know as hell	11:35
quackgyver	I'm not used to version control.	11:35
luto	ah	11:35
quackgyver	Did SVN for a bit	11:35
	liked it more because it was easy and intuitive	11:35
	← enr left	11:35
luto	think graphs, no folders! lol	11:35
quackgyver	heh	11:35
	← dvor left	11:35
	← rchavik left	11:35
	→ enr joined	11:36
wald0	how i can import commits from one git repository to another ?	11:36
	→ Droolio joined	11:36
	Nexos → fdel	11:36
jokajak	wald0: git remote add <name for other repository> <url for other repository>	11:36
	wald0: git fetch <name for other repository>	11:36
quackgyver	canton7: okay its showing me a big tree here. looks really cool	11:36
luto	no tree. it's a graph!	11:37
quackgyver	however, i feel that i cant paste anything not knowing how sensitive this iss	11:37
canton7	learn to love that graph - or the one from gitk	11:37
quackgyver	since im doing this for a client	11:37
	← KhashayaR left	11:37
luto	!lol	11:37
gitinfo	A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	11:37
canton7	quackgyver, I'm interested in the relationships between different branches, on that graph	11:37
	feel free to censor the one-line commit messages	11:37
quackgyver	canton7: Sure, I'll do my best to give you the lowdown.	11:37
fdel	wald0: if you just need a couple of commits, you could do git format-patch on source repos, then git apply	11:37
	← trusktr left	11:37
canton7	as long as the depiction of the graph remains the same	11:37
	← quazimodo left	11:37
	→ michaelarestad joined	11:38
	← michaelarestad left	11:38
wald0	thx	11:38
	← danicampa901 left	11:38
	→ michaelarestad joined	11:38
	← enr left	11:40
quackgyver	canton7: I see my own branch at the very top starting with "(HEAD, branchname". The branch is then split, where on the new branch there is a line starting with "(tag: someone", which is then followed with another such line but with minor alterations to the name on the same branch, and then once more, effectively creating three "(tag: "-lines on the secondary	11:41
	branch. Following that point, the secondary branch is just continuouosly broken off into new branches with one single entry per branching-off.	11:41
canton7	where's master?	11:42
quackgyver	Master is not mentioned anywhere	11:42
canton7	origin/master?	11:42
quackgyver	Nope, not at all. :/	11:42
canton7	and the exact command you ran?	11:42
	is it somewhere further down?	11:43
quackgyver	how do you scroll in linux?	11:43
	im in some kind of cli prompt	11:43
canton7	are you still viewing the tree? do the up and down arrows scroll?	11:43
	← michaelarestad left	11:43
quackgyver	i usually do shift+pgup/pgdwn in putty	11:43
	oh, down works	11:44
	lol	11:44
canton7	you're in a pager, called 'less'. 'q' quits it	11:44
quackgyver	Ah	11:44
	→ drizzd joined	11:44
quackgyver	canton7: Honestly, I couldn't paste you all of this. It's huge and full of entries, and I don't really know what I should or shouldn't censor. There are tons of entries and references to actions being made	11:44
	→ CodeShark joined	11:44
quackgyver	so can I just help you look for anything specific instead?	11:45
	→ quazimodo joined	11:45
canton7	i'm looking for the relationship between branchname and master	11:45
	which is why I asked for the command 'git log --graph --decorate --oneline branchname master'. Are you sure that's what you used?	11:45
quackgyver	"git log --graph --online --decorate master banchname"	11:46
	branchname*	11:46
	putting origin/master at the end returns the same thing	11:46
	just a huge tree with lots of people doing stuff	11:46
canton7	and you said you compared branchname to master, and got no differences?	11:46
	how did you do that?	11:46
quackgyver	git diff --name-only master	11:46
	or branchname master	11:47
	or origin/master	11:47
	canton7: the first line that mentions my branchalso says "merge branch master of " etc	11:48
	is that what you were looking for?	11:48
canton7	oh! so you merged master into branchname?	11:49
quackgyver	sorry about my poor spelling. my client is really laggy	11:49
canton7	(mine's worse, and I've got no excuse)	11:49
	checkout branchname, then 'git show'	11:49
	← CodeShark left	11:49
quackgyver	canton7: my coworker told me to merge it with master to ensure that there was no difference whatsoever between branchname and master when doing git diff	11:50
	so thats why	11:50
canton7	that doesn't mean that branchname is empty	11:50
	it's the same as master, because you merged master into it	11:50
quackgyver	ive already got branchname checked out, so i did git show and it returned "Merge branch 'master' of <path> into <branch>	11:51
canton7	yup	11:51
	← rurufufuss left	11:51
canton7	so your local changes haven't gone anywhere - they're still there in branchname	11:51
quackgyver	so if you point to branchname and do "merge master"	11:51
canton7	(I suspect, look at the output of 'git log' or 'git log -p')	11:51
quackgyver	then you cannot tell them apart?	11:51
	canton7: both show lots of entries	11:52
	whats the diff between the commands?	11:52
	so i know what im looking for	11:52
canton7	depends on the merge I guess. Was branchname merged into master at any point in the past?	11:52
	log -p shows a diff after each commit	11:52
	→ Roots47 joined	11:53
quackgyver	canton7: it doesnt just show changes made by me	11:53
	it shows changes made by others too	11:53
	up until this point	11:53
	all of these commands do	11:54
canton7	erm, add --first-parent	11:54
quackgyver	should i have added --first-parent to the graph too? :p	11:54
canton7	nah	11:54
	you could, but then we're looking at something different	11:54
quackgyver	Ah finally, my commands.	11:54
	Cool, it's the ultimate display of my fear-induced GIT OCD.	11:54
	MERGE MERGE MERGE MERGE PULL MERGE	11:55
canton7	not good ;)	11:55
quackgyver	:)	11:55
	→ rchavik joined	11:56
canton7	found your commits?	11:56
	→ AlexanderS joined	11:57
quackgyver	Okay so today I have a "merge branch master of <url> into <branchname>", then 3 additional such entries from exactly 10 days ago. However, 3 days before the latter entries there's a "Merge remote-tracking branch origin/master into <branchname>	11:57
	→ mino joined	11:57
	← mino left	11:57
	→ mino joined	11:57
quackgyver	Could this mean something?	11:57
canton7	just lots of stuff being merged into branchname	11:57
	'git merge origin/master' vs 'git pulll <url> master' I suspect	11:58
quackgyver	Prior to that I see a message specified by me, which means its a commit	11:58
	← devoldmx left	11:58
quackgyver	yeah canton7 exactly	11:58
canton7	cool. Out of curiosity, grab the commit hash, and 'git branch --contains <hash>'	11:58
quackgyver	ok	11:58
	"qwoifhfhqowfihqw". Good comment.	11:58
canton7	yeah ><	11:58
	→ yassine joined	11:58
	→ cannonball joined	11:58
	← yassine left	11:58
	→ yassine joined	11:58
	← cannonball left	11:58
	→ cannonball joined	11:58
	→ Milossh joined	12:00
quackgyver	ok canton7, that printed "master" along with 3 additional branches	12:00
	← Roots47 left	12:00
quackgyver	which are for different projects created by be	12:00
canton7	cool, so your commit is already in master	12:01
quackgyver	and which exist on my local branch	12:01
	oh i see	12:01
canton7	hence the lack of differences	12:01
quackgyver	heh	12:01
	← frgtn left	12:01
quackgyver	But that doesn't explain why the files suddenly disappeared?	12:01
	since they're not on my local repo anymore	12:01
canton7	git checkout master; git log -- path/to/deleted/file	12:01
quackgyver	ok looking for the pathname one sec	12:03
	→ marhaban joined	12:03
quackgyver	canton7: it returned nothing :(	12:04
	do i need to specify the full path?	12:04
	or is part ok?	12:04
canton7	path relative to where you are	12:04
quackgyver	ok	12:05
	will a folder suffice?	12:05
canton7	sure	12:05
quackgyver	if i pick a shorter url, will that increase the amount of hits returned?	12:05
canton7	(as long as not too much else affects that folder - we're filtering logs by which ones touches the path your specify)	12:05
quackgyver	or will it return 0 due to requiring specifics	12:05
	ko	12:05
	ok*	12:05
	Ok, i have one entry	12:06
	when i point to the folder above the missing one	12:06
	"Adding files for merge to origin"	12:06
	by me	12:06
canton7	might be worth sticking --name-status in there	12:06
quackgyver	before or after the path?	12:06
canton7	we're looking for the point at which the files were added, then deleted	12:06
	berfore	12:06
	*before	12:06
quackgyver	ok	12:06
	yep, it spits out the missing files	12:06
	how could they have disappeared when the only entry regarding them is me adding htem?	12:07
	them*	12:07
	this is nuts	12:07
	← rchavik left	12:07
quackgyver	but im also happy! :-)	12:07
canton7	if they've been deleted while someone's sorting out merge conflicts, they can get a bit lost	12:07
	the term is "evil merges"	12:07
	← marhaban left	12:07
wald0	i have "git pull" an extra remote, it shows in the history as origin/foo, but "foo" locally doesn't seems update, how i should update it ?	12:08
quackgyver	haha, evil merges	12:08
	canton7: They're a bunch of files in a single folder	12:08
	→ pdx joined	12:08
	→ raf joined	12:08
quackgyver	so i dont think someone accidentally removed all of them, including their folder :P	12:08
	→ michaelarestad joined	12:09
	→ spaceonline joined	12:09
	← michaelarestad left	12:09
	→ michaelarestad joined	12:09
quackgyver	So what do you think happened?	12:10
canton7	I'm not sure	12:10
	are you dead sure that commit actually adds those files?	12:10
	'git show --name-status <commit>'	12:10
	→ hyperair joined	12:11
quackgyver	There is an "A" before each file entry	12:11
	Does that mean "Add" or "Annihilate"? :P	12:11
canton7	'Added'. cool	12:11
	→ Roots47 joined	12:12
	→ nicoulaj joined	12:12
	→ garbagecollectio joined	12:12
quackgyver	This is not the first time I've lost branches	12:12
canton7	it hasn't been lost	12:12
quackgyver	and this applies to more than just this one	12:12
canton7	the commit was in master	12:12
	well, is	12:12
	the changes have since been undone by someone/something	12:12
quackgyver	canton7: Well, it has been pushed to origin, and then master has fetched from origin	12:13
	so maybe thats why?	12:13
canton7	going back to what we were saying earlier 'git fetch' updates the remote-trakcing branches, not local branches like 'master'	12:13
	but anyway, probably not	12:14
	→ longbeach joined	12:14
quackgyver	hmm	12:14
canton7	did the 'git branch --contains' include origin/master ?	12:14
	← michaelarestad left	12:14
quackgyver	canton7: no just the id of the commit	12:14
canton7	it should list a number of branches	12:15
quackgyver	and it lists 4 branches in my local repo	12:15
	but not all of them	12:15
canton7	did that list contain origin/master as well as master?	12:15
quackgyver	constant: I don't know. Can I tell them apart somehow?	12:15
canton7	one's called 'origin/master' and the other's called 'master'	12:15
	← hmsimha left	12:15
quackgyver	oh, you mean as an actual entry	12:15
	sorry, no, just master	12:15
	not origin/master	12:15
canton7	'git fetch', try again?	12:16
quackgyver	Nope, not at all!	12:16
	← Droolio left	12:17
quackgyver	well	12:17
canton7	ok, it's in 'master' but not 'origin/master', that's somethign	12:17
quackgyver	at least now i can track down the files	12:17
	let me just try doing this to a different branch	12:17
	to see if it outputs anything more	12:17
canton7	but that commit was definitely in your local master at some point	12:17
	→ Droolio joined	12:17
	→ ewnd9 joined	12:17
wald0	when i tried to "git push" changes that i get from upstream, it complained about that i need to "pull" first, but now the branches looks totally diverged, how i should fix that ?	12:19
	← kcj left	12:19
	→ jefflyne joined	12:19
wald0	in fact it looks like the commits was duplicated in a diverged branch :/	12:20
	→ rchavik joined	12:20
	← TandyUK left	12:20
	→ TandyUK joined	12:21
wald0	http://paste.debian.net/25444/ it looks like the commits was duplicated in line 18	12:21
	→ DoniRS joined	12:21
wald0	is this a common problem using git? :/	12:21
quackgyver	canton7: Okay, so in the specific case we discussed, it actually seems that the files have somehow been relocated to another folder. Looking more closely, the git log actually doesn't point to the exact path endpoint as i thought (and as has been specified everywhere), so i did manage to finally locate the files in that alternate folder (which differs by a	12:21
	single letter)	12:21
	however	12:21
	this case is not true for the other branches that are empty	12:22
	→ test____ joined	12:22
quackgyver	and i have specifically received a comment about the project from other coworkers, referring to the exact path its supposed to be located in	12:22
	and i cannot find any commits pertaining to that path	12:22
	→ normanrichards joined	12:22
quackgyver	when i use your techniques as described	12:22
canton7	quackgyver, pass -M to git log to look for renames	12:22
	← rchavik left	12:23
	← Roots47 left	12:23
quackgyver	canton7: in regards to the first or second project? because the second one is more important and more likely to point to whatever core issue that caused this, whereas the first one feels like an isolated incident of either me messing up at some point (though i dont see how considering the logs) or someone accidentally altering something	12:23
	just so we're on the same page as to what we're trying to look for	12:23
	:P	12:24
canton7	right, is this a new scenario? can I have a bit more detail?	12:24
	cool	12:24
	what's the problem with this one?	12:24
	← rfoust left	12:24
quackgyver	canton7: exact same scenario for multiple branches.	12:25
	so what we're troubleshooting is applicable to all of them in the same way	12:25
	same behavior, same time of disappearane	12:25
	disappearance*	12:25
	all of them confirmed to have worked at some point not too long ago	12:25
	so, it doesn't really matter which one.	12:25
	→ rnsanchez joined	12:25
canton7	ok, pick one	12:25
	that's the new 'branchname'	12:25
	← test____ left	12:25
	→ xequence joined	12:25
quackgyver	yep, im trying to say that you helped me solve one issue, but that im gonna act as if we didnt ;)	12:26
	yep, branch2 = branchname now	12:26
canton7	git checkout branchname; git log --first-parent --no-merges. See your commit?	12:26
	→ anonymuse joined	12:26
quackgyver	indeed i do! and it prints "master" along with 3 more branches	12:27
canton7	what does?	12:27
quackgyver	--contains	12:27
	in fact	12:27
	all of these branches are the ones lacking files	12:28
	haha	12:28
canton7	ok, so that commit was merged into master, too	12:28
quackgyver	yep, i think i did it to all of them while troubleshooting	12:28
	→ ledestin joined	12:28
quackgyver	would you say that merging into master is a bad idea?	12:28
	i feel like my coworker shouldnt have suggested it	12:28
canton7	depends on what you're trying to do	12:28
quackgyver	ok	12:29
canton7	if you're trying to take the changes from that branch and put them in master, yes	12:29
wald0	how i can remove a commit that i have pushed ?	12:29
	→ xSmurf joined	12:29
quackgyver	canton7: so are you saying that "git merge foo" would merge the branch you're currently working on into "foo"?	12:29
	or that "foo" would be merge into your current one	12:29
canton7	no, it merges 'foo' into the branch you're currently on	12:29
	you can only ever merge into the currently-checked-out branch	12:29
quackgyver	If that's the case, then why does master have my commits?	12:30
canton7	since the merge operation needs a working copy to work	12:30
quackgyver	because I never merge into master	12:30
	← wald0 left	12:30
quackgyver	only into branches, if i ever do it	12:30
canton7	output of 'git reflog master'?	12:30
	→ Roots47 joined	12:31
quackgyver	it wants me to do show, expire or delete	12:34
	← mmitchell left	12:34
canton7	erm, show	12:34
	must be a slightly different git version to what i'm running	12:34
	git reflog show master	12:35
quackgyver	Aight, now it's showing a couple of entries	12:35
	→ sgambino joined	12:36
quackgyver	master@{0}: pull: Fast-forward	12:36
	→ wald0 joined	12:36
quackgyver	each entry incrementally increases the 0 to 1, 2, 3 etc	12:36
canton7	yup	12:36
	i'm looking for merges into it	12:36
	just making sure	12:36
quackgyver	and the first two commands are the same (Fast-forward) while the latter 5 say "pull origin: Fast-forward"	12:36
canton7	thought if no. 0 is a pull, then that seems unlikely	12:36
wald0	it is common in git that the history becomes broken ? my history diverged in a kind of duplicated commits... how i should solve that now ? :/	12:36
	← mika left	12:36
canton7	wald0, that's what happens when you rewrite public history	12:37
ledestin	after I committed to master and it's not up to date, is there any way to fetch stuff from remote and rebase? I don't like that if I do 'git pull', I get stupid merge commit message.	12:37
quackgyver	canton7: Okay so no merges have been done into master, yet it contains the commits done on other branches	12:37
canton7	not recently anyway	12:37
wald0	i have fetched changes from a remote, when tried to push it complained about a pull is required, so i pulled, when finally pushed, my branch looked as diverged with duplicated commits	12:37
quackgyver	ok	12:37
	← ewnd9 left	12:37
quackgyver	So this means that my commits must be coming rom elsewhere then?	12:38
canton7	quackgyver, there is where we really need that graph	12:38
quackgyver	i.e. origin?	12:38
	→ rchavik joined	12:38
quackgyver	canton7: I have pushed these branches to origin at some point, but not into origin/master	12:38
canton7	oops, git branch -a --contains <commit hash>	12:39
	forgot that damn -a	12:39
quackgyver	does that explain anything?	12:39
wald0	http://paste.debian.net/25444/ it looks like diverged on line 18, with duplicated commits :/	12:39
quackgyver	what i just said, i mean	12:39
wald0	how i should solve that now ?	12:39
	→ enr joined	12:39
canton7	quackgyver, give me that output :P	12:39
	→ michaelarestad joined	12:39
quackgyver	canton7: "forgot that damn -a" as in "dont use -a" or "i forgot it before"? :)	12:40
canton7	I forgot it before	12:40
	← michaelarestad left	12:40
canton7	'git branch -a --contains <commit hash>'	12:40
	→ michaelarestad joined	12:40
	→ gusnan joined	12:40
	→ mika joined	12:40
quackgyver	canton7: It prints a huge list of branches	12:40
	on remotes/origin/	12:41
canton7	including origin/master?	12:41
	cool	12:41
	so your commit was merged into origin/master, and it sounds like that was quite a long time ago	12:41
quackgyver	so at some point after i pushed it to origin, it was merged by other projects?	12:41
	yeah	12:41
	← anonymuse left	12:41
canton7	I'm not sure who merged it	12:41
wald0	i should trash my git and start a new project on these cases ?	12:41
quackgyver	my log doesnt go back far enough	12:42
	:(	12:42
canton7	it does - you just need to scroll	12:42
quackgyver	nah, it stops	12:42
	as if there was a limit	12:42
	is that the server or client	12:42
	let me check my putty settings	12:42
canton7	how are you scrolling?	12:42
	← crazydiamond left	12:42
quackgyver	shift+pgup	12:42
canton7	that's putty's scroll buffer, I think	12:42
quackgyver	aye probably	12:42
canton7	when you get the log output, is there's a colon on the very last line, at the bottom?	12:43
quackgyver	nah, it puts me back in shell	12:43
canton7	weird config then	12:43
quackgyver	haha	12:43
canton7	'git log .... \| less'	12:43
quackgyver	maybe!	12:43
	← looper left	12:43
quackgyver	Don't worry, I changed PuTTy's scrollback from 200 to 20000 :p	12:44
canton7	just use a pager	12:44
wald0	there's really no solution for that?	12:44
	← enr left	12:44
canton7	wald0, you can rewrite public history to fix that, but then what's to stop it happening agian?	12:44
	← michaelarestad left	12:45
canton7	you need to learn how to deal with you, or other people, force-pushing rewritten history	12:45
	read 'recovering from upstream rebase' in man git rebase	12:45
gitinfo	the git-rebase manpage is available at http://jk.gs/git-rebase.html	12:45
	← kewah left	12:45
	← simesy left	12:45
	→ looper joined	12:45
wald0	thx	12:46
	← rudak left	12:46
quackgyver	canton7: When I run your command to check the details of the commit id, it lists master first	12:46
	and then my project branch	12:46
	following that, a remote branch	12:46
	→ mechanicalduck_ joined	12:47
canton7	which command?	12:47
quackgyver	the one without the less parameter	12:47
	→ TheBrainWork joined	12:47
	← tanema left	12:47
quackgyver	i added more scrollback to putty and went back to the beginning of the output	12:48
canton7	which one? log?	12:48
quackgyver	git branch -a --contains id	12:48
	the id from my work on the branch with the missing files	12:48
	work = commit	12:48
	sorry	12:48
canton7	that's listing all of the branches which contain that commit	12:48
	→ shruggar joined	12:48
	→ pr0ggie joined	12:48
quackgyver	not in chronological order?	12:48
canton7	I have several meetings in a few mins btw	12:49
quackgyver	damn	12:49
canton7	no. the commit has the same timestamp, whatever branch it's in	12:49
quackgyver	sorry for taking up your time	12:49
	okay	12:49
	one of the lines read	12:49
	"remotes/origin/HEAD -> origin/master	12:49
	"	12:49
	does this explain anything?	12:49
canton7	no	12:49
	← mechanicalduck left	12:49
quackgyver	ok	12:49
	← rchavik left	12:49
quackgyver	any quick input on how i could possibly locate the files associated with the branch?	12:49
	→ babilen joined	12:49
canton7	that means origin/HEAD is the same as origin/master. origin/HEAD only says what commit should be checked out when that repo is cloned	12:49
quackgyver	ah i see	12:49
	→ enr joined	12:50
	→ Carraway joined	12:50
canton7	erm, you might be able to bisect master, see when the changes were removed	12:50
	man git bisect	12:50
gitinfo	the git-bisect manpage is available at http://jk.gs/git-bisect.html	12:50
canton7	that's assuming they were removed in an evil merge	12:50
quackgyver	I don't think they were	12:50
	← fdel left	12:50
quackgyver	because the folders are too different	12:50
	:/	12:50
canton7	since they should be displayed - both being added and removed - by 'git log -- path/to/file'	12:50
	fiddle with -M and -C	12:51
	← kesha_ left	12:51
quackgyver	-M and -C regarding which command?	12:51
canton7	even if they were renamed, that counts as a removal from their original pth	12:51
	*path	12:51
quackgyver	ah ok	12:51
canton7	regarding man git log	12:51
gitinfo	the git-log manpage is available at http://jk.gs/git-log.html	12:51
quackgyver	thanks for the help. hit me up later if i can repay you somehow	12:51
	really appreciate it :)	12:51
shruggar	sometimes I have exported directories, ie: directories which are not under version-control, but which are based on directories which are. Usually to verify that nothing has changed since they were exported, I sometimes have the need to compare the "exported" directory with a tree-ish from a bare repository. I have created this script to aid in this task: https://github.com/wpalmer/git-scripts/blob/master/git-bare and I would appreciate comment on whethe	12:51
canton7	that's alright	12:51
	good luck!	12:52
quackgyver	thanks!	12:52
	→ whaley joined	12:52
	→ Marquisk2 joined	12:52
	← xSmurf left	12:53
	← netsroht left	12:53
	→ ianliu joined	12:54
	→ luxgeek joined	12:54
	→ HenryG joined	12:55
	→ scampbell joined	12:56
	→ netsroht joined	12:57
	← St_Marx left	12:57
	← lifelike left	12:58
	← babilen left	12:58
	→ St_Marx joined	12:58
	← mechanicalduck_ left	12:59
	→ adamwathan joined	12:59
	→ enjoi joined	12:59
	→ rfoust joined	12:59
quackgyver	canton7: There should be more people like you. I also like to help as much as possible within my own field of expertise, and as I've experienced now it really can affect your perception of a channel. Keep it up. You helped me out of a pickle there. Cheers. :-)	13:00
	→ mklappstuhl joined	13:00
	← jim0thy_ left	13:00
	→ mattcen joined	13:02
	→ crazydiamond joined	13:02
	← whaley left	13:03
	← Raging_Hog left	13:04
	→ kill-9_ joined	13:04
	← polymar left	13:05
	→ rchavik joined	13:05
	← tg left	13:05
	← enjoi left	13:05
	← normanrichards left	13:06
	→ oliveiraev joined	13:06
	← mikecmpbll left	13:06
	→ mikecmpbll joined	13:06
	→ tg` joined	13:06
quackgyver	If you do a git diff and it doesn't output "Already up-to-date", what does that mean?	13:07
	→ ewnd9 joined	13:07
	→ lamarus joined	13:07
	tg` → tg	13:08
	→ nucatus joined	13:08
	→ decotii joined	13:08
	→ jerius joined	13:10
	← rchavik left	13:10
	→ michaelarestad joined	13:10
	← michaelarestad left	13:11
	→ michaelarestad joined	13:11
	← h0bbit left	13:11
	← flaguy48 left	13:11
	← nucatus left	13:12
	→ tplaner joined	13:13
	→ devoldmx joined	13:14
	→ AaronMT joined	13:14
	← TandyUK left	13:14
	→ TandyUK joined	13:15
	← matanya left	13:15
	← emergion left	13:15
	→ tanema joined	13:15
	← michaelarestad left	13:15
	← enr left	13:16
	→ enr joined	13:17
	← enr left	13:17
	→ enr_ joined	13:17
wald0	how i can generate a massive list of 30 patches to export and reapply in a new git history ? this rebase problem is too much complex, what a mess	13:18
	→ mdhopkins joined	13:18
jokajak	wald0: git format-patch --help	13:19
	→ r0dn3y joined	13:19
	← mklappstuhl left	13:20
	← jefflyne left	13:20
	← Carraway left	13:21
	→ DeanH joined	13:23
	→ Carraway joined	13:23
	→ mklappstuhl joined	13:24
	→ verysoftoiletppr joined	13:25
	→ x3ro joined	13:25
	← crane_work left	13:25
	→ trungqtran joined	13:26
	→ hellopat joined	13:27
	← jonez left	13:27
	← enr_ left	13:27
	sami_ → sami	13:27
	← aharris6 left	13:27
	gitinfo set mode: +v	13:27
	→ PeterBooker joined	13:28
	→ TeckniX joined	13:29
	← ntus1017 left	13:30
lb1a	and i thought i know every silly photo of EugeneKay .... i was wrong : http://2.bp.blogspot.com/-ncJzdrGVZ9g/UQl2J7gXepI/AAAAAAAABZ8/HeMzHSvtFH8/s1600/Google-Chrome-Hair.jpg	13:30
	→ natechan joined	13:30
	← Gwyxx left	13:30
	→ nucatus joined	13:30
x3ro	Hi. I'm currently looking for a way to integrate a submodule into its parent repository, while preserving history. I've tried several possibilities, including simply adding it as a remote and merging and "git subtree add", but the resulting paths are wrong. Say I've commited the file "foo.c" in the submodule, and the submodule lives in "src/bar/" in the parent repo. The commit merged into the parent repository should then have the path "src/bar/foo.c", and not "foo.	13:31
	because then "git log src/bar/foo.c" won't work. I understand that this requires rewriting all commits previously made, but I'm still wondering if this is possible. Thanks for reading :)	13:31
	← tanema left	13:31
	→ polymar joined	13:31
	← LekeFly left	13:31
	← mklappstuhl left	13:32
PerlJam	x3ro: of course it's possible! (but I don't know the correct incantation right off, sorry :)	13:33
	→ Destos joined	13:33
x3ro	PerlJam: Where might I find any more information? Googling mostly led me to the opposite operation, creating a submodule from a directory :(	13:34
	← hashpuppy left	13:34
quackgyver	canton7: FOUND IT.	13:34
	→ mehdiNej joined	13:34
quackgyver	A coworker I don't know deleted my files	13:34
	← trungqtran left	13:34
canton7	quackgyver, nice! what was it?	13:34
	aha	13:34
	how did you get that?	13:34
quackgyver	and must've merged it back into origin by mistake	13:34
	which i then fetched back into my repo :(	13:34
PerlJam	x3ro: http://stackoverflow.com/questions/1759587/un-submodule-a-git-submodule might help	13:34
	← devoldmx left	13:34
quackgyver	canton7: Did some more generic log fetches	13:34
	→ devoldmx joined	13:35
canton7	nice	13:35
quackgyver	and found a commit specifically addressing my files	13:35
	can i rollback?	13:35
	or something	13:35
x3ro	PerlJam: I found that, but the answer unfortunately results in paths not being updated in the submodule's history.	13:35
	→ jrobichaud joined	13:35
canton7	quackgyver, you can make a commit which completely undoes his commit with 'git revert', or you can checkout a specific dir as it was just before that commit with e.g. 'git checkout <commit before one which deleted files> -- path/to/files'	13:36
	(then commit)	13:36
quackgyver	canton7: I'd rather do a checkout, so that i dont revert anything on any other repo than mine	13:36
	← ledestin left	13:36
	← keller left	13:36
	→ mmitchell joined	13:36
	→ rchavik joined	13:36
canton7	quackgyver, 'any other repo'?	13:36
quackgyver	canton7: can i supply a generic parent folder or do i have to revert all the files individually	13:37
	canton7: yeah like remotely	13:37
	← relipse left	13:37
canton7	quackgyver, hmm? there's no much difference between 'git revert <commit>' and 'git checkout <commit>^ -- .; git commit'	13:37
quackgyver	canton7: Can I do a complete checkout of a specific commit into a branch of mine?	13:37
canton7	actually, ignore my last sentence	13:38
quackgyver	canton7: Well, wouldn't revert change the files in the location where he deleted them?	13:38
	before merging htem back in	13:38
canton7	not entirely sure what you want I'm afraid	13:38
quackgyver	canton7: This person who deleted my files did so in his own dev repo, then pushed it back into origin which i then fetched and applied all over my projects	13:38
	→ twoface88 joined	13:38
quackgyver	therefor, i wouldnt want to revert the changes on his side	13:39
lov	quackgyver: track this dev down then punch him right in his stupid rm-happy face.	13:39
quackgyver	id merely want to fetch them into a branch in my own local repo	13:39
lov	this is dev law.	13:39
	← devoldmx left	13:39
	→ chrisgeorge joined	13:39
quackgyver	lov: Unfortuantely he's also my most important point of contact for immediate and urgent assistance	13:39
	→ trungqtran joined	13:39
quackgyver	otherwise i'd put on that cowboy hat and follow your advice..	13:39
	→ outcoldman joined	13:39
quackgyver	but not with this guy.. even a hero makes mistakes	13:40
	→ ledestin joined	13:40
	→ pandeiro joined	13:40
	→ huoxito joined	13:41
	→ vince_prignano joined	13:41
	← outcoldman left	13:41
	← r0dn3y left	13:41
	→ michaelarestad joined	13:41
	→ keller joined	13:42
	→ babilen joined	13:42
	← michaelarestad left	13:42
	← babilen left	13:42
	→ michaelarestad joined	13:42
	→ dougsland joined	13:42
	→ outcoldman joined	13:43
	← outcoldman left	13:43
	→ grampajoe joined	13:43
	← rhombus left	13:43
	→ breakingthings joined	13:43
	→ babilen joined	13:45
	← michaelarestad left	13:47
canton7	quackgyver, you can't revert them 'on his side'. you can only make the change locally, then maybe push it to origin	13:47
	whatever you do	13:47
quackgyver	canton7: ahh, great to know	13:47
	thanks mat	13:47
	e	13:47
	→ harish joined	13:48
canton7	you can't directly affect what's on someone else's computer. that would be a massive security risk :P	13:48
	← rchavik left	13:48
	← agile left	13:48
	→ lautreamont joined	13:49
	← kermit left	13:50
	→ rudak joined	13:50
	← beautifulmind left	13:50
	← fragje left	13:50
	→ illsci joined	13:51
illsci	hey wahts up	13:51
lautreamont	can someone help me with git	13:51
illsci	im trying to move a bunch of github enterprise repos from one instance to another and I want to pull down all the branches just as they are and move them to this new github enterprise instance	13:51
	I scripted it... but its not keeping the feature/blah feature part	13:52
lov	lautreamont: this is the wrong channel, sorry. We just judge people, we don't help them.	13:52
	lov silently judges lautreamont	13:52
illsci	is there a simpler way to just pull it all down and then push it all back up just as it is in one	13:52
dfanjul	illsci: git fetch one refs/:refs/move/ && git push two refs/move/:refs/, maybe?	13:53
	← zivester left	13:53
	→ Swayz joined	13:53
	← harish left	13:53
	→ guampa joined	13:53
	← grampajoe left	13:53
lautreamont	mine is simpler, i cloned someones repo from github, change it, and now I want updates from original, but git tells me that all is up-to-date but I see on web that changes are made	13:54
	→ agile joined	13:55
	← rodyhaddad left	13:55
	→ simesy joined	13:56
quackgyver	canton7: Good to know. :-) Cheers	13:56
	→ rbento joined	13:56
	→ enr joined	13:56
illsci	dfanjul: that doesn't seem do it...	13:56
	or im messing it up	13:57
	I cloned the repo and I cd'd into it	13:57
	← yassine left	13:57
illsci	how do I pull down everything all at once and retain the branch name structure.... like feature/blah	13:57
	I can just git push upstream --all	13:57
	thats easy	13:58
	im not sure how to pull them down and keep them as they're named	13:58
	← PainBank left	13:58
	→ PainBank1 joined	13:58
	← trungqtran left	13:58
	→ rodyhaddad joined	13:59
	→ devoldmx joined	13:59
	← cbreak-work left	13:59
	← donmichelangelo left	14:00
	← TandyUK left	14:00
	→ zhost joined	14:00
	← simesy left	14:00
	→ TandyUK joined	14:00
	← lautreamont left	14:00
	← konadr left	14:00
	→ donmichelangelo joined	14:00
	→ cbreak-work joined	14:00
	← enr left	14:01
dfanjul	illsci: if you have cloned, if you already have your branches and tags, no need to pull	14:03
	→ goran joined	14:03
	→ jim0thy_ joined	14:03
illsci	so this was the command: git fetch one refs/:refs/move/ && git push two refs/move/:refs/,	14:03
	how does that work if I've cloned it and im in the git repo?	14:03
	→ rchavik joined	14:04
dfanjul	replace <one> and <two> by the url's	14:04
	← sidus left	14:04
illsci	I tried that and got an error, let me try again	14:04
dfanjul	and the trailing comman should be removed	14:04
illsci	sure :)	14:04
	I was just doing the first part to see if I could pull them down	14:04
	if you're in the repo do you need to have the url for the name of the repo?	14:04
	← e66 left	14:05
dfanjul	well, then <one> could be 'origin'	14:05
illsci	sure	14:05
	→ acharlieh joined	14:05
	← garbagecollectio left	14:06
illsci	hmmm it shows a ton of * [new ref] refs/pull/99/merge -> refs/move/pull/99/merge	14:06
	but then I do git branch and I have just master	14:06
	← goran left	14:07
nDuff	illsci: "git branch" shows your local branches. "git branch -r" shows your remote ones.	14:07
	illsci: it sounds like you want the latter, if you expect to see remote branches.	14:07
	→ michaelarestad joined	14:07
illsci	yeah I want to pull down all my remote branches and maintain the name	14:08
	nDuff takes a closer read, and... ahh.	14:08
illsci	and then I want to git push --all	14:08
	to this new github instance	14:08
	→ HenryG_ joined	14:09
	→ konadr joined	14:09
dfanjul	now you have the original in refs/move/*	14:09
	it is not the normal namespace, git does not consider them branches or remote branches or anything, just other refs	14:09
	← acharlieh left	14:09
dfanjul	so now you can do the second push	14:10
	← rchavik left	14:10
	→ zivester joined	14:10
illsci	lets see...	14:11
quackgyver	canton7: If I check out this commit, it's gonna revert a bunch of other files too	14:11
	what command do i need to use in order to check it out into a single branch?	14:11
	→ maroloccio joined	14:11
	← HenryG left	14:12
	← ayaz left	14:12
	← pr0ggie left	14:12
	← hyperair left	14:12
	→ bitkiller joined	14:13
	→ rabellamy joined	14:13
illsci	hmm it looks like thats working but it still hasn't given me my prompt back yet	14:13
	weird	14:13
	there we go	14:13
	→ danicampa901 joined	14:14
	→ tang^ joined	14:14
	← lb1a left	14:14
	← lamarus left	14:15
	← zivester left	14:15
	→ zivester joined	14:16
	→ grampajoe joined	14:16
	← subhojit777 left	14:17
	→ e66 joined	14:17
	→ bamj0rb joined	14:18
	→ anonymuse joined	14:19
	← maasdesigner left	14:19
	← ledtc left	14:21
	← raf left	14:21
	→ bonnie joined	14:21
	← x3ro left	14:21
	→ babilen_ joined	14:22
	→ ntus1017 joined	14:22
dfanjul	if you cloned, the fetch didn't transfer anything, the push needs to transfer every object	14:23
amcsi_work	how do I set 1 file to be CRLF in .gitattributes?	14:23
	← babilen left	14:23
	→ SergeyPenkin joined	14:24
	← scampbell left	14:25
	→ crane_work joined	14:25
cbreak-work	amcsi_work: man gitattributes, look for eol	14:25
gitinfo	amcsi_work: the gitattributes manpage is available at http://jk.gs/gitattributes.html	14:25
	← shruggar left	14:25
	→ lamarus joined	14:26
	← papegaaij left	14:26
cbreak-work	quackgyver: git checkout -b branch checks out what ever commit you want into a new branch	14:26
	→ rchavik joined	14:26
quackgyver	cbreak-work: isnt that the command for checking out the branch itself?	14:27
	or do you mean that I should first point to the commit i want to revert to in a headless state?	14:27
	← ledestin left	14:28
	→ ballmenace joined	14:28
cbreak-work	quackgyver: -b blah means "create branch blah"	14:28
	so it will check out the commit you tell it to into that new branch	14:28
	← Sonderblade left	14:29
	→ Gamecubic joined	14:29
cbreak-work	quackgyver: you don't need to point it to a commit you want to revert	14:29
quackgyver	cbreak-work: yeah so how would your example know which commit to check out into the branch?	14:29
cbreak-work	if you want to revert, git revert can do that.	14:29
	← sqlnoob left	14:29
	← bonnie left	14:29
cbreak-work	quackgyver: you tell it	14:29
quackgyver	cbreak-work: where? :p	14:29
cbreak-work	with an additional parameter...	14:29
	git checkout takes the thing you want to check out as parameter	14:29
quackgyver	alright great	14:29
cbreak-work	-b name just tells it to create a new branch from that	14:30
	→ mustmodify joined	14:30
	← ballmenace left	14:30
quackgyver	cbreak-work: so wait, I'd do git checkout -b <target commit id>?	14:31
	→ scampbell joined	14:31
	← sershe left	14:31
cbreak-work	no.	14:31
quackgyver	cbreak-work: I thought that "blah" = branch name	14:31
cbreak-work	yes	14:31
	→ KhashayaR joined	14:31
	← KhashayaR left	14:31
	→ KhashayaR joined	14:31
quackgyver	cbreak-work: I'm checking the help page and it doesnt say anything about a source	14:31
	in the symopsis	14:31
	eynopsis*	14:31
	→ sriracha joined	14:32
cbreak-work	it's called <commit>	14:32
mustmodify	ok git nerds... give me a push. If I want to add some files to (not-pushed) HEAD^2, is there a better way than `git reset HEAD^1; git add xyz; git commit -m "message from HEAD^2" --amend; git add sometimes; git commit -m "message from HEAD^1"`? like a ... `git commit --amend=HEAD^2` or something?	14:32
cbreak-work	or, in the -b mode <start_point>	14:32
	mustmodify: man git-rebase	14:32
gitinfo	mustmodify: the git-rebase manpage is available at http://jk.gs/git-rebase.html	14:32
cbreak-work	mustmodify: look at git rebase -i HEAD~3	14:32
	→ kesha_ joined	14:32
cbreak-work	mustmodify: also, do you really mean HEAD^2?	14:33
	and not HEAD~2?	14:33
	because that'd be a whole lot harder	14:33
	← keller left	14:33
	→ polymar_ joined	14:34
quackgyver	cbreak-work: Okay so just to be perfectly clear, you're telling me that "origin" is actually a parameter to be used when checking out one's entire repo, but not when admitting a SHA file into the git config, or whichever is broken when you do "HEADless mode"? Because that's what you've been telling me all along. :-/	14:34
	Haha just kidding. Bet you had a heart attack. ;-)	14:34
	Thanks for the help mate.	14:34
cbreak-work	quackgyver: no.	14:34
	quackgyver: it's totally context dependent	14:34
	quackgyver: you could do git checkout -b origin origin	14:35
quackgyver	cbreak-work: I was just kidding, no worries. I understand now. I was just a little confused by the parameters.	14:35
	← kpreid left	14:35
cbreak-work	and both origin's would mean something totally different	14:35
quackgyver	Speaking of which	14:35
	is there like, a "git ref for beginners"?	14:35
	→ kpreid joined	14:35
cbreak-work	man gitrevisions :)	14:35
gitinfo	the gitrevisions manpage is available at http://jk.gs/gitrevisions.html	14:35
	→ jefflyne joined	14:35
	← jefflyne left	14:35
	→ thiago joined	14:35
	→ jefflyne joined	14:36
quackgyver	cbreak-work: Does that really cover everything?	14:36
	→ johnnyfuchs joined	14:36
quackgyver	in the way you'd expect a true ref to do?	14:36
cbreak-work	it covers it if you know how to read it :/	14:36
quackgyver	haha	14:36
	→ mizu_no_oto joined	14:36
quackgyver	cbreak-work: I'm asking because the reason why I'm here in the first place is because being new to GIT means you probably won't be able to decipher all the seemingly interchangeable/vague words which will only make perfect sense if you are actually familiar with GIT	14:37
cbreak-work	quackgyver: man gitglossary has some word descriptions	14:37
gitinfo	quackgyver: the gitglossary manpage is available at http://jk.gs/gitglossary.html	14:37
cbreak-work	otherwise, there are books	14:37
	← polymar left	14:38
quackgyver	cbreak-work: No i mean more like, non-specific descriptions which allude to some specific git concept yet doesn't contain specific words you can research	14:38
	like when talking about git constructs	14:38
	you did it earlier in the chat too	14:38
	when i couldnt understand you	14:38
	I don't know how I'm supposed to research those kind of explanations :/	14:38
	Am I being vague or do you sort of understand what i'm looking for?	14:39
cbreak-work	I found the man pages to be very self-explaining	14:39
quackgyver	hm	14:39
	Okay well, I guess I'll just show you a clear example when I come across one, and you can tell me whatever difference there is in our thought processes that makes it seem self-evident to you	14:40
	while I think the opposite	14:40
	thanks for the help	14:40
	→ frgtn joined	14:40
cbreak-work	most likely education. I've worked with computers, software and the language used with those two for all my life, almost.	14:41
	so it's very familliar.	14:41
	→ mklappstuhl joined	14:41
	→ Dougie187 joined	14:43
	→ irqq joined	14:44
	→ john2496 joined	14:44
	← rednaks left	14:44
	→ polymar joined	14:45
	→ rednaks joined	14:45
	→ chris______ joined	14:45
	← Carraway left	14:46
	← michaelarestad left	14:46
	→ michaelarestad joined	14:47
	← michaelarestad left	14:47
	← robbyoconnor left	14:47
	→ michaelarestad joined	14:47
	← polymar_ left	14:47
	→ Carraway joined	14:48
	→ alezost joined	14:50
	→ kukks joined	14:50
	← kukks left	14:50
	→ kukks joined	14:50
	← dougsland left	14:50
	→ robbyoconnor joined	14:50
	← michaelarestad left	14:52
	→ arietis joined	14:52
	← Swayz left	14:53
	→ ErKa joined	14:53
	← nkambo left	14:53
	→ Swayz joined	14:53
	← yacks left	14:53
	→ dougsland joined	14:54
	← \|Freeman\| left	14:54
	← kesha_ left	14:55
	→ rednaks_ joined	14:56
	← TheBrainWork left	14:56
	→ onethfour joined	14:58
	← rednaks left	14:58
	← cotton left	14:59
	→ kesha_ joined	15:00
	← polymar left	15:00
	→ polymar joined	15:00
	→ pitzips joined	15:00
	← HenryG_ left	15:00
	← lavaman left	15:01
	→ sferry joined	15:02
	← sferry left	15:02
	→ sferry joined	15:02
	← sferry left	15:02
wald0	if i have created a branch from master (nothing commited yet) but i want that it references to the "stable" branch instead of master (starting from that point), it is possible to change its pointing reference ?	15:02
	adhawkins-away → adhawkins	15:02
	→ chrisshattuck joined	15:03
lov	sure, use git reset --hard	15:03
	← PeterBooker left	15:04
	→ PeterBooker joined	15:04
Underbyte	hey, is there a way one can set 'never ever allow a merge from branch A into branch B" in the git config?	15:05
	← zhost left	15:05
PerlJam	Underbyte: you can make a hook for that	15:06
Underbyte	got any examples?	15:06
PerlJam	not handy	15:06
	← mikecmpbll left	15:06
	← tinti left	15:06
nDuff	Underbyte: ...well, do you know how to write a script that asserts that "<this ref> must not contain <this other ref> in its history"?	15:06
	→ mikecmpbll joined	15:06
Underbyte	no idea :D	15:07
nDuff	Underbyte: if so, you plug that into an update hook, and there you are.	15:07
	Ahh. Well, now you have a pointer as to where to start. :)	15:07
	→ fission6 joined	15:08
	→ chuckharmston joined	15:08
Underbyte	can "this ref" and "this other ref" be branch heads?	15:08
	→ tinti joined	15:08
	← crazydiamond left	15:09
	← Droolio left	15:09
	→ mechanicalduck joined	15:10
	← frankstallone left	15:10
	← babilen_ left	15:12
	← nucatus left	15:12
	← cbreak-work left	15:12
	← Carraway left	15:13
	← SirCmpwn left	15:13
	← pduin left	15:15
	← rchavik left	15:16
	← dfanjul left	15:16
	→ bookmage joined	15:17
	→ michaelarestad joined	15:17
	→ nucatus joined	15:17
	← danicampa901 left	15:20
	← boblu left	15:20
	→ Carraway joined	15:20
	→ babilen joined	15:21
	→ acharlieh joined	15:21
	→ AWinterm_ joined	15:22
	→ vansonhk_ joined	15:24
	← thiago left	15:25
	→ hike joined	15:25
	← LimeBlast left	15:26
	← devoldmx left	15:26
	→ juanmabc joined	15:26
	→ SirCmpwn joined	15:26
	→ devoldmx joined	15:26
	→ umib0zu joined	15:26
	← crane_work left	15:26
canton7	quackgyver, sorry, 'nother meeting. still wondering?	15:27
	→ PaulCapestany joined	15:27
	→ r0dn3y joined	15:28
	r0dn3y → Guest46210	15:29
Underbyte	anyone feeling up to helping out a guy who needs a pre-recieve hook?	15:29
	→ devoldmx3 joined	15:30
	← devoldmx left	15:31
lov	sorry bro, no gay stuff for me.	15:31
Underbyte	:(	15:31
	← bobbyz_ left	15:32
Underbyte	i'm trying to make a hook that says "Branch B must never be merged into branch A"	15:32
	← bvi left	15:32
	← Guest46210 left	15:32
	← TandyUK left	15:32
	→ TandyUK joined	15:33
	→ skiernose joined	15:33
	→ clintwn joined	15:33
	← rodyhaddad left	15:33
	→ r0dn3y joined	15:34
	← Balliad left	15:35
EugeneKay	You'll want to do a post-receive	15:36
	→ tbmiller joined	15:36
	→ ology joined	15:36
	← ntus1017 left	15:36
	← vansonhk_ left	15:37
	← mike_af left	15:37
	→ enr joined	15:38
	→ jhulten joined	15:38
	→ bobbyz joined	15:38
Underbyte	i didn't know post recieve can deny a push	15:38
EugeneKay	Oh, right. Durp	15:38
	Update hook!	15:38
	→ ntus1017 joined	15:39
	← babilen left	15:39
EugeneKay	My brain is not on; I'm teaching class and thus sober :-(	15:39
Underbyte	yeah -- basically i want to block bad merges (merges not in-line with git-flow) from being accepted by the blessed repository (our origin)	15:39
	→ claudiuvlad joined	15:39
EugeneKay	Yup. Bash script.	15:39
claudiuvlad	hello	15:40
gitinfo	claudiuvlad: 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.	15:40
claudiuvlad	git shows untracked files like HEAD, config, description	15:40
	→ trungqtran joined	15:40
	← AWinterm_ left	15:40
	→ primitive joined	15:40
EugeneKay	First check the ref name; if it's Foo then examine the new history being pushed.	15:40
ology	irssi regexp /ignore to the rescue!	15:40
	→ AWinterm_ joined	15:41
	adhawkins → adhawkins-away	15:41
claudiuvlad	anyone	15:41
	i have a problem	15:42
	git shows untracked files present	15:42
	← ThomasLocke left	15:42
EugeneKay	I think you're after man git-rev-list	15:42
gitinfo	the git-rev-list manpage is available at http://jk.gs/git-rev-list.html	15:42
claudiuvlad	like HEAD , config , etc.	15:42
EugeneKay	claudiuvlad - !repro	15:42
gitinfo	claudiuvlad: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will help immensely with troubleshooting.	15:42
	→ TheBrainWork joined	15:42
	← polymar left	15:42
claudiuvlad	EugeneKay, https://gist.github.com/anonymous/6241908	15:43
	→ babilen joined	15:43
EugeneKay	It sounds like you have a bare repo that isn't bare, or something	15:43
claudiuvlad	any solution?	15:44
	← JohnBat26 left	15:44
EugeneKay	Or managed to copy the contents of .git/ into your repo	15:44
	Do you see .git when you do `ls -a` ?	15:44
	← kill-9_ left	15:44
claudiuvlad	yes there is .git	15:44
	← enr left	15:44
claudiuvlad	EugeneKay, yes there is .git	15:45
	→ enr joined	15:45
	→ rchavik joined	15:45
EugeneKay	And does `git fsck` give any major errors?	15:45
claudiuvlad	EugeneKay, two dangling blobs (?!?)	15:46
	→ enr_ joined	15:46
EugeneKay	That's normal - means you have some objects that aren't being used.	15:47
	→ bvi joined	15:47
EugeneKay	You should be OK to just delete these untracked files.	15:47
	← enr left	15:47
EugeneKay	It's just a copy of stuff that belongs in .git/ which you managed to cp into your worktree	15:47
claudiuvlad	EugeneKay, I have read we should use only bare repos	15:47
	→ nicedice_ joined	15:47
EugeneKay	Read !bare	15:48
gitinfo	an explanation of bare and non-bare repositories (and why pushing to a non-bare one causes problems) can be found here: http://bare-vs-nonbare.gitrecipes.de/	15:48
	→ lpaul7 joined	15:48
	← Devastator left	15:49
	← mklappstuhl left	15:49
	← enr_ left	15:49
	→ enr joined	15:50
	→ sainaen joined	15:50
	→ Devastator joined	15:50
	→ towski joined	15:50
claudiuvlad	EugeneKay, are bare repos safer ?	15:50
EugeneKay	!read the link in the factoid given.	15:51
gitinfo	Don't expect everything to be spoon fed to you - the man pages and other documents do not bite, you need to spend some time and effort reading them.	15:51
claudiuvlad	EugeneKay, thanks	15:51
	→ jfoy joined	15:51
	← TandyUK left	15:52
	→ TandyUK joined	15:52
	← KhashayaR left	15:52
	→ Gamecubic_ joined	15:53
	→ crazydiamond joined	15:53
	← jcromartie left	15:54
	← enr left	15:54
	← mechanicalduck left	15:55
	← Gamecubic left	15:56
	← maxmanders left	15:58
	← maroloccio left	15:58
	← jfoy left	15:59
	→ lindenle joined	15:59
quackgyver	canton7: sort of, yeah :-)	15:59
	→ mike_af joined	15:59
	→ dabar joined	16:00
dabar	Hello. If I want to find when a line in a file was added, how can I do that?	16:00
lov	git blame	16:00
	EugeneKay spins the bottle, blames lov	16:00
lov	it's a fair cop.	16:01
quackgyver	canton7: I mean, I'm still just sort of experimenting right now	16:01
	→ lpapp joined	16:01
	→ maxmanders joined	16:01
lpapp	hi, is there a way to set the committer similarly to --author when committing?	16:01
	→ jfoy joined	16:01
dabar	I don't seem to have git blame	16:01
	Oh, I do.	16:02
	Just isn't in the list when I just run "git"	16:02
	→ CodeShark joined	16:02
dabar	I actually found "git log -p $path" to be more useful.	16:03
	Thanks!	16:03
	← acharlieh left	16:03
	← claudiuvlad left	16:03
	→ ojacobson joined	16:03
arand	lpapp: I think you need to make use of GIT_COMMITER_NAME and GIT_COMMITER_EMAIL	16:04
	→ yacks joined	16:04
	← PeterBooker left	16:04
	→ PeterBooker joined	16:04
lpapp	arand: is this basic feature intentionally left out?	16:05
	← dabar left	16:05
	← rchavik left	16:05
grawity	yes, because when you commit something, then you are the committer	16:05
	it just doesn't make much sense to change it frequently.	16:05
lpapp	exactly why I would like to set it to myself.	16:05
	and not leave it as the default on a shared network.	16:05
	← devoldmx3 left	16:06
grawity	shared network?	16:06
	I don't see how this has anything to do with networks	16:06
	(and it's not /left out/ – arand just gave you a way to do it)	16:06
	→ angry_baby joined	16:06
lpapp	arand: xport GIT_COMMITER_NAME/EMAIL did not help.	16:06
grawity	ah, it's COMMITTER	16:06
lpapp	grawity: no no, I would like to have --committer	16:06
	I would like to have consistency.	16:07
arand	oh, sorry, my typo	16:07
grawity	patches welcome	16:07
	→ thiago joined	16:07
lpapp	grawity: it is kinda weird it has never been added.	16:07
mustmodify	cbreak-work: Sorry for the delay. Maybe I'm confused. How are HEAD^2 and HEAD~2 different?	16:07
	→ Guest___ joined	16:07
	← rath left	16:08
grawity	lpapp: because it is not something that should be used frequently; committer means committer, and if the committers start changing the 'committer' info, the "consistency" goes away	16:08
	← verysoftoiletppr left	16:08
grawity	mustmodify: `man gitrevisions` – ^2 means the second parent, ~2 means the parent of the parent	16:08
gitinfo	mustmodify: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html	16:08
	← angry_baby left	16:08
lpapp	grawity: ?	16:09
	grawity: as I said, we use a shared computer.	16:09
	→ dfanjul joined	16:09
	← dfanjul left	16:09
mustmodify	grawity: I've read it. Still confused. :P	16:09
lpapp	there is no such a thing as "you are you" without an explicit option.	16:09
grawity	lpapp: and a shared user account?	16:09
	→ acharlieh joined	16:09
lpapp	grawity: correct	16:09
mustmodify	But let me read your message a few more times.	16:09
grawity	.digraph d->c->b->a; f->e->a	16:09
gitinfo	.digraph: http://g.jk.gs/dV.png	16:09
lpapp	grawity: one account to the server.	16:09
	grawity: and some issues are better fixed right there.	16:10
grawity	ah, wait, wrong direction.	16:10
lpapp	grawity: which are specific to that machine.	16:10
grawity	.digraph a->b->c->d->e; a->f->g->d	16:10
gitinfo	.digraph: http://g.jk.gs/dW.png	16:10
lpapp	grawity: ok, I will try to submit a patch.	16:10
	grawity: this has bugged me enough times now to care. ^^	16:10
	→ devoldmx joined	16:10
	← grampajoe left	16:10
grawity	mustmodify: see above graph – if HEAD is a, then HEAD^ (or HEAD^1) is b, HEAD^2 is f, HEAD~2 is c	16:11
	→ rodyhaddad joined	16:11
lpapp	grawity: I am actually looking into an option where I would not need to duplicate the set up for committer, and author.	16:11
	so I can set both one-shot.	16:11
	← chuckharmston left	16:11
lpapp	anyway, thanks for noe.	16:12
	now*	16:12
	→ dreiss joined	16:12
	→ chuckharmston joined	16:12
mustmodify	grawity: ok, that kind of makes sense.	16:12
	→ verysoftoiletppr joined	16:12
mustmodify	grawity: I get that. thanks.	16:12
	→ cedeon joined	16:13
grawity	I think those can be stacked; HEAD^2^ would be g, for example...	16:13
	← noname001 left	16:13
grawity	and of course, only merges have more than one parent – for regular commits, x^2 wouldn't give you anything	16:14
lpapp	I have a git hook for pulling for a push ... how can I make it nicer to actually not pull when changes are done in the pulling repository?	16:14
	← maxmanders left	16:14
lpapp	should I always execute git reset --hard HEAD before the pull?	16:15
grawity	lpapp: !deploy is relevant	16:15
gitinfo	lpapp: 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/the-list-and-irc/deploy.html	16:15
lpapp	or there is a better way.	16:15
	← AWinterm_ left	16:15
	← blinkdesign left	16:15
	← trungqtran left	16:15
	→ jaequery joined	16:16
	→ mechanicalduck joined	16:16
	→ lunaphyte_ joined	16:16
	gitinfo set mode: +v	16:17
	← fRAiLtY- left	16:17
	← lunaphyte_ left	16:17
	→ lunaphyte_ joined	16:17
	← tbmiller left	16:17
	→ joshsmith joined	16:18
	← chuckharmston left	16:18
	→ maxmanders joined	16:19
	→ xSmurf joined	16:19
	→ boombatower joined	16:20
	→ enr joined	16:20
	← gittish left	16:20
	← freestyl3r left	16:20
	→ rchavik joined	16:21
	→ lavaman joined	16:21
	← arand left	16:21
	r04r\|away → r04r	16:21
	← lavaman left	16:22
texasmynsted	lpapp, I am curious what you are doing. Why do you need this hook?	16:22
	← mechanicalduck left	16:22
	← lamarus left	16:23
	→ ken01 joined	16:23
	← ErKa left	16:23
	← mustmodify left	16:23
lpapp	texasmynsted: webservice?	16:24
	right from a stable repository?	16:24
	AFAICT, it is quite common practice.	16:24
	how else would you solve it?	16:24
	→ mechanicalduck joined	16:24
texasmynsted	so you have code someplace that is updated by a webservice?	16:24
	→ n8chur_ joined	16:24
lpapp	texasmynsted: no, the code itself is the web service.	16:25
texasmynsted	(sorry I only saw your last couple of posts)	16:25
	← Milossh left	16:25
	← CheckDavid left	16:25
	← babilen left	16:26
	→ freestyl3r joined	16:26
	→ macrobat joined	16:26
texasmynsted	I guess I did/do not understand your "I have a git hook for pulling for a push ... how can I make it nicer to actually not pull when changes are done in the pulling repository?"	16:26
lpapp	texasmynsted: ok ...	16:26
texasmynsted	I think I see what is happening . . .	16:27
lpapp	texasmynsted: you need to have an up to date git repository of the webservice apache, nginx, or something else is serving to the clients, right?	16:27
	← dreiss left	16:27
	→ chuckharmston joined	16:27
texasmynsted	ok	16:28
	→ HenryG joined	16:28
	← john2496 left	16:28
ianliu	given the argument "foo" to git checkout "foo", how can I verify if HEAD points to the same commit as "foo"? Note that "foo" can be a commit hash, a tag, a branch or anything that can be passed to git checkout "foo".	16:28
	← xequence left	16:28
lpapp	texasmynsted: so the repository has to be updated once a developer pushes which is usually the development host, but there are server specific bugs.	16:28
	→ aaronmt_ joined	16:28
lpapp	texasmynsted: which are tested on the server, and fixed right in there, and hence sometimes there are stray mods around in that repository for which the automated pull in the hook will fail ...	16:28
	← enr left	16:28
lpapp	clearer?	16:28
texasmynsted	yes, I think so	16:29
	← AaronMT left	16:29
	→ nadirvar_ joined	16:30
	← aaronmt_ left	16:30
	← donmichelangelo left	16:30
	← Mode-M left	16:30
	← mikecmpbll left	16:30
	→ donmichelangelo joined	16:30
texasmynsted	I may not be totally clear but it seems perhaps like you are trying to automate a kind of clean-up, made necessary by the way your team is using git.	16:30
	→ Milossh joined	16:30
	→ john2496 joined	16:31
	← r0dn3y left	16:31
lpapp	texasmynsted: you are welcome to suggest improvements... I think we are doing things right, but perhaps not ...	16:31
texasmynsted	You might consider only pushing changes that have been tested to work on a fully integrated set of code.	16:31
lpapp	texasmynsted: ?	16:32
	→ Skrypter joined	16:32
	→ goshawk joined	16:33
lpapp	every change is of course tested, but how is that related?	16:33
	← TandyUK left	16:33
	→ TandyUK joined	16:33
texasmynsted	lpapp, I do not see why you should be experiencing the problem in the first place. It is like you have more than one person moving code to a server where the first time a specific set of code change have been integrated is on the development server its self.	16:33
	→ hwrd\|work joined	16:33
	← hwrd\|work left	16:33
	→ hwrd\|work joined	16:33
lpapp	texasmynsted: as I said, if you fix a server specific issue, it is handier to push in place.	16:34
texasmynsted	I am sorry but I think it is clear I do not understand the nature of the problem. If it is an integration issue you might check something like this http://nvie.com/posts/a-successful-git-branching-model/	16:34
lpapp	rather than backporting to a setup where it might get broken, and then push there, go back to fix, etc etc etc.	16:34
	→ devoldmx3 joined	16:35
lpapp	perhaps you just lack experience working with servers. ;)	16:35
texasmynsted	LOL	16:35
lpapp	server is different to a development host ...	16:35
texasmynsted	no, I have been working with servers and code for decades	16:35
lpapp	and a server service has to work there ...	16:35
	← jim0thy_ left	16:35
lpapp	it is inevitable for pretty much any server development to test and fix bugs on the real server.	16:36
	ssh, and co.	16:36
	→ dmarkham joined	16:36
	← mizu_no_oto left	16:36
texasmynsted	I just think you need to have the code that is executing on the server match exactly to some place in git.	16:36
	← mehdiNej left	16:36
	→ lamarus joined	16:37
	→ arvind_khadri joined	16:37
texasmynsted	So you know that when you test, you are testing XYZ, and you are clear about every piece of code that is contributing to the success or failure of the test you are performing.	16:37
	← rabellamy left	16:37
	← devoldmx left	16:37
lpapp	texasmynsted: no, imho it does not make sense to use several checkouts when you can guarantee the cleanness with the hook script, too.	16:38
	→ leeN joined	16:38
lpapp	after it is just one additional statement.	16:38
	after all*	16:38
	→ wongon joined	16:38
texasmynsted	Best of luck then. I would not be inclined to perform development on an active server.	16:38
	← konadr left	16:39
	← twoface88 left	16:39
texasmynsted	maybe make a VM of the server, and test your code on the vm. That way you control as many variables of your testing as you can.	16:39
	← sriracha left	16:40
	← sjuxax left	16:40
texasmynsted	In any case good luck.	16:40
	← mechanicalduck left	16:40
texasmynsted	There is a two part article on using VMs for development here—> http://www.bytesizedworkbench.com/	16:41
	← Swayz left	16:41
	← crazydiamond left	16:41
	→ Swayz joined	16:42
	→ mmlac-bv joined	16:42
	→ chuckhar_ joined	16:42
	→ arand joined	16:42
lpapp	texasmynsted: are you seriously claming a whole bunch of vm setup is simpler than "git reset --hard HEAD"?	16:42
	← bitkiller left	16:43
texasmynsted	Maybe not "simpler" but better	16:43
	What you want to do may work fine for some simple cases, but if you get into more complex code or a larger team you may need to have better control, or you could spend ages trying to unwind a problem.	16:44
	← rudak left	16:46
	← rednaks_ left	16:46
texasmynsted	In any case, I am not here to convince you to change your practices. I wish you the best of luck.	16:46
	→ mizu_no_oto joined	16:46
	→ rednaks_ joined	16:47
	→ rabellamy joined	16:47
	← PaulCapestany left	16:47
	→ bitkiller joined	16:48
	→ crazydiamond joined	16:48
	→ ngladitz joined	16:48
	← ngladitz left	16:48
	→ ngladitz joined	16:48
	← bitkiller left	16:49
	→ joshuairl joined	16:49
	→ bitkiller joined	16:49
	← TandyUK left	16:51
	→ mechanicalduck joined	16:51
	→ TandyUK joined	16:51
	← ken01 left	16:51
EugeneKay	Are you smoking crack	16:52
	→ iliketur_ joined	16:52
	← jkremser left	16:53
	→ Blaster joined	16:54
	→ DrShoggoth joined	16:54
lpapp	texasmynsted: ?	16:55
	texasmynsted: not sure what you mean.	16:55
	EugeneKay: yes, we all do.	16:55
ianliu	I'm trying to check if HEAD points to the same commit as a branch or tag. How can I do this?	16:56
EugeneKay	Ah, good. Carry on!	16:56
grawity	ianliu: a specific branch or tag, or just any?	16:56
	→ trungqtran joined	16:57
	→ sriracha joined	16:57
	← khushildep left	16:57
	← Plummer left	16:58
	← fridim_ left	16:58
johndo	ianliu: you can use git rev-parse and compare the results	16:58
ianliu	grawity: a specific branch or tag	16:58
	→ sjuxax joined	16:59
	→ Taggg joined	16:59
lpapp	EugeneKay: lol	16:59
	→ infynyxx joined	16:59
ianliu	johndo: I'm using rev-parse, but when the name is a tag, it has its own hash, which is different from the commit it points to	16:59
	← ntus1017 left	16:59
grawity	ianliu: use $name^{commit} to dereference it	16:59
Taggg	hello, can anyone tell me how to checkout the files from a tag but keep the HEAD where it is?	16:59
	← freestyl3r left	17:00
grawity	ianliu: actually, ^{} works as well	17:00
	← rchavik left	17:00
grawity	Taggg: `git checkout $tag -- .`	17:00
	← chuckhar_ left	17:00
Taggg	grawity: thanks!	17:00
	→ ErKa joined	17:00
grawity	you can specify any files, . just stands for "this directory"	17:00
lpapp	grawity: thanks for git deploy.	17:01
	← lpapp left	17:01
grawity	but as long as you specify files, it won't switch HEAD	17:01
Taggg	grawity: what's the double dash for?	17:01
	→ Sonderblade joined	17:02
ianliu	grawity: $name^{commit} works perfectly! Thanks	17:02
	← Sonderblade left	17:02
grawity	ianliu: look up `man gitrevisions` for other similar things	17:02
gitinfo	ianliu: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html	17:02
	→ Sonderblade joined	17:02
	→ freestyl3r joined	17:03
	→ hyperair joined	17:03
	← hyperair left	17:03
	→ hyperair joined	17:03
	HariboPenguin\|Of → HariboPenguin	17:04
	← PeterBooker left	17:04
grawity	Taggg: in this case it separates the tree (tag, branch, ...) name from file names, to stop git from trying to guess	17:04
	→ PeterBooker joined	17:04
	← rednaks_ left	17:05
	→ rednaks_ joined	17:06
	← leeN left	17:06
	→ babilen joined	17:06
	→ leeN joined	17:06
texasmynsted	EugeneKay, was that smoking crack comment directed toward me?	17:06
	→ PainBank joined	17:06
	← tplaner left	17:07
	← ErKa left	17:07
	→ grampajoe joined	17:07
	← rbento left	17:07
	← PainBank1 left	17:07
	→ ErKa joined	17:07
	→ tufflax joined	17:08
	← crazydiamond left	17:08
	→ tbmiller joined	17:08
EugeneKay	Both of you, really. It was an.... interesting conversation :-p	17:08
	→ dreiss joined	17:08
grawity	I would guess lpapp because it's not the first "interesting" conversation with that guy I've seen lately	17:09
	→ xequence joined	17:09
	← leeN left	17:09
	→ leeN joined	17:09
	← tatsuya_o left	17:10
	← ojacobson left	17:10
	← mechanicalduck left	17:10
texasmynsted	heh	17:10
	→ mechanicalduck joined	17:11
	← leeN left	17:11
	← towski left	17:12
	← juanmabc left	17:12
	← ErKa left	17:12
	→ sershe joined	17:13
	→ rbento joined	17:13
	→ leeN joined	17:13
	→ _jmg joined	17:14
	← hahuang61 left	17:16
	← arietis left	17:16
	← sershe left	17:17
	→ ErKa joined	17:17
	→ p1ng joined	17:18
	← _goTAN left	17:18
	→ zerorez joined	17:19
	← ErKa left	17:19
	→ boblu joined	17:19
	→ ErKa joined	17:20
	← nicedice_ left	17:21
	→ pdrinhobarbosa joined	17:23
	← worstadmin left	17:24
	→ enr joined	17:25
	← quazimodo left	17:25
Taggg	i would like to rewind the HEAD on master, how do i do that?	17:26
	→ chuckhar_ joined	17:27
Taggg	(without changing the working directory	17:27
	)	17:27
	→ nicedice_ joined	17:27
	← HenryG left	17:27
	← ErKa left	17:27
	→ worstadmin joined	17:27
Taggg	i.e. i want to discard commits after a certain tag (they are in a branch)	17:28
	← rednaks_ left	17:28
	→ danman joined	17:28
cbreak	Taggg: git reset --soft master	17:28
	Taggg: that will nuke all commits out of the current branch that are not in master	17:28
	→ rednaks_ joined	17:28
	← devoldmx3 left	17:28
	→ devoldmx3 joined	17:29
	← enr left	17:29
Taggg	cbreak: hmm, i'm confused, i don't want to change anything about my other branch, i only want to change master	17:30
	← koki left	17:30
	← achadwick left	17:30
Taggg	cbreak: and in master i want to discard all commits after a certain tag	17:30
	→ koki joined	17:30
Taggg	(but keep the working directory	17:30
	← acharlieh left	17:30
macrobat	I want to keep uptodate on a project, not contribute or even edit. I use git clone --depth 1 . if I do a git fetch --depth 1 and then merge, I get merge conflicts. I don't ever want the local stuff.	17:30
	Is it possible to get the project in a current, useable condition without getting the whole big old repo?	17:30
cbreak	Taggg: you said you wanted to rewind HEAD to master	17:31
	Taggg: HEAD is your current branch	17:31
	→ gittish joined	17:32
Taggg	cbreak: no i want to rewind HEAD _on_ master	17:32
macrobat	I do "git merge -s ours" and get "error: 'merge' is not possible because you have unmerged files". I don't want to merge things by hand	17:32
cbreak	onto master?	17:32
	Taggg: what do you mean with on?	17:32
	→ nucatus_ joined	17:32
Taggg	cbreak: i have done what i want with git reset - the only issue is it shows i am no longer on master, it says i am on "(no branch)"	17:32
cbreak	Taggg: then you just git checkout master	17:33
	after that you're on master	17:33
Taggg	cbreak: won't that bring me back to master's HEAD?	17:33
	← nucatus left	17:33
cbreak	note that everything you did while you were not on a branch will be lost	17:33
	Taggg: no	17:33
	there is no master's HEAD	17:33
	there's just HEAD	17:33
	HEAD is the current branch	17:33
	HEAD will point to master when you switch to master	17:33
	at the moment it points to a commit directly, that's why it says you are not on a branch	17:34
	← lpaul7 left	17:34
Taggg	cbreak: ah ok, so i don't want all of master's commits	17:34
	← iliketur_ left	17:34
	← worstadmin left	17:34
cbreak	then, check out master	17:34
	after that, HEAD points to master, and it can easily be changed	17:34
	you can use git reset as I said above	17:34
	git reset always changes the current branch, HEAD	17:34
Taggg	but i want master to point to an old commit	17:34
	→ quazimodo joined	17:34
cbreak	then check it out...	17:35
	and use git reset ...	17:35
	← nicedice_ left	17:35
Taggg	i think that's the answer :)	17:35
cbreak	git reset --soft whereveryouwantyourHEADbranchtobe	17:35
	of course... as I said above :)	17:35
Taggg	yeah will try that thanks	17:35
cbreak	note that --soft means not to touch the index either	17:35
	so all your current state will remain as staged changes	17:36
	← mechanicalduck left	17:36
iveqy	macrobat: use the tarball supplied by the project	17:37
	macrobat: otherwise, it's: git clone, git pull	17:37
	→ acharlieh joined	17:37
Taggg	cbreak: $ git co master	17:37
	fatal: Untracked working tree file '.gitignore' would be overwritten by merge.	17:37
	is there a checkout --mixed?	17:38
macrobat	git clone gives me 1.5 gig and I want about 100Mb	17:38
cbreak	Taggg: there is.	17:38
	Taggg: that would not help you	17:38
	Taggg: you seem to have changes that would collide between master and your current commit	17:39
	Taggg: nuke them away, or commit them	17:39
grawity	macrobat: I'm wondering why do you get merge conflicts at all, if you said you don't even edit anything...	17:39
	→ abstrusenick joined	17:39
cbreak	(note: you are NOT on a branch, committing stuff while not on a branch abandons that stuff in nowhere, it will get garbage collected eventually)	17:39
	Taggg: this is important :)	17:39
	→ nicedice joined	17:40
	→ gmc joined	17:40
iveqy	macrobat: then I strongly suggest you use the tarball, or simply do a git clone --depth=1 and next time a rm -rf && git clone --depth=1	17:40
	→ endiruna joined	17:40
Taggg	cbreak: right so can i skip the merge and go straight to moving master to where i am right now?	17:40
cbreak	Taggg: sure.	17:40
iveqy	grawity: the remote could be rebased	17:40
macrobat	there is no way to merge to force favour the origin?	17:40
cbreak	you can use git branch -f master HEAD	17:41
	Taggg: but that'd likely be risky	17:41
grawity	yeah, but still, why are you merging at all	17:41
	→ whaley joined	17:41
Taggg	cbreak: _that_ is what i want!	17:41
iveqy	macrobat: that wouldn't be a merge but a reset.	17:41
	→ refried_ joined	17:41
Taggg	:)	17:41
cbreak	Taggg: you'd still be on no branch	17:41
	← OOPMan left	17:41
iveqy	macrobat: !revert you're looking for something like e)	17:41
gitinfo	macrobat: That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?	17:41
macrobat	I compile, I guess that leaves a few files around the place. I use git clean -dfx to remove stuff	17:41
cbreak	and you'd still lose all your commits and so on if you switch away	17:41
	← leeN left	17:42
Taggg	cbreak: all of those commits are also in another branch	17:42
	→ nkambo joined	17:42
	→ leeN joined	17:42
iveqy	macrobat: do a git reset --hard HEAD	17:42
	instead of a git clean	17:42
	before you do a pull	17:42
cbreak	(or in addition to)	17:42
	→ OOPMan joined	17:42
iveqy	but that will fail if the remote did a rebase	17:42
macrobat	ok	17:42
	← refried_ left	17:43
macrobat	I can clone if things get too hairy, I just want something moderately convenient	17:43
	→ jceb joined	17:43
	← chuckhar_ left	17:43
cbreak	macrobat: you only need to clone once	17:44
	after that you can fetch to get new history	17:44
	→ ErKa joined	17:44
	← wongon left	17:44
	← ecube left	17:44
	← whaley left	17:44
	→ worstadmin joined	17:44
macrobat	in theory :D	17:44
cbreak	no	17:45
	always.	17:45
	→ refried_ joined	17:46
Taggg	cbreak: ah there's no git branch --fource in git 1.5.2 :(	17:46
	← maxmanders left	17:47
Taggg	cbreak: nvm `-f` works :)	17:47
	← babilen left	17:47
cbreak	Taggg: as I said, -f.	17:47
	Taggg: 1.5 is ancient	17:48
	get yourself 1.8	17:48
macrobat	git pull --depth 1 gave 38 conflicts	17:48
	← leeN left	17:48
	← scampbell left	17:48
	→ ncd\|leeN joined	17:48
Taggg	cbreak: haha, yeah i'm doing some research on an older system, thanks!	17:48
	→ babilen joined	17:49
cbreak	macrobat: if you want to merge, then resolve the merge conflicts	17:49
	→ hahuang61 joined	17:49
Taggg	cbreak: how would i push that change to a remote repo?	17:50
	→ towski joined	17:51
Taggg	error: remote 'refs/heads/master' is not a strict subset of local ref 'refs/heads/master'. maybe you are not up-to-date and need to pull first?	17:51
	← cedeon left	17:51
cbreak	Taggg: did they change the wording?	17:51
	Taggg: you can force push to rewrite remote history and nuke everything others pushed	17:51
	or you can pull and merge the stuff	17:51
Taggg	ah nice	17:52
	← OOPMan left	17:52
macrobat	is there a way to resolve merge conflicts without having to visit all the files and do it by hand? I always want what's on origin master	17:52
	← DoniRS left	17:52
	→ leeN joined	17:53
cbreak	macrobat: do you want to keep your history?	17:53
	← tvw left	17:53
	→ scorphus joined	17:53
macrobat	dont want history	17:53
	→ whaley joined	17:53
cbreak	then why do you want to merge?	17:53
macrobat	I just want to be up to date	17:53
cbreak	then why merge?	17:53
	just fetch as I said above	17:53
	then you can git reset --hard @{u} or so	17:53
	→ OOPMan joined	17:55
	← ncd\|leeN left	17:55
	← nicedice left	17:56
	→ Nicholas_Rishel joined	17:57
	→ _goTAN joined	17:58
	→ nicedice joined	17:59
	← abstrusenick left	17:59
	← anonymuse left	18:00
	← kesha_ left	18:00
	← skiernose left	18:01
	→ kesha_ joined	18:01
	← devoldmx3 left	18:01
	← Swayz left	18:01
	→ devoldmx3 joined	18:02
	← Skrypter left	18:02
	HariboPenguin → HariboPenguin\|Of	18:02
	→ eslwork joined	18:03
	→ Skrypter joined	18:04
	← gittish left	18:04
	→ ukd1 joined	18:05
ukd1	Is there a simple way to tell if a particular commit is 'in' a particular tag?	18:05
cbreak	ukd1: --contains	18:06
	→ arietis joined	18:06
ukd1	cbreak, thanks	18:07
	← johnnyfuchs left	18:08
	← insejn left	18:09
	← arand left	18:09
	→ PaulCapestany joined	18:09
	← OOPMan left	18:12
	← Roots47 left	18:12
	→ tatsuya_o joined	18:12
	→ OOPMan joined	18:13
	← joshuairl left	18:13
	→ ziddey joined	18:14
	← _goTAN left	18:14
	← Nicholas_Rishel left	18:14
	← boblu left	18:15
	← GODDOG left	18:17
	→ crazydiamond joined	18:18
	→ Mode-M joined	18:18
	→ alvaro_o joined	18:18
	← trungqtran left	18:19
	→ iliketur_ joined	18:19
	← rabellamy left	18:19
	→ trungqtran joined	18:20
	→ HenryG joined	18:20
	← kenperkins left	18:20
	→ btree joined	18:21
	← grampajoe left	18:22
	← m0ltar left	18:22
	← btree left	18:23
	← nkambo left	18:23
	← leeN left	18:25
	→ ncd\|leeN joined	18:25
	→ wongon joined	18:25
	→ enr joined	18:25
	→ pantsman joined	18:25
	← Gitzilla left	18:26
	← natechan left	18:26
	→ johnnyfuchs joined	18:26
	→ natechan joined	18:27
	← jefflyne left	18:27
	← trungqtran left	18:27
	← freestyl3r left	18:27
	← acharlieh left	18:28
	← enr left	18:30
	→ sq-one joined	18:30
	← OOPMan left	18:30
	→ trungqtran joined	18:30
	← angelsl left	18:31
	→ OOPMan joined	18:31
	← xequence left	18:32
	→ jefflyne joined	18:32
	← infynyxx left	18:32
	→ maxmanders joined	18:33
	← PeterBooker left	18:34
	→ infynyxx joined	18:34
	← pdrinhobarbosa left	18:35
	← Devastator left	18:36
	→ Devastator joined	18:36
	→ nkambo joined	18:38
	→ rabellamy joined	18:38
	→ Ksg89 joined	18:38
	← arvind_khadri left	18:38
	← Milossh left	18:39
	← longbeach left	18:39
	→ Balliad joined	18:39
	→ Gitzilla joined	18:39
	→ tjbiddle joined	18:39
	HariboPenguin\|Of → HariboPenguin	18:40
	HariboPenguin → HariboPenguin\|Of	18:40
	← PainBank left	18:42
	← devoldmx3 left	18:42
	← hahuang61 left	18:43
	← sainaen left	18:44
	→ hahuang65 joined	18:44
	← hoschi left	18:44
	→ acharlieh joined	18:45
	→ vlad003 joined	18:45
	r04r → r04r\|away	18:45
	→ girishr joined	18:46
	← jceb left	18:46
	← mizu_no_oto left	18:46
	→ devoldmx3 joined	18:46
	→ cogitokat joined	18:46
	→ chrob joined	18:47
	← girishr left	18:47
	← bitkiller left	18:47
	→ zhost joined	18:47
	→ girishr joined	18:47
	← robbyoconnor left	18:50
	→ rvsjoen_ joined	18:50
	← rvsjoen left	18:50
	← chrob left	18:50
	← ncd\|leeN left	18:50
	→ robbyoconnor joined	18:50
	→ ncd\|leeN joined	18:50
	← girishr left	18:51
	→ girishr joined	18:52
	← devoldmx3 left	18:52
	→ Roots47 joined	18:52
	→ devoldmx3 joined	18:53
	← iliketur_ left	18:54
	→ anonymuse joined	18:55
	→ mizu_no_oto joined	18:56
	→ iliketur_ joined	18:56
	← OOPMan left	18:58
	→ infynyxx_ joined	18:58
	← infynyxx_ left	18:58
	← maxmanders left	18:58
	→ joshuairl joined	18:59
	→ geekbri joined	18:59
	→ btree joined	18:59
	→ nfroidure joined	19:00
	← infynyxx left	19:01
	→ osmosis joined	19:01
	← girishr left	19:01
	→ girishr joined	19:01
	← tatsuya_o left	19:02
	→ OOPMan joined	19:02
	→ jakob joined	19:03
	← marthinal left	19:03
	→ nickpresta joined	19:05
	← Mode-M left	19:05
	→ devoldmx27 joined	19:05
	← geekbri left	19:06
	← devoldmx3 left	19:08
	← Sigma left	19:09
	← towski left	19:09
	→ shinnya joined	19:10
	→ bitkiller joined	19:11
	r04r\|away → r04r	19:12
	← ewnd9 left	19:12
	← nickpresta left	19:12
	→ SpecialEmily[w] joined	19:13
	← rabellamy left	19:14
	→ ewnd9 joined	19:14
	→ fostertheweb joined	19:14
Vinnie_win	how do I push a single tag?	19:15
	→ towski joined	19:15
cbreak	git push remotename tagname	19:15
Vinnie_win	thanks	19:15
	cbreak is everywhere	19:15
	→ cads joined	19:17
	→ devoldmx3 joined	19:18
EugeneKay	You git	19:18
	← mmlac-bv left	19:20
	← devoldmx27 left	19:21
	← ewnd9 left	19:22
	← ianliu left	19:22
	← iliketur_ left	19:22
	← ziddey left	19:23
	→ infynyxx joined	19:23
	→ enr joined	19:26
lunaphyte_	hi, i've been familiarizing myself a bit with git, and would like to use it to better manage a collection of small common utilties and programs that end up on most/all servers in our environment, via puppet. i'm having a little trouble though visualizing a suitable approach/workflow for doing this though.	19:26
EugeneKay	lunaphyte_ - !deploy them as a package	19:26
gitinfo	lunaphyte_: 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/the-list-and-irc/deploy.html	19:26
	← btree left	19:26
	← pantsman left	19:26
EugeneKay	Then use Puppet(or whatever) to install them someplace, via script	19:27
lunaphyte_	great, thank you.	19:28
cbreak	git's not really a management tool	19:30
	it's for source code	19:30
	→ tplaner joined	19:30
cbreak	if you regularly commit binaries or other big and hard to deltafy things, your repository will bloat	19:30
	← enr left	19:30
	← osmosis left	19:30
	← ukd1 left	19:31
	← johnnyfuchs left	19:31
	← illsci left	19:32
lunaphyte_	that was vague, i guess. the various utilties/programs are scripts, for the most part, along with [to some degree] plain text config files.	19:32
	← SergeyPenkin left	19:33
	→ ziddey joined	19:33
cbreak	it is almost always a mistake to commit configuration	19:33
PerlJam	"almost always"?	19:33
cbreak	configuration often varies, it is often changed, and it it is usually not portable	19:33
	so it has no place in a repository	19:33
	→ iliketur_ joined	19:33
cbreak	PerlJam: there are always weirdos that do strange things like abuse git as backup system for settings, which is a mistake in the first place	19:34
PerlJam	okay, I guess I can accept "almost" after thinking about it a little.	19:34
	← nucatus_ left	19:34
lunaphyte_	my thought was the possibility of using it for objects which are identical across all servers. for example [in my case], an ntp config.	19:34
	but i'm mostly trying to learn about intelligent conventions at this point.	19:35
	Gamecubic_ → Gamecubic	19:35
lunaphyte_	i'm not educated enough to know if what comes to mind would actually make sense :)	19:35
PerlJam	I could see that there might be some sort of "one time application config" that you'd want to put in a repo that is separate from the "configure the thing for my particular system" config.	19:35
	→ maasdesigner1 joined	19:35
cbreak	PerlJam: usually you'd commit those as config templates though	19:35
	← rodyhaddad left	19:36
	maasdesigner1 → maasdesigner	19:36
	← eslwork left	19:36
	→ maxmanders joined	19:37
johndo	cbreak: but you can abuse it quite well :P	19:37
	← fission6 left	19:37
johndo	look at etckeeper ... configure it to automatically push and you have both history and backup :)	19:37
lunaphyte_	i was reading about etckeeper just yesterday :)	19:38
	← Balliad left	19:39
johndo	lunaphyte_: but it's not made for centralized management	19:39
lunaphyte_	right, of course.	19:39
	it took me a while to figure that part out, but eventually it sank in.	19:39
	for non config stuff, for example various shell scripts that are part of a recipe for a "typical" server, i thought it might be useful to manage the evolution of them with git, and then as new versions are produced, make them somehow available to puppet, to be distributed.	19:39
	→ chuckhar_ joined	19:40
	→ gittish joined	19:40
lunaphyte_	i wondered in what manner the "make them somehow available to puppet" might work.	19:40
	but i'll go back to reading the suggest url for the moment.	19:41
	*suggested	19:41
nDuff	lunaphyte_: Probably about like a harder-to-use version of the chef deploy provider. :P	19:41
	← anonymuse left	19:41
nDuff	...a little more seriously, IIRC, that provider is based on Capistrano	19:41
	→ johnnyfuchs joined	19:41
PerlJam	long ago we used to have our "system config" in a svn repo. Each time we installed a new machine it was base install, check out the repo, run a script	19:41
	→ rodyhaddad_ joined	19:41
nDuff	...there are certainly public examples of using those tools together.	19:42
	→ anonymuse joined	19:42
lunaphyte_	yeah, quite a few.	19:43
	→ arand joined	19:43
lunaphyte_	my eyes are red from two days of reading :)	19:43
	← OOPMan left	19:43
	← chuckhar_ left	19:44
	→ OOPMan joined	19:45
	← kesha_ left	19:46
	← gittish left	19:47
EugeneKay	lunaphyte_ - this is really a server management (Puppet or Salt) question. Ultimately, git is just a datastore.	19:47
	Salt makes it easy with gitfs; you may/may not be able to do the same thing with Puppet	19:48
	My advice for a lot of stuff you want to make availalbe on all your machines is to build a rpm/deb and make it available via a custom repo(which you set up via Puppet/Salt) and them install the package.	19:48
	Again, via your config mgmt stuff.	19:48
	← ziddey left	19:50
	← ngladitz left	19:52
	← johnnyfuchs left	19:53
	→ tatsuya_o joined	19:54
	→ johnnyfuchs joined	19:54
Remram	how can't figure out how to use edit (e) in --patch mode with checkout or revert	19:55
	in add --patch I can replace '-' lines with ' ' lines, and delete '+' lines	19:55
	→ nickpresta joined	19:56
	← nickpresta left	19:56
Remram	this is so weird	19:56
	→ gittish joined	19:57
	→ mmlac-bv joined	19:57
	← maxmanders left	19:58
cbreak	Remram: a patch tells you what will be added and what removed	19:59
	lines starting with + are added things	20:00
	if you don't want them added, removing seems natural	20:00
	← rbento left	20:00
cbreak	lines with - are removed things. replacing the - with a " " (making it a context line) seems natural	20:00
	← joshuairl left	20:01
	← fostertheweb left	20:01
	← DrShoggoth left	20:03
	→ Dreamer3 joined	20:03
	→ devoldmx27 joined	20:04
	→ rednaks__ joined	20:05
	← nicholasruunu left	20:05
	← devoldmx3 left	20:06
	← rfoust left	20:06
	← rednaks_ left	20:08
	← gittish left	20:08
	→ lb1a joined	20:10
	← refried_ left	20:11
	→ aharris6 joined	20:12
	→ ojacobson joined	20:12
	← towski left	20:13
	→ mechanicalduck joined	20:14
	← vince_prignano left	20:14
	→ asharp joined	20:14
Remram	cbreak: that's when using add -p, in checkout or revert it works differently	20:14
	because you're unstaging adds	20:14
	the diff gets applied backwards	20:15
	I figured it out now, but still not fun	20:15
asharp	my branch is 1 commit ahead of master. this commit is pushed. i have uncommitted changes. as a final product, i want to have one commit pushed that includes my first commit as well as my current changes. what should i do?	20:16
lb1a	asharp: that would require to rewrite public history !rewrite	20:17
gitinfo	asharp: [!rewriting_public_history] Rewriting public history is usually bad. Everyone who has pulled the old history have to do work (and you'll have to tell them to). If you must, you can use `git push -f` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	20:17
lb1a	is that what you want?	20:17
asharp	sounds like that's the only option	20:17
	← e66 left	20:17
asharp	thanks	20:17
	→ byprdct joined	20:18
	← byprdct left	20:18
	→ ezrafree joined	20:18
lb1a	asharp: so go ahead, stage all your stuff, you want wo add. make a "git commit --amend" followed by a "git push -f <remote>"	20:18
	← goshawk left	20:18
asharp	lb1a: gotcha. thanks	20:19
	← OOPMan left	20:19
lb1a	the "git commit --amend" part will combine your current staged stuff and the last commit to a new commit.	20:19
	→ CleverMeda_ joined	20:19
lb1a	details are on the man git commit page ;)	20:20
gitinfo	the git-commit manpage is available at http://jk.gs/git-commit.html	20:20
	→ catcher joined	20:21
	→ OOPMan joined	20:21
catcher	I have a Q about the 3 files involved in a git merge. Is this explanation close? "Local" is the current local version of the file, "Remote" is the incoming merge, and "Base" is git's initial attempt at merging them together?	20:22
lb1a	catcher: BASE is the merge base. it the point in history where the two version have divereged	20:22
	→ shpoont joined	20:23
catcher	lb1a, ahh - so base will always differ from both files then, right?	20:23
lb1a	yep	20:23
	man git merge-base	20:23
gitinfo	the git-merge-base manpage is available at http://jk.gs/git-merge-base.html	20:23
catcher	ty	20:23
	← asharp left	20:25
	→ enr joined	20:26
	← babilen left	20:26
	→ CheckDavid joined	20:27
	← enr left	20:28
lb1a	yw	20:28
	← lb1a left	20:28
	→ goshawk joined	20:29
	→ maxmanders joined	20:29
	← oliveiraev left	20:30
	← shpoont left	20:31
	→ shpoont joined	20:31
shpoont	what can git notes be used for?	20:33
	← aChatir left	20:33
	→ Swayz joined	20:34
	→ rfoust joined	20:34
nDuff	shpoont: ...well, to give you an example, subgit uses them to provide metadata about which SVN revision each git rev is mapped to.	20:34
	→ nucatus joined	20:35
	→ rbento joined	20:35
	→ akurilin joined	20:35
	→ xequence joined	20:35
shpoont	nDuff: I dont think that notes where designed to store metadata, it looks like a dirty hack	20:35
	the question is how can they be helpfull for developers communication	20:36
cbreak	shpoont: too slow for communication. use email	20:37
	→ menace joined	20:37
shpoont	looks like nobody knows what to do with them :)	20:38
	← nucatus left	20:39
	← maxmanders left	20:40
CleverMeda_	shpoont addendum to the commit message?	20:40
	→ pantsman joined	20:43
menace	do you mean --amend?	20:43
	→ zipper__ joined	20:44
nDuff	menace: --amend changes the hash. notes don't.	20:44
	← lunaphyte_ left	20:44
nDuff	menace: so, once something is published to the world and other people have made changes based on it, it's too late to amend.	20:45
	← zipper__ left	20:45
	→ gittish joined	20:45
	→ coldboot\|laptop joined	20:45
coldboot\|laptop	How do you make a regular patch (with no git information in it)?	20:46
EugeneKay	That really depends on whether you care about other people	20:46
	dean\|away → dean	20:46
	← TheBrainWork left	20:46
EugeneKay	coldboot\|laptop - just use `patch`, then `git add` the file	20:46
	→ nerdfiles joined	20:47
	→ edburns joined	20:47
coldboot\|laptop	EugeneKay: I don't understand. The source directory I want to generate the patch from is a git repository, the destination is not.	20:48
iveqy	coldboot\|laptop: use git format-patch or just simply diff	20:48
	← girishr left	20:49
coldboot\|laptop	Ah I got it, use `patch -p2` to strip the "a/" and "b/" prefixes.	20:49
EugeneKay	coldboot\|laptop - oh, that way. Yeah, diff it and redirect to a file, or just take a git patch and vim the metadata out	20:49
edburns	normally I do "git pull --rebase upstream master" to update my workarea, which is a fork from another repository. I'd like to have a hudson job that does the same thing with that workarea, but I don't see where in hudson to put in the --rebase upstream master.	20:49
EugeneKay	Yup.	20:49
coldboot\|laptop	I thought `-p1` was deep enough.	20:49
iveqy	edburns: what's hudson?	20:49
edburns	ha ha.	20:49
	Jenkins will do fine too.	20:50
iveqy	ask Jenkins?'	20:50
	edburns: however, you shouldn't to a pull in a script, there can be conflicts, see !deploy	20:51
edburns	iveqy: Ah, so it was a sincere question? I thought you were referring to the fact that ever since the fork, most of the people went to Jenkins, leaving the original product without its user base.	20:51
gitinfo	edburns: 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/the-list-and-irc/deploy.html	20:51
	← OOPMan left	20:52
edburns	iveqy: Ah, so it was a sincere question?	20:52
	iveqy: I thought you were referring to the fact that ever since the fork, most of the people went to Jenkins, leaving the original product without its user base.	20:52
iveqy	edburns: it was, never heard about hudson before,	20:52
	← verysoftoiletppr left	20:52
edburns	it's a continuous intgration server.	20:53
	→ rurufufuss joined	20:53
	→ baudtack joined	20:53
edburns	I guess what I'm looking for is, what is the refspec equivalent for "pull --rebase upstream master"?	20:53
iveqy	edburns: well, you still shouldn't pull into it =)	20:53
baudtack	does git bisect have trouble with nonlinear history? i always thought it did but can't find that documented anywhere	20:54
	← daemonkeeper left	20:54
	→ OOPMan joined	20:54
	← lamarus left	20:54
	→ p1ng_ joined	20:54
EugeneKay	Nope, works fine.	20:55
baudtack	hrm no idea where i got that from then.	20:56
	thanks	20:56
	← mizu_no_oto left	20:56
	← mechanicalduck left	20:57
	← p1ng_ left	20:58
	← spaceonline left	20:58
	← OOPMan left	20:58
	← sq-one left	20:59
	← clintwn left	21:00
	← freeed left	21:01
	→ OOPMan joined	21:01
	← alezost left	21:02
	← tjbiddle left	21:03
	← DeanH left	21:03
	→ zipper_ joined	21:04
	→ tjbiddle joined	21:05
	← adamwathan left	21:06
	→ KhashayaR joined	21:06
	← KhashayaR left	21:06
	→ KhashayaR joined	21:07
	← bewest left	21:08
	→ mizu_no_oto joined	21:09
	← Guest___ left	21:09
	← cannonball left	21:10
	← Carraway left	21:10
	→ tpollard joined	21:11
	← KhashayaR left	21:11
	← ameagher left	21:12
	← zipper_ left	21:12
	← ojacobson left	21:12
	← mizu_no_oto left	21:13
	→ babilen joined	21:16
	← jefflyne left	21:18
	← ethanolwu left	21:18
	rednaks__ → rednaks	21:19
	← w0ng left	21:20
	→ Someguy123 joined	21:20
	→ mechanicalduck joined	21:21
	→ Cassiel joined	21:21
	← drizzd left	21:24
	← hellopat left	21:25
	← chuckharmston left	21:25
	→ gee_ joined	21:26
	→ starsinmypockets joined	21:26
	← OOPMan left	21:26
gee_	hi	21:26
starsinmypockets	Hey gities	21:26
gitinfo	gee_: 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.	21:26
gee_	question: can you see this plz?	21:26
	http://www.youtube.com/watch?feature=player_detailpage&v=IomxvOTf-So	21:26
	its very good	21:26
	→ enr joined	21:27
	← enr left	21:27
	→ rabellamy joined	21:27
	→ OOPMan joined	21:28
gee_	thanks for i686 kernels	21:29
bekks	gee_: Stop the spam.	21:29
gee_	my pc is thankfull too	21:29
texasmynsted	huh? Does that video have a git related question?	21:29
	→ ledestin joined	21:29
bekks	You just avoided an ignore in #ubuntu.	21:29
gee_	no kiddening	21:29
	well bb	21:29
bekks	I am not kidding. Stop that shit.	21:29
gee_	your really mad	21:30
	← donmichelangelo left	21:30
	← jrobichaud left	21:30
gee_	bb little man	21:30
	← gee_ left	21:30
Dougie187	I don't think he's mad. He probably knows your a troll.	21:30
	you're*.....	21:30
	I hate typos when talking to trolls.	21:30
	← jaimef left	21:30
	→ y_morin joined	21:31
	→ donmichelangelo joined	21:31
	→ bewest joined	21:31
	→ jaimef joined	21:31
y_morin	Hello! How can I get all changeset that are not referenced by a head (ie all changesets that would be trahed by gc) ?	21:31
arand	git fsck, with some option.	21:32
	← jerius left	21:32
	← OOPMan left	21:32
arand	man git fsck	21:32
gitinfo	the git-fsck manpage is available at http://jk.gs/git-fsck.html	21:32
starsinmypockets	Can I graft repoB branch foo onto repoA (currently only has branch Master which I want to hold on to), including the commit history?	21:32
	← TeckniX left	21:33
	← Swayz left	21:33
y_morin	arand: Thank you! :-)	21:33
	→ Arcsech joined	21:33
	→ OOPMan joined	21:34
	← ncd\|leeN left	21:34
	→ joepie91 joined	21:37
joepie91	is there a way to reset the master branch to a particular commit and push this change to a remote git repository (mirrored to github), and leaving the current commit as the develop branch? this is for a project that I started working on when I wasn't very familiar with git yet, and every commit was made to the master branch, and I'd like to 'move' that to the develop branch and leave the master branch for releases only	21:38
	← trungqtran left	21:38
	← Dougie187 left	21:39
cbreak	joepie91: yes.	21:40
	← AWinterman left	21:40
cbreak	just git branch develop, then git reset --hard somepastcommit, then git push -fu --all	21:40
	joepie91: note that this is history rewriting	21:40
	and it will nuke remote history too	21:40
	← Arcsech left	21:40
joepie91	cbreak: I'm assuming that as long as my develop branch still points to the latest commit, the actual commits will not be lost?	21:41
	just the history of them being in masetr?	21:41
	master *	21:41
cbreak	nope	21:41
	just the history that is no longer refered to by anything	21:41
joepie91	okay	21:42
	thanks	21:42
	:)	21:42
	← HenryG left	21:42
	→ vince_prignano joined	21:44
	Arokh → Arokh[Off]	21:44
	→ Milossh joined	21:44
	← arietis left	21:46
	← menace left	21:47
	← nicedice left	21:47
	← danman left	21:48
	→ mloskot joined	21:48
	→ nicedice joined	21:48
	→ danman joined	21:48
	← dougsland left	21:48
	← danman left	21:49
	← bvi left	21:49
	→ bvi joined	21:49
	→ mmitchel_ joined	21:49
	→ verysoftoiletppr joined	21:50
	← aharris6 left	21:50
	← chrisshattuck left	21:51
	→ Arcsech joined	21:52
	← Arcsech left	21:53
	← mmitchel_ left	21:53
	← joki left	21:53
	← mmitchell left	21:53
	← nicoulaj left	21:53
	← rendar left	21:54
	← Milossh left	21:54
	← tatsuya_o left	21:54
	→ zorzar joined	21:57
	← mmlac-bv left	21:57
	→ DeanH joined	21:57
	→ Milossh joined	21:57
	→ joki joined	21:58
	← Sonderblade left	21:58
	→ mmlac-bv joined	21:59
	→ Nicholas_Rishel joined	22:00
	← breakingthings left	22:00
	← Destos left	22:01
	← OOPMan left	22:01
	→ mdiers joined	22:02
	→ aharris6 joined	22:04
	← Marquisk2 left	22:04
	→ OOPMan joined	22:04
	← nicedice left	22:04
	← zhost left	22:06
	→ cofeineSunshine joined	22:08
	→ juanmabc joined	22:08
	← worstadmin left	22:09
	→ Caecus joined	22:09
	← cofeineSunshine left	22:10
	← y_morin left	22:10
	← unomystEz left	22:11
	→ chrisshattuck joined	22:11
	← aharris6 left	22:12
	← juanmabc left	22:12
	→ Arcsech joined	22:12
	→ juanmabc joined	22:12
	→ yassine joined	22:13
	← pantsman left	22:13
	← john2496 left	22:14
	→ cofeineSunshine joined	22:14
	← tbmiller left	22:15
	← mechanicalduck left	22:16
	→ kermit joined	22:16
	← tufflax left	22:17
	→ worstadmin joined	22:17
	→ tufflax joined	22:18
	← Nicholas_Rishel left	22:18
	← cofeineSunshine left	22:19
	← umib0zu left	22:19
	→ mattalexx joined	22:23
	→ danman joined	22:23
mattalexx	What is the `git stash` equivalent of `git commit --amend`? In other words, how can I include the current changes in the last stash?	22:23
	→ w0ng joined	22:24
	→ ewnd9 joined	22:24
	← o] left	22:24
	← maasdesigner left	22:25
	→ tatsuya_o joined	22:25
onethfour	what is the best git book explaining advanced concepts such as patching and stuff	22:25
	→ nicedice joined	22:26
	→ o] joined	22:26
	→ sgambino_ joined	22:26
johndo	mattalexx: better use a (temprorary) branch when you want to do that	22:26
mattalexx	ok thx	22:26
	← sgambino_ left	22:26
	→ cofeineSunshine joined	22:26
johndo	mattalexx: you can try to apply the stash and then save it again though	22:26
	→ enr joined	22:27
catcher	when I'm resolving a conflict with mergetool, do I want to save the changes to BASE? is that what's ultimately used?	22:27
	← gerard0 left	22:28
	← edburns left	22:28
s4muel	mattalexx: use git stash branch, fixup your changes there	22:28
	← sgambino left	22:29
johndo	onethfour: I don't know what's the best book for that specific topic, but there are some !book s you can look at	22:29
gitinfo	onethfour: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	22:29
	← pdx left	22:29
	→ gerard0 joined	22:29
mattalexx	I did something like git stash pop; git commit -am tmp; git stash pop; git reset ~HEAD	22:30
	← Arcsech left	22:30
mattalexx	Something like that	22:30
	← Milossh left	22:30
mattalexx	johndo, s4muel Thanks	22:30
	← OOPMan left	22:30
	← rabellamy left	22:30
	← shpoont left	22:31
	← enr left	22:32
	→ OOPMan joined	22:32
	→ devoldmx joined	22:33
	← tatsuya_o left	22:34
	← rnsanchez left	22:35
	→ chuckharmston joined	22:36
	← infynyxx left	22:36
	← yassine left	22:36
	← jrgcombr left	22:37
	← devoldmx27 left	22:37
	← nicedice left	22:38
	→ jrgcombr joined	22:38
	← hwrd\|work left	22:39
	← michaelarestad left	22:40
	→ bipolar joined	22:41
	← chuckharmston left	22:41
	→ maasdesigner1 joined	22:41
	← Caecus left	22:42
	maasdesigner1 → maasdesigner	22:42
	← Roots47 left	22:42
	→ Destos joined	22:42
	← xequence left	22:42
	← mike_af left	22:42
	→ AardvarkSagus joined	22:42
	← mattalexx left	22:42
	→ Roots47 joined	22:43
	← Taggg left	22:43
	→ Caecus joined	22:44
	← gittish left	22:44
	→ pr0ton joined	22:45
	← Caecus left	22:45
	→ nicedice joined	22:46
bobbyz	Is zaptel/dahdi needed for a sip-only asterisk box? It doesn't make sense to me that it would be needed, but several sip-only tutorials I've seen explicitly install this	22:46
	← AardvarkSagus left	22:47
bobbyz	err	22:47
	wrong channel	22:47
	→ Nicholas_Rishel joined	22:49
	→ ecube joined	22:49
	← ecube left	22:49
	→ ecube joined	22:49
	← devoldmx left	22:51
	→ devoldmx joined	22:52
	← decotii left	22:52
milki	/win 23	22:54
	er...	22:54
	← OOPMan left	22:54
	← huoxito left	22:55
	← _iron left	22:55
	→ OOPMan joined	22:56
	← p3lim left	22:57
	← zivester left	22:58
	→ flaguy48 joined	22:59
	→ ziddey joined	22:59
	← bamj0rb left	22:59
	→ simesy joined	23:02
	← danman left	23:02
	→ danman joined	23:02
	← simesy left	23:03
	→ relipse joined	23:03
	→ simesy joined	23:03
	← ewnd9 left	23:04
	← maasdesigner left	23:05
	← rednaks left	23:05
	← Destos left	23:06
	→ infynyxx joined	23:06
	← catcher left	23:07
	← danman left	23:07
	→ danman joined	23:07
	→ tbmiller joined	23:07
	← tang^ left	23:08
	← _jmg left	23:08
	→ michaelarestad joined	23:09
	r04r → r04r\|away	23:09
	← cads left	23:12
	→ towski joined	23:13
	→ barq joined	23:13
	→ g0bl1n joined	23:14
	→ mklappstuhl joined	23:16
	← infynyxx left	23:16
	→ zivester joined	23:18
	→ bmac joined	23:19
	← Nicholas_Rishel left	23:19
	← jaequery left	23:20
	→ jefflyne joined	23:20
	← primitive left	23:21
	→ jaseg joined	23:22
	← threesome left	23:22
	← OOPMan left	23:23
	← nova_ left	23:23
	→ rednaks joined	23:23
	← boombatower left	23:24
	← zerorez left	23:25
	→ kenperkins joined	23:25
	→ OOPMan joined	23:25
	← jhulten left	23:26
	← johnnyfuchs left	23:26
	← kenperkins left	23:27
	→ enr joined	23:28
	← sriracha left	23:29
	← enr left	23:32
	← devoldmx left	23:35
Roots47	Hey guys, how do I get a one-line log that also displays the committer	23:35
	→ Milossh joined	23:35
EugeneKay	man git-log. see --format	23:36
gitinfo	the git-log manpage is available at http://jk.gs/git-log.html	23:36
	→ devoldmx joined	23:36
	→ nucatus joined	23:36
	← coldboot\|laptop left	23:37
	← bmac left	23:37
	→ vansonhk_ joined	23:39
	← glosoli left	23:40
	← nucatus left	23:41
	→ chuckharmston joined	23:41
	← g0bl1n left	23:41
	→ eribeiro joined	23:41
	→ voe joined	23:42
	← chris2 left	23:42
Roots47	EugeneKay: Hey, I'm not seeing the --format option in the man pages	23:42
EugeneKay	It's there, I assure you	23:43
mstksg	is there a way i'm "supposed" to handle small tweaks like changing a margin on a css file or deleting one trailing whitespace character	23:43
	do i just save it up and then commit it with the next major revision?	23:43
EugeneKay	Depends upon your project guidelines, really.	23:43
	← dreiss left	23:43
Roots47	EugeneKay: found it, but i dont see how that would show the author in the log message… this looks like it's just for filtering	23:43
EugeneKay	There's no reason to "save" unrelated small things for a larger commit; just `git add foo.css; git commit -m 'Typofix in foo.css'` and call it a day	23:43
	Roots47 - you specify an output format......	23:44
	→ sriracha joined	23:44
	→ devoldmx3 joined	23:44
mstksg	EugeneKay: I guess I feel weird cluttering up my log. is this a normal thing to do?	23:44
	→ chris2 joined	23:44
EugeneKay	mstksg - yup, small commits are valid cocmmits. It's not clutter, just a small change.	23:44
	← p1ng left	23:44
mstksg	ah, thanks	23:45
	← mdiers left	23:45
	← anonymuse left	23:45
	← jefflyne left	23:45
	← devoldmx left	23:45
	← baudtack left	23:45
	← chuckharmston left	23:46
	← aquaman left	23:46
	→ johnnyfuchs joined	23:46
EugeneKay	Roots47 - if you want something special you have to build it. --oneline is roughly --pretty="%h %s"; you'll want to append %an or such	23:47
	→ jefflyne joined	23:47
	→ aquaman joined	23:47
Roots47	EugeneKay: this is confusing :P:	23:47
	← jefflyne left	23:47
EugeneKay	Roots47 - good, that means you're learning.	23:47
	dean → dean\|away	23:47
	→ mdiers joined	23:47
EugeneKay	!tryit ;-)	23:48
gitinfo	[!tias] Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/1-basic-usage/tias.html may help with git-specific TIAS.	23:48
	→ jefflyne joined	23:48
	→ skiernose joined	23:48
	← barq left	23:48
	← devoldmx3 left	23:49
	← pilif left	23:51
	← vince_prignano left	23:51
Roots47	EugeneKay: Thanks :)	23:52
	EugeneKay: makes more sense after seeing your example	23:52
	EugeneKay: I'm all for reading the man pages, but knowing exactly what to read helps via example :D	23:53
	← PigeonFriend left	23:53
	→ Marquisk2 joined	23:54
	← skiernose left	23:55
EugeneKay	Indeed.	23:57
	→ trusktr joined	23:57
EugeneKay	Hence, I give you a lil shove	23:57
	But not a spoonfeeding	23:57
	→ pilif joined	23:58

Logs Search ←Prev date Next date→

Channels Documentation