IRCloggy #git 2014-03-02

Provider of IRC logs since 2005.

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

	2014-03-02
o11c	just make the change on the oldest branch, and merge into each newer one	00:00
jon-mac	I want to commit a few things upstream, and then I'll eventually end up merging them twice	00:00
	if i cherry pick a commit to upstream, then the next time i merge in upstream changes, i'll have the change duplicated	00:01
thiago	then don't cherry-pick	00:01
	commit on the oldest and merge up	00:01
	← jagob left	00:01
o11c	jon-mac: make the commit upstream first	00:01
jon-mac	thats not possible	00:01
o11c	then when you merge upstream, it's only once	00:01
	← eVRiAL left	00:01
	← johnkevinmbasco left	00:01
jon-mac	its more of a retroactive process	00:01
	← joelroa left	00:03
	← sbogg left	00:03
	← dreiss__ left	00:04
	← jluc left	00:04
	→ vkrest joined	00:05
	→ Zaknefain joined	00:05
	← Zaknefain left	00:05
	hfp → hfp`away	00:06
	→ srji_ joined	00:09
	→ Kayra joined	00:09
	← MachineX left	00:10
	← Kayra left	00:11
	→ maslowbeer joined	00:11
	→ Kayra joined	00:11
	← Naeb left	00:12
	← srji left	00:12
	→ LucaS05 joined	00:13
	← kriks left	00:14
	← ngladitz left	00:14
	← cff left	00:15
	← Kayra left	00:16
	← armyriad left	00:17
	← leninmhs2 left	00:18
	← noxd left	00:19
	→ stepa joined	00:19
	→ treaki__ joined	00:20
	→ skyflash joined	00:20
	← treaki_ left	00:21
	→ Sly1986 joined	00:22
	→ whomp_ joined	00:24
	← kenneth left	00:24
whomp_	i accidentally added a huge folder, committed, then removed the folder and committed again	00:24
	how do i make git pretend like it was never added, for when i push?	00:24
Hello71	!delete	00:24
gitinfo	[!branch_delete] Deleting a branch is easy. `git branch -d branchname` (or -D). However, this will NOT delete the branch upstream, that requires `git push --delete origin branchname`. However, this will NOT delete remote tracking branches. EACH USER must `git remote prune origin`, but if any users have local branches, they must likewise run `git branch -d branchname` (or -D)	00:24
	← arif-ali left	00:24
Hello71	hm...	00:24
	https://help.github.com/articles/remove-sensitive-data	00:24
	← looper_ left	00:25
whomp_	Hello71, this is the master branch. wouldn't i lose everything before my latest?	00:25
Hello71	!filter_sensitive	00:25
gitinfo	You can use filter-branch to remove sensitive data from a repository's history. http://help.github.com/remove-sensitive-data/	00:25
	← el3ctron left	00:25
thiago	whomp_: did you commit --amend when you committed again?	00:26
whomp_	thiago, no	00:26
	← skyflash left	00:26
whomp_	`git rebase -i HEAD~2` seems legit	00:26
thiago	yes	00:26
o11c	whomp_: if it's recent, just 'git rebase' .... yeah, that	00:26
whomp_	i just need to "delete" a commit	00:26
thiago	no	00:27
whomp_	?	00:27
thiago	well, try it	00:27
o11c	whomp_: no, you need to push an older commit over the remote branch	00:27
thiago	if there are conflicts, you'll need to fix them	00:27
rawtaz	whomp_: have you done anything else after these two commits, and are they consecutive?	00:27
	← FortySix2 left	00:27
whomp_	rawtaz, i haven't done anything significant. i just want to delete the commit before last	00:27
rawtaz	never mind, someone just recommended rebase :)	00:27
	← jaequery left	00:28
rawtaz	whomp_: that doesnt answer any of those questions, but it doesnt matter anymore	00:28
thiago	and the last one too	00:28
	→ kenneth joined	00:28
whomp_	error: could not apply d5a01b2...	00:29
	→ Gavrisimo joined	00:29
	→ slicknick joined	00:29
whomp_	are there merge conflicts now?	00:29
thiago	yes	00:29
	did you remove both commits?	00:29
	← hs366 left	00:30
whomp_	thiago, no just one	00:30
thiago	that's the mistake	00:30
	now do git rebase --skip	00:30
	that will remove the second one too	00:30
	→ el3ctron joined	00:31
whomp_	oh, so that actually removed the stuff the commit was affecting	00:32
	i just wanted to make it pretend like i hadn't committed at that point in time	00:32
thiago	you did	00:33
	now there's no record of you ever committing	00:33
	if you don't tell, no one will now :-)	00:33
rawtaz	at least not officially :-)	00:33
	but we know, don't we ;-)	00:33
whomp_	haha	00:33
	but i have way fewer files now	00:33
rawtaz	whomp_: the stuff is still around in the reflog, so you can probably get them back if you want.	00:34
whomp_	how? it's a lot of files	00:34
rawtaz	but you need to be very specific about what you want to do, so there aren't misunderstandings	00:34
whomp_	ya know what... i'm just gonna use time machine XD	00:34
rawtaz	so right now you are back to the state before you made the commit where you added those files (assuming that and later commits are not gone)	00:34
	you dont need to use time machine	00:35
whomp_	ok	00:35
	→ adurity joined	00:35
	→ Watabou joined	00:35
o11c	whomp_: didn't you want all the files gone?	00:35
whomp_	doesn't seem that way though	00:35
rawtaz	doing so will mostly invalidate the efforts people in here made to help you and educate you on this	00:35
whomp_	i wanted all of the files that existed only for the commit before last gone	00:35
	→ armyriad joined	00:35
whomp_	ok well idk what to do now	00:35
o11c	whomp_: are you saying, "the commit before last" added more than just the files you wanted to remove?	00:36
	← stepa left	00:36
rawtaz	whomp_: can you pastebin a copy of the log from before you rebased? so we can see what commits there was?	00:36
whomp_	o11c, yes, many more	00:36
	→ stepa joined	00:36
	← stepa left	00:36
rawtaz	whomp_: just relax, it's not gone. dont worry, and pay attention :)	00:36
o11c	okay, we can fix this now!	00:36
	→ Noldorin joined	00:36
whomp_	education today: fear git	00:36
	← el3ctron left	00:36
o11c	first, you need to hard-reset to before the rebase	00:36
rawtaz	whomp_: no. it is all still there	00:36
	← jogos left	00:36
o11c	then you need to rebase -i and squash	00:36
whomp_	feed me commands	00:36
o11c	okay, we'll need the output of 'git reflog'	00:36
	→ ntio joined	00:37
whomp_	https://gist.github.com/michaeleisel/9299967	00:37
	← BadProphet left	00:37
	→ BadProphet joined	00:37
	→ el3ctron joined	00:38
rawtaz	and which ones are the commits you are talking about?	00:38
o11c	whomp_: is d5a01b2 the one where you did the removals?	00:38
	← BadProphet left	00:38
	→ BadProphet joined	00:39
	← LucaS05 left	00:39
whomp_	i want to remove 102eb7e (the one before last) and idc about d5a01b2 (the last one)	00:39
	i could delete both if them if it'd be easier	00:39
o11c	no, you just told us you don't want 102eb7e gone	00:39
	because some of the files you do want us to keep ...	00:39
whomp_	maybe i was unclear. when i say delete, i mean delete git's history of that commit having happened. or, it sounds like you want me to just delete the files that i don't want, which works for me but is more of a pain	00:40
	but i don't want to delete all of the changes from these commits, except regarding certain big files	00:40
o11c	whomp_: if we delete just the files, we can delete the history from there	00:41
offby1	whomp_: sorry if someone has already said this, but: !fixup	00:41
whomp_	whatever works	00:41
gitinfo	whomp_: So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!	00:41
o11c	but you did not give true information initially about wanting to drop the entire commit	00:41
	← SegFaultAX left	00:41
	→ FortySix2 joined	00:41
rawtaz	this is so confusing. it's so unclear what you want to do whomp_. that is the problem here, not the git stuff/commands	00:41
o11c	whomp_: so, if d5a01b2 is the correct tree, do:	00:41
whomp_	ok, i'm not here to discuss what i did or didn't do, and i'm not trying to blame anyone	00:41
rawtaz	we can fix about anything for ya, but not without understanding what you want to do	00:41
o11c	whomp_: git reset --hard d5a01b2	00:41
rawtaz	elaborate :)	00:41
	→ SegFaultAX joined	00:42
o11c	whomp_: git rebase -i HEAD^^ (and change the second line from pick to fixup)	00:42
	← FortySix2 left	00:42
whomp_	to elaborate, there are a few big files which were around only for one commit, the second to last commit titled "created os x program". i don't want any record of them in the repo. i could see this being done by deleting any record of the commit but preserving the changes of the commit, or by deleting any record of the big files	00:43
o11c	whomp_: that is what my commands will do	00:43
	← BadProphet left	00:43
o11c	'git reset --hard d5a01b2' is undoing the mistaken attempt at removing them	00:43
	'git rebase -i HEAD^^' with fixup is actually removing them	00:44
	← Trudko left	00:44
o11c	if there are any further changes after that, you can git commit --amend	00:44
jon-mac	whomp_: git obliterate	00:44
whomp_	o11c, now i see the two commits before my two most recent, because of the commands i already entered. do you still want me to change the second line to 'fixup'?	00:44
	so i do the git reset first?	00:45
	← marcjs left	00:45
whomp_	now i need you to be a bit more clear	00:45
o11c	the reset must go first	00:45
	I am being perfectly clear	00:45
	← Silmarilion left	00:46
	← trewe left	00:48
whomp_	ok, new lesson: fear git, trust #git	00:49
	thx for the help, everything works!	00:49
rawtaz	nice o11c	00:50
	← angelsl left	00:51
	← phuh left	00:51
jon-mac	whomp_: are they really gone from your index though	00:51
	thats the tricky part	00:51
	→ v1n joined	00:52
whomp_	jon-mac, idc if they're gone from my .git folder (they're not)	00:52
jon-mac	ok	00:52
whomp_	although it would free up 300 mb	00:52
jon-mac	sometimes you do care :p	00:52
	→ tmart joined	00:52
o11c	don't worry about removing them from .git, it will be automatically cleared in a month or 3 (I forget)	00:53
	the important thing is, they're gone from history, so they won't be pushed or pulled from htere	00:53
jon-mac	probably longer than 3	00:53
	it becomes eligible in 3	00:53
o11c	in order to remove them from .git, you'd have to break your reflog	00:54
whomp_	i've done enough breaking for today	00:54
	→ koell joined	00:55
	← lithiumjake left	00:56
	→ jftf joined	00:56
	← Balliad left	00:57
	→ Balliad joined	00:58
	→ joelroa joined	00:59
	← ntio left	01:00
	→ Zaknefain joined	01:00
	← WaReZ left	01:00
	→ ntio joined	01:00
	← joelroa left	01:03
	← Zaknefain left	01:04
	← fatalhalt left	01:06
	← robustus left	01:07
	← starkhallo left	01:07
	← kloeri left	01:07
	→ jogos joined	01:10
	→ robustus joined	01:10
	← recycle left	01:10
	→ recycle joined	01:11
	→ Kayra joined	01:11
	→ kloeri joined	01:13
	→ ciaranm joined	01:13
	→ m0viefreak joined	01:14
	← Gamecubic left	01:15
	← recycle left	01:15
	← Kayra left	01:16
	→ sdouglas joined	01:16
	→ Sabbath joined	01:17
	→ javasox joined	01:18
	→ lithiumjake joined	01:18
	→ axsuul joined	01:19
	← axsuul left	01:19
	→ ianmcorvidae joined	01:19
	← MetalMatze left	01:19
	→ didi joined	01:19
	→ axsuul joined	01:19
	→ akiress joined	01:19
	← vvetter left	01:20
	← adurity left	01:21
	← sdouglas left	01:22
	← Sabbath left	01:22
didi	I have some feature branches for which the patches the upstream project did not yet apply or they won't apply but I still find them useful and want to use them myself. Is there a document that describes a possible work flow for this scenario?	01:22
	← axsuul left	01:22
o11c	didi: probably just repeatedly rebase them	01:23
	→ axsuul joined	01:23
	→ ArcTanSusan joined	01:23
	← axsuul left	01:23
didi	o11c: The thing is, I want to use multiple feature branches at the same time.	01:23
peterschmidler_	Which private alternatives do you suggest to github?	01:23
	→ axsuul joined	01:24
	← axsuul left	01:24
	→ axsuul joined	01:24
	← axsuul left	01:24
offby1	peterschmidler_: running gitolite on your own server?	01:25
	shrug	01:25
	→ rq60 joined	01:25
	← javasox left	01:25
	→ pwnz0r joined	01:25
offby1	peterschmidler_: what about github are you trying to avoid?	01:25
peterschmidler_	offby1: cost, privacy	01:25
BtbN	Well, hosting stuff costs money	01:26
offby1	gitolite solves both those problems.	01:26
	→ axsuul joined	01:26
	→ whitby joined	01:26
peterschmidler_	BtbN: Yea	01:26
	→ mribeirodantas joined	01:26
offby1	although to be fair, the "privacy" issue with github is theoretical only: I've never heard of github snooping into people's repositories.	01:26
	but it's true: they could.	01:26
BtbN	offby1, he propbly doesn't want to pay them for private repos.	01:26
o11c	didi: well, rebase them all on one feature branch, then rebase all the other feature branches on top of that? Or you could just merge I guess	01:26
offby1	BtbN: maybe. He's here so he can clarify.	01:27
o11c	offby1: to be fair, they did have a security breach once	01:27
bremner	if money is no object, you could run github on your own server	01:27
peterschmidler_	I can speak for myself ;)	01:27
	← axsuul left	01:27
offby1	if money were no object, I'd be in a swimming pool full of cheesesteaks	01:27
	→ ntio1 joined	01:27
	→ john2x joined	01:27
peterschmidler_	Actually the privacy thing is more of a concern.	01:27
o11c	peterschmidler_: it depends on exactly what you want. If all you want is a central repo, or whether you want a web interface	01:27
	→ axsuul joined	01:28
	← axsuul left	01:28
	→ javasox joined	01:28
offby1	peterschmidler_: I'd assume that would rule out any repository that you don't host yourself, on hardware in your own data center.	01:28
	← koda left	01:28
offby1	which basically means gitolite.	01:28
peterschmidler_	o11c: A central repo would be enough to start with. I can switch to github easily at anytime, right?	01:28
	← slicknick left	01:28
	← Lemony left	01:28
offby1	(or Github Enterprise if you trust them enough to write decent non-open-source software)	01:28
	→ axsuul joined	01:28
	← thegattaca left	01:28
	← axsuul left	01:28
BtbN	well, gitolite has no interface at all, which is the main reason to use github.	01:28
offby1	BtbN: it has an interface! Just not a GUI one :)	01:29
BtbN	Not realy, no	01:29
bremner	by that reasoning git has not interface	01:29
BtbN	it has gitweb	01:29
bremner	sigh.	01:29
	← ntio left	01:29
	→ leninmhs2 joined	01:30
	→ axsuul joined	01:30
	← didi left	01:30
	← ntio1 left	01:30
	← ws2k33 left	01:31
jon-mac	peterschmidler_: you should really be looking at github enterprise or atlassian stash probably	01:31
	← vkrest left	01:31
thiago	gitolite can use gitweb	01:31
offby1	bremner: you have to admit: sitaram's stubborn insistence on purging gitweb from any box that runs gitolite is a _bit_ bizarre.	01:31
	offby1 whistles innocently	01:31
	← axsuul left	01:31
thiago	therefore, gitolite has an interface	01:31
	→ axsuul joined	01:31
	← pfg left	01:31
bremner	offby1: go back to your cheesesteaks	01:31
offby1	bremner: oh thank you	01:32
	← axsuul left	01:32
	→ Orbitrix joined	01:32
	← Orbitrix left	01:32
	offby1 bets bremner has never had a cheesesteak. Poutine-n-beef doesn't count	01:32
bremner	offby1: also, you don't _have_ to give sitaram root on your server. Although he generally tidies things up.	01:32
	→ Orbitrix joined	01:32
offby1	bremner: I don't? But he said it was the only way I could stop the spam	01:32
	← tomengland left	01:32
peterschmidler_	Thanks for your input, guys!	01:33
	→ Lemony joined	01:33
	→ axsuul joined	01:34
	← axsuul left	01:34
	→ axsuul joined	01:34
	← axsuul left	01:35
	← Dougie187 left	01:35
	→ ErKa joined	01:35
	→ axsuul joined	01:35
	→ noisewaterphd_ joined	01:35
	← Dougie2187 left	01:35
	← axsuul left	01:36
	← godgodgodgo left	01:36
	← ghostlines left	01:36
	→ robbyoconnor joined	01:36
peterschmidler_	How easy would it be to switch from gitolite to e.g. github enterprise?	01:36
	→ axsuul joined	01:36
	← axsuul left	01:37
	→ axsuul joined	01:37
	← axsuul left	01:37
thiago	easy. Just push your repositories.	01:37
	→ Gamecubic joined	01:38
	→ axsuul joined	01:38
	← axsuul left	01:38
thiago	I assume that the GitHUb people will set everything up for you. That's why you pay them, right?	01:38
	← javasox left	01:38
peterschmidler_	What about githaven?	01:38
	→ axsuul joined	01:38
	← axsuul left	01:39
	→ specious joined	01:39
	→ axsuul joined	01:40
thiago	never heard of it	01:40
	← axsuul left	01:40
	← el3ctron left	01:40
	→ axsuul joined	01:40
	← pr0ton left	01:41
	← axsuul left	01:41
peterschmidler_	thiago: Never mind, but if you're intereted: https://news.ycombinator.com/item?id=3116594	01:42
	→ RofricTheBearded joined	01:43
	→ axsuul joined	01:43
	← axsuul left	01:44
	→ axsuul joined	01:44
	→ pr0ton joined	01:45
milki	While I still use it for my own personal use I am no longer developing GitHaven so it has been released under the AGPL in the hope that it can be useful for others.	01:45
	← cwillu_at_work left	01:45
milki	sounds like a defunct project	01:45
	← axsuul left	01:45
	→ boombatower joined	01:45
peterschmidler_	milki: yea	01:45
	→ axsuul joined	01:46
	← _iron left	01:46
	← axsuul left	01:46
	→ axsuul joined	01:46
	← axsuul left	01:47
peterschmidler_	What about gitlab?	01:47
	→ axsuul joined	01:47
	← axsuul left	01:47
	milki shrugs	01:48
milki	i only use gitolite	01:48
	← leninmhs2 left	01:48
milki	and github -.-	01:48
	→ axsuul joined	01:48
	← axsuul left	01:48
	→ axsuul joined	01:49
	← axsuul left	01:49
thiago	gitlab has apparently become very good	01:49
	KDE is trial-running it	01:49
	→ axsuul joined	01:50
	← axsuul left	01:50
	→ jalmeida joined	01:50
bremner	"i am no longer developing this so I am open sourcing it" -- unclear on the concept.	01:51
	← robbyoconnor left	01:51
	→ axsuul joined	01:51
	← axsuul left	01:51
	→ robbyoconnor joined	01:51
	→ shruggar_ joined	01:51
	← lifelike left	01:52
	← shruggar left	01:52
thiago	yeah	01:52
	← tvw left	01:52
	→ axsuul joined	01:52
	← axsuul left	01:52
	← jftf left	01:52
	→ axsuul joined	01:52
	← axsuul left	01:53
	→ francesca joined	01:53
	← shruggar_ left	01:53
	→ Zaknefain joined	01:54
francesca	hello, I would need some help to get started with git.	01:56
offby1	you would?	01:56
	→ Nicholas_Rishel joined	01:57
bremner	francesca: go ahead and ask some questions. If nothing else we can point you to some tutorials and free books	01:57
	→ axsuul joined	01:57
francesca	bremmer: thanks, How do I access and change my info, name and email address?	01:58
	← robbyoconnor left	01:58
offby1	git config --global user.email "francesca@wherever.com"	01:58
	francesca: I'm pretty sure it will holler at you if you've left it blank	01:58
francesca	offby1: thank you	01:59
	← Zaknefain left	01:59
offby1	similarly for user.name I think	01:59
	PLejeck → nuck	01:59
offby1	or you can just edit ~/.gitconfig directly, which is what I do	01:59
	→ joelroa joined	02:00
francesca	offby1: I found it, how can I change the email address, and the name?	02:01
	← kenneth left	02:01
francesca	off	02:01
offby1	just edit the file in the obvious way.	02:01
	OR run the "git config" command.	02:01
	Either works.	02:02
francesca	offby1: ok	02:02
	→ robbyoconnor joined	02:02
	→ vkrest joined	02:02
francesca	offby1: git config I get the options, but how do I access the file?	02:03
offby1	francesca: sorry, I couldn't parse that.	02:03
	!repro	02:03
gitinfo	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.	02:03
	← vkrest left	02:03
francesca	offby1: I still do't know how to change the email address	02:04
	← joelroa left	02:05
sitaram	offby1: what do you mean "purging gitweb from any box that runs gitolite"?	02:06
	← oojacoboo left	02:06
offby1	sitaram: a feeble attempt at humor	02:06
	← Balliad left	02:06
offby1	they guy had said "gitolite has no interface" and I was trying to demonstrate the silliness of that statement	02:06
	offby1 loosens his collar with his index finger	02:06
offby1	francesca: try one of my suggestions; if it doesn't do what you expect, paste a transcript so we can look at it.	02:07
sitaram	offby1: I know it was humor, I was trying to actually understand the joke!	02:08
offby1	wasted effort sir	02:08
	← jhulten_ left	02:08
Hello71	I think the joke is that "obviously you won't have an interface if you delete the interface"	02:08
	→ adurity joined	02:09
francesca	offby1: another silly question but I need to get started ... how do I copy text on IRC???	02:09
sitaram	Hello71: I do have an interface. And it's GUI too... it's called "gvim"	02:09
offby1	Hello71: more like "of course it has an interface, fool; if nothing else you can use gitweb"	02:09
	francesca: that depends on how you're using IRC.	02:09
	Also on the operating system.	02:09
Hello71	can I say "press ctrl-c"?	02:09
	→ _W_ joined	02:09
francesca	offby1: xchat on linux mint 14	02:09
offby1	francesca: so e.g. if you're using a Mac, you copy and paste with Command-C and Command-V ...	02:09
	heh, linux is harder because there's at least two ways to do it and I can never remember which is which	02:10
	francesca: actually that "!repro" factoiod includes a URL to a nice (if I do say so myself) set of instructions for making a transcript visible	02:10
	← ErKa left	02:10
offby1	https://gist.github.com/2415442 to be exact	02:10
francesca	offby1: ah, yes it works here too :-) thanks	02:10
	→ nicladas joined	02:11
	→ Kayra joined	02:11
	← koell left	02:11
offby1	sitaram: does vim have lots of fancy git interop built in?	02:11
	← peterschmidler_ left	02:12
offby1	sitaram: I know you're not an Emacs user but I gotta say: its "magit" is _really_ slick. I've come to depend on it	02:12
	← noisewaterphd_ left	02:12
	→ shruggar_ joined	02:13
	→ recycle joined	02:13
francesca	offby1: ok, got email and name sorted. Thank you!	02:14
offby1	\o/	02:15
	~	02:15
	/ \	02:15
francesca	offby1: "making a transcript visible": what's that for?	02:15
	← Watabou left	02:15
francesca	offby1: :-)	02:15
offby1	francesca: when git is acting strangely, and you ask us for help, we'll tell you to "make a transcript" so that we can see exactly what you saw.	02:16
	otherwise it's too hard to figure out what's going on.	02:16
	← nicladas left	02:16
	← Kayra left	02:16
	← whomp_ left	02:16
	→ whomp joined	02:16
offby1	you'll try to describe what happened using regular English, and we'll misunderstand; and you'll omit details that seem irrelevant but are actually very important, &c &c	02:16
francesca	offby1: ah, thanks, the problem was that up to then there was nothing to see! thank you until the next!	02:16
	→ sdouglas joined	02:18
	→ thegattaca joined	02:18
	→ pfg joined	02:19
	← shruggar_ left	02:19
	← robbyoconnor left	02:20
	← lunaphyte_ left	02:21
	→ lunaphyte_ joined	02:22
	← sdouglas left	02:23
	← ctp left	02:24
	← bren2010 left	02:24
	→ ctp joined	02:25
	← MattMaker left	02:26
	← shinnya left	02:26
	→ ctp_ joined	02:26
	← mribeirodantas left	02:27
	← gnugnu8 left	02:28
	→ ctp- joined	02:28
	← ctp left	02:29
	← Lemony left	02:31
	← ctp_ left	02:32
	← ctp- left	02:32
	→ tomengland joined	02:34
	← CKyle left	02:34
	← axsuul left	02:35
	← Noldorin left	02:37
	← tomengland left	02:38
	← eletuchy left	02:40
	→ Watabou joined	02:41
	← thegattaca left	02:41
	← recycle left	02:42
	→ Lemony joined	02:42
	← Lemony left	02:42
	→ recycle joined	02:42
	→ Lemony joined	02:43
	→ CKyle joined	02:46
	→ sctt joined	02:46
	← jalmeida left	02:46
	→ tmcmahon joined	02:46
	← recycle left	02:47
	← CKyle left	02:47
	→ eletuchy joined	02:47
	→ lifelike joined	02:47
	→ chrisshattuck joined	02:47
	→ werlley joined	02:48
	→ kenneth joined	02:48
	→ MattMaker joined	02:48
	→ Zaknefain joined	02:48
	← thevishy left	02:51
	← tmcmahon left	02:51
	← SegFaultAX left	02:51
	← Zaknefain left	02:53
	→ SegFaultAX joined	02:53
	→ recycle joined	02:53
	→ Vampire0 joined	02:55
	← whomp left	02:56
	← linduxed left	02:56
	← recycle left	02:57
	→ recycle joined	02:57
	← Vampire0_ left	02:58
	→ linduxed joined	02:58
	← pekster left	02:59
	← MattMaker left	03:00
	→ pekster joined	03:00
	← p8952 left	03:01
	→ el3ctron joined	03:02
	← recycle left	03:02
	← simesy left	03:02
	← Gavrisimo left	03:03
	→ thevishy joined	03:03
	→ vkrest joined	03:04
	→ simesy joined	03:05
	→ goel88 joined	03:06
	→ shingshang joined	03:06
	← vkrest left	03:09
	→ recycle joined	03:09
	→ Rastus_Vernon joined	03:10
	→ MattMaker joined	03:10
	→ axsuul joined	03:10
	← axsuul left	03:10
	→ Kayra joined	03:11
	→ axsuul joined	03:12
	← Lemony left	03:12
	← axsuul left	03:12
	→ axsuul joined	03:12
	← axsuul left	03:12
	→ axsuul joined	03:13
	→ p8952 joined	03:13
	← axsuul left	03:13
	→ axsuul joined	03:14
	← axsuul left	03:14
	→ Lemony joined	03:14
	← chrisshattuck left	03:14
	← bluesm left	03:15
	← MattMaker left	03:15
	→ rchavik joined	03:15
	← Kayra left	03:16
	→ axsuul joined	03:17
	→ kukks joined	03:17
	← kukks left	03:17
	→ kukks joined	03:17
	← axsuul left	03:18
	→ axsuul joined	03:19
	← axsuul left	03:19
	← whitby left	03:19
	→ axsuul joined	03:19
	← oskarkv left	03:20
	← makubi left	03:20
	→ Axsuul_ joined	03:20
	← Axsuul_ left	03:21
	← simesy left	03:21
	→ Axsuul_ joined	03:21
	← Axsuul_ left	03:22
	→ robbyoconnor joined	03:22
	→ Axsuul_ joined	03:22
	← Axsuul_ left	03:22
	← Watabou left	03:23
	→ Axsuul_ joined	03:23
	← Axsuul_ left	03:23
	→ makubi joined	03:23
	← axsuul left	03:24
	→ axsuul joined	03:24
	← axsuul left	03:24
	→ axsuul joined	03:25
sitaram	offby1: "built-in", no. Available, of course	03:25
	← axsuul left	03:25
	→ Watabou joined	03:25
	→ axsuul joined	03:26
	← axsuul left	03:26
	← rq60 left	03:26
sitaram	offby1: emacs, to me, is like python -- a lot of my friends use it, so it's one of the "good guys" but no thanks :)	03:26
	→ axsuul joined	03:26
	← axsuul left	03:27
	→ standyro1 joined	03:27
	→ axsuul joined	03:27
	← axsuul left	03:28
	→ axsuul joined	03:28
	← axsuul left	03:28
	→ z8z joined	03:28
	→ axsuul joined	03:29
	→ rq60 joined	03:29
	← brian_____ left	03:30
	← axsuul left	03:30
	→ axsuul joined	03:30
	← _ikke_ left	03:30
	← axsuul left	03:30
	→ yuppie joined	03:31
yuppie	hello i want to uh, make my local working dir match the master branch on my github. how would i do that?	03:31
	i already did git init	03:31
	and i also did	03:31
	→ _ikke_ joined	03:31
yuppie	git remote add upstream "x"	03:31
	→ axsuul joined	03:31
	← axsuul left	03:32
	← Cerise left	03:33
	→ axsuul joined	03:34
	← axsuul left	03:35
o11c	yuppie: why not just do 'git clone' ?	03:36
	← v1n left	03:37
yuppie	o11c how do i clone to local stuff to my github, overwriting whats on the github currently?	03:37
	i mean	03:39
	← pdurbin left	03:39
yuppie	clone my local files to the remote branch, overwriting the remote branch's files	03:39
	?	03:39
	lol	03:39
	gitinfo set mode: +v	03:40
skorgon	yuppie: not sure what you're trying to do. but usually, you'd clone the github repo, do your changes in that clone, push changes back to github	03:40
	← lifelike left	03:40
yuppie	yes so how do i push? im getting error	03:40
thiago	you have to tell us the error	03:40
skorgon	what error?	03:40
yuppie	https://dpaste.de/uNwG	03:41
	→ lifelike joined	03:41
yuppie	https://dpaste.de/AWJ4 <- easier to read :P	03:41
thiago	have you tried doing what it suggested?	03:42
	← jefflyne left	03:42
yuppie	https://dpaste.de/MFO5	03:42
	→ Zaknefain joined	03:42
thiago	yuppie: looks like the repository doesn't exist on the server	03:43
	yuppie: double-check the URL	03:43
	← Lemony left	03:43
yuppie	i think my keys are worn	03:43
	← specious left	03:43
	→ specious joined	03:44
	→ jefflyne joined	03:45
	→ Lemony joined	03:45
	← daivyk left	03:46
	← standyro1 left	03:47
	← Zaknefain left	03:47
	→ D3vi1 joined	03:47
	← francesca left	03:48
D3vi1	after forking a git to my repo, the original branch has been updated but not the repo. How can I update my repo again so that it will be up to date with the original one ?	03:48
	→ m104 joined	03:49
rawtaz	D3vi1: when you say "my repo", do you mean one on your local machine or do you mean your fork of the other repo over at github?	03:50
D3vi1	forl of the other repo over github	03:50
rawtaz	D3vi1: by "your fork" i mean "your copy on github"	03:50
	mhm	03:50
D3vi1	rawtaz: yeah, copy on the github	03:50
	← kukks left	03:50
yuppie	https://dpaste.de/xdsL	03:51
	im getting this error now	03:51
	still not sure if im using the right command or not <.<	03:51
rawtaz	im not sure if github has some way of doing it via their website. maybe. if not you need to clone the repo to your local machine, update that, and then push the updates to your fork	03:51
	→ kukks joined	03:51
	← kukks left	03:51
	→ kukks joined	03:51
skorgon	D3vi1: add both repos as remote to your local repo and then create and push the branches you want to your github space	03:51
	→ mizu_no_oto joined	03:52
	← SegFaultAX left	03:53
	→ ntio joined	03:53
	→ tomengland joined	03:53
	→ SegFaultAX joined	03:54
yuppie	how do i push all my local files to a repo?	03:54
	→ axsuul joined	03:55
	← axsuul left	03:55
rawtaz	yuppie: is that really a valid way to specify a remote? shouldnt you add [email@hidden.address] as a remote using `git remote add foo [email@hidden.address] and then do `git push --set-upstream foo master` instead?	03:56
yuppie	rawtaz let me do both commands and show you the output	03:56
	fatal: remote dotfiles already exists.	03:57
	← ArcTanSusan left	03:57
	← o11c left	03:57
yuppie	rawtaz https://dpaste.de/jezK output of second command	03:57
	← scarabx left	03:58
rawtaz	yuppie: what does `git remote -v` show?	03:58
	→ BeardlessOne joined	03:58
yuppie	https://dpaste.de/91fp	03:59
rawtaz	line 2 and 3 doesnt look right, do they?	03:59
	→ f0ster joined	04:00
	→ CKyle joined	04:00
rawtaz	im guessing you should remove those, and heck, remove the fourth one too and then re-add your remote repo using the git remote command i gave you earlier	04:00
	git remote remove dotfiles	04:01
	to remove them	04:01
f0ster	hello, i just had a disaterous merge, and a push to remote, I'd like to basically undo what i did.. make head the earlier SHA before i did the merge on my branch, and update the branch on the remote so it also isnt messed. any ideas how to do this? can I just cahnge the HEAD pointer to the earlier sha and push to remote ?	04:01
D3vi1	thanks skorgon	04:01
yuppie	https://dpaste.de/9vmB#L5 rawtaz	04:01
skorgon	f0ster: !fixup	04:01
gitinfo	f0ster: So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!	04:01
	→ joelroa joined	04:02
NotSomeCheese	can git use ~/.config for config files? I don't want it to clutter my home directory	04:02
	→ v1n joined	04:03
yuppie	NotSomeCheese make a symlink?	04:03
	→ standyro1 joined	04:03
NotSomeCheese	yuppie: it will still be there? lol	04:03
yuppie	lol	04:03
	← D3vi1 left	04:03
	← Watabou left	04:03
	→ koell joined	04:04
	← zumba_addict left	04:04
rawtaz	yuppie: what does `git branch -v` show?	04:04
	← omegahm left	04:05
rawtaz	yuppie: just git branch is fine	04:05
	→ zumba_addict joined	04:05
yuppie	rawtaz nothing	04:05
	← lindenle left	04:05
	→ vkrest joined	04:05
rawtaz	yuppie: hm. dont you have any branches? is your local repo empty?	04:06
	← narrow_code left	04:06
yuppie	im not sure :(	04:06
	← joelroa left	04:06
rawtaz	yuppie: hehe ok. let's take a step back. what are you trying to do here anyway? how did you end up here, did you make a new repo or did you want to clone something, or what?	04:06
NotSomeCheese	guys?	04:07
offby1	nobody here but us zombie processes.	04:07
	→ lindenle joined	04:07
	→ Watabou joined	04:07
skorgon	yuppie: just create a fresh clone of your github repo and work with that one.	04:08
NotSomeCheese	can I have my git config file in ~/.config?	04:08
offby1	NotSomeCheese: it's possible that you can set some environment variable: YO_GIT_LOOK_HERE_FOR_YOUR_CONFIG_STUFF=$HOME/.config	04:08
	NotSomeCheese: but I don't know for sure, and even if you can, I don't know the variable's name nor its precise semantics; all of that would be in the docs if it existed at all.	04:08
	So, that's a long-winded way of saying: !rtfm	04:08
skorgon	lol	04:09
offby1	and what have you got against cheese anyway	04:09
rawtaz	that's by far the biggest issue here today	04:09
NotSomeCheese	nothing? I was banned in some channel, under some cheese name, and I thought I could come back just by changing my nickname	04:09
	but they banned my cloak/ip	04:09
	← vkrest left	04:10
rawtaz	haha. so it was an act of desperation	04:10
offby1	a cunning plan nevertheless	04:10
	→ dreiss__ joined	04:10
offby1	so I guess you're not blast_hardcheese is blast_hardcheese (~blast_har@unaffiliated/blast-hardcheese/x-0199635)	04:10
	variable looks at offby1	04:10
offby1	perhaps if we put the two of you together there'd be a flash and you'd annihilate each other	04:10
rawtaz	offby2, soon.	04:10
NotSomeCheese	no I was mozzarella	04:10
	offby1 looks at variable	04:10
NotSomeCheese	like matter and antimatter?	04:11
offby1	yep	04:11
	like Martin and Lewis.	04:11
	or Jagger and Richards!	04:11
	Beer and Pizza!	04:11
	→ Kayra joined	04:11
rawtaz	yuppie: looks like you fixed it. what did you end up doing?	04:11
	NotSomeCheese → mozzarella	04:12
mozzarella	test	04:12
offby1	exam	04:12
	← z8z left	04:12
juri_	tesuto.	04:13
	← ntio left	04:14
	← Kayra left	04:16
	← standyro1 left	04:16
	← eletuchy left	04:17
	→ ntio joined	04:17
	→ jhulten_ joined	04:17
yuppie	git sucks	04:17
rawtaz	that's hardly a very constructive statement	04:18
	← v1n left	04:19
	kermit1 → kermit	04:20
	→ m0ltar joined	04:20
	← kermit left	04:20
	→ kermit joined	04:20
f0ster	i did a merge and instead of git sayin gi had conflicts it just outputted messages like this, https://gist.github.com/f0ster/9301875 , shouldnt it have said i had conflicts? it definitely inserted code like ===== HEAd etc but didnt tell me in console	04:22
	→ simesy joined	04:22
	← specious left	04:22
	→ starkhallo joined	04:22
rawtaz	i dont know. someone else is bound to. but im curious, what does `git status` say?	04:23
	are you sure it didnt output anything but messages like those?	04:23
	← pwnz0r left	04:23
	→ specious joined	04:23
	← shingshang left	04:24
	← lunaphyte_ left	04:24
	→ NimeshNeema joined	04:25
	← Goplat left	04:26
	→ _jr_42 joined	04:26
	← simesy left	04:27
	← lithiumjake left	04:28
	← _jr_42 left	04:28
	← specious left	04:29
mozzarella	can I have my git config file in ~/.config?	04:30
	← the_cybersphinx left	04:30
	← maslowbeer left	04:31
	← pr0ton left	04:31
	← m0ltar left	04:32
rawtaz	mozzarella: make a symlink to it and i guess yes?	04:32
	← Lemony left	04:34
	→ JPeterson joined	04:34
sunny256	mozzarella: That's a really good question. I don't think Git supports that (yet), maybe it should. Seems as more and more programs move their config files to ~/.config .	04:35
	→ ssj4mo joined	04:35
	← ssj4mo left	04:36
	← madewokherd left	04:36
	→ ssj4mo joined	04:36
	← ssj4mo left	04:36
sunny256	It could read ~/.gitconfig first, then try ~/.config/git/.gitconfig or something.	04:36
	→ ssj4mo joined	04:36
	← ssj4mo left	04:36
mozzarella	it should	04:36
	→ ssj4mo joined	04:36
	← ssj4mo left	04:36
	→ BiggFREE joined	04:36
	→ frege joined	04:37
	→ ssj4mo joined	04:37
	← ssj4mo left	04:37
frege	hey guys	04:37
	→ Zaknefain joined	04:37
	→ ssj4mo joined	04:37
	← ssj4mo left	04:37
frege	I wanna hard revert	04:37
	→ trusktr joined	04:37
	→ ssj4mo joined	04:37
	← ssj4mo left	04:37
frege	and remove the new files that I haven't added yet	04:37
	→ ssj4mo joined	04:37
	← ssj4mo left	04:37
	← trusktr left	04:37
sunny256	makubi: Maybe you should post that idea to the !mailing_list .	04:37
gitinfo	makubi: The mailing list can be reached via [email@hidden.address] You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://j.mp/gitlist	04:37
frege	is it git reset --hard?	04:38
	→ ssj4mo joined	04:38
	← ssj4mo left	04:38
	← BiggFREE left	04:38
	→ ssj4mo joined	04:38
	← ssj4mo left	04:38
sunny256	mozzarella: Ah, sorry, meant you. :)	04:38
	→ ssj4mo joined	04:38
	← ssj4mo left	04:38
skorgon	frege: if you didn't add the files yet, then there isn't anything to undo ?!	04:38
	→ ssj4mo joined	04:38
rawtaz	frege: a hard reset will reset all the files that git tracks to the state theyre in at the commit you specify	04:38
	← ssj4mo left	04:38
frege	ahh it needed git clean -f -d	04:38
	→ ssj4mo joined	04:39
	← ssj4mo left	04:39
	→ ssj4mo joined	04:39
	← ssj4mo left	04:39
rawtaz	frege: yeah. also know that making it a habit to do `git clean -ndf` before doing the real `git clean -df` might be a good idea :)	04:39
sunny256	mozzarella: Or even better, create a patch. :)	04:39
	→ ssj4mo joined	04:39
	← ssj4mo left	04:39
	→ flowerhack joined	04:39
	→ siaW joined	04:40
siaW	i do "git push origin master"	04:41
	→ shingshang joined	04:41
	→ ssj4mo joined	04:41
siaW	and git tells me everything is up to date but the changes are not show on github	04:41
	← ssj4mo left	04:41
siaW	can someone help me?	04:41
	← Zaknefain left	04:41
	→ slicknick joined	04:41
siaW	i want to have my local changes on github	04:41
	→ mikepack joined	04:42
skorgon	siaW: you commited your changes and pushed them but they don't show on github?	04:42
siaW	that's right	04:42
	skorgon: yes	04:43
	→ s1icknick joined	04:43
	← wongon left	04:43
skorgon	then, hit ctrl+r in your browser :P	04:43
juri_	step 1: get the source code to github...	04:43
	oh wait. -ENOTFREESOFTWARE	04:43
	→ wongon joined	04:43
skorgon	siaW: what does git log --oneline --decorate show	04:43
	← wongon left	04:44
	→ sdouglas joined	04:44
	← sluther left	04:45
siaW	skorgon: 42515ce (HEAD, origin/master, origin/HEAD, master) confirm	04:45
	05e335b test repo connection	04:45
	← ntio left	04:45
	→ ssj4mo joined	04:46
skorgon	siaW: and origin is your github repo?	04:46
	← ssj4mo left	04:46
	→ ssj4mo joined	04:46
	← ssj4mo left	04:46
	← GT left	04:46
siaW	skorgon: yeap	04:46
	→ ssj4mo joined	04:46
	→ lunaphyte_ joined	04:46
	← ssj4mo left	04:46
	← slicknick left	04:47
	→ ssj4mo joined	04:47
	← ssj4mo left	04:47
	← goel88 left	04:47
	← lunaphyte_ left	04:47
	→ lunaphyte_ joined	04:47
	→ ssj4mo joined	04:47
	← ssj4mo left	04:47
	→ ssj4mo joined	04:47
	← ssj4mo left	04:47
	→ ssj4mo joined	04:47
	← ssj4mo left	04:47
	→ ssj4mo joined	04:48
	← ssj4mo left	04:48
	→ ssj4mo joined	04:48
	← ssj4mo left	04:48
	← s1icknick left	04:48
	→ ssj4mo joined	04:49
	← ssj4mo left	04:49
rawtaz	can someone temp ban that guy? like 20 minutes or so	04:49
	→ slicknick joined	04:49
skorgon	siaW: the output inidicates that your local master and the remote master are pointing to the very same commit (42515ce). so, probably really just a matter of the webUI getting the update	04:49
	→ ssj4mo joined	04:49
skorgon	rawtaz: ignore him	04:49
	← ssj4mo left	04:49
	→ ssj4mo joined	04:49
	← mikepack left	04:49
	← ssj4mo left	04:50
	→ ssj4mo joined	04:50
	← ssj4mo left	04:50
siaW	skorgon: but it's been 40minutes already	04:50
	→ mikepack joined	04:50
rawtaz	its just flooding messages	04:50
skorgon	siaW: are you sure origin is your github repo? what does github -v say?	04:50
	→ ssj4mo joined	04:50
	← ssj4mo left	04:50
	→ ssj4mo joined	04:51
	← ssj4mo left	04:51
	→ ssj4mo joined	04:51
	← ssj4mo left	04:51
skorgon	siaW: sorry, git remote -v	04:51
	→ ssj4mo joined	04:51
	← ssj4mo left	04:51
	→ ssj4mo joined	04:51
	← ssj4mo left	04:52
siaW	skorgon: emmanuels-imac:kalendarz siaW$ git remote -v	04:52
	origin https://github.com/siaw23/kalendarz.git (fetch)	04:52
	origin https://github.com/siaw23/kalendarz.git (push)	04:52
	→ ssj4mo joined	04:52
	← ssj4mo left	04:52
	→ ssj4mo joined	04:52
	← ssj4mo left	04:52
	→ ssj4mo joined	04:52
skorgon	siaW: when i go to that URL it is as expected	04:52
	← ssj4mo left	04:52
	→ ssj4mo joined	04:52
	← ssj4mo left	04:53
skorgon	HEAD@42515ce247d27cc087a7ddb91665114703f01e3a	04:53
slicknick	get a clue	04:53
	← SegFaultAX left	04:53
siaW	skorgon: well the problem is. i did a commit. and it's not showing the changes i made locally and when i try to push it tells me everything is up to date	04:53
	→ SegFaultAX joined	04:53
skorgon	siaW: then you didn't commit them	04:54
	everything that is commited locally is also visible at github	04:54
	→ leninmhs2 joined	04:54
siaW	skorgon: ok i'll show you a screenshot	04:55
skorgon	siaW: look at the output of log --oneline --decorate. as i said above master and origin/master point to the same commit	04:55
	← mikepack left	04:55
skorgon	there is no other commit (in that branch)	04:55
siaW	this is what i have	04:55
	http://gyazo.com/0d25456126839bed9753e2817437d541	04:55
	→ noisewaterphd_ joined	04:55
siaW	skorgon: screenshot in link above	04:55
	← SHyx0rmZ left	04:56
skorgon	siaW: read what it printed there	04:56
	s/it/is	04:57
	← dreiss__ left	04:57
slicknick	shoulda dont a git status! heh	04:58
	← armyriad left	04:58
slicknick	skorgon: i dont understand what is meant the --all explanation. "will also let you record the removals." mind discussing ?	04:59
siaW	skorgon: i did "git add --all"	05:00
	→ eletuchy joined	05:00
skorgon	nothing was commited	05:00
siaW	skorgon: does it mean "git add ." works no more?	05:00
skorgon	there is no commit to push	05:00
	all you have changed is apparently that you removed a file	05:00
slicknick	record as in log? to what / where? my initial reaction to this is.. why not in the (global) config ?	05:00
skorgon	and the output tells you that removals are ignored when you do commit -A	05:00
slicknick	errr i think i need to understand what 'record' really means / does / refers to	05:01
skorgon	so, git rm the file, commit the change and push it	05:01
siaW	skorgon: thanks :)	05:01
slicknick	git status is helpful	05:01
skorgon	slightly different, you need the -A to add the removal but you just used . or somehting like that	05:01
slicknick	sorry for being dislexic	05:02
	← m104 left	05:02
slicknick	and unable to spell	05:02
	→ zumba_ad_ joined	05:02
	→ axsuul joined	05:02
	→ joelroa joined	05:03
	← cads left	05:03
	→ armyriad joined	05:03
	→ orangejuicejame joined	05:03
sunny256	git bisect bad master	05:04
	Yes, bad, bad master!	05:04
	← orangejuicejame left	05:04
	→ daito joined	05:04
sunny256	Or as Gollum would say, "git bisect good master"	05:05
slicknick	so if you want to record the removal, you have to specify so when you add it	05:05
	confused	05:05
skorgon	slicknick: just use git rm	05:05
	→ vkrest joined	05:05
skorgon	that removes the file and stages the removal	05:05
	add --cached if you want to keep the file and just want to stop tracking it	05:06
	← zumba_addict left	05:06
	→ zumba_a__ joined	05:06
slicknick	right on, thanks	05:06
	← zumba_ad_ left	05:07
	→ zumba_addict joined	05:07
	← tomengland left	05:07
	→ tomengland joined	05:08
	← joelroa left	05:08
	← daito left	05:09
	→ m104 joined	05:10
	← zumba_a__ left	05:11
	← werlley left	05:11
	→ m0ltar joined	05:11
	→ Kayra joined	05:11
	← tomengland left	05:11
	→ tomengland joined	05:12
	← CheckDavid left	05:12
	← tomengland left	05:12
	← f0ster left	05:14
	← sohail left	05:14
	← m0ltar left	05:15
	← Kayra left	05:16
	→ oskarkv joined	05:16
	← Mitchbones left	05:18
	→ tomengland joined	05:19
	→ Zifre joined	05:21
	← soyDiegol left	05:21
	← mizu_no_oto left	05:22
	← pfg left	05:22
	← lindenle left	05:22
	→ simesy joined	05:22
	→ shinnya joined	05:22
	→ Lemony joined	05:25
	→ tgkokk joined	05:26
	← simesy left	05:26
	← john2x left	05:27
	→ AndreSomers joined	05:27
	→ john2x joined	05:28
	← leninmhs2 left	05:30
	← geomyidae left	05:30
	← bwreilly left	05:30
	→ Zaknefain joined	05:31
	← freestyl3r left	05:31
	← Zaknefain left	05:31
	→ pheaver joined	05:33
	→ geomyidae joined	05:33
	← jefflyne left	05:35
	← vkrest left	05:37
	→ jefflyne joined	05:37
	→ jackneill joined	05:37
	← dglambert left	05:37
	← m104 left	05:38
	← JPeterson left	05:38
	← eletuchy left	05:38
	→ ntio joined	05:38
	→ Kicer86 joined	05:38
	→ kaictl joined	05:38
	→ ssj4mo joined	05:41
	← ssj4mo left	05:41
	→ ssj4mo joined	05:41
	← ssj4mo left	05:41
	→ ssj4mo joined	05:42
	← ssj4mo left	05:42
	→ ssj4mo joined	05:42
	← ssj4mo left	05:42
	→ ssj4mo joined	05:42
	← ssj4mo left	05:42
	→ chrisshattuck joined	05:42
	→ ssj4mo joined	05:42
	← ssj4mo left	05:42
	→ ssj4mo joined	05:43
	← ssj4mo left	05:43
	→ ssj4mo joined	05:43
	← ssj4mo left	05:43
	→ ssj4mo joined	05:43
	← ssj4mo left	05:43
	← Vivekananda left	05:43
	→ ssj4mo joined	05:43
	← noisewaterphd_ left	05:43
	← ssj4mo left	05:43
	← CKyle left	05:44
	← stellarhopper left	05:46
	→ pfg joined	05:47
	← dougsland left	05:48
	→ leninmhs2 joined	05:49
	← dagnachew left	05:51
	→ ssj4mo joined	05:51
	← ssj4mo left	05:51
	→ snuffeluffegus joined	05:52
	→ ssj4mo joined	05:52
	← ssj4mo left	05:52
	→ ssj4mo joined	05:52
	← ssj4mo left	05:52
	→ ssj4mo joined	05:52
	← ssj4mo left	05:52
	← Freeman42 left	05:52
	← tomengland left	05:52
	→ ssj4mo joined	05:52
	← ssj4mo left	05:52
	→ ssj4mo joined	05:53
	← ssj4mo left	05:53
	→ ssj4mo joined	05:53
	← ssj4mo left	05:53
	→ ssj4mo joined	05:53
	← ssj4mo left	05:53
	→ ssj4mo joined	05:53
	← ssj4mo left	05:53
	← SegFaultAX left	05:54
	→ SegFaultAX joined	05:55
	← adurity left	05:55
	← nicedice_ left	05:55
	→ nicedice joined	05:56
	← Tommy[D] left	05:58
	→ adurity joined	05:59
	→ stellarhopper joined	06:00
	← robbyoconnor left	06:01
	← tgkokk left	06:02
	→ joelroa joined	06:03
	← adurity left	06:04
	← fauxtoniche left	06:04
	→ kotk joined	06:06
	← Gamecubic left	06:07
	← joelroa left	06:08
	→ eletuchy joined	06:08
	→ Tommy[D] joined	06:10
	→ tgkokk joined	06:11
	← tgkokk left	06:11
	→ Kayra joined	06:11
	← zacts left	06:12
	→ ssj4mo joined	06:12
	← ssj4mo left	06:12
	→ ssj4mo joined	06:12
	← ssj4mo left	06:12
	→ ssj4mo joined	06:13
	← ssj4mo left	06:13
	← eletuchy left	06:13
	→ ssj4mo joined	06:13
	← ssj4mo left	06:13
	→ ssj4mo joined	06:13
	← ssj4mo left	06:13
	→ ssj4mo joined	06:13
	← ssj4mo left	06:13
	→ ssj4mo joined	06:14
	← ssj4mo left	06:14
	→ ssj4mo joined	06:14
	← frogonwheels left	06:15
	← Kayra left	06:16
	→ frogonwheels joined	06:16
	← salamanderrake left	06:16
	→ salamanderrake joined	06:17
	← enigmus left	06:18
	← starkhallo left	06:19
	← axsuul left	06:19
	→ tomengland joined	06:19
	← ssj4mo left	06:21
	→ jaequery joined	06:21
	← jaequery left	06:21
	→ ssj4mo joined	06:21
	← ssj4mo left	06:21
	→ ssj4mo joined	06:21
	→ jaequery joined	06:21
	← ssj4mo left	06:22
	← jaequery left	06:22
	→ ssj4mo joined	06:22
	← ssj4mo left	06:22
	→ thegattaca joined	06:22
	→ ssj4mo joined	06:22
	← ssj4mo left	06:22
	→ jaequery joined	06:22
	← jaequery left	06:22
	→ ssj4mo joined	06:22
	← ssj4mo left	06:22
	→ ssj4mo joined	06:23
	← ssj4mo left	06:23
	→ jaequery joined	06:23
	← jaequery left	06:23
	→ simesy joined	06:23
	→ ssj4mo joined	06:23
	← ssj4mo left	06:23
	→ ssj4mo joined	06:23
	← ssj4mo left	06:23
	→ jaequery joined	06:23
	→ ssj4mo joined	06:23
	← ssj4mo left	06:23
	→ ssj4mo joined	06:24
	← ssj4mo left	06:24
	→ ssj4mo joined	06:24
	→ Zaknefain joined	06:26
	← kukks left	06:26
	→ KindOne_ joined	06:27
	← KindOne_ left	06:27
	← simesy left	06:27
	→ AruL_ joined	06:28
	← leninmhs2 left	06:29
	→ ben_alman joined	06:29
	→ KindOne_ joined	06:29
	← KindOne_ left	06:29
	← Zaknefain left	06:30
	← ssj4mo left	06:33
	→ KindOne_ joined	06:33
	→ robbyoconnor joined	06:33
	← NimeshNeema left	06:34
	→ ssj4mo joined	06:34
	→ adurity joined	06:34
	← ben_alman left	06:35
	← frege left	06:35
	← adurity left	06:36
	← thegattaca left	06:39
	→ w0ng joined	06:39
	← ntio left	06:39
	→ thegattaca joined	06:40
	← yuppie left	06:40
	→ simesy joined	06:40
	← thegattaca left	06:42
	← Lemony left	06:42
	→ chessguy joined	06:44
	← siaW left	06:45
	→ Lemony joined	06:46
	→ JPeterson joined	06:47
	← ssj4mo left	06:47
	→ ssj4mo joined	06:47
	→ ssj4mo_s joined	06:48
	← ssj4mo_s left	06:48
	← ssj4mo left	06:48
	→ ssj4mo joined	06:49
	→ ntio joined	06:49
	← jhulten_ left	06:50
	← ssj4mo left	06:51
	→ ssj4mo joined	06:51
	← ssj4mo left	06:51
	→ ssj4mo joined	06:51
	← pheaver left	06:53
	← simesy left	06:54
	← SegFaultAX left	06:55
	→ SegFaultAX joined	06:56
	→ simesy joined	06:56
	← chrisshattuck left	06:58
	→ eduardtm joined	06:59
	← bgerber left	07:03
	← o9 left	07:03
	← rq60 left	07:04
	→ joelroa joined	07:05
	→ emergion joined	07:05
	← el3ctron left	07:06
	← armyriad left	07:06
	← joelroa left	07:09
	→ eletuchy joined	07:09
	← Rastus_Vernon left	07:09
	→ Kayra joined	07:11
	← ssj4mo left	07:13
	← kerrick left	07:13
	→ ssj4mo joined	07:13
	← eletuchy left	07:14
	← sdouglas left	07:14
	→ kerrick joined	07:14
	→ ehmatthes joined	07:15
	→ jmpp joined	07:16
	jmpp greets!	07:16
	← Kayra left	07:16
jmpp	I'm in the middle of quite a large merge, trying to bring a feature branch I was working on into master	07:16
	it produced quite a bit of conflicts, but I think I solved them all already	07:17
	← slicknick left	07:17
jmpp	however, I would like to confirm by diff'ing the current working copy against the feature branch, but I can't find a way of doing that	07:17
	I've tried things like "git diff -- . featureBranch", from the root of my repo, but to no avail	07:18
	any pointers?	07:18
	← kerrick left	07:18
	← salamanderrake left	07:19
	→ sdouglas_ joined	07:19
	← robbyoconnor left	07:20
moritz	git diff --cached featureBranch	07:20
	^^ for jmpp	07:20
jmpp	moritz: but wouldn't that diff only what's in the index, ready to be committed?	07:20
	→ Zaknefain joined	07:20
	jmpp tries any way	07:20
moritz	jmpp: yes; but in a merge where you have resolved your conflicts, all the changes should be in the index, no?	07:21
	← ssj4mo left	07:21
jmpp	right, they are indeed	07:21
	→ ssj4mo joined	07:21
jmpp	there are no unmerged paths at this point, all that remains is to commit	07:21
	but...	07:21
	before I do so I'd love to diff the entire working tree against the branch, not just the index	07:22
	though I concede that what's in the index is what matters, true, since it's what will go into the commit	07:22
	still, I find it odd that there's no way to diff an entire working tree against a branch during a merge....	07:22
moritz	doesn't the same invocation without --cached diff the working copy against the branch?	07:23
jmpp	no	07:24
	it produces no output what-so-ever	07:24
m0viefreak	yes, because everything is staged	07:24
jmpp	and I find it hard to believe there are no differences	07:24
	→ hoschi joined	07:24
	← flowerhack left	07:24
m0viefreak	you want 'git diff featureBranch'	07:24
	jmpp tries that	07:25
moritz	that's what I said :-)	07:25
	← Zaknefain left	07:25
m0viefreak	jmpp: in your original command you just mixed up the argument order	07:25
moritz	(or meant, at least; git diff --cached featureBranch and later "without --cached")	07:25
	→ dc5ala joined	07:25
	→ akim joined	07:25
m0viefreak	not	07:26
	git diff -- . featureBranch	07:26
	but	07:26
	git diff featureBranch -- .	07:26
jmpp	moritz: right ;)	07:26
	m0viefreak: let me try that last one...	07:26
	← KindOne_ left	07:26
m0viefreak	its the same as 'git diff featureBranch' (unless you are in a subdirectory)	07:26
jmpp	OK	07:26
	interesting	07:26
	→ takamichi joined	07:27
jmpp	thought git would follow the diff(1) right-to-left convention	07:27
	← geomyidae left	07:27
	→ ntio1 joined	07:28
	← akim__ left	07:28
	→ wizard_A joined	07:28
jmpp	funny, for some reason it's trying to show me differences in a PDF file :S	07:29
	in any case, I'm seeing a pretty good looking diff, thanks guys!	07:29
	→ SilverBln joined	07:29
	← ntio left	07:30
	← simesy left	07:30
	→ geomyidae joined	07:30
moritz	jmpp: git usually has the interpretation that stuff before a -- is used as a branch name, and stuff after -- as a path	07:30
	since for example a branch and a file can have the same name, and 'git checkout <file>' and 'git checkout <branch>' are both allowed, and do different things	07:31
	same with diff	07:31
jmpp	I see	07:32
	didn't know git had the convention of accepting branches before --	07:33
	but it makes sense	07:33
	and it also makes sense why I got confused before...	07:33
	jmpp tries to remember an example that confused him, but fails to ;)	07:33
jmpp	I was trying to diff against a path in a branch, not in the working copy, so I was doing theBranch:thePath	07:34
	and I had to put that after --	07:34
	because git was telling me that paths not currently in the working copy have to go after --	07:35
	but i take it in that case it has to go after the -- because that's a path, even if in another branch, not the branch itself, which according to what you say would come before the --	07:35
	← eduardtm left	07:36
	→ adurity joined	07:37
	→ simesy joined	07:38
	→ eduardtm joined	07:38
	← simesy left	07:38
	→ armyriad joined	07:38
	→ simesy joined	07:39
	→ vkrest joined	07:39
	← tmart left	07:39
	← AruL_ left	07:39
	← eduardtm left	07:39
	← simesy left	07:39
	→ eduardtm joined	07:40
	← ahammond left	07:40
	→ ahammond joined	07:40
	→ simesy_ joined	07:40
	→ simesy joined	07:41
jmpp	this diff looks beautiful, commit ready to go!	07:41
	← adurity left	07:42
jmpp	but I think I'm too hungry even for that :S	07:42
	← simesy left	07:43
	→ khmarbaise joined	07:43
	← jaequery left	07:44
	← eduardtm left	07:44
	← simesy_ left	07:45
	→ eduardtm joined	07:45
	→ srji joined	07:45
	← eduardtm left	07:46
	← s4lt left	07:46
	→ eduardtm joined	07:46
	← eduardtm left	07:46
	→ eduardtm joined	07:47
	→ slicknick joined	07:48
	→ hyperair joined	07:48
	← srji_ left	07:48
	→ arietis joined	07:48
	← eduardtm left	07:48
	← hahuang61 left	07:48
	← slicknick left	07:49
	→ slicknick joined	07:50
	→ simesy joined	07:52
	← thiago left	07:52
	← ccmonster left	07:52
	← slicknick left	07:54
	← geomyidae left	07:54
	← simesy left	07:55
	→ simesy joined	07:55
	→ bwreilly joined	07:55
	→ geomyidae joined	07:57
	→ tgkokk joined	07:58
	← bwreilly left	08:00
	→ goel88 joined	08:02
	→ joji joined	08:02
	← vkrest left	08:02
	← shinnya left	08:03
	→ zapb joined	08:03
	→ jsilver-ipod joined	08:04
	← jsilver-ipod left	08:04
	→ joelroa joined	08:05
	← sdouglas_ left	08:07
	← Nicholas_Rishel left	08:09
	← joelroa left	08:10
	→ eletuchy joined	08:10
	← khmarbaise left	08:10
	← goel88 left	08:10
	→ Kayra joined	08:11
	← tomengland left	08:12
	← george2 left	08:12
	→ goel88 joined	08:13
	← eletuchy left	08:14
	→ Zaknefain joined	08:14
	→ ewet joined	08:14
	← pfg left	08:15
	→ Draleth joined	08:16
	← wizard_A left	08:16
	← Kayra left	08:16
	← Lemony left	08:16
	← rchavik left	08:17
	→ tomengland joined	08:18
	← Zaknefain left	08:19
	→ thiago joined	08:20
	→ eaj joined	08:20
	→ xlinkz0 joined	08:21
	← sonicblud left	08:23
	← geomyidae left	08:23
	← hyperair left	08:23
	→ geomyidae joined	08:26
	← geomyidae left	08:30
	→ vince_prignano joined	08:30
	→ geomyidae joined	08:31
	← sctt left	08:32
	← geomyidae left	08:33
	← boombatower left	08:33
	→ jagob joined	08:34
	← ingoldey left	08:34
	→ geomyidae joined	08:34
	← geomyidae left	08:35
	→ v1n joined	08:35
	→ jizanthapus joined	08:36
	→ mikestir joined	08:36
	→ vurma joined	08:37
	→ adurity joined	08:37
	← m0viefreak left	08:38
	← vince_prignano left	08:38
	→ ben_alman joined	08:39
	→ sctt joined	08:41
	← adurity left	08:42
	← ben_alman left	08:45
	→ BiggFREE joined	08:46
	→ jnavila joined	08:47
	→ harobed joined	08:49
	→ vkrest joined	08:50
	← simesy left	08:50
	→ Shusshu joined	08:52
	← Shusshu left	08:52
	→ simesy joined	08:52
	← v1n left	08:53
	→ ngladitz joined	08:55
	← ngladitz left	08:55
	→ ngladitz joined	08:55
	→ upene joined	08:55
	← HelloComputer15 left	08:56
	← jnavila left	08:56
	← emergion left	08:57
	← ehmatthes left	08:57
	→ JerryT joined	08:58
	→ nepochal joined	08:58
	→ gfixler joined	08:58
	→ cads joined	09:05
	→ carbon1 joined	09:05
	→ narrow_code joined	09:06
	← tplaner left	09:06
	← carbon1 left	09:06
	→ joelroa joined	09:06
	→ sdouglas joined	09:07
	→ Zaknefain joined	09:09
	→ pantsman joined	09:09
	← Zaknefain left	09:10
	→ slicknick joined	09:10
	→ eletuchy joined	09:10
	← joelroa left	09:11
	→ Zaknefain joined	09:11
	← sdouglas left	09:12
	→ jatt joined	09:14
	← jatt left	09:14
	→ jatt joined	09:14
	← eletuchy left	09:15
	→ hahuang61 joined	09:17
	→ LeMike joined	09:17
	→ mourest joined	09:17
	→ Nizumzen joined	09:20
	← akiress left	09:20
	← jagob left	09:21
	← hahuang61 left	09:21
	→ netcarver joined	09:26
	→ ferreum joined	09:26
	→ Silmarilion joined	09:30
	← stellarhopper left	09:32
	→ liquidmetal joined	09:35
liquidmetal	I have a file in my remote repository called local.properties - this is required for builds	09:36
	→ rchavik joined	09:36
	← harobed left	09:36
liquidmetal	however this file changes from machine to machine - and I don't want git to track this file	09:36
	Any suggestions how this can be accomplished? I tried adding it to .gitignore - but that didn't work	09:36
	→ adurity joined	09:37
	→ vince_prignano joined	09:37
osse	!config > liquidmetal	09:38
gitinfo	[!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas	09:38
osse	liquidmetal: the proper way would be to commit a file called local.properties.template and have developers copy that and make changes to it	09:38
	← JerryT left	09:39
osse	liquidmetal: there is a way to tell Git to stop checking that file for changes but that is only a local action	09:39
	← adurity left	09:39
liquidmetal	Thanks for the link - will read up	09:39
	← mikestir left	09:39
osse	liquidmetal: so in your case I think you can rename local.properties to local.properties.template, commit that along with the addition to .gitignore and update the build instructions	09:40
	← tomengland left	09:43
	→ kriks joined	09:43
	→ tomengland joined	09:43
liquidmetal	osse, looks like the local.properties.template is the way to go	09:44
	This would also mean that the automated build system would also have to rename the file everytime a build is made	09:46
	→ shinnya joined	09:46
	→ lolmaus joined	09:48
	← tomengland left	09:48
	→ stellarhopper joined	09:49
	← stellarhopper left	09:49
	→ stellarhopper joined	09:49
osse	liquidmetal: in that case I would make a change to the build system so that if local.properties doesn't exist it would use local.properties.template instead	09:50
	→ h0bbit_ joined	09:50
	→ aarapov joined	09:50
	→ harobed joined	09:53
	← harobed left	09:53
	→ leninmhs2 joined	09:53
	→ harobed joined	09:54
osse	or copy it. basically avoid a dirty state	09:55
	→ JerryT joined	09:55
	→ pinage404 joined	09:57
	← harobed left	09:58
	→ Acidnerd1 joined	09:58
	Cathy → catherinejf	10:00
	catherinejf → Cathy	10:00
	Cathy → catherinejf	10:00
	catherinejf → Cathy	10:00
	→ jayallen joined	10:01
	aarapov → aarapov\|afk	10:01
	← jon_x7 left	10:01
	← ntio1 left	10:01
	aarapov\|afk → aarapov	10:03
	← tgkokk left	10:04
	aarapov → aarapov\|afk	10:06
	← zedsix left	10:06
	→ ntio joined	10:06
	aarapov\|afk → aarapov	10:06
	→ joelroa joined	10:07
	→ harobed_ joined	10:08
	← koell left	10:09
	← pierre1_ left	10:09
	→ ThomasLocke joined	10:09
	→ a-l-e joined	10:10
	← vkrest left	10:10
	→ skyflash joined	10:10
	→ dsdeiz joined	10:10
	→ tomengland joined	10:11
	→ eletuchy joined	10:11
	→ Kayra joined	10:11
	← joelroa left	10:12
	← kcj left	10:14
	← netcarver left	10:14
	→ skyflash_ joined	10:14
	← Kayra left	10:16
	← eletuchy left	10:16
	← dsdeiz left	10:16
	← skyflash left	10:17
	→ dsdeiz joined	10:17
	→ SonicX joined	10:17
	← leninmhs2 left	10:19
	→ hahuang61 joined	10:19
	← BiggFREE left	10:20
	→ hyperair joined	10:21
	← hahuang61 left	10:24
	→ Exancillatus joined	10:24
	→ jnavila joined	10:26
	← Nizumzen left	10:27
	← dsdeiz left	10:29
	← simesy left	10:29
	← joji left	10:30
	← Exancillatus left	10:32
	→ cff joined	10:32
	← slicknick left	10:33
	→ nick108 joined	10:33
	→ metamorpy joined	10:34
	→ Mode-M joined	10:34
	aarapov → aarapov\|afk	10:35
	← jargon left	10:35
	aarapov\|afk → aarapov	10:37
	→ adurity joined	10:37
	→ sluther joined	10:38
	→ Macaveli joined	10:41
	← adurity left	10:42
	→ akitada joined	10:42
	← tomengland left	10:45
	← makubi left	10:45
	← arvind_khadri left	10:45
	→ makubi joined	10:47
	→ Octalot joined	10:47
	→ jargon joined	10:47
	→ Lemony joined	10:48
	← sluther left	10:48
	→ the_cybersphinx joined	10:48
	→ tgkokk joined	10:50
	← tgkokk left	10:50
	aarapov → aarapov\|afk	10:50
kent\n	is it "safe" to abuse ./.git/refs/<foo>/<bar> to tell git to do keep certain SHA1's around? ie: using non-standard ref types for nefarious purposes?	10:51
	aarapov\|afk → aarapov	10:51
	→ SorenHolm joined	10:52
masak	kent\n: as far as I know, using non-standard ref types like that is not only allowed/safe, but encouraged.	10:53
	aka "it's all namespaces" and "third-party apps can extend .git/refs however they want"	10:53
kent\n	sweet =)	10:54
masak	the only risk is accidentally intersecting with someone else's namespace, but I'd consider that a fairly small risk.	10:54
	or, let's say, manageable by community mechanisms.	10:54
	← narrow_code left	10:56
	→ angelsl joined	10:56
	→ ghostlines joined	10:56
	← ghostlines left	10:56
	aarapov → aarapov\|afk	10:56
	→ ghostlines joined	10:57
	aarapov\|afk → aarapov	10:57
	← harobed_ left	10:58
	→ shruggar joined	10:58
	→ simesy joined	10:59
	← ThomasLocke left	11:01
	→ joji joined	11:02
	→ arvind_khadri joined	11:03
	← SorenHolm left	11:04
masak	I have a question. if you were to take a course for git experts -- a kind of level-3 course, after "intro" and "advanced" -- what would you expect to see in such a course?	11:06
	I'm thinking things like "how do merges actually work, internally?", or "what's the packfile format like and what happens during a network transfer of objects?"	11:07
	"how does the index work at a detailed level?"	11:07
	← SonicX left	11:07
	→ Naeb joined	11:07
	← goel88 left	11:07
masak	other suggestions very welcome.	11:07
	← simesy left	11:08
moritz	"advanced" covered 'git rebase', inclusive --onto, I presume?	11:08
	→ joelroa joined	11:08
	← Fandekasp left	11:09
masak	moritz: yes.	11:09
moritz	difference lightweight vs. annotated tags	11:09
masak	that's already in "advanced".	11:09
Seveas	the git wire protocol	11:10
masak	think of the "experts" course as being basically read-the-source-complete.	11:10
	Seveas: thank you.	11:10
	→ khmarbaise joined	11:10
Seveas	a section on contributing to git	11:10
moritz	masak: 'git replace' might be worth mentioning	11:10
Seveas	various file formats and a deep dive into .git	11:10
moritz	aliasing mechanism (if not yet 'advanced')	11:11
Seveas	what hash-object etc. do	11:11
	← rchavik left	11:11
Seveas	alternative implementations (libgit, dulwich...)	11:11
masak	moritz: no, that sounds reasonable.	11:11
	Seveas: ooh	11:11
moritz	plumbing commands in general	11:11
	← jargon left	11:11
	→ Kayra joined	11:11
Seveas	yeah, rev-list and rev-parse (though the latter could be in "advanced" as well)	11:12
	→ eletuchy joined	11:12
Seveas	how history/ref walking works, so the internals of rev-list	11:12
	→ jargon joined	11:12
masak	aye.	11:12
	← joji left	11:12
	→ shevy joined	11:12
	← ghostlines left	11:13
Seveas	fixing broken repos	11:13
	← shevy left	11:13
	← joelroa left	11:13
Seveas	as in: filesystem corruption and recovering from that	11:13
	peff sent some nice mails on that over the years	11:13
	← thevishy left	11:13
	← Kneferilis left	11:15
	← Kayra left	11:16
	← eletuchy left	11:16
masak	Seveas: do you happen to have access to those emails, perchance?	11:16
Seveas	search gmane for peff and corruption	11:16
	I don't have them bookmarked, so I'd have to do the same :)	11:17
masak	oki	11:17
	url to gmane?	11:17
moritz	search.gmane.org	11:17
masak	thank you.	11:17
Seveas	ttp://dir.gmane.org/gmane.comp.version-control.git	11:17
	s/^/h/ # copy paste snafu	11:17
moritz	oh, git-filter-branch (if not yet covered)	11:18
Seveas	and bfg repo cleaner	11:18
moritz	aye	11:18
masak	"Around 147 matching articles." -- this will take a while. :)	11:18
	anyway, thanks for that.	11:18
	← arietis left	11:19
masak	what's 'bfg repo cleaner'?	11:19
osse	masak: http://thread.gmane.org/gmane.comp.version-control.git/236238	11:19
	masak: I remember it was posted on reddit so that helped with googling :p	11:19
Seveas	osse: yup, that's the one.	11:19
	→ noxd joined	11:20
moritz	btw there was this tool which did some mixture of rebase and merging	11:20
masak	thank you.	11:20
Seveas	generally everything from peff is interesting, especially if he talks about the git tweaks they do at github for scale	11:20
moritz	something you'd do for very large merges, where you can resolve conflicts bit by bit	11:20
	does anybody recognize what I mean, and remember the name?	11:20
Seveas	moritz: rerere?	11:20
moritz	Seveas: no	11:20
Seveas	rerere is a good one to cover though	11:21
	→ marcjs joined	11:21
	→ _iron joined	11:21
Seveas	I've never used it, but it seems to be made of magic and ponies	11:21
	→ ayaka joined	11:21
	← vince_prignano left	11:21
moritz	something not in git core, where all new commits from both branches are merged with each other, and in the end you can decide if you want to leave history as is, or make a big rebase or a big merge out of it	11:21
ayaka	I have a problem, if I wan to get a directory from a git repo but not the whole repo, is there any way to do that?	11:22
masak	moritz: yes, I remember that. I thought I had an open issue for it, but seems not.	11:22
moritz	ayaka: no	11:22
	git imerge, I think	11:23
Seveas	ayaka: you might be able to get somewhere with git archive if you are also not interested in revision history	11:23
moritz	https://github.com/mhagger/git-imerge that's what I meant	11:23
Seveas	moritz: oooooh	11:24
	← nick108 left	11:24
masak	moritz: ooh, that's it!	11:24
	moritz++	11:24
moritz	I have yet to use it, but I'm pretty sure I will :-)	11:25
Seveas	I've had merges that were nasty enough that this would be useful	11:26
	→ Balliad joined	11:26
moritz	same here; we have an upstream repo with 45k commits, and about 6k commits on our own	11:26
Seveas	our main.git at work is humongous, hundreds of commits per day	11:27
ayaka	moritz, Seveas thank you	11:27
Seveas	so if you actually touch core code and forget to rebase for a week, merge is not going to make you happy.	11:27
moritz	main.git sounds like a bad idea :-)	11:27
Seveas	the app is quite monolithic. Attempts to split it up in logical chunks so far have failed. No doubt we'll try again though :)	11:28
	→ narrow_code joined	11:30
	→ thevishy joined	11:31
	→ Bilge joined	11:32
	← ayaka left	11:33
masak	r: say "\0xA0"	11:34
	oops, ww	11:35
	→ johnkevinmbasco joined	11:36
	→ adurity joined	11:37
	→ arietis joined	11:38
	← Naeb left	11:38
	← akim left	11:39
	→ diegoviola joined	11:40
	← adurity left	11:42
	← shingshang left	11:42
	→ shingshang joined	11:42
	→ n-st joined	11:44
	aarapov → aarapov\|afk	11:45
	→ SHyx0rmZ joined	11:46
	← jargon left	11:46
	→ Freeman42 joined	11:46
	← eaj left	11:47
	→ phanimahesh joined	11:48
	→ eaj joined	11:48
	→ Kayra_ joined	11:49
	→ Goplat joined	11:50
metamorpy	Hey guys, git newbie here, anyone mind asking some quick questions?	11:50
	answering*	11:50
	← northfurr left	11:51
	→ ben_alman joined	11:51
Seveas	metamorpy: just !ask :)	11:52
gitinfo	metamorpy: Yes, it's okay to ask questions here.... in fact, you just asked one! ;-) Pretty much any question is fine. We're not terribly picky, but we might be asleep. Please be patient and you should get an answer soon.	11:52
	← eaj left	11:52
	← joki left	11:53
	← aarapov\|afk left	11:53
	→ metamorpy_ joined	11:53
	← metamorpy left	11:55
	metamorpy_ → metamorpy	11:55
	→ aarapov joined	11:55
	← Balliad left	11:56
	← h0bbit_ left	11:56
	← ben_alman left	11:56
	→ lithiumjake joined	12:02
	→ Naeb joined	12:03
	← SegFaultAX left	12:03
	← skorgon left	12:04
	← _Vi left	12:04
	→ kenyon joined	12:05
	← marcjs left	12:05
	→ SegFaultAX joined	12:07
	← jnavila left	12:07
	→ jnavila joined	12:07
	→ joki joined	12:09
	→ eaj joined	12:09
	→ bgerber joined	12:10
Nevik	metamorpy: in case you missed it, please just ask your question. someone will answer when they know/feel like helping	12:10
metamorpy	Nevik: thanks :)	12:11
	→ Norrin joined	12:11
	← Xiti left	12:12
	→ mishok13 joined	12:12
	→ Xiti joined	12:12
	→ eletuchy joined	12:13
	→ Balliad joined	12:13
	← jnavila left	12:14
metamorpy	My setup might be slightly strange, but i works for me, i have a dev server that is live, i currently make changes through SFTP, and want to add in GIT to the mix, is there a way i can point a git client to the same server, and commit directly on that, without having a local repo on my laptop?	12:15
	← eletuchy left	12:17
	← jogos left	12:18
	← noxd left	12:18
bremner	metamorpy: basically no. git only commits locally. If you want to ssh onto the remote server, then you can commit there.	12:18
	→ jayallen_ joined	12:19
	→ _Vi joined	12:19
	← cads left	12:20
metamorpy	I have SSH setup now, so yes, that was the idea, but is there a GUI client that support SSH'ing in, and committing there?	12:20
	→ Cid joined	12:20
phanimahesh	metamorpy: why do you need that?	12:20
metamorpy	prefer GUI :)	12:20
phanimahesh	I mean not having a local repo	12:21
	there are gui git clients, but I can't recommend any. lets try !gui	12:21
gitinfo	Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed.	12:21
phanimahesh	okay.	12:22
	← jayallen left	12:22
	jayallen_ → jayallen	12:22
phanimahesh	Also, this is the first time I am hearing a request for this strange setup.	12:22
metamorpy	hehe	12:22
phanimahesh	you can setup a commit hook to publish the update to server automatically on every commit if you don't want to manually do that.	12:23
	aarapov → aarapov\|afk	12:23
osse	metamorpy: if you want to work on the server directly then use SSHFS or Remote Desktop or something like that.	12:23
metamorpy	server is ssh only, no GUI	12:23
phanimahesh	use sshfs.	12:23
	← upene left	12:24
	aarapov\|afk → aarapov	12:24
metamorpy	that takes care of the editing of the files, but still needs to commit changes using SSH then i guess?	12:24
phanimahesh	It allows you to mount a folder on ( another computer that allows ssh-ing in) on your local machine.	12:25
osse	metamorpy: no, you can use Git as if the files were local	12:25
	metamorpy: so Git or any Git GUI is cool	12:25
phanimahesh	Essentially, you get a folder in your local machine.	12:25
metamorpy	ah :D	12:25
phanimahesh	but when you access it, you are accessing the server.	12:25
	so use it like it is a ordinary local folder.	12:25
metamorpy	you guys are geniuses.	12:25
phanimahesh	except that you are screwed if the network goes poof	12:25
	→ skorgon joined	12:26
	→ hunt3r joined	12:26
	← Cid left	12:26
	← phanimahesh left	12:27
metamorpy	I'll try this out, see if i can make this work. thanks guys	12:27
	→ phanimahesh joined	12:27
	gitinfo set mode: +v	12:27
	→ harobed joined	12:28
	← harobed left	12:28
	→ faizoff joined	12:30
	→ upene joined	12:31
	← TheFuzzball left	12:32
	→ el3ctron joined	12:33
	→ Not_Whatever joined	12:33
	→ harobed joined	12:33
	← harobed left	12:33
	→ TheFuzzball joined	12:34
	→ harobed joined	12:34
	← metamorpy left	12:35
	← Watabou left	12:35
	→ adurity joined	12:37
	→ leeN joined	12:38
	← Mode-M left	12:40
	aarapov → aarapov\|afk	12:41
	aarapov\|afk → aarapov	12:41
	→ koda joined	12:41
	← el3ctron left	12:41
	← adurity left	12:42
	← aarapov left	12:42
	→ ghostlines joined	12:42
	→ el3ctron_ joined	12:43
	→ noxd joined	12:43
	→ salamanderrake joined	12:44
	→ metamorpy joined	12:44
moritz	watching git-imerge in process is really fascinating	12:50
	→ m0ltar joined	12:51
	→ jatt` joined	12:52
	← jatt left	12:52
	← jatt` left	12:52
	← hunt3r left	12:53
	← cagedwisdom left	12:53
	→ Silmarilion_ joined	12:55
	← Silmarilion left	12:57
	← LeMike left	13:00
	→ felipewm joined	13:01
	→ Watabou joined	13:02
	→ ben_alman joined	13:02
	→ CheckDavid joined	13:03
	→ JyZyXEL joined	13:07
	← ben_alman left	13:08
JyZyXEL	how do i see what version i currently have cloned?	13:08
_ikke_	git describe	13:09
	→ joelroa joined	13:10
	← noxd left	13:10
JyZyXEL	its not very accurate though?	13:10
BtbN	it shows the accurate version description.	13:10
	→ brian___ joined	13:11
	← ntio left	13:11
_ikke_	JyZyXEL: What do you expect?	13:11
	if you want the hash: git rev-parse HEAD	13:12
	→ NimeshNeema joined	13:13
	→ sdouglas joined	13:13
	→ eletuchy joined	13:13
	← joelroa left	13:14
	← Naeb left	13:14
	← Lemony left	13:16
	← eletuchy left	13:18
	← sdouglas left	13:18
	→ vvetter joined	13:19
	→ northfurr joined	13:19
	← northfurr left	13:19
	→ northfurr joined	13:19
	→ h0bbit_ joined	13:21
	→ leninmhs2 joined	13:21
	→ Trudko joined	13:21
	→ bluesm joined	13:22
	← harobed left	13:25
	→ WaReZ joined	13:26
	→ tgkokk joined	13:26
	→ enigmus joined	13:27
	→ ntio joined	13:28
	← tgkokk left	13:30
	← m0ltar left	13:31
	→ lindenle joined	13:32
	→ tgkokk joined	13:32
	→ Gizburdt joined	13:32
	→ ctp joined	13:33
	← ctp left	13:33
	→ Anupkumar joined	13:34
	← Watabou left	13:35
	← tgkokk left	13:37
	→ adurity joined	13:37
	→ tgkokk joined	13:38
	→ lindenle_ joined	13:38
	→ xsbeats joined	13:38
	→ Ru00161154 joined	13:41
	→ netcarver joined	13:41
	← adurity left	13:42
	← netcarver left	13:42
	← a-l-e left	13:44
	← skorgon left	13:46
	→ Cerise joined	13:49
	← shinnya left	13:49
	→ marcjs joined	13:51
	← Gizburdt left	13:53
	→ CKyle joined	13:54
	→ Gizburdt joined	13:54
	→ hunt3r joined	13:54
	→ thegattaca joined	13:56
	← lindenle_ left	13:58
	← Gizburdt left	13:58
	→ Mitchbones joined	13:58
	→ jogos joined	13:59
	← hunt3r left	13:59
	→ Gizburdt joined	13:59
	→ imizeropt joined	14:00
	→ sgambino joined	14:01
	← sgambino left	14:04
	← oskarkv left	14:06
	→ sgambino joined	14:07
	→ beastd joined	14:08
	→ goel88 joined	14:08
	→ joelroa joined	14:11
	→ eletuchy joined	14:14
	← joelroa left	14:15
	← leninmhs2 left	14:16
	→ adurity joined	14:16
	→ Watabou joined	14:16
	← lindenle left	14:18
	← eletuchy left	14:19
	→ Sicp joined	14:19
	→ lindenle joined	14:19
	→ aarapov joined	14:21
	← sctt left	14:22
	→ francesca joined	14:22
	← akitada left	14:22
	→ jnavila joined	14:23
	← Gizburdt left	14:24
	← kriks left	14:24
	→ Gizburdt joined	14:25
	← Not_Whatever left	14:26
	→ Noldorin joined	14:26
	→ krizzii joined	14:28
	← sgambino left	14:28
	→ simesy_ joined	14:29
	← Gizburdt left	14:30
	→ skorgon joined	14:30
	→ bartman`` joined	14:31
	→ jon_x7 joined	14:31
	→ noxd joined	14:32
	→ werlley joined	14:32
	→ zequence joined	14:34
goel88	Hi. In git commit message we write the extra message below --- . This --- should be just below Signed-Off line . Right ?	14:34
	← simesy_ left	14:34
	← diegoviola left	14:35
	→ herdingcat joined	14:35
osse	goel88: yes	14:36
goel88	Thanks osse :)	14:36
osse	goel88: but you don't write it as part of the commit messagen when you commit. You do it after generating a patch with git format-patch	14:36
	hmm, although I suppose the end result will be the same	14:36
goel88	Ok.	14:37
	→ kotk1 joined	14:38
	← krizzii left	14:39
	← jogos left	14:39
	← SHyx0rmZ left	14:39
	← kotk left	14:40
	← jmpp left	14:40
	→ krizzii joined	14:40
	← krizzii left	14:41
metamorpy	I have setup a local repo based on a remote repo, but when trying to do push i get: By default, updating the current branch in a non-bare repository is denied, because it will make the index and work tree inconsistent with what you pushed, and will require 'git reset --hard' to match the work tree to HEAD.	14:41
	...	14:41
	Any idea what I'm doing wrong?	14:41
	→ robbyoconnor joined	14:41
	→ xaq joined	14:41
	→ Raging_Hog joined	14:42
_ikke_	!bare	14:42
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/	14:42
	← Macaveli left	14:42
	→ jmpp joined	14:43
	← xaq left	14:45
	→ tomengland joined	14:45
	→ r0bby joined	14:46
metamorpy	so in other words, since i have a non-bare repo on the server, i get issues with push?	14:47
	→ xaq joined	14:47
	aarapov → aarapov\|afk	14:48
gfixler	yes, you can't [by default] push to a non-bare repo, because it has a working tree - this would allow anyone who can see your repo to push changes right into your working tree, which would be confusing and possibly disastrous	14:48
	→ JSharpe__ joined	14:48
	→ conan joined	14:49
metamorpy	aha	14:49
gfixler	a bare repo doesn't have a working tree, so it doesn't need the .git folder to sequester the git files, so it just puts them all right in the main folder, and the '.git' moves up (by convention) to the end of the folder name	14:50
	← herdingcat left	14:50
	← Watabou left	14:50
	← robbyoconnor left	14:50
	← tomengland left	14:50
	→ sgambino joined	14:50
	→ Rastus_Vernon joined	14:51
	→ tplaner joined	14:51
	← tplaner left	14:51
	→ tplaner joined	14:51
	→ o9 joined	14:52
metamorpy	so lets stay, i have a server, i want to have a GIT repo on it, and on the same server have a web server what is currently in the master branch, i would setup the GIT repo as a --bare, and then set up another repo in the web directory with a working-copy? and just check out the master every once in a while to update the web server copy? and that way i can have a local repo on my laptop i work on, push this to the bare, and check out from t	14:52
	web-repo?	14:52
	if you get what i mean	14:52
	← JSharpe_ left	14:52
	→ looper_ joined	14:52
	aarapov\|afk → aarapov	14:53
cbreak	metamorpy: !deploy	14:53
gitinfo	metamorpy: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html	14:53
	aarapov → aarapov\|afk	14:53
	r0bby → robbyoconnor	14:54
	→ jogos joined	14:55
gfixler	metamorpy: just to answer the question, you /can/ have a bare copy of your project on your server and checkout the latest master on it, but it's not a great idea, and it's frowned upon by most who know what they're talking about	14:55
	→ hunt3r joined	14:55
_ikke_	metamorpy: It sounds nice to be able to do a git pull to update a project that is hosted, but it can cause all sorts of problems	14:55
	→ SHyx0rmZ joined	14:56
	← Noldorin left	14:57
	← hunt3r left	14:58
metamorpy	Thanks for the resources guys, appreciate it	14:58
	← robbyoconnor left	14:59
	→ Matrixiumn joined	14:59
	aarapov\|afk → aarapov	15:00
	→ darryl_ joined	15:00
	→ herdingcat joined	15:03
goel88	I am using git version 1.9.0.138 . I am not able to use --notes option in `git format-patch` command. Any specific reason or --notes not intended for it?	15:05
	← herdingcat left	15:05
	→ Gamecubic joined	15:06
	← johnkevinmbasco left	15:06
	← lindenle left	15:06
	→ herdingcat joined	15:07
_ikke_	goel88: Define not able to?	15:07
	→ starkhallo joined	15:09
goel88	git format-patch --notes="blah blah" -1	15:10
	← cff left	15:10
goel88	did not add "blah blah" to patch	15:10
	← JerryT left	15:10
	← h0bbit_ left	15:11
	→ joelroa joined	15:12
	← Ru00161154 left	15:12
	→ ben_alman joined	15:13
goel88	_ikke_ : `git format-patch --notes="blah blah" -1` did not add "blah blah" to patch ... (missed to add your id in message previous time)	15:14
	← Matrixiumn left	15:14
	← Silmarilion_ left	15:14
	→ eletuchy joined	15:15
	← khmarbaise left	15:16
	← joelroa left	15:17
	→ vince_prignano joined	15:17
	→ lindenle joined	15:17
liquidmetal	osse, you had told me about config.ini.template earlier - is there a way I can get a list of all such gists/docs	15:18
	← ben_alman left	15:18
	→ Noldorin joined	15:19
	← eletuchy left	15:20
	→ jaequery joined	15:20
	← Octalot left	15:21
	→ dagnachew joined	15:24
	← NimeshNeema left	15:24
	← brian___ left	15:25
	→ Xethron joined	15:25
	→ souther joined	15:26
	← imizeropt left	15:27
	← Noldorin left	15:27
	→ psyl0n_ joined	15:28
	→ SorenHolm joined	15:28
	→ Matrixiumn joined	15:29
	← arvind_khadri left	15:29
	→ bebna joined	15:30
	← jogos left	15:32
	← conan left	15:32
	→ sohail joined	15:32
	→ khmarbaise joined	15:33
narrow_code	Can I fork a github project without creating a separate repository for it? I'd rather merge it into a sub-folder and have github recognize it (giving credit to that person)?	15:34
	← tgkokk left	15:34
	→ harobed joined	15:34
narrow_code	(I plan on making some changes of my own)	15:34
grawity	not in the Github sense of "forking", no	15:34
	→ tgkokk joined	15:34
	← o9 left	15:35
	→ conan joined	15:35
narrow_code	So I should fork it in the github sense and add it as a sub-module?	15:35
grawity	although all commits have their author attached, so if you do things like subtree-merge into your own repository, it'll import the complete history	15:35
	or a submodule, yes	15:35
	← Vinnie_win left	15:35
narrow_code	ok, thanks	15:35
	→ Naeb joined	15:36
	→ Sonderblade joined	15:37
	→ Noldorin joined	15:38
	→ AaronMT joined	15:38
	→ freestyl3r joined	15:38
	→ merica joined	15:38
	→ v1n joined	15:39
	← tgkokk left	15:39
	← psyl0n_ left	15:39
	iamtakin1iteasy → iamtakingiteasy	15:39
	← sohail left	15:41
	← Kayra_ left	15:41
	← ghostlines left	15:42
	→ jnavila_ joined	15:43
	← jnavila left	15:43
	jnavila_ → jnavila	15:43
	→ sohail joined	15:43
	→ Silmarilion joined	15:44
	← Gamecubic left	15:44
	→ Gamecubic joined	15:44
	← herdingcat left	15:46
	→ Watabou joined	15:47
	← zequence left	15:49
	→ jogos joined	15:50
	← frogonwheels left	15:51
	→ gnugnu8 joined	15:52
	→ zequence joined	15:53
	→ Dougie187 joined	15:54
	→ brian___ joined	15:54
	← aarapov left	15:54
	→ jatt joined	15:55
	← jatt left	15:55
	→ jatt joined	15:55
	← shingshang left	15:55
	→ wereHamster joined	15:56
	← goel88 left	15:58
	← john2x left	15:59
	← Sly1986 left	15:59
	← Xethron left	15:59
	← Dougie187 left	16:00
	← SorenHolm left	16:01
	→ arif-ali joined	16:01
	← Mitchbones left	16:02
	→ herdingcat joined	16:02
	→ Kayra joined	16:02
	→ ehmatthes joined	16:02
	← Noldorin left	16:03
	← herdingcat left	16:04
	→ LuxuryMode joined	16:05
	← jaequery left	16:06
	← Leoneof left	16:07
	← hyperair left	16:08
	→ Leoneof joined	16:08
	→ ghostlines joined	16:08
	← ghostlines left	16:08
	→ ghostlines joined	16:08
	→ daito joined	16:09
	← vurma left	16:09
	→ Gavrisimo joined	16:09
	← merica left	16:10
	← werlley left	16:10
	← jatt left	16:11
	← metamorpy left	16:11
	→ diegoviola joined	16:11
	→ vurma joined	16:12
	← Trudko left	16:12
	← BeardlessOne left	16:12
	→ joelroa joined	16:13
	← daito left	16:13
	← dc5ala left	16:15
	→ dsdeiz joined	16:15
	→ eletuchy joined	16:15
	→ dglambert joined	16:16
	← SilverBln left	16:17
	← joelroa left	16:17
	→ NimeshNeema joined	16:17
	→ jatt joined	16:19
	← jatt left	16:19
	→ jatt joined	16:19
	← eletuchy left	16:20
	← Watabou left	16:20
	→ m0viefreak joined	16:22
	→ cff joined	16:22
	→ herdingcat joined	16:22
	← Naeb left	16:24
	← felipewm left	16:24
	→ DrZingo joined	16:25
	→ hyperair joined	16:27
	→ acharlieh joined	16:28
	→ jluc joined	16:29
	→ werlley joined	16:30
	← justaguy left	16:30
	→ jaequery joined	16:31
	→ e^0 joined	16:31
	→ ssm2017 joined	16:32
ssm2017	hello	16:32
	i would like to get the commits logs between 2 tags but when using : "git log tag1 tag2" it is displaying all tags anyway	16:33
	← armyriad left	16:33
	→ armyriad joined	16:33
	→ unknwn- joined	16:33
	→ justaguy joined	16:33
	← sohail left	16:34
	← Sicp left	16:34
grawity	the range syntax is tag1..tag2	16:34
	← narrow_code left	16:35
	← khmarbaise left	16:35
	← p8952 left	16:36
	→ marcjs_ joined	16:37
ssm2017	ah ok, i need to enter the 2 points :) thanks grawity for clarification	16:37
	← marcjs left	16:37
	→ pheaver joined	16:37
	→ bwreilly joined	16:39
	← RofricTheBearded left	16:41
	→ krizzii joined	16:43
	← arif-ali left	16:44
	← Tuna-Fish2 left	16:45
	→ valgrind joined	16:46
	← ghostlines left	16:47
	→ tubaman joined	16:47
	← Sonderblade left	16:49
	← bwreilly left	16:49
Nevik	ssm2017: see also man gitrevisions	16:51
gitinfo	ssm2017: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html	16:51
Nevik	(under "revision ranges")	16:51
	→ jftf joined	16:53
	→ n-a-n joined	16:54
	→ s4lt joined	16:54
n-a-n	hi all	16:55
	← mourest left	16:55
	→ merica joined	16:55
	→ faizoff_ joined	16:56
	→ polyzen joined	16:57
	← DrZingo left	16:57
	→ nnyk_ joined	16:58
	← faizoff left	16:58
	← nnyk_ left	16:58
	→ nnyk_ joined	16:58
	← vince_prignano left	16:59
	→ vince_prignano joined	16:59
	→ Hello71 joined	17:01
	← vince_prignano left	17:01
	← Raging_Hog left	17:01
	→ metamorpy joined	17:01
	→ vince_prignano joined	17:01
	→ mani2399 joined	17:01
	→ micks9093 joined	17:02
	← micks9093 left	17:04
	→ mongor joined	17:04
	→ ghostlines joined	17:06
	← Silmarilion left	17:07
ssm2017	thank you for precisions	17:07
	← ssm2017 left	17:07
	← shruggar left	17:08
	→ miraj9093 joined	17:09
	← angelsl left	17:10
	← Gamecubic left	17:10
	← beastd left	17:10
	→ Gamecubic joined	17:10
	→ pierre1_ joined	17:13
	→ joelroa joined	17:14
	→ koell joined	17:14
	→ dik_dak joined	17:15
	→ eletuchy joined	17:16
	→ Watabou joined	17:17
	← s4lt left	17:18
	← joelroa left	17:18
	→ sdouglas joined	17:18
	→ mizu_no_oto joined	17:19
osse	liquidmetal: you mean the bot triggers?	17:19
	→ aarapov joined	17:20
	← koell left	17:20
liquidmetal	osse, yes!	17:20
osse	!help	17:20
gitinfo	What do you need help with? Something with git? Tell us what's going on, and please be specific. For information on how to abuse me (I'm a bot!), see http://jk.gs/git/bot . Please be gentle.	17:20
	← D9 left	17:20
osse	liquidmetal: http://jk.gs/git/bot/trigger.php	17:20
	← eletuchy left	17:21
	→ shruggar joined	17:21
	← brian___ left	17:23
	→ D9 joined	17:23
	← D9 left	17:24
	→ hassoon joined	17:24
	← QoS left	17:24
	← mongor left	17:25
	→ khmarbaise joined	17:25
	→ LeMike joined	17:26
	→ hahuang61 joined	17:26
	→ fauxtoniche joined	17:26
	← Draleth left	17:26
	← dik_dak left	17:27
	→ Silmarilion joined	17:27
	→ s4lt joined	17:28
	← s4lt left	17:28
	→ s4lt joined	17:28
	→ koell joined	17:29
	→ omegahm joined	17:29
	← freestyl3r left	17:30
	← hahuang61 left	17:31
	← ghostlines left	17:31
	→ narrow_code joined	17:31
	→ mourest joined	17:32
	→ SorenHolm joined	17:32
_ikke_	osse: there is ! trigger	17:32
	← jftf left	17:32
	← xaq left	17:33
	← shruggar left	17:33
osse	oh	17:34
	→ shruggar joined	17:34
sunny256	This is strange behaviour, isn't it? "git log --reverse -1" should list the first commit, but it shows the newest.	17:35
	← ntio left	17:35
grawity	the limit is applied before --reverse	17:35
sunny256	grawity: Yeh, I thought it was something like that, but it's quite counter-intuitive.	17:36
	ChanServ set mode: +o	17:38
	← SorenHolm left	17:38
	← mani2399 left	17:38
	Eugene changed the topic to: Welcome to #git, the place for git help and two aspirin \| Current stable version: 1.9.0 \| Start here: http://jk.gs/git \| Seeing "Cannot send to channel" or unable to change nick? /msg gitinfo .voice \| Why did the commit cross the rebase? To git to the other repo	17:38
	← sgambino left	17:38
Nevik	sunny256: it makes sense, because finding the first commit is a potentially very long search	17:39
	← acharlieh left	17:39
	→ axsuul joined	17:40
osse	Nevik: the --reverse makes it do that anyway	17:40
	← narrow_code left	17:40
osse	why would 'git log --reverse -1' take any longer than 'git log --reverse'	17:41
Nevik	osse: what? we just discussed that the limit is applied first	17:41
	so git takes the first commit from HEAD, and reverses the display order	17:41
osse	Nevik: Ahh. I thought you were aruing why it should be like that	17:41
	*arguing	17:41
	Nevik whacks osse on the head	17:42
Nevik	turn on your telepathy before accusing me of nonsense	17:42
	→ ghostlines joined	17:42
	→ Tuna-Fish joined	17:43
	→ invinceable joined	17:43
	→ jcvfen joined	17:43
osse	Nevik: so you agree the current behaviour is bleh ?	17:43
	:)	17:43
Nevik	no	17:43
	the current behavior makes sense	17:43
	→ cloud\|nix joined	17:43
	← jogos left	17:43
osse	why?	17:44
Nevik	>> <Nevik> sunny256: it makes sense, because finding the first commit is a potentially very long search	17:44
osse	but that's what the user wants!	17:44
Nevik	no	17:44
	that's what THIS user THOUGHT this meant	17:44
	but the user was wrong	17:44
osse	yes he was	17:45
	→ rq60 joined	17:45
Nevik	i guess the manpage could be one word more explicit	17:45
	← jmpp left	17:45
osse	He was wrong about what it meant. But that doesn't mean he's wrong in wanting to see the first commit. I for one think --reverse -1 should mean what he thought it meant	17:46
Nevik	but looking at the first commit is really rare. so i dont think it's worth changing the way log applies the limits	17:46
	← jatt left	17:46
	→ acharlieh joined	17:46
Nevik	no, i think the way the limits are applied are fine	17:46
	there could be another switch though	17:46
	for starting at the root, or whatever	17:47
	← Tuna-Fish left	17:47
Nevik	root(s)*	17:47
	→ jogos joined	17:47
osse	but that switch already exists: --reverse	17:47
Nevik	no, --reverse reverses the display order of the selected commits	17:47
	it does not reverse search order	17:48
osse	ugh	17:48
	that's impossible anyway	17:48
Nevik	that's the one word more explicitness i mentioned	17:48
	osse: it's not. it's just inefficient (find all commits, then walk over that list in reverse)	17:48
	→ Mitchbones joined	17:48
	→ Tuna-Fish joined	17:49
osse	I don't see how that exact description is any different from --reves	17:49
	--reverse	17:49
	→ felipewm joined	17:50
Nevik	it's actually quite explicit ("Output the commits in reverse order.")	17:50
	← felipewm left	17:50
	← Silmarilion left	17:50
	← mizu_no_oto left	17:50
Nevik	maybe it could be "Output matching/selected commits in reverse order."	17:50
	← Watabou left	17:50
	→ vu joined	17:50
sunny256	It's probably a good thing after all to limit the search before the output id modified by reverse. What this command actually says is, "List the 1 newest commits, and then reverse the result".	17:50
	→ pfg joined	17:50
osse	I meant your description of the hypothetical flag	17:51
	→ godgodgodgo joined	17:52
Nevik	sunny256: correct	17:52
	→ sgambino joined	17:52
Nevik	it might help if the manpage could mention that tidbit	17:52
sunny256	With for example "git log -1000 --reverse", it says "show me the 1000 newest commits, and display it in reverse". As it has to travel all the way through the DAG from the newest to the oldest commut in all cases, this is the only option.	17:53
Nevik	("Limits are applied before reversing" or whatever)	17:53
sunny256	Nevik: Indeed.	17:53
	starkhallo → starkhalo	17:53
Nevik	sunny256: email the !list right now!	17:53
gitinfo	sunny256: [!mailing_list] The mailing list can be reached via [email@hidden.address] You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://j.mp/gitlist	17:53
osse	Nevik: it does	17:53
Nevik	osse: where?	17:53
sunny256	Nevik: Yup. I can prepare a patch for this.	17:53
osse	Nevik: last paragraph under "Commit limiting"	17:53
	Nevik: before the actual description of the options	17:54
Nevik	well, imo mentioning it again in --reverse's paragraph cant hurt	17:54
	→ jftf joined	17:55
	→ cads joined	17:55
Nevik	sunny256: feel free to drop that email, maybe it gets accepted :)	17:55
	← gnugnu8 left	17:55
	← krizzii left	17:56
	→ krizzii joined	17:57
	← krizzii left	17:58
sunny256	Nevik: Yep, I'm clarifying the docs there now a bit.	17:59
	← khmarbaise left	17:59
Nevik	awesome	17:59
	→ mizu_no_oto joined	17:59
	→ Noldorin joined	17:59
	→ krizzii joined	17:59
	← krizzii left	18:00
	← nilg left	18:00
	→ miraj90931 joined	18:01
	→ nilg joined	18:01
	→ gnugnu8 joined	18:02
	→ mtk joined	18:03
	← miraj9093 left	18:03
	← francesca left	18:04
	→ santiissopasse joined	18:05
	→ arif-ali joined	18:05
santiissopasse	I have an older commit where I accidentally included files I didn't want to include. How can I edit the commit to only not include those files, without losing any changes I've made since then?	18:06
	→ krizzii joined	18:06
	← dagnachew left	18:07
	→ rethus joined	18:07
milki	santiissopasse: this is a textbook example of man git rebase -i	18:08
gitinfo	santiissopasse: the git-rebase manpage is available at http://jk.gs/git-rebase.html	18:08
	→ greggrot1 joined	18:08
milki	santiissopasse: !rewriting applies here though	18:08
gitinfo	santiissopasse: [!rewriting_public_history] Rewriting public history is usually bad. Everyone who has pulled the old history have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push -f` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	18:08
	← mizu_no_oto left	18:08
	→ Vivekananda joined	18:09
	→ dagnachew joined	18:09
	→ SorenHolm joined	18:09
	← cloud\|nix left	18:09
	← krizzii left	18:10
	→ dougsland joined	18:10
	→ hardenedapple joined	18:12
	← Tuna-Fish left	18:14
	→ joelroa joined	18:14
	← LuxuryMode left	18:16
	→ khmarbaise joined	18:16
	← mtk left	18:17
	→ ss1891 joined	18:17
	→ Trudko joined	18:17
	→ eletuchy joined	18:17
	← joelroa left	18:19
	← aarapov left	18:20
	→ mtk joined	18:20
	← acharlieh left	18:21
	← werlley left	18:21
	← arietis left	18:21
	← eletuchy left	18:22
	← phanimahesh left	18:23
	→ kcj joined	18:24
	← Noldorin left	18:24
	← NimeshNeema left	18:24
	→ Vampire0_ joined	18:25
santiissopasse	milki: thanks	18:25
	← Vampire0 left	18:25
	→ retnuh joined	18:26
	← cads left	18:26
	← jftf left	18:26
	← mourest left	18:26
	← LeMike left	18:27
	← eaj left	18:28
	← dougsland left	18:28
	← SorenHolm left	18:28
	→ hahuang61 joined	18:29
	→ Silmarilion joined	18:30
	← greggrot1 left	18:30
	→ MeanderingCode joined	18:30
	→ _lynX joined	18:31
	→ tirengarfio__ joined	18:31
MeanderingCode	okay, new blackmagic corner case i don't fathom: i'm squashing old history and getting patch merge conflicts and it makes no sense to me	18:31
	my strategy is to check out the commit i want to redifine as "initial commit"	18:32
thiago	ok	18:32
MeanderingCode	as	18:32
	as 'git checkout --orphan temp <SHA>'	18:32
	commit	18:32
	← tirengarfio_ left	18:33
MeanderingCode	now i 'git rebase --onto temp <SHA of that same pre-squash> master'	18:33
thiago	is your commit history entirely linear from <SHA> to HEAD?	18:33
MeanderingCode	definitely not	18:33
thiago	ok, problem 1	18:33
	are there any merges from before SHA?	18:33
MeanderingCode	no	18:34
	→ Noldorin joined	18:34
thiago	here's a suggestion:	18:34
	→ mizu_no_oto joined	18:34
thiago	echo <SHA> > .git/info/grafts	18:34
	git filter-branch --all	18:34
MeanderingCode	should i abort this rebase first?	18:35
thiago	yes	18:35
MeanderingCode	or do it while at this conflict?	18:35
	okay	18:35
	and does it matter what branch is checked out?	18:35
	the "--all" suggests it doesn't matter	18:35
	that needs one more arg, or so	18:36
	hmm	18:36
	← dagnachew left	18:36
	← hahuang61 left	18:36
thiago	probably git filter-branch -- --all	18:37
	← Vampire0_ left	18:37
MeanderingCode	well that's running through shas on the stdout, so s'th is happening	18:37
	→ edrisse joined	18:39
MeanderingCode	okay, some "suchandsuch rewritten" msgs, some "unchanged", several warnings...	18:39
	MeanderingCode looking at git log graph	18:39
	← edrisse left	18:40
	← Balliad left	18:40
	→ mani2399 joined	18:41
	← mani2399 left	18:41
MeanderingCode	wow. that looks to have worked...but just to check on things:	18:41
	→ Guest96644 joined	18:41
	← takamichi left	18:41
MeanderingCode	tags look to be attached to the commits where they're supposed to be, but filter-branch is warning me that i "said to rewrite tagged commits, but not the corresponding tag"	18:42
	← doener_ left	18:42
Guest96644	https://www.google.com/search?client=ubuntu&channel=fs&q=git+log+graph&ie=utf-8&oe=utf-8	18:42
MeanderingCode	after every output line where it says it rewrote the tag :/	18:42
	← diegoviola left	18:43
Guest96644	;/	18:43
	:/	18:43
	← Guest96644 left	18:43
	→ totokaka joined	18:45
MeanderingCode	thiago: thanks for helping here	18:45
	→ tonyj joined	18:45
thiago	MeanderingCode: you're welcome	18:45
	← SegFaultAX left	18:45
	→ cads joined	18:45
	→ BadProphet joined	18:45
	← Zaknefain left	18:46
MeanderingCode	still can't rebase onto a rewritten first commit (the first commit is where i want it, i just want to rewrite the commit msg to indicate it's where i forked another project)	18:46
	← tonyj left	18:46
	→ arietis joined	18:46
totokaka	I have a kind of strange situation. I copied a project to create a new one with it as base. Now I just did the first commit, but ofc I forgot to delete .git. Is there any way I can undo the latest commit and just put it into the working tree. That way I can just delete .git, do 'git init' and commit again.	18:46
	→ jftf joined	18:46
	→ Zaknefain joined	18:46
MeanderingCode	also, is it relevant, those warnings about tag rewrites?	18:46
	→ bwreilly joined	18:46
totokaka	LOL, I don't need to do that. I can just delete .git.	18:47
	→ tonyj joined	18:47
	→ SegFaultAX joined	18:47
	→ diegoviola joined	18:48
	← SegFaultAX left	18:48
	→ aarapov joined	18:48
thiago	MeanderingCode: don't rebase if you have merges following it	18:49
	MeanderingCode: you need to use filter-branch with a proper filter	18:49
MeanderingCode	i see	18:49
	i'll have to read up on filter-base. thanks for the direction	18:49
	← tonyj left	18:49
MeanderingCode	filter-branch	18:49
	→ tonyj joined	18:50
	→ Vampire0_ joined	18:50
	→ SegFaultAX joined	18:50
	← Zaknefain left	18:51
	← sdouglas left	18:51
	← valgrind left	18:51
	→ cloud\|nix joined	18:51
	→ Aa4on joined	18:51
	→ dagnachew joined	18:51
	→ sdouglas joined	18:51
grawity	totokaka: why are you deleting all of it anyway?	18:52
totokaka	To be able to start off with a clean history	18:52
grawity	why?	18:52
totokaka	I basically deleted everything from the old repo	18:52
	I didn't want the old history in it	18:52
thiago	why?	18:53
	← bwreilly left	18:54
	← Trudko left	18:54
	→ roymiloh joined	18:55
	← cloud\|nix left	18:56
	← kpreid left	18:56
	← sdouglas left	18:56
	← pheaver left	18:56
	← bebna left	18:57
	← dsdeiz left	18:57
	← tonyj left	18:57
	→ tonyj joined	18:57
	→ akiress joined	18:59
	→ longbeach joined	19:00
	← SegFaultAX left	19:01
	→ acharlieh joined	19:01
	→ sdouglas joined	19:01
	→ Vinnie_win joined	19:01
	← Sound left	19:02
	← bgerber left	19:03
	← faizoff_ left	19:03
	→ ArcTanSusan joined	19:03
	→ Silmarilion_ joined	19:04
	← acharlieh left	19:04
	← dagnachew left	19:07
	← Silmarilion left	19:08
	← hassoon left	19:09
	→ SegFaultAX joined	19:09
	← jaequery left	19:09
	→ gimpygoo joined	19:09
	→ dagnachew joined	19:09
	← ewet left	19:10
	→ Tuna-Fish joined	19:12
	← bartman`` left	19:12
	→ Nicholas_Rishel joined	19:12
	← Gavrisimo left	19:14
	→ francesca joined	19:14
	← ArcTanSusan left	19:14
	← nlogn left	19:15
	← Anupkumar left	19:15
	→ joelroa joined	19:15
	→ bgerber joined	19:16
	→ ArcTanSusan joined	19:17
	→ greggrot1 joined	19:17
	→ faizoff joined	19:17
	→ Balliad joined	19:18
	→ eletuchy joined	19:18
	← Balliad left	19:20
	← arietis left	19:20
	← joelroa left	19:20
	→ jatt joined	19:20
	← jatt left	19:20
	→ jatt joined	19:20
	→ nlogn joined	19:21
	← dagnachew left	19:22
	← cff left	19:22
	→ saorge_ joined	19:22
	→ nZac joined	19:22
	← nlogn left	19:22
	← upene left	19:22
	← eletuchy left	19:23
	→ RofricTheBearded joined	19:23
	→ scarabx joined	19:23
	→ aard_ joined	19:24
	← mtk left	19:24
	← jftf left	19:24
	← RofricTheBearded left	19:24
	← saorge left	19:25
	← Tuna-Fish left	19:25
	→ noisewaterphd_ joined	19:27
	← mizu_no_oto left	19:27
	→ mani2399 joined	19:27
	← mani2399 left	19:27
	→ mani2399 joined	19:28
	→ arietis joined	19:29
	← aarapov left	19:29
	← conan left	19:29
	← rq60 left	19:30
	→ nilg` joined	19:30
	→ conan joined	19:30
	→ dagnachew joined	19:30
	← khmarbaise left	19:30
	→ aarapov joined	19:30
	→ rq60 joined	19:30
	← conan left	19:31
	← miraj90931 left	19:31
	→ jdav_gone joined	19:31
	→ mizu_no_oto joined	19:32
	→ conan joined	19:33
	→ ajikeshi joined	19:34
	→ uma joined	19:35
	→ sluther joined	19:35
	← joelrobichaud left	19:35
	→ Zaknefain joined	19:35
	← Zaknefain left	19:35
uma	please help me with the issue when i try to send patch using git send-email it shows Unable to initialize SMTP properly. Check config and use --smtp-debug.	19:35
	→ veebers joined	19:36
thiago	pastebin the output with --smtp-debug	19:36
	→ shuaib joined	19:36
	→ Gizburdt joined	19:40
	→ cagedwisdom joined	19:40
	→ jughead9 joined	19:40
	← Nicholas_Rishel left	19:41
	← shuaib left	19:43
	→ misterpink joined	19:44
	← marcjs_ left	19:44
	→ jontem joined	19:44
	← mizu_no_oto left	19:47
	→ Balliad joined	19:47
	← nZac left	19:48
	→ codezomb joined	19:49
	→ bwreilly joined	19:50
	→ Watabou joined	19:50
	← dagnachew left	19:51
	← jast left	19:51
	← codezomb left	19:52
	← Balliad left	19:53
	→ george2 joined	19:54
	→ mizu_no_oto joined	19:55
	→ freestyl3r joined	19:55
	→ Jonathanchasr joined	19:55
	→ Balliad joined	19:56
	← retnuh left	19:56
	→ marcjs_ joined	19:57
	→ dagnachew joined	19:58
	← uma left	19:58
	ryanakca_ → ryanakca	19:58
	← diegoviola left	19:58
	→ jast joined	20:01
	→ holybit joined	20:03
	← marcjs_ left	20:04
	→ Silmarilion__ joined	20:04
	→ SorenHolm joined	20:04
	← ArcTanSusan left	20:06
	← metamorpy left	20:06
	→ Nicholas_Rishel joined	20:06
	← Jonathanchasr left	20:08
	← Silmarilion_ left	20:08
	→ pseudocfoch joined	20:08
pseudocfoch	hello	20:09
gitinfo	pseudocfoch: 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.	20:09
	→ daito joined	20:10
pseudocfoch	If I modify I file in my working tree in the master. While I don't commit it, If I do 'git pull --rebase' I will lose these changes to this file, right?	20:10
	Or am I wrong	20:10
	?	20:10
	gitinfo set mode: +v	20:11
skorgon	pull will fail	20:11
	it will warn you and fail before overwriting uncommited changes	20:11
	← arietis left	20:12
	→ nlogn joined	20:13
	← vurma left	20:13
cbreak	in particular, the fetch will succeed, but the rebase will fail.	20:13
	rebasing with uncommitted changes is not possible.	20:13
	← arif-ali left	20:14
	→ Gavrisimo joined	20:14
	← daito left	20:14
pseudocfoch	Because in the master I have an script I want to modify (modify a uri) to be able to execute the program in the directory which I have my repo. But... in the future I will want to do some "git pull --rebase" to "update" to the last changes What could I do? Because I need to modify that script to run the program/	20:15
	← godgodgodgo left	20:15
skorgon	commit or stash the change before the rebase	20:15
	← axl_ left	20:16
	→ joelroa joined	20:16
	← roymiloh left	20:16
	← lolmaus left	20:17
pseudocfoch	the origin repo is not mine	20:17
	→ FenderQ joined	20:17
skorgon	so?	20:17
pseudocfoch	skorgon: so... it doesn't matter?	20:18
skorgon	why would it?	20:18
	→ Dougie187 joined	20:18
	→ eletuchy joined	20:19
	← Gavrisimo left	20:19
	← joelroa left	20:21
	→ axl_ joined	20:21
	← longbeach left	20:22
	← Kayra left	20:22
	→ Kayra joined	20:22
	← francesca left	20:23
	← eletuchy left	20:23
	← xlinkz0 left	20:23
cbreak	pseudocfoch: just commit it	20:23
	→ FortySix2 joined	20:24
cbreak	pseudocfoch: if you don't want to commit it, kill the changes, they are clearly not worth it to be kept :)	20:24
	(otherwise you would commit them)	20:24
	→ Tuna-Fish joined	20:24
	← Kayra left	20:27
	→ m8 joined	20:27
	→ RaceCondition joined	20:27
	← pseudocfoch left	20:28
	← Tuna-Fish left	20:29
	← Balliad left	20:30
	→ Zaknefain joined	20:30
	→ Balliad joined	20:30
	← nicedice left	20:31
	← ToreadorVampire left	20:33
	← ghostlines left	20:34
	→ retnuh joined	20:34
	→ marcjs_ joined	20:34
	← Zaknefain left	20:35
	← cads left	20:35
	← Balliad left	20:35
	→ ghostlines joined	20:35
	→ cads joined	20:36
	← dagnachew left	20:37
	→ nszceta joined	20:37
	← nszceta left	20:38
	→ mtk joined	20:38
	← santiissopasse left	20:39
	→ Zifre_ joined	20:39
	← salamanderrake left	20:39
	← greggrot1 left	20:40
	← axl_ left	20:40
	← jcs222 left	20:40
	← jackneill left	20:41
	← marcjs_ left	20:41
	→ nszceta joined	20:41
	→ blackmesa joined	20:42
	← mtk left	20:42
	← starkhalo left	20:43
	← Zifre left	20:43
	← Dougie187 left	20:43
	→ Dudi joined	20:43
	→ Lemony joined	20:44
	← mizu_no_oto left	20:45
	← harobed left	20:45
	← Kicer86 left	20:46
	← polyzen left	20:46
	← veebers left	20:47
	→ Exancillatus joined	20:48
	→ harobed_ joined	20:49
	← harobed_ left	20:49
	→ shinnya joined	20:49
	← karpoff left	20:49
	→ harobed_ joined	20:49
	→ karpoff joined	20:50
	← harobed_ left	20:50
	← lunaphyte_ left	20:50
	→ dagnachew joined	20:50
	← noisewaterphd_ left	20:50
	← karpoff left	20:50
	→ harobed_ joined	20:50
	← harobed_ left	20:50
	→ wongon joined	20:50
	→ harobed_ joined	20:51
	← harobed_ left	20:51
	→ noisewaterphd_ joined	20:52
	→ harobed_ joined	20:52
	← harobed_ left	20:52
	→ harobed_ joined	20:53
	→ NikitaTropin joined	20:53
	← harobed_ left	20:53
	→ Kayra joined	20:53
	Zifre_ → Zifre	20:53
	→ Bosox20051 joined	20:53
	← aarapov left	20:53
	→ harobed_ joined	20:53
	← harobed_ left	20:54
	→ greggrot1 joined	20:54
	→ jpierre03 joined	20:54
	← Kayra left	20:54
	→ harobed_ joined	20:54
	→ Kayra joined	20:55
	← Exancillatus left	20:55
	→ Exancillatus joined	20:56
	→ marcjs_ joined	20:57
	← kcj left	20:59
	← Kayra left	20:59
	← iamtakingiteasy left	21:00
	→ iamtakin1iteasy joined	21:01
	→ Tuna-Fish joined	21:04
	→ Silmarilion_ joined	21:05
	→ Samual joined	21:05
	← marcjs_ left	21:05
	→ veebers joined	21:06
	← noisewaterphd_ left	21:06
	← Silmarilion__ left	21:08
	← ajikeshi left	21:08
	→ tpollard joined	21:10
	← Samual left	21:10
	← veebers left	21:10
	→ jceb joined	21:10
	→ Samual joined	21:10
	← koda left	21:11
	← greggrot1 left	21:11
	→ veebers joined	21:12
	← SorenHolm left	21:13
	← jnavila left	21:14
	→ SorenHolm joined	21:15
	→ Gavrisimo joined	21:15
	← Nicholas_Rishel left	21:16
	← RaceCondition left	21:16
	→ marcjs_ joined	21:16
	→ gazprom joined	21:16
	← Mitchbones left	21:17
	→ RaceCondition joined	21:17
	→ joelroa joined	21:17
	→ trewe joined	21:17
	→ eletuchy joined	21:19
	← Gavrisimo left	21:20
	→ Sabbath joined	21:20
	← Gizburdt left	21:21
	← joelroa left	21:21
	← mani2399 left	21:22
	→ Gizburdt joined	21:22
	← marcjs_ left	21:22
	→ jcs222 joined	21:23
	← eletuchy left	21:23
	← vital left	21:24
	← Gizburdt left	21:24
	→ Zaknefain joined	21:24
	← merica left	21:24
	→ Gizburdt joined	21:24
	← Sabbath left	21:24
	→ tomengland joined	21:25
	← zapb left	21:25
	→ salamanderrake joined	21:25
	→ Fandekasp joined	21:25
	→ santiissopasse joined	21:27
	← Tuna-Fish left	21:27
	← m8 left	21:27
	→ vkrest joined	21:28
	← sgambino left	21:29
	← Zaknefain left	21:29
	← Gizburdt left	21:29
	→ merica joined	21:29
	← WaReZ left	21:30
	← tomengland left	21:30
	← hoschi left	21:32
	→ Gizburdt joined	21:32
	← conan left	21:32
	→ Tuna-Fish joined	21:33
	→ sgambino joined	21:33
	→ axl_ joined	21:33
	← NikitaTropin left	21:33
	→ tgkokk joined	21:34
	→ pheaver joined	21:36
	→ Nicholas_Rishel joined	21:36
	→ starkhalo joined	21:36
	← ferreum left	21:37
	→ ferreum joined	21:37
	← Gizburdt left	21:38
	← ferreum left	21:38
	→ ferreum joined	21:38
	← gazprom left	21:38
	→ Gizburdt joined	21:39
	← jceb left	21:39
	→ jaequery joined	21:40
	← jaequery left	21:40
	← pheaver left	21:41
	→ hyperboreean joined	21:41
	→ jaequery joined	21:41
	← jaequery left	21:41
	→ maslowbeer joined	21:41
	→ jaequery joined	21:42
	← nszceta left	21:42
	→ Octalot joined	21:42
	→ roymiloh joined	21:42
	→ madewokherd joined	21:43
	← Gizburdt left	21:43
	→ tvw joined	21:44
	→ nszceta joined	21:45
	← jughead9 left	21:45
	→ ben_alman joined	21:46
	← pfg left	21:46
	→ sohail joined	21:46
	← jluc left	21:48
	→ jughead9 joined	21:48
	→ pfg joined	21:49
	→ WaReZ joined	21:50
	← ben_alman left	21:51
	← sohail left	21:52
	← chessguy left	21:52
	→ marcjs_ joined	21:53
	→ Bumba joined	21:53
Bumba	hi	21:53
gitinfo	Bumba: 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:53
	→ Kayra joined	21:53
	← santiissopasse left	21:53
	→ santiissopasse_ joined	21:54
	← axl_ left	21:55
	← Silmarilion_ left	21:55
	← invinceable left	21:56
	→ teran joined	21:56
	← jaequery left	21:57
	← jcs222 left	21:57
	← johnw left	21:57
	← Kayra left	21:58
	← Dudi left	21:59
	→ JerryT joined	21:59
	→ simesy joined	22:00
	→ jcs222 joined	22:00
	→ pwnz0r joined	22:03
Spyro	How do I remove tags from a remote repo?	22:03
skorgon	Spyro: you don't. !rewrite	22:04
gitinfo	Spyro: Rewriting public history is not recommended. Everyone who has pulled the old history have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push -f` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	22:04
	← pwnz0r left	22:04
Spyro	does that work to remove tags?	22:04
skorgon	well, you can remove tags, but that won't update the tag for anybody who already has it	22:05
	← hardenedapple left	22:05
thiago	Spyro: people who already have the tags will continue to have them	22:05
skorgon	so, if people already pulled your tag, it won't get updated, even if you choose to rewrite it	22:05
	← adurity left	22:05
Spyro	nobody's pulled from me	22:06
	→ chessguy joined	22:06
Spyro	I'm very unpopular :P	22:06
	→ arif-ali joined	22:06
thiago	then just git push --delete --tag xyz	22:06
	→ FUZxxl joined	22:07
FUZxxl	Hello	22:07
	← ghostlines left	22:07
FUZxxl	Is there a git command to figure out if there has ever been a file named foo in a certain git repository?	22:07
thiago	yes	22:07
	git log -- directory/foo	22:07
FUZxxl	thiago: What if I don't know in what directory the file is?	22:08
	→ takamichi joined	22:08
m0viefreak	FUZxxl: it takes globs	22:08
FUZxxl	ok	22:09
m0viefreak	git log -- '*/foo'	22:09
	be sure to quote it, so git interprets the * and not your shell	22:09
FUZxxl	thank you	22:09
thiago	you may want to use git whatchanged instead of git log then	22:10
	→ Gavrisimo joined	22:10
m0viefreak	isn't whatchanged deprecated?	22:10
FUZxxl	ok	22:11
	← santiissopasse_ left	22:13
	→ MattMaker joined	22:13
	→ pheaver joined	22:13
	→ standyro1 joined	22:14
	← Gavrisimo left	22:14
	→ cfoch joined	22:14
	→ francesca joined	22:16
	← Gamecubic left	22:16
	← Tuna-Fish left	22:16
	→ Gamecubic joined	22:16
	→ joelroa joined	22:18
	→ Zaknefain joined	22:18
	→ nevyn joined	22:19
	← ehmatthes left	22:19
	← tvw left	22:19
	← Bumba left	22:19
	→ Tuna-Fish joined	22:19
	→ eletuchy joined	22:20
	→ MattMake_ joined	22:21
	← MattMaker left	22:22
	← joelroa left	22:22
	→ Sonderblade joined	22:23
	← Zaknefain left	22:23
	Vampire0_ → Vampire0	22:24
	← eletuchy left	22:24
	→ teran_ joined	22:25
	← mishok13 left	22:25
	→ xaq joined	22:25
	→ teran__ joined	22:26
	← ferreum left	22:27
	← teran left	22:27
rawtaz	gitlab is really looking nice	22:28
	← teran_ left	22:29
thiago	so I hear	22:29
	→ dsdeiz joined	22:29
	← Freeman42 left	22:30
rawtaz	quite funny that github still have their network graph horizontally laid out	22:30
	gitlab apparently managed to realize how stupid that is, and made it vertical instead :D	22:30
	it's a bit slow, but that might be just the demo page	22:32
	← jcs222 left	22:32
	← pantsman left	22:32
	← sdouglas left	22:33
	→ sdouglas joined	22:33
	← takamichi left	22:33
	← SHyx0rmZ left	22:34
	→ hahuang61 joined	22:35
	← MattMake_ left	22:37
	→ MattMaker joined	22:37
	← francesca left	22:37
	← vkrest left	22:37
	← sdouglas left	22:38
	← hahuang61 left	22:39
	← pheaver left	22:39
	→ Dougie187 joined	22:40
	→ tomengland joined	22:40
	← SorenHolm left	22:40
	← Tuna-Fish left	22:41
	→ Tuna-Fish joined	22:41
	← roymiloh left	22:43
	→ ArcTanSusan joined	22:43
	→ woollyams joined	22:44
	→ sohail joined	22:44
	← WaReZ left	22:45
	← harobed_ left	22:46
	← blackmesa left	22:47
	→ blackmesa joined	22:47
	→ AccessibleWeb joined	22:47
	AccessibleWeb → reskp	22:48
xender	rawtaz: Why "stupid"?	22:51
rawtaz	i'd go for silly if that makes you feel better :)	22:52
xender	I think humans are versatile enough that it doesn't make difference...	22:52
	← thevishy left	22:52
	→ khmarbaise joined	22:52
	← recycle left	22:52
	← lithiumjake left	22:52
rawtaz	xender: hm, start reading all your text from top to botton (i.e. vertically instead of horizontally) and you'll see that we find some things easier than others :)	22:53
xender	I rather wonder, why orientation of graph matters at all. Especially, when gitk is serving spaghetti sometimes	22:53
	→ Kayra joined	22:53
	← sluther left	22:53
xender	rawtaz: Chinese done that for tousands of years I think. So it worked ;)	22:53
rawtaz	xender: but to answer your Q, i think it makes way more sense to scroll vertically than horizontally, just like web pages	22:53
	hehe good point :P	22:54
	← makubi left	22:55
xender	Yeah, in case of scrolling it matters. But AFAIK Github's network view shows only a few last commits	22:55
	→ JTAAHV5T joined	22:55
rawtaz	mhm	22:55
xender	It's mote "who forks who" than a layout of branches...	22:56
	*more like	22:56
	← aard_ left	22:56
xender	My writing gets bad now...	22:56
	← Exancillatus left	22:56
	← ArcTanSusan left	22:56
	→ Exancillatus joined	22:57
	← FortySix2 left	22:57
	← Exancillatus left	22:58
	← Kayra left	22:58
	← Rastus_Vernon left	22:59
	→ makubi joined	23:00
	→ Balliad joined	23:00
	→ mdub joined	23:00
	← woollyams left	23:00
	→ JerryT_ joined	23:01
	→ francesca joined	23:01
	→ hunt3r joined	23:01
	← JerryT left	23:01
	→ Yomi joined	23:02
	← Balliad left	23:02
	→ Balliad joined	23:02
	→ chrisshattuck joined	23:02
	← standyro1 left	23:02
	← leeN left	23:03
	← chessguy left	23:03
	→ sdouglas joined	23:04
	← tgkokk left	23:04
	→ Kayra joined	23:05
	← sohail left	23:06
	→ whitemoustache joined	23:06
	← jogos left	23:06
	→ jnewt joined	23:07
	→ lithiumjake joined	23:07
	→ maestrojed joined	23:07
	→ jmpp joined	23:07
	jmpp greets!	23:08
	→ Exancillatus joined	23:08
rawtaz	hello	23:08
jmpp	is it customary to delete merged branches?	23:08
	← scarabx left	23:08
jnewt	when i get a "both modified", how do i know which one is in my working directory? in this case i tried stash pop, and got a conflict. is my working file the one from stash, or the one that was there pre-pop?	23:08
osse	jnewt: it's a partially resolved file	23:08
	← sdouglas left	23:08
jmpp	if the file is merge'able, it should have conflict markers within it	23:08
rawtaz	jmpp: if you are not planning on doing any more fork on the merged branch, then sure, not much reason to keep it	23:08
osse	jnewt: so where Git managed to do a merge you will see the merged result, and in other places you'll see conflict markers	23:09
jmpp	so you have to look through it and decide which blocks you want to keep, and then mark it as resolved	23:09
	← reskp left	23:09
rawtaz	jmpp: if it's a branch you pushed so others can merge it (e.g. upstream), it might be good to have it around until they did the final merge though, in case they want you to add something	23:09
jmpp	jnewt: if it's a binary file, then you should have gotten two files: file~HEAD and file~SOMETHING-ELSE	23:09
jnewt	i really just want it to use the stash file. can i just tell it to use that?	23:09
	it's not binary	23:10
	→ bsaaasd2 joined	23:10
skorgon	jnewt: git checkout --theirs <file>	23:10
osse	jnewt: git checkout --theirs <file> should do the trick	23:10
jmpp	rawtaz: I don't think I'll be working any more on that branch... but if for some reason I want to look for something in it, a commit, a log, something...?	23:10
	I can find everything in master, since it's merged?	23:10
osse	jmpp: yep	23:10
	→ Gavrisimo joined	23:11
rawtaz	jmpp: deleting the branch will just delete the pointer that the branch is (it's a pointer to a commit), the history will stay intact	23:11
	jmpp: try it by doing a !lol before and after you delete the merged branch	23:11
gitinfo	jmpp: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	23:11
rawtaz	jmpp: youll see that the history is the same, except that the label for the branch, by the commit it was on, is gone	23:11
	→ reskp joined	23:12
	→ Zaknefain joined	23:13
jmpp	if that's so, I could recreate the branch at any point, by branching master from where it was originally branched, right?	23:13
	→ greggrot1 joined	23:14
	→ Discovery joined	23:14
	Discovery → Guest46599	23:14
	← Gavrisimo left	23:15
skorgon	jmpp: as long as a commit is part of a branch or tag it will always be in your repo. and you can always start/create branches at any arbitrarily chosen commit/tag/branch	23:16
	← reskp left	23:16
	→ jmcantrell joined	23:17
	← looper_ left	23:17
	← Zaknefain left	23:17
jmpp	I wonder... what happes if I branch master from HEAD~n and then merge it into master back again at HEAD~(n-m), as to simulate having created the branch, worked on it, and then merged it back in...	23:18
	transparent, auto merge of all the files?	23:18
	→ weltling joined	23:18
	← BadProphet left	23:19
	← greggrot1 left	23:19
jmpp	sorry, the merge would be at HEAD~(n+m)	23:19
	→ joelroa joined	23:19
	→ BadProphet joined	23:19
jmpp	hhhmmm, no, the future of n would indeed be n - m, not n + m	23:19
	← kotk1 left	23:19
jmpp	adding more to n would only more the pointer backwards	23:20
	s/more/move/	23:20
	→ eletuchy joined	23:21
skorgon	jmpp: i have no clue what you wanna do here, but you should probably just !try	23:21
gitinfo	jmpp: [!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/tias.html may help with git-specific TIAS.	23:21
	← whitemoustache left	23:22
jmpp	skorgon: no, not wanting to do anything, just wondering about how the repo history would look like if I tried to recreate the branch, from this discussion that the history wont be affected by deleting it	23:22
	just a thought experiment, not attempting anything ;)	23:23
	← joelroa left	23:23
skorgon	well, just do 'git branch foo <commit>' that will start a branch at the given commit and you're done	23:23
	← BadProphet left	23:23
	← eletuchy left	23:25
	← francesca left	23:26
	→ elighcash joined	23:27
	← teran__ left	23:27
	→ chessguy joined	23:28
	← jughead9 left	23:28
	jmpp nods	23:29
	→ jmau5 joined	23:30
	← mdub left	23:30
	← skyflash_ left	23:32
	← Balliad left	23:34
	→ sluther joined	23:34
	← tomengland left	23:35
	← jmau5 left	23:35
	→ jmau5 joined	23:36
	→ woollyams joined	23:37
	← khmarbaise left	23:38
	→ jaequery joined	23:38
	← tplaner left	23:39
	← gnugnu8 left	23:39
	→ reskp joined	23:40
	← jmau5 left	23:40
	→ daito joined	23:41
	← akiress left	23:42
	← reskp left	23:45
	→ D4N3 joined	23:45
	← Dougie187 left	23:45
	← ngladitz left	23:45
	← daito left	23:46
	→ ben_alman joined	23:46
	→ russm joined	23:46
	← maslowbeer left	23:48
	← elighcash left	23:49
	→ elighcash joined	23:49
	← D4N3 left	23:49
	→ D4N3 joined	23:49
	D4N3 → danemacmillan	23:50
	← ben_alman left	23:50
	← dagnachew left	23:51
	→ mwarning joined	23:51
	← danemacmillan left	23:51
	→ dagnachew joined	23:52
	→ johnkevinmbasco joined	23:52
	← vince_prignano left	23:52
	→ danemacmillan joined	23:52
	← nszceta left	23:53
	← elighcash left	23:53
mwarning	hi, I've have messed up my git repository, maybe someone can give me a hint how to fix it: https://github.com/mwarning/KadNode.git	23:53
milki	mwarning: why dont you first define "messed up"	23:54
mwarning	I have made an empty dummy commit that is not showing up during rebase	23:54
thiago	what's an empty dummy commit?	23:54
	how did you do the rebase	23:54
	→ seksifemale joined	23:54
seksifemale	hi	23:54
gitinfo	seksifemale: 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.	23:54
thiago	and why are you saying it's "not showing up"	23:54
mwarning	a commit without changes and a name without any meaning	23:55
	← nfk left	23:55
mwarning	sec please	23:55
thiago	so git commit --allow-empty?	23:55
mwarning	I haven't used that command yet	23:55
	→ nszceta joined	23:55
	← Nicholas_Rishel left	23:56
thiago	how did you create an empty commit without that?	23:56
	→ sohail joined	23:56
	unsigned_ → unsignedint	23:56
mwarning	I don't remember anymore (at least I know I haven't used --allow-empty)	23:56
thiago	if you use git show, it shows no diff, right?	23:57
	→ ben_alman joined	23:57
	→ conan joined	23:57
	→ ariscop joined	23:58
	→ Diemuzi joined	23:58
	gitinfo set mode: +v	23:58
mwarning	thiago, git show shows me the diff of my last commit	23:58
thiago	if you use git show on that commit	23:58
mwarning	right, the commit in question is empty	23:59
	→ tomengland joined	23:59
	← danemacmillan left	23:59
thiago	ok	23:59
mwarning	no diff is displayed, just the commit message and such	23:59
	→ danemacmillan joined	23:59
thiago	it must have been an --allow-empty, because git commit doesn't allow empty commits otherwise	23:59
	anyway, how did you rebase?	23:59

Logs Search ←Prev date Next date→

Channels Documentation