IRCloggy #git 2014-11-23

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-11-23
	→ smccarthy joined	00:02
	→ Literphor joined	00:04
	→ otter768 joined	00:04
	→ LucasKA joined	00:06
	→ russt joined	00:07
	← Rastus_Vernon left	00:07
	← karthik_ left	00:07
	← Literphor left	00:08
	← daedeloth left	00:08
	→ shawn joined	00:09
	shawn → Guest26641	00:09
	→ sajan joined	00:09
	← Guest26641 left	00:10
	← nnyk_ left	00:13
	→ RaceCondition_ joined	00:13
	← sq-one left	00:15
	→ dorkmafia joined	00:17
	→ scottschecter joined	00:17
	← RaceCondition left	00:17
	RaceCondition_ → RaceCondition	00:17
dorkmafia	has anyone used git p4 before?	00:17
	← endiruna left	00:17
thiago	yes	00:18
	→ EminenceHC joined	00:19
	→ hexagoxel_ joined	00:21
	← Zupoman left	00:21
	← ruukasu left	00:21
	→ aspiers joined	00:21
	← zivester left	00:22
	← JSharpe left	00:23
	→ zivester joined	00:23
	← bgerber left	00:23
	← EminenceHC left	00:24
	→ Nijikokun joined	00:25
	← hexagoxel left	00:25
	← Nijikokun left	00:25
	→ Nijikokun joined	00:25
	← Nijikokun left	00:25
dorkmafia	is the git p4 clone a git repo i could setup as a git server meaning I could push/pull to it from another cpu?	00:26
thiago	no	00:27
dorkmafia	or is there a way from me to create a pending changelist in p4 from the git-p4 repo?	00:27
thiago	you should never push back into that	00:27
dorkmafia	i'm trying to figure out how I can keep my laptop and desktop in sync	00:27
thiago	use git p4 to submit to the p4 server	00:27
	→ Nijikokun joined	00:27
thiago	regular sharing, as if p4 wasn't involved	00:28
	using git fetch && git reset --hard	00:28
	← m0ltar left	00:28
dorkmafia	how would I fetch from my tower if the commit isn't submitted to p4	00:29
	i don't want to submit my commits yet but I would like to grab them and work on them on my laptop	00:30
thiago	on one machine, git fetch from the other machine	00:31
	then git reset --hard to what you've just fetched. That means both machines will be at the same commit.	00:31
	be careful, this will throw away any new commits you might have made	00:31
dorkmafia	oh ok cool	00:32
thiago	this has nothing to do with p4. This is simply making two repositories be the same.	00:32
	the p4 part comes into place when in one of those you do a git p4 submit and a git p4 rebase	00:32
dorkmafia	yah do i have to add the tower as a remote?	00:32
thiago	the other one will get the updates when it next fetches and resets	00:32
	← acharlieh left	00:35
	← mizu_no_oto left	00:36
	← Velzes left	00:36
	→ skorgon joined	00:36
	← skorgon left	00:36
	→ skorgon joined	00:36
imastupidguest	Does anyone here use bitbucket? I'm wondering if there's some way to include a message (or something) when I do a 'git push -u origin master'	00:39
	?	00:39
	→ jb55_ joined	00:39
imastupidguest	Dunno even what to google for about it	00:40
	← otter768 left	00:40
Seveas	imastupidguest: there is not	00:40
imastupidguest	ok. thx	00:41
Seveas	imastupidguest: for what reason would you want that?	00:42
	← delight left	00:42
	← Pyrogerg left	00:42
	← jb55 left	00:42
imastupidguest	Seveas: Seems like it would be good to log pushes to that online repo	00:42
	Prolly it does it for me though (bitbucket does I mean)	00:43
Seveas	imastupidguest: the reflog does this. gitHub also stores this as 'events', not sure what bitbucket does.	00:43
	← AR45 left	00:44
	→ delight joined	00:45
imastupidguest	Seveas: Ok. I'll have to poke around a bit more to see what's what I guess.	00:45
	Is 'git push -u origin master' even the right way to do a push to bitbucket when it isn't the first one/time doing it?	00:45
Seveas	i'd leave off the -u	00:46
	← dorkmafia left	00:46
imastupidguest	ok	00:46
	→ si13b joined	00:46
imastupidguest	Does using that command clobber the thing on bitbucket?	00:46
	← alanwill left	00:48
	← wayne left	00:48
	← sajan left	00:49
	← LucasKA left	00:50
	→ FreezingDroid joined	00:50
imastupidguest	I see there are a lot of command in the git manual page of the format 'git-SomeCommand' Is that some newer way to issue commands than git SomeCommand ?	00:50
	← FreezingCold left	00:50
Seveas	no, it's just a way of splitting the documentation in per-command pages	00:51
	(and a hystorical, no longer recommended and in many case not even possible, way of calling git commands)	00:52
	bender → zoly	00:52
imastupidguest	I see	00:52
	right on	00:52
	← raven-au left	00:53
	← kirin` left	00:53
	→ ScioMin joined	00:54
	→ mdhopkins joined	00:55
	← mellernoia left	00:56
	← zivester left	00:58
	→ moritzs joined	00:58
	→ zivester joined	00:59
	← moritzs left	00:59
	→ moritzs joined	01:00
	← moritzs left	01:00
	→ fstd_ joined	01:00
	→ moritzs joined	01:00
	→ thedodd joined	01:01
	← dtrott left	01:01
	← FreezingDroid left	01:02
	← trewe left	01:02
	← thedodd left	01:03
	→ raven-au joined	01:04
	→ ruukasu joined	01:04
	→ kirin` joined	01:04
	← fstd left	01:04
	fstd_ → fstd	01:04
	→ gbbr joined	01:06
gbbr	after squashing together my 2 latest commits using "git rebase -i COMMIT_ID" I get: ((no branch, rebasing 106-redundant-return))	01:06
	→ dtrott joined	01:07
gbbr	how do I "commit" the changes?	01:07
	better yet, how do I get out of "rebasing" mode	01:07
	→ aidalgol joined	01:07
	→ ascarter joined	01:07
	← russt left	01:08
	→ lidaaa joined	01:08
	← WaReZ left	01:08
si13b	git rebase --abort	01:09
	← hexagoxel_ left	01:09
gbbr	yeah I just realized I didn't go far back enough	01:09
	← cagedwisdom left	01:09
	→ FreezingCold joined	01:10
gbbr	so now i've successfully squashed the last 2 commits	01:10
	but the push to origin is rejected	01:10
	do i need to -f ?	01:10
si13b	push will always fail after rebase	01:10
	the history has changed, so you will need to -f	01:11
gbbr	nice, thanks si13b	01:11
si13b	np	01:11
	← gbbr left	01:12
	← Skapadapaduu left	01:12
	→ karthik__ joined	01:12
thiago	si13b: you didn't warn him about the dangers of history-rewriting	01:12
brucelee	some more senior programmers make it very clear what their commits do	01:14
	like they would have very specific changes all related to one thing go under 1 commit	01:14
	but when i use commit, i use it more as a "save" feature	01:14
	how do i go backwards and organize particular parts of a change to one file under one commit	01:14
	← ruukasu left	01:16
	→ GHAAPQ9C joined	01:17
	→ Marcus__ joined	01:19
thiago	brucelee: git rebase -i	01:19
Seveas	brucelee: you're going to love rebase --interactive and add -p	01:20
brucelee	:p	01:20
	→ githogori joined	01:21
brucelee	so i pretty much create a new branch of master, and rebase my work over this new branch?	01:21
	rebase doesnt go by commits does it?	01:21
	it goes by changes right?	01:21
	actually nevermind, i think i get it	01:22
	→ dorkmafia joined	01:22
	← robustus left	01:22
Seveas	it goes by commit, but makes it possible to edit, split, combine or drop commits	01:23
	← MLM left	01:23
Seveas	definitely a case of !backup and !tias :)	01:23
gitinfo	Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups	01:23
	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.	01:23
	← karthik__ left	01:23
	← adamben left	01:23
brucelee	Seveas: nice :p	01:23
	i think i have na idea of how this will go	01:23
	cant wait to start being less noob	01:23
	→ EminenceHC joined	01:23
	← moritzs left	01:24
brucelee	hmm im reading the help page about the -p option... preserve merges	01:24
	still dont really understand what it would do though	01:24
	→ robustus joined	01:25
brucelee	it even says combining with --interactive explicitly is generally not a good idea	01:25
	unless you know what you are doing :p	01:25
	← bb010g left	01:27
	← nfk left	01:27
	← EminenceHC left	01:28
	← delight left	01:30
	← smccarthy left	01:30
	→ danemacmillan joined	01:35
	← skorgon left	01:36
	← HelloShitty left	01:39
	→ ruukasu joined	01:40
	← danemacmillan left	01:40
	← fahadash left	01:41
	→ palcu joined	01:41
	← brucelee left	01:42
	→ kyb3r_ joined	01:43
	← shinnya left	01:44
	← imastupidguest left	01:45
	← palcu left	01:46
	→ smccarthy joined	01:47
	→ thedodd joined	01:47
	← Nijikokun left	01:53
	← jagob left	01:55
	→ chrisshattuck joined	01:56
	← chrisshattuck left	01:58
	→ eyeRobut joined	01:58
puff	good evening.	01:58
	→ chrisshattuck joined	02:00
	← stellarhopper left	02:00
	← chrisshattuck left	02:01
	→ hcc23 joined	02:01
	← amikiri left	02:01
	← CKyle left	02:03
	→ amikiri joined	02:05
	→ Nijikokun joined	02:05
	→ BiggFREE joined	02:06
	→ Literphor joined	02:06
	← ascarter left	02:07
	← RaceCondition left	02:08
	← ruukasu left	02:08
	← thedodd left	02:09
	→ AR45 joined	02:09
	← AR45 left	02:09
	← CustosL1men left	02:10
	→ AR45 joined	02:11
	→ imastupidguest joined	02:13
	→ aartist joined	02:15
	← AR45 left	02:16
	→ philipandersen joined	02:17
	→ Vampire0 joined	02:18
	← BiggFREE left	02:19
	← Vampire0_ left	02:20
imastupidguest	I had my few little files right in the main dir where my .git repo resides, and I just moved them into a new 'src' dir that I created - now, 'git status' shows a list of the 'deleted' files. Would I use git rm <file> to make those entries disappear from the output of git status? If not, how can I do that?	02:22
thiago	imastupidguest: yes	02:22
imastupidguest	thiago: thx	02:23
	→ EminenceHC joined	02:25
	← dorkmafia left	02:26
	→ bhuvanaurora joined	02:26
imastupidguest	thiago: Wait a min now. I don't want to do anything to the actual files (least of all delete them, nor remove them from tracking) I just want the stupid 'delete <file name>' stuff to go away from the output of git status. When I ran git rm * (those delete entries are the only thing in my git status output right now) I get : fatal: not removing 'src' recursively without -r <-- why would it mention 'src' (the name of the dir I	02:26
	into) in that output?	02:26
	← Literphor left	02:28
imastupidguest	I'm a little confused on how to use git in this particular use case (files moved into a newly created subdir)	02:29
	→ punchagan joined	02:29
thiago	imastupidguest: git rm oldfilename	02:30
	← EminenceHC left	02:30
thiago	that will stop tracking oldfilename	02:30
	→ danemacmillan joined	02:31
	← crystal77 left	02:32
	← raven-au left	02:32
	← smccarthy left	02:32
	← Comentarinformal left	02:32
	← ScioMin left	02:32
	→ crystal77 joined	02:34
imastupidguest	thiago: I need to be crystal clear on this before I do something that is difficult or impossible to undo. The file names did not change, the command was 'mkdir src && mv filename src/filename' I still need them to continue being tracked just don't want to see 'deleted filenam' in the output of git status is all. Now perhaps my definition of filename is off - should it be that you are calling 'src/filename' the "oldfilename" or wou	02:34
	cause git to stop tracking the file altogether?	02:34
thiago	imastupidguest: the file names changed	02:35
	imastupidguest: changed from filename to src/filename	02:35
imastupidguest	ok	02:35
	← githogori left	02:35
imastupidguest	thank you so much for clarifying	02:35
thiago	imastupidguest: if "filename" does not exist anymore, it's been removed	02:35
	git rm to make it permanent	02:35
imastupidguest	ahh	02:35
thiago	src/filename is new. You need to git add it.	02:35
	→ thedodd joined	02:36
	→ raven-au joined	02:36
imastupidguest	And now I know why 'src' appeared in the output after running/trying to run git rm * <-- that would have been a horrible command to have execute. Thank God git didn't just do it.	02:36
	ahhh	02:36
thiago	it appeared there because * includes src	02:37
	so you told git to remove it	02:37
imastupidguest	now I'm really git... ing it (ha ha no pun intended)	02:37
	← hcc23 left	02:38
	← LeMike left	02:39
	→ dorkmafia joined	02:39
	→ otter768 joined	02:41
	→ palcu joined	02:42
	← mdhopkins left	02:42
imastupidguest	thiago: So, after running that git rm command successfully (with specific file names now) I see them listed as stuff being ready to commit. Does this mean that git will track the actual deletion of the files as it's own event? And, in the bigger picture, what is going on with the way git works? If I rm something physically, I rm it in git? So, in general, git is paralleling what I do physically? (by physically I mean just regular fi	02:44
	manipulation in the terminal).	02:44
	← thedodd left	02:44
thiago	imastupidguest: you can use git rm to remove from git and from the filesystem	02:45
	or you can rm the file and just do a git commit filename to make it permanent	02:45
imastupidguest	If I add something physically (touch filename or mkdir somedir) I add it in git (looks like a perfect parallel)	02:45
thiago	you need to do that, yes	02:45
	→ mdhopkins joined	02:45
	← otter768 left	02:46
	→ Pyrogerg joined	02:46
imastupidguest	thiago: I see. This is cool. git is cool and you gave me a leap ahead here. thx	02:46
	← palcu left	02:47
	→ bgerber joined	02:48
	→ githogori_ joined	02:48
	← ErKa left	02:48
	→ Technocrat joined	02:50
	← philipandersen left	02:51
	→ philipandersen joined	02:51
	→ Sleepy63 joined	02:52
	→ rchavik joined	02:52
	← Gino_ left	02:52
	← Nijikokun left	02:53
	→ m0ltar joined	02:53
	← si13b left	02:54
	← Technocrat left	02:54
	→ elepfontius joined	02:57
	← aartist left	02:57
Lyqyd	For the moving files to another location case, you could also use `git mv oldpath newpath` to move the file and stage the change.	02:58
	→ Rastus_Vernon joined	02:58
	→ whomp joined	03:00
	→ tmcmahon joined	03:00
whomp	how do i sync my fork up with the repo it was forked from? i looked at https://help.github.com/articles/syncing-a-fork/, but `git fetch upstream` doesn't work	03:00
	→ dreiss joined	03:01
thiago	whomp: fetch from the original and the push to your repo	03:01
whomp	thiago, how do i do that?	03:02
	like what commands	03:02
thiago	whomp: git fetch and git push	03:03
	I don't know what you named your remotes and what branches you want to update, so I can't help further	03:03
	→ learner joined	03:04
phy1729	whomp: you need to git remote add upstream URL	03:05
imastupidguest	I need a gob (is it called a glob?) to make git ignore an entire directory and anything/everything in it. My dir will be named 'bin' <-- would 'bin/*' (without the quotes) be the right thing to add to my .gitignore then?	03:06
	→ IIT joined	03:06
thiago	imastupidguest: "bin" is enough	03:06
imastupidguest	or bint/ ??	03:06
	Is git now tracking dirs too?	03:07
thiago	no	03:07
	but if you ignore a dir, it ignores everything in that dir	03:07
	← dtrott left	03:07
imastupidguest	hmm, ok then	03:07
	right on	03:07
whomp	phy1729, something like `git remote add upstream https://github.com/michaeleisel/ExSwift.git`?	03:08
imastupidguest	thiago: Is this also correct if I do it with global .gitignore then?	03:08
thiago	imastupidguest: yes	03:08
imastupidguest	right on	03:08
	← jb55_ left	03:09
phy1729	whomp: that looks reasonable	03:09
	→ jb55_ joined	03:09
whomp	phy1729, ok but that's the url of my fork	03:10
	do i use that or the branch i forked off of?	03:10
thiago	whomp: let's take a step back	03:10
phy1729	use the URL of upstream	03:10
thiago	whomp: what do you mean by "sync" ?	03:10
imastupidguest	So the only difference between a global gitignore and a local one is the name of the file (ie: .gitignore_global vs. .gitignore)? And I could place either of the files anywhere git has access perms to read it?	03:11
	→ Nijikokun joined	03:11
whomp	so i'm not allowed to branch off of the actual repo and push changes that i can put in pull reqs	03:12
	so i fork. but then as that repo changes, i need to keep up on my fork, right?	03:12
thiago	imastupidguest: there's no .gitignore_global	03:12
	→ thedodd joined	03:12
thiago	whomp: right	03:13
whomp	so what would be the easiest way to do that?	03:13
thiago	whomp: your local repository, did you clone yours or the original?	03:13
	← darkbasic left	03:13
	← graphitemaster left	03:13
whomp	thiago, mine	03:13
	← jb55_ left	03:13
thiago	whomp: ok, first mistake	03:13
	whomp: you should have cloned the original	03:14
	whomp: not a big deal, though	03:14
	whomp: git remote add upstream <URL-to-the-original>	03:14
	then git fetch upstream	03:14
	→ darkbasic joined	03:14
	→ DolpheenDream joined	03:14
phy1729	thiago: depends on your convention. Personally I fork on github and clone that so my copy is origin and upstream is upstream	03:14
	→ AR45 joined	03:14
	← AR45 left	03:14
	→ AR45 joined	03:14
whomp	thiago, ok	03:15
	done	03:15
thiago	phy1729: sounds wrong. You usually want to pull from the original.	03:15
	whomp: now git rebase upstream/master (or whatever the branch is named in the upstream)	03:15
	→ alanwill joined	03:15
imastupidguest	thiago: So what is this : https://help.github.com/articles/ignoring-files/ <-- talking about then (as it relates to file name vs. file location)? Am I reading the wrong document for my use case, or am I just misunderstanding what's being said in the doc? I'm confused.	03:16
thiago	imastupidguest: a recommendation I don't follow	03:17
	imastupidguest: therefore, .gitignore_global does not exist	03:17
imastupidguest	I see they are referring to a git config command but they don't seem to break it down into detail very well what 'precisely' to do.	03:17
thiago	imastupidguest: it sets the core.excludesfile globally	03:18
	→ au_ joined	03:18
	← au_ left	03:19
thiago	imastupidguest: man git-config will explain what the setting is	03:20
gitinfo	imastupidguest: the git-config manpage is available at http://jk.gs/git-config.html	03:20
imastupidguest	thiago: So once I do that (set the core.excludesfile globally - and I'm assuming 'excludesfile' is an example I can replace with any name I choose) - once I do that, I could, theoretically place the 'excludesfile' anywhere I want?	03:20
thiago	imastupidguest: the excludesfile is an extra file that contains ignore patterns	03:20
imastupidguest	ok ok	03:20
thiago	imastupidguest: yes, you can place it anywhere you want	03:20
imastupidguest	Now it's clear. thx	03:20
	→ notjohn joined	03:21
imastupidguest	Just out of curiosity, is it required to create the file before running the git config command for it?	03:22
	→ LifeBlood joined	03:22
imastupidguest	I'm (hoping) that the answers to questions like this is teaching me some across the board stuff about git	03:22
thiago	imastupidguest: I don't know	03:23
	imastupidguest: !tias	03:23
gitinfo	imastupidguest: 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.	03:23
imastupidguest	ok	03:23
	← bhuvanaurora left	03:23
	→ graphitemaster joined	03:23
imastupidguest	yeah, but I think that left something out of the path there. It's usually try it > break it > fix it > eventually learn a bunch of stuff a week later after you figure out how to fix it (not : try it > learn something). Just saying. :)	03:24
	→ bhuvanaurora joined	03:26
	→ jgardella joined	03:26
	← punchagan left	03:27
	← AR45 left	03:27
	→ AR45 joined	03:28
	← amikiri left	03:28
	→ shinnya joined	03:29
	← St_Marx left	03:30
	→ EminenceHC joined	03:30
	→ St_Marx joined	03:31
	← bhuvanaurora left	03:33
	→ mizu_no_oto joined	03:34
	← msonntag left	03:34
	← zivester left	03:34
	← Consuela left	03:35
	→ NoNMaDDeN joined	03:35
	← EminenceHC left	03:35
	→ zivester joined	03:35
	→ sinequanon joined	03:36
	→ msonntag joined	03:36
	← sinequanon left	03:37
	← Pyrogerg left	03:38
	gitinfo set mode: +v	03:38
thedudez0r	is it possible to delete the last two commits even if they've already been pushed to bitbucket?	03:38
thiago	thedudez0r: yes, but mindful what will happen if other people have already got them	03:39
	thedudez0r: it's a history !rewrite	03:39
gitinfo	thedudez0r: Rewriting public history is not recommended. Everyone who has pulled the old history have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push -f <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	03:39
	← IIT left	03:39
	→ hush joined	03:41
	← CEnnis91 left	03:42
	→ palcu joined	03:43
	→ Cassiel joined	03:45
	→ Zenith77 joined	03:47
	← AR45 left	03:47
	← palcu left	03:48
	← dreiss left	03:48
	→ AR45 joined	03:48
	← zivester left	03:49
	→ dsdeiz joined	03:50
	→ tmcmahon_ joined	03:55
	← coasterz left	03:56
	← AR45 left	03:57
	→ AR45 joined	03:57
	→ zivester joined	03:58
	← AR45 left	04:00
	→ AR45 joined	04:00
	→ dreiss joined	04:00
	→ ncd\|leeN joined	04:00
	→ cagedwisdom joined	04:01
	← AR45 left	04:01
	→ AR45 joined	04:02
	← AR45 left	04:02
	← tmcmahon left	04:02
	→ AR45 joined	04:02
	tmcmahon_ → tmcmahon	04:02
	← leeN left	04:03
	← m0ltar left	04:04
	→ Technocrat joined	04:07
	← githogori_ left	04:07
	→ bb010g joined	04:07
	← AR45 left	04:09
	→ AR45 joined	04:10
	← AR45 left	04:14
	→ githogori_ joined	04:14
	→ AR45 joined	04:14
	← AR45 left	04:16
	→ AR45 joined	04:16
	→ CEnnis91 joined	04:17
	→ Pyrogerg joined	04:17
	→ dtrott joined	04:17
	← AR45 left	04:18
	→ AR45 joined	04:19
	← unixpro1970 left	04:20
	← fstd left	04:20
	→ fstd joined	04:21
	→ russt joined	04:21
	← AR45 left	04:21
	→ Milkweed joined	04:21
	→ jacksparrow007 joined	04:22
	→ AR45 joined	04:23
	← Polyatomic left	04:23
	← AR45 left	04:24
	← zivester left	04:25
	→ zivester joined	04:26
	← imastupidguest left	04:28
	→ learner1 joined	04:29
	← kyb3r_ left	04:29
	→ unixpro1970 joined	04:30
	→ faylite joined	04:30
	← Noldorin left	04:31
	← learner left	04:31
	← Technocrat left	04:32
	→ EminenceHC joined	04:35
	→ kadoban joined	04:36
	← mdhopkins left	04:38
	→ brucelee joined	04:39
	← dreiss left	04:40
	← dtrott left	04:40
	→ chrisshattuck joined	04:41
	→ coasterz joined	04:41
	← EminenceHC left	04:41
	→ otter768 joined	04:42
	← jgardella left	04:42
	← brucelee left	04:44
	← unixpro1970 left	04:44
	← otter768 left	04:46
	← russt left	04:46
	← kukks left	04:46
	← tmcmahon left	04:48
	→ iamjarvo joined	04:48
	← NaStYdoG left	04:49
	← mizu_no_oto left	04:49
	→ russt joined	04:50
	→ NaStYdoG joined	04:50
	← rchavik left	04:50
	→ kyb3r_ joined	04:53
	← shinnya left	04:55
	← JanC left	04:57
	→ Peuc2 joined	04:59
	→ mizu_no_oto joined	04:59
	← Peuc left	05:01
	Peuc2 → Peuc	05:01
	→ rchavik joined	05:03
	→ angelsl joined	05:03
	← whomp left	05:05
	← CheckDavid left	05:07
	← Arsonide left	05:07
	← ColdKeyboard left	05:07
	→ Arsonide joined	05:07
	→ Literphor joined	05:08
	← jacksparrow007 left	05:09
	← Milkweed left	05:09
	→ lacrymology joined	05:10
	→ otter768 joined	05:10
	→ jacksparrow007 joined	05:10
	→ JanC joined	05:11
	← scottschecter left	05:11
	→ qbann0p joined	05:15
	→ mennea joined	05:16
	← nkouevda left	05:17
	← mizu_no_oto left	05:19
	→ dreiss joined	05:25
	→ thumpba joined	05:27
	→ bhuvanaurora joined	05:27
	← lasers left	05:28
	→ palcu joined	05:29
	← tgunr left	05:30
	← danemacmillan left	05:32
	← bhuvanaurora left	05:32
	← thumpba left	05:34
	← palcu left	05:34
	→ bhuvanaurora joined	05:35
	→ sinequanon joined	05:37
	→ flugo joined	05:40
	← bhuvanaurora left	05:41
	← Literphor left	05:42
	→ bhuvanaurora joined	05:42
	→ EminenceHC joined	05:42
	← kadoban left	05:44
	← mennea left	05:46
	← bhuvanaurora left	05:46
	→ mennea joined	05:47
	← EminenceHC left	05:47
	← DolpheenDream left	05:50
	→ shebbi joined	05:50
	→ ErKa joined	05:51
	← chrisshattuck left	05:51
	← aspiers left	05:51
	pikaren → pikabot	05:52
	pikabot → help	05:52
	help → pikabot	05:52
	pikabot → pikaren	05:53
	→ Literphor joined	05:53
shebbi	anyone here can help me with tortoise git?	05:54
	← otter768 left	05:58
	← russt left	05:58
Literphor	shebbi: You should ask your question and find out	05:58
	← jacksparrow007 left	05:59
shebbi	I have some files that don't have the green tick icon on it, which I guess are no longer tracked by trotoise git. These files are ones I have added after a created a repos with my project in it.	06:00
	← Marcus__ left	06:00
	→ checkItOut joined	06:00
shebbi	HOw do i make the files be tracked along with the rest of the files?	06:00
	→ whomp joined	06:01
	← UmbraMalison left	06:01
	← checkItOut left	06:02
	→ checkItOut joined	06:02
	→ ehmatthes joined	06:03
	→ soreau joined	06:03
	→ UmbraMalison joined	06:04
soreau	How can I setup git server on linux and can be cloned without password	06:04
	← listochkin left	06:04
	← iamjarvo left	06:05
	← whomp left	06:06
	→ bhuvanaurora joined	06:06
	← Arsonide left	06:07
	→ Arsonide joined	06:07
	→ jgardella joined	06:07
	← zivester left	06:08
	← Literphor left	06:08
	← Nijikokun left	06:09
milki	soreau: man git daemon	06:10
gitinfo	soreau: the git-daemon manpage is available at http://jk.gs/git-daemon.html	06:10
milki	soreau: that would serve the trick	06:10
shebbi	man git add	06:10
gitinfo	the git-add manpage is available at http://jk.gs/git-add.html	06:10
	← johtso_ left	06:11
soreau	milki: gitinfo: I don't really know what option to use. I have so far 'git daemon --base-path=/opt/git --detach --syslog --export-all'	06:13
	← MattMaker left	06:13
	→ skorgon joined	06:14
	← skorgon left	06:14
	→ skorgon joined	06:14
	→ arup_r_ joined	06:15
	← elepfontius left	06:15
	← mennea left	06:16
shebbi	how to add a folder say 'foo' to the index. I have cd to that directory	06:16
	→ mennea joined	06:17
ojacobson	Strictly speaking, you don't -- git doesn't track directories.	06:17
faylite	git add ./	06:17
shebbi	i want to add directory foo and it's subfolders	06:17
ojacobson	However, 'git add foo' will recurse down 'foo' and its subdirectories, adding all files and symlinks found	06:17
shebbi	git add foo OR git add ./	06:17
	Im in foo dir now	06:18
faylite	Then git add ./	06:18
	"./" or "." is the current directory.	06:18
shebbi	what does adding the extra / do?	06:19
faylite	Nothing..... just a habit.	06:19
	→ oojacoboo joined	06:19
shebbi	ok	06:19
	← qbann0p left	06:19
oojacoboo	hey guys, did something stupid... forgot to change branches before doing some work. What'd be the best way to get the working files moved over to another branch? Should I commit, change branches then try to cherry-pick the commit?	06:20
shebbi	did it, it did nothing	06:20
phy1729	oojacoboo: I usually git stash then git checkout newbranch then git stash pop	06:20
oojacoboo	phy1729: oh yea... perfect	06:21
	thanks	06:21
ojacobson	oojacoboo: it continues :-\	06:21
	oh, no, that was _Actually_ meant for you - my mistake	06:22
faylite	shebbi: The folder should be staged now, use "git status" to see what files/folders that are staged. Then commit them when done adding stuff.	06:22
oojacoboo	ojacobson: you dirty sob :P	06:22
phy1729	ojacobson: I kind of figured oojacoboo was just your alt nick	06:23
	← rchavik left	06:23
ojacobson	nope :D	06:24
	→ Nijikokun joined	06:24
	← Nijikokun left	06:25
shebbi	faylite: it shows the new files	06:25
	faylite: waiting to be commited	06:25
	→ Nijikokun joined	06:25
shebbi	faylite: or staged..	06:26
	← arup_r_ left	06:26
oojacoboo	phy1729: na, he's just trying to steal my identity :)	06:26
	← checkItOut left	06:26
faylite	shebbi: So is there a problem still?	06:26
	← jgardella left	06:27
phy1729	oojacoboo: I knew ojacobson first soooo	06:27
shebbi	faylite: I thought the green tick icon will appear on the files after I had added them, but It hasn't. I assume I have to commit them.	06:27
	← notjohn left	06:27
faylite	Yeah	06:27
oojacoboo	phy1729: so the debacle continues...	06:28
	→ danemacmillan joined	06:28
	→ The_Phoenix joined	06:29
	→ pppp2 joined	06:29
shebbi	it seems git does not track "new files" added into the repos automatically.	06:29
	← bhuvanaurora left	06:30
faylite	No, intended by design.	06:31
	← pradeepc_ left	06:31
shebbi	if you commit a parent folder it will not commit the new files	06:31
oojacoboo	isn't there a recursive flag?	06:31
	git add --all	06:31
	→ whomp joined	06:32
faylite	Or use git add -A	06:32
	→ kriks joined	06:32
shebbi	let me check if tortoise git has it	06:32
	← The_Phoenix left	06:32
	← danemacmillan left	06:33
faylite	Just to remember to add project files/bin files to the .gitignore.	06:33
	→ winst joined	06:33
	→ otter768 joined	06:33
	→ MattMaker joined	06:35
ojacobson	shebbi: git's basic model is that 'git commit' copies the _staging area_ (more or less verbatim) to a new commit, and 'git add' and friends modify the staging area from the work tree	06:35
	there's no fully automatic step	06:35
	→ rchavik joined	06:35
phy1729	there's git commit -a but I'd highly discourage that	06:35
faylite	Why?	06:36
phy1729	because it doesn't scale well and gets you into bad habits	06:36
	← whomp left	06:37
	← diegoaguilar left	06:37
phy1729	I git add; git rev (my alias for diff --staged) and then commit. I review every commit first to make sure I didn't leave anything out or make other mistakes	06:37
	← dsdeiz left	06:38
shebbi	i say git commit -a is great.	06:39
	what shouldn't be there should be in .gitignore	06:39
	simplifies things	06:39
	→ listochkin joined	06:39
shebbi	except tortoise git UI doesn't have git commit -a	06:40
phy1729	except sometimes you really should split things into two or more commits	06:40
faylite	It's "git commit -A"	06:40
shebbi	the flags are case sensitive?	06:40
thiago	yes	06:41
	everything on Unix is case-sensitve	06:41
	→ The_Phoenix joined	06:41
shebbi	ok im new to UNIX	06:41
soreau	I can't seem to figure out how to allow cloning without password	06:42
faylite	soreau: Clone from where?	06:42
soreau	faylite: from the git server I setup	06:42
faylite	I haven't used git-daemon, but you could probably just setup a ssh-key and add it to the keychain.	06:45
soreau	It asks for password when trying ssh:// or git@	06:45
	faylite: the ssh keys work fine	06:45
	faylite: I want to make it so anyone can get a read-only clone without password	06:46
	← mennea left	06:46
soreau	I looked through the docs here http://jk.gs/git-daemon.html but didn't see what needs to be done	06:47
	→ mennea joined	06:47
	← diegoviola left	06:47
	→ solker joined	06:47
	→ EminenceHC joined	06:47
	← winst left	06:48
	← dreiss left	06:49
	← darkbasic left	06:50
	→ darkbasic_ joined	06:50
faylite	soreau: I have a local GitLab server running for my repos, maybe try setting up a server?	06:50
	← Gamecubic left	06:50
oojacoboo	faylite: ain't nobody got time fo dat	06:50
	http://rs1img.memecdn.com/ain-amp-039-t-nobody-got-time-for-that_o_1582005.jpg	06:51
	← solker left	06:51
faylite	It's not that time consuming, just setup a vm with ubuntu-server and install using the omnibus package?	06:51
	← listochkin left	06:52
	← hyperair left	06:52
	→ listochk_ joined	06:52
	→ hypera1r joined	06:52
	← EminenceHC left	06:52
faylite	If you're running linux, then you access using the vm hostname, if on windows add the hostname to the hosts file.	06:53
oojacoboo	or you could use github or bitbucket	06:53
bremner	soreau: what OS are you running?	06:53
	on most linux variants it's one command to install git-daemon	06:53
faylite	Or that :P	06:53
	He already installed git-daemon.	06:54
	← ErKa left	06:54
	← shebbi left	06:54
bremner	so point it at your repos?	06:54
faylite	bremner: He wanted to clone repos without passwords	06:55
bremner	that is exactly what git-daemon does	06:55
	← zoly left	06:55
bremner	soreau: you should use a git:// url	06:56
soreau	bremner: linux	06:56
	bremner: I am trying git:// but it's giving permission errors and or not a git repo	06:56
faylite	Idk, I never used the git-daemon.	06:56
	→ dsdeiz joined	06:56
	→ fahadash joined	06:57
bremner	soreau: you need to configure git-daemon	06:57
soreau	bremner: How can I do it permanently? I figured it out now	06:58
	→ subhojit777 joined	06:58
bremner	soreau: there should be a config file in /etc git-daemon.conf or something like that	06:58
	oh. hmm. I was thinking of gitweb.conf	06:59
	→ snuffeluffegus joined	07:00
	→ metateck joined	07:01
metateck	im trying to upgrade from gitlab ce to gitlab ee	07:01
	i guess i should have cloned all the repos somewhere first	07:01
	or run that backup command	07:01
	i did neither	07:01
bremner	metateck: if gitlab ee is "enterprise", I guess it comes with support?	07:02
metateck	i still have the .git files but no working directories. is there a way to create a working directory from the .git?	07:02
	← CEnnis91 left	07:02
metateck	yeah it kind of does but i didnt really pay for it either.	07:02
bremner	soreau: I guess it's hard coded into the appropriate startup script	07:03
	soreau: depends on the distro	07:03
metateck	i tried copying the .git folder to an empty folder and running git checkout development but it didn't work	07:03
	← mennea left	07:04
	← listochk_ left	07:04
	→ listochkin joined	07:05
metateck	does anyone have any ideas?	07:05
phy1729	did it error?	07:06
	← ehmatthes left	07:06
metateck	did what error?	07:06
	oh yes it said this operation nmust be run from a work tree	07:06
phy1729	you could try and git clone <path to .git>	07:06
	← Arsonide left	07:07
	→ Arsonide joined	07:07
	← aswen left	07:08
bremner	metateck: !bare has some hints	07:08
gitinfo	metateck: 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/	07:08
metateck	ok thanks i will read that	07:08
	phy1729's solution worked fine too	07:09
bremner	hmm. not directly relevant actually, sorry, more background info	07:09
	← ncd\|leeN left	07:09
metateck	im pretty new to git so it was kind of stupid of me to not make sure i had backups before taking down our version control server	07:09
	but i think ill be able to make it work with that git clone <path> command	07:10
bremner	metateck: for that matter, reading the link may help you understand why gitlab doesn't need working trees	07:10
metateck	yeah that surprised me	07:10
	i saw ~/gitlab/git-data/repositories and assumed i had working trees in there but didnt check	07:10
	ill read up on it	07:10
	im just glad i can recreate the projects	07:10
	→ dreiss joined	07:11
	→ si13b joined	07:12
	← geomyidae_ left	07:12
	→ glebihan__ joined	07:14
	← glebihan__ left	07:14
	← thedodd left	07:15
	→ palcu joined	07:18
	→ ehmatthes joined	07:20
metateck	well that was kind of terrifying im glad its all back now	07:22
	thank you so much guys	07:22
	→ learner joined	07:22
	← palcu left	07:22
	← dorkmafia left	07:22
	← ojacobson left	07:22
	← learner1 left	07:24
	→ Literphor joined	07:26
	← eyeRobut left	07:29
	→ aswen joined	07:32
	← flugo left	07:32
	→ whomp joined	07:32
	→ lasers joined	07:33
	← whomp left	07:37
	← The_Phoenix left	07:40
	→ The_Phoenix joined	07:41
	← dreiss left	07:41
	← LifeBlood left	07:42
	← pikaren left	07:43
	→ pikaren joined	07:43
	→ solker joined	07:48
	→ EminenceHC joined	07:48
	→ Marcus joined	07:49
	← aswen left	07:49
	← solker left	07:52
	← EminenceHC left	07:53
	→ delight joined	07:53
	← skorgon left	07:53
	← aidalgol left	07:53
	← si13b left	07:53
	← Marcus left	07:53
	← ehmatthes left	07:54
	→ BenjaminDeuter joined	07:55
	→ palcu joined	08:00
	← palcu left	08:00
	← thedudez0r left	08:00
	→ bhuvanaurora joined	08:01
	→ geomyidae_ joined	08:03
	← kyb3r_ left	08:05
	← fahadash left	08:06
	← Arsonide left	08:07
	→ Arsonide joined	08:07
	→ mennea joined	08:07
	→ sgen joined	08:11
	← Nijikokun left	08:12
	→ adamben joined	08:13
	← soreau left	08:14
	← Literphor left	08:15
	→ danemacmillan joined	08:17
	→ Kicer86 joined	08:18
	← delight left	08:20
	← danemacmillan left	08:21
	→ Literphor joined	08:22
	← sinequanon left	08:23
	→ petersr joined	08:24
	→ b4rbz joined	08:25
	→ Jackneill joined	08:25
	→ Akagi201 joined	08:28
	→ settermjd joined	08:28
	← MattMaker left	08:29
	← otter768 left	08:29
	→ whomp joined	08:33
	→ Oebele joined	08:33
	→ shpoont joined	08:34
	← joki left	08:35
	→ tbxyz joined	08:35
	→ moritzs joined	08:36
	← Goplat left	08:38
	→ dtrott joined	08:38
	← whomp left	08:38
	→ joki joined	08:39
	← Lyqyd left	08:43
	→ flugo joined	08:45
	→ ItSANgo joined	08:46
	← dtrott left	08:48
	→ solker joined	08:48
	→ nkouevda joined	08:49
	← thiago left	08:49
	→ EminenceHC joined	08:49
	← adamben left	08:50
	← pppp2 left	08:53
	← dsdeiz left	08:53
	← solker left	08:53
	← EminenceHC left	08:54
	→ zanchoPa1sa joined	08:55
	→ AliRezaTaleghani joined	08:55
	→ dsdeiz joined	08:56
	← zanchoPansa left	08:58
	← bhuvanaurora left	08:58
	→ palcu joined	09:00
	→ bhuvanaurora joined	09:01
	→ punchagan joined	09:02
	→ durre joined	09:03
	→ Takle joined	09:04
	← palcu left	09:06
	→ shinnya joined	09:06
	← Cassiel left	09:07
	← Arsonide left	09:07
	→ Arsonide joined	09:07
	← Literphor left	09:08
	→ Nijikokun joined	09:09
	← Takle left	09:09
	→ msankhala joined	09:12
	← hahuang65 left	09:12
	→ mennea_ joined	09:15
	← hifi left	09:16
	→ agro joined	09:16
	→ palcu joined	09:17
	agro → Guest34961	09:17
	← mennea left	09:17
	→ dorkmafia joined	09:18
	→ hahuang61 joined	09:18
	← bhuvanaurora left	09:19
	← durre left	09:20
	→ netcarver joined	09:20
	← smw left	09:20
	← dorkmafia left	09:23
	→ bhuvanaurora joined	09:25
	← Freemason left	09:26
	→ mabil joined	09:30
	← tbxyz left	09:30
	← mabil left	09:32
	retard_ → retard	09:33
	→ whomp joined	09:34
	→ hs366 joined	09:35
	→ Marcus joined	09:38
	← moritzs left	09:38
	← alanwill left	09:38
	← whomp left	09:39
	← Marcus left	09:42
	Solid1_afk → Solid1	09:43
	← hahuang61 left	09:44
	← maestrojed left	09:44
	→ solker joined	09:49
	→ maestrojed joined	09:53
	← solker left	09:54
	→ EminenceHC joined	09:54
	→ Zupoman joined	09:54
	→ Marcus joined	09:54
	← Zupoman left	09:54
	→ Zupoman joined	09:54
	→ HelloShitty joined	09:55
	← netcarver left	09:56
	← kloeri left	09:59
	→ kloeri joined	09:59
	← EminenceHC left	09:59
	← sigv left	10:01
	← crystal77 left	10:01
	→ giusef joined	10:03
	→ skylite joined	10:04
	→ AndroUser466 joined	10:04
	← causasui left	10:05
	← AndroUser466 left	10:05
	→ danemacmillan joined	10:06
	← Arsonide left	10:08
	→ Arsonide joined	10:08
	← lidaaa left	10:09
	→ diegoaguilar joined	10:10
	← danemacmillan left	10:10
	→ velan joined	10:12
velan	I deleted branch in github after merging the pull request. How to cleanup local branch which i deleted in remote?	10:13
	→ BlaXpirit joined	10:13
	← The_Phoenix left	10:14
	→ The_Phoenix joined	10:15
	→ pppp2 joined	10:16
	→ PCatinean joined	10:16
cbreak	velan: man git fetch --prune	10:17
gitinfo	velan: the git-fetch manpage is available at http://jk.gs/git-fetch.html	10:17
Seveas	velan: git branch -d and git remote prune origin	10:17
cbreak	velan: that'll clean up remote tracking branches	10:17
	the real local branches have to be deleted manually	10:17
velan	Do i need to do it manually like "git branch -d feature-something"	10:18
	then why do i need run "git remote prune origin"? what is the purpose?	10:19
	→ adamben joined	10:20
	← catsup left	10:20
cbreak	remote tracking branches	10:21
	velan: git branch -r shows those	10:21
	→ catsup joined	10:21
	← giusef left	10:21
Seveas	velan: git branch -d can be used to kill 'branch', the pruning is to kill 'remotes/origin/branch'	10:21
	← The_Phoenix left	10:21
	→ kukks joined	10:21
velan	Seveas: Thanks. Understood	10:22
	← govg left	10:23
	→ causasui joined	10:24
	→ darnir joined	10:25
	→ bvi joined	10:25
	→ The_Phoenix joined	10:26
	← voltagex left	10:27
	→ tak30 joined	10:29
	→ otter768 joined	10:30
	← flugo left	10:32
	← pppp2 left	10:32
	→ flugo joined	10:32
	← kcj left	10:32
	Solid1 → Solid1_afk	10:34
	← otter768 left	10:35
	→ whomp joined	10:35
	→ BSaboia joined	10:35
	← flugo left	10:37
	← BenjaminDeuter left	10:38
	→ delight joined	10:38
	← whomp left	10:40
	← rchavik left	10:41
	→ barduck joined	10:41
	→ rchavik joined	10:41
	← maestrojed left	10:46
	→ nrsk joined	10:47
	→ berndj joined	10:47
	← BSaboia left	10:50
	→ solker joined	10:50
	← The_Phoenix left	10:50
	← D-Boy left	10:50
	→ The_Phoenix joined	10:52
	→ D-Boy joined	10:53
	← The_Phoenix left	10:53
	← j416 left	10:54
	← solker left	10:54
	→ The_Phoenix joined	10:55
	← kukks left	10:56
	→ JohnBat26 joined	10:56
	← palcu left	10:57
	→ hexagoxel joined	10:58
	→ palcu joined	10:58
	← rchavik left	10:58
	← tak30 left	10:59
	← msonntag left	10:59
	→ j416 joined	10:59
	← adamben left	11:00
	← Oebele left	11:00
	→ EminenceHC joined	11:00
	← _5kg left	11:01
	→ m0viefreak joined	11:03
	→ brucelee joined	11:04
	← lasers left	11:04
	← EminenceHC left	11:05
	→ lasers joined	11:06
	← velan left	11:07
	← listochkin left	11:07
	← Arsonide left	11:07
	→ Arsonide joined	11:07
	→ listochkin joined	11:08
	← AliRezaTaleghani left	11:08
	→ jcalonso joined	11:10
	← barduck left	11:11
	→ ecky--ptang-zoob joined	11:14
	→ nfk joined	11:16
	→ WaReZ joined	11:18
	← learner left	11:18
	→ corni joined	11:19
	← palcu left	11:20
	→ aswen joined	11:23
	← nkouevda left	11:28
	→ joo-_ joined	11:28
	← ecky--ptang-zoob left	11:29
	→ ecky--ptang-zoob joined	11:29
	← aswen left	11:34
	← bhuvanaurora left	11:35
	→ aswen joined	11:35
	→ whomp joined	11:36
	← diegoaguilar left	11:38
	→ note joined	11:38
	← mibofra left	11:40
	← whomp left	11:41
	← NanoArro1 left	11:41
	→ bhuvanaurora joined	11:41
	← kriks left	11:42
	← bhuvanaurora left	11:42
	← joo-_ left	11:43
	→ _5kg joined	11:45
	→ joo-_ joined	11:45
	→ Skapadapaduu joined	11:47
	→ CheckDavid joined	11:48
	→ bhuvanaurora joined	11:50
	→ paul424 joined	11:50
	→ solker joined	11:51
	→ jagob joined	11:51
	→ danemacmillan joined	11:52
	← bhuvanaurora left	11:53
	← solker left	11:55
	← danemacmillan left	11:56
	→ amikiri joined	11:56
	← Marcus left	11:57
	→ Marcus joined	11:58
	← mennea_ left	11:58
	→ mribeirodantas joined	11:59
	← brucelee left	11:59
	→ Marcus__ joined	11:59
	→ mennea joined	12:00
	← Marcus left	12:02
	← Marcus__ left	12:03
	← aswen left	12:04
	→ s8321414 joined	12:04
	→ EminenceHC joined	12:05
	→ mennea_ joined	12:06
blueyed	How can I set the default format for "git reflog"? I have tried reflog.format in the config.	12:06
	← mennea left	12:08
	← EminenceHC left	12:10
	→ nnyk_ joined	12:11
	→ mdhopkins joined	12:11
	→ predmijat joined	12:11
	← HelloShitty left	12:12
predmijat	hello, i need help :) there is a server, hosting git repo and website (3 branches - dev, staging, production) with hooks set up so that when push is made, the right website is updated. git repo is now moved to bitbucket. what is the course of action now, so that git push (this time to bitbucket), also results in the right website being updated?	12:13
	→ mibofra joined	12:14
	→ aswen joined	12:15
	→ EminenceHC joined	12:15
	← Rastus_Vernon left	12:17
Zupoman	hello	12:18
	how can i undo a revert?	12:18
	← note left	12:18
Zupoman	i kind of messed everything up	12:18
	← darnir left	12:18
	← EminenceHC left	12:20
	← metateck left	12:20
	→ t0th_-__ joined	12:22
grawity	predmijat: BitBucket supports hooks as well – it can notify another server over HTTP about receiving a push	12:22
	→ adamben joined	12:23
predmijat	grawity, ok, but i'm not sure what needs to be done (with at least amount of effort) - just point branches to new url? git branch --set-upstrem-to=url/branch?	12:23
grawity	you're mixing up branches and remotes, but kinda yeah, just change the URL	12:24
	`git remote set-url origin ...`	12:24
predmijat	grawity, ok...thanks	12:25
	→ learner joined	12:25
Zupoman	how can i revert a commit to the remote git repo, then push my own one to replace it?	12:26
	→ netcarver joined	12:31
	→ otter768 joined	12:31
	← mdhopkins left	12:35
	← aswen left	12:36
	← otter768 left	12:36
	→ whomp joined	12:37
	→ mihaicris joined	12:38
	→ earny joined	12:40
	→ NanoArro1 joined	12:40
	→ HelloShitty joined	12:40
	→ jheg joined	12:41
jheg	o/	12:41
	← whomp left	12:42
	← St_Marx left	12:42
	→ SwedFTP joined	12:44
jheg	hey all	12:44
	Last night I created a new branch locally	12:45
	and then I pushed this brach to my local repo	12:45
	→ durre joined	12:45
blueyed	Zupoman: look into "git reset" (possibly with --hard) and "git push --force" (but better avoid this). There is also "git revert", so you could revert the bad commit and then cherry-pick the good one, for example.	12:45
jheg	then on git I merged my branch and master and deleted the remote branch	12:45
	now back in local how do I pull the master branch again so its synced with my remote master?	12:45
	→ quetz joined	12:47
Zupoman	blueyed: but can `git reset` and `git revert` work on remote repository, without pulling it?	12:47
blueyed	Zupoman: you can undo a revert by reverting the commit that reverted it. It also depends on if the remote repo's history can be changed (using git push -f).	12:47
	← paul424 left	12:47
	← r00tWearsRedHats left	12:47
	← lacrymology left	12:47
blueyed	Zupoman: you cannot work on a remote directly.	12:47
	Zupoman: please describe better what you're trying to do and your current state.	12:47
	→ r00tWearsRedHats joined	12:48
Zupoman	i have my local version of the repo, and a remote version of the repo	12:48
blueyed	jheg: "and then I pushed this brach to my local repo"? do you mean remote?	12:48
jheg	oh yes sorry pushed to my remote repo	12:49
Zupoman	the remote version is different than the local one, but i haven't pulled it so far	12:49
jheg	would help if I got my description correct lol	12:49
	→ lacrymology joined	12:49
Zupoman	i don't know what will happen to my commits if i pull it	12:49
jheg	I think Ive done it now … I just did	12:49
	git pull	12:49
	← nrsk left	12:49
jheg	seems to have synced things up nicely	12:49
blueyed	jheg: yes. probably.	12:50
jheg	thanks	12:50
blueyed	Zupoman: why/how is the remote different? try "git pull --ff-only", then nothing bad should happen.	12:51
	Zupoman: you can also fetch it only "git fetch --all", and then look at your local branch vs. the remote, e.g. "master" vs "origin/master".	12:51
	→ solker joined	12:51
	→ Lingo_ joined	12:52
	→ Gizburdt joined	12:52
Zupoman	blueyed: thanks, i think i've solved this	12:52
	← gfixler left	12:53
	→ Takle joined	12:54
	→ mribeiro1antas joined	12:54
	← mribeiro1antas left	12:54
	→ gfixler joined	12:55
	→ St_Marx joined	12:55
	→ Velzes joined	12:55
	→ si13b joined	12:56
	← solker left	12:56
	→ mennea joined	12:56
	← Gizburdt left	12:57
	← eletuchy left	12:58
	→ eletuchy joined	12:58
	← earny left	12:59
	← Takle left	12:59
	← gfixler left	12:59
	← mennea_ left	13:00
	→ Gizburdt joined	13:00
	→ thiago joined	13:01
	→ fstd_ joined	13:01
	← si13b left	13:01
	← joo-_ left	13:03
	→ Malsasa_ joined	13:03
	← eletuchy left	13:03
	← settermjd left	13:03
	← nnyk_ left	13:03
	← fstd left	13:04
	fstd_ → fstd	13:04
	← jimmyy left	13:04
	→ joo-_ joined	13:07
	→ danemacmillan joined	13:07
	← jagob left	13:07
	→ EminenceHC joined	13:08
	← phantombeta left	13:09
	→ pppp2 joined	13:11
	← danemacmillan left	13:12
	← EminenceHC left	13:13
	→ settermjd joined	13:17
	← dregad left	13:17
	← msankhala left	13:17
	← settermjd left	13:19
	→ earny joined	13:22
	→ russt joined	13:25
	← Gizburdt left	13:25
	→ johtso_ joined	13:25
	← predmijat left	13:26
	→ nouranology joined	13:26
	→ ncd\|leeN joined	13:26
	→ Gizburdt joined	13:26
	→ jacksparrow007 joined	13:28
	← Velzes left	13:30
	← Gizburdt left	13:31
	← joo-_ left	13:31
	→ dregad joined	13:31
	← ap0c left	13:33
	→ joo-_ joined	13:33
	Guest29784 → ariver	13:36
	← amikiri left	13:37
	→ kriks joined	13:37
	→ whomp joined	13:37
	← whomp left	13:43
	← mennea left	13:43
	← sgen left	13:43
	→ m0ltar joined	13:45
	→ Gizburdt joined	13:45
	→ liamkeily joined	13:45
	← yazdmich left	13:46
	← pppp2 left	13:46
	← dregad left	13:46
	→ DanMAbraham joined	13:48
	→ Gizburdt_ joined	13:48
	→ aswen joined	13:49
	← Gizburdt left	13:50
	← mribeirodantas left	13:50
	→ ManikM joined	13:51
	← Gizburdt_ left	13:51
	→ Gizburdt joined	13:51
	→ ruukasu joined	13:51
	← ManikM left	13:52
	→ ManikM joined	13:52
	← ManikM left	13:52
	→ ManikM joined	13:52
	→ yazdmich joined	13:52
	→ solker joined	13:53
	→ mennea joined	13:53
	→ phantombeta joined	13:53
	→ enitiz joined	13:54
	← solker left	13:57
	← phantombeta left	13:58
	← liamkeily left	13:58
	→ eletuchy joined	13:58
	← durre left	14:00
	→ phantombeta joined	14:00
	→ twoface88 joined	14:01
	← eletuchy left	14:03
	← s8321414 left	14:04
	→ solker joined	14:08
	← phantombeta left	14:08
	→ str joined	14:08
	→ jceb joined	14:10
	→ phantombeta joined	14:10
	→ moritzs joined	14:11
	→ EminenceHC joined	14:12
	← sarri left	14:13
	← cagedwisdom left	14:13
	→ sarri joined	14:14
	← Gizburdt left	14:15
	→ Gizburdt joined	14:16
	→ h4ml3t joined	14:16
	← EminenceHC left	14:17
	→ herdingcat joined	14:17
	← herdingcat left	14:18
	← h4ml3t left	14:18
	→ nnyk_ joined	14:18
	→ h4ml3t joined	14:19
	← moritzs left	14:19
	← phantombeta left	14:19
	→ herdingcat joined	14:19
	→ looper joined	14:21
	← jceb left	14:21
	← Gizburdt left	14:21
	→ palcu joined	14:21
	← h4ml3t left	14:21
	→ h4ml3t joined	14:22
	→ phantombeta joined	14:23
	← russt left	14:25
	← aswen left	14:25
	← palcu left	14:26
	→ barduck joined	14:29
	← adamben left	14:30
	← phantombeta left	14:30
	→ CEnnis91 joined	14:30
	→ endiruna joined	14:30
	→ jargon joined	14:31
	→ phantombeta joined	14:32
	→ otter768 joined	14:32
	← mihaicris left	14:35
	→ mihaicris joined	14:36
	← phantombeta left	14:36
	← otter768 left	14:37
	→ Orbitrix joined	14:37
	← Orbitrix left	14:37
	→ Orbitrix joined	14:38
	→ whomp joined	14:38
	→ King_Hual joined	14:38
	← whomp left	14:43
	← The_Phoenix left	14:43
	← zumba_addict left	14:44
	→ phantombeta joined	14:44
	→ zumba_addict joined	14:45
	→ Noldorin joined	14:45
	← jargon left	14:46
	→ crystal77 joined	14:47
	→ jagob joined	14:47
	→ Gizburdt joined	14:47
	→ jargon joined	14:48
	→ virtualsue joined	14:49
	← jargon left	14:50
	→ The_Phoenix joined	14:50
	← The_Phoenix left	14:51
	→ The_Phoenix joined	14:51
	← phantombeta left	14:54
	→ King_Hual` joined	14:54
	→ brucelee joined	14:55
	← King_Hual left	14:55
	→ danemacmillan joined	14:56
	→ johnkevinmbasco joined	14:56
	← johnkevinmbasco left	14:56
	← earny left	14:57
	→ phantombeta joined	14:58
	→ kukks joined	14:58
	← Lingo_ left	14:59
	→ aspiers joined	14:59
	← brucelee left	15:00
	→ Lingo_ joined	15:00
	← Lingo_ left	15:00
	→ Mitchbones joined	15:01
	← danemacmillan left	15:01
	← phantombeta left	15:02
	→ durre joined	15:05
	← _Vi left	15:07
	→ Lingo_ joined	15:09
	→ phantombeta joined	15:10
	← King_Hual` left	15:10
	→ King_Hual joined	15:11
	→ hamster joined	15:11
	→ mellernoia joined	15:13
	→ bhuvanaurora joined	15:14
	→ EminenceHC joined	15:15
	→ amikiri joined	15:15
	→ Dougie187 joined	15:16
	← bhuvanaurora left	15:18
	→ dreiss joined	15:18
	← EminenceHC left	15:20
	← Gizburdt left	15:20
	→ Gizburdt_ joined	15:20
	← JohnBat26 left	15:21
	← endiruna left	15:21
	← The_Phoenix left	15:22
	← Malsasa_ left	15:24
	← tureba left	15:24
	→ The_Phoenix joined	15:25
	← The_Phoenix left	15:25
	→ Milkweed joined	15:26
	→ The_Phoenix joined	15:26
	→ JohnBat26 joined	15:26
	← jagob left	15:29
	← The_Phoenix left	15:29
	→ tureba joined	15:29
	← subhojit777 left	15:30
	← durre left	15:30
	→ Rob-ThisIsMe joined	15:30
	← solker left	15:30
	← Vile left	15:30
	→ jagob joined	15:30
	→ The_Phoenix joined	15:31
	→ nrsk joined	15:32
	→ moritzs joined	15:32
	DanMAbraham → moarrr	15:33
	→ subhojit777 joined	15:35
	← The_Phoenix left	15:35
	→ dougsland joined	15:35
	→ Ace joined	15:35
	← moarrr left	15:36
	→ The_Phoenix joined	15:36
	→ Robert-ThisIsMe joined	15:37
	← amikiri left	15:37
	→ notjohn joined	15:38
	→ eyeRobut joined	15:38
	→ layke joined	15:38
	→ zivester joined	15:38
layke	I accidentally deleted a sub-folder. How can I get it back from my latest version?	15:39
	I don't want to interfer with any of my other changes	15:39
	→ whomp joined	15:39
layke	Just need this one folder I deleted.	15:39
	← hs366 left	15:39
layke	I think this worked.. I navigated to the directory parent that I deleted..	15:41
	git checkout -- folder_I_deleted	15:41
	← h4ml3t left	15:41
	← Robert-ThisIsMe left	15:41
	→ h4ml3t joined	15:42
	← whomp left	15:44
	← eyeRobut left	15:44
	← dsdeiz left	15:45
	→ eyeRobut joined	15:46
	← nasso_ left	15:47
	→ nasso joined	15:47
	→ eletuchy joined	15:47
	← m0viefreak left	15:48
	→ m0viefreak joined	15:48
	← troyt left	15:48
	← notjohn left	15:50
	← looper left	15:50
	← tanath_ left	15:52
	← eletuchy left	15:52
	← ManikM left	15:52
	→ ManikM joined	15:52
	→ tanath_ joined	15:52
	← The_Phoenix left	15:52
	← corni left	15:53
	→ The_Phoenix joined	15:53
	← h4ml3t left	15:53
	→ weyer joined	15:53
	pikaren → pikabot	15:53
	→ russt joined	15:54
	pikabot → pikaren	15:56
	→ mizu_no_oto joined	15:57
	← t0th_-__ left	15:57
	← zumba_addict left	15:58
	→ zumba_addict joined	15:58
	→ t0th_-__ joined	16:01
	→ wrouesnel4 joined	16:01
	← mennea left	16:02
	→ a_le joined	16:02
	← ruukasu left	16:03
	← mihaicris left	16:03
	← kukks left	16:04
	← snuffeluffegus left	16:05
	→ Gamecubic joined	16:06
	← wrouesnel4 left	16:06
	→ tier joined	16:06
	← mizu_no_oto left	16:07
	← Nijikokun left	16:07
	→ tbxyz joined	16:07
	→ Duikb00t joined	16:07
	← pikaren left	16:09
	→ pikaren joined	16:09
	→ johnny2600 joined	16:10
	← pikaren left	16:10
	→ pikaren joined	16:10
	→ gavit joined	16:10
gavit	anyone know how to push to a master branch? - https://gist.github.com/gavit/97023ae83b4a1ea530b1	16:10
	← joo-_ left	16:10
	← pikaren left	16:11
	← githogori_ left	16:11
	→ corni joined	16:11
	→ polyzen joined	16:11
gavit	non master branch :S	16:11
	→ darkbasic joined	16:12
	← darkbasic_ left	16:12
phy1729	git push remote branch	16:12
gavit	phy1729, error: src refspec branch does not match any. error: failed to push some refs to 'remote'	16:13
cbreak	gavit: so... obviously you didn't call your branch branch	16:15
gavit	I dont think I even made a branch	16:15
	→ m8 joined	16:16
	← csstylish left	16:16
gavit	show branch gives "[master] updated ruby"	16:17
	← CheckDavid left	16:17
	→ ehmatthes joined	16:17
cbreak	gavit: then you can't push anything	16:17
gavit	'git push remote master'?	16:17
	→ EminenceHC joined	16:17
cbreak	if you want to push the master branch, sure	16:17
	← hamster left	16:17
cbreak	if you really want you can push a commit directly too	16:17
	← aspiers left	16:18
gavit	cbreak, I'd like to send this code to heroku and don't care about the code already there	16:18
cbreak	so?	16:18
gavit	I already rolled back to v1 via the GUI of heroku	16:18
cbreak	why do you ask in a git channel?	16:18
	git doesn't care about this heroku thing, what ever it is	16:18
gavit	cause I can't seem to figure out why my git doesnt want to push code to my 'master'	16:18
cbreak	pushing transfers history	16:18
	→ csstylish joined	16:18
cbreak	gavit: why do you think git push doesn't work?	16:18
	→ hamster joined	16:19
	← csstylish left	16:19
	→ msankhala joined	16:19
cbreak	gavit: does git push give an error?	16:22
	← EminenceHC left	16:22
gavit	cbreak, as a matter of fact it didn't :(	16:22
	← fstd left	16:22
	→ palcu joined	16:22
gavit	trying to figure out what's wrong here.. sorry	16:22
cbreak	then it probably worked	16:22
	← crystal77 left	16:22
	→ joo-_ joined	16:23
	← msankhala left	16:23
	→ csstylish joined	16:24
	→ fstd joined	16:24
	→ LucasTT joined	16:25
	← palcu left	16:25
	→ lindenle joined	16:26
	→ pikaren joined	16:26
	← fstd left	16:27
	← pikaren left	16:27
	→ pikaren joined	16:27
	← lindenle left	16:27
	← ecky--ptang-zoob left	16:27
	→ kukks joined	16:28
	→ ecky--ptang-zoob joined	16:28
	→ ferri joined	16:29
	← pikaren left	16:29
	→ dsdeiz joined	16:30
	→ solker joined	16:31
	→ pikaren joined	16:33
	→ otter768 joined	16:33
	← solker left	16:35
	← csstylish left	16:35
	← nouranology left	16:37
	← otter768 left	16:38
	→ nour joined	16:38
	→ whomp joined	16:40
	← Gitzilla left	16:40
	← zivester left	16:40
	→ madewokherd joined	16:42
	← przemoc left	16:42
	← CEnnis91 left	16:42
	← The_Phoenix left	16:42
	← joo-_ left	16:43
	→ lindenle joined	16:43
	← lindenle left	16:43
	→ lindenle joined	16:44
	→ joo-_ joined	16:44
	← whomp left	16:45
	→ dangerousdave joined	16:46
	← hamster left	16:49
	← lindenle left	16:49
	→ hamster joined	16:50
	→ przemoc joined	16:50
	→ Consuela joined	16:52
	← twoface88 left	16:53
	→ quitte joined	16:54
	→ zivester joined	16:56
	← dangerousdave left	16:56
	← Vadtec left	16:57
	← m0ltar left	16:58
	→ endiruna joined	16:59
	→ The_Phoenix joined	16:59
	→ dangerousdave joined	16:59
	→ Literphor joined	16:59
	→ Vadtec joined	17:00
	← herdingcat left	17:02
	→ alanwill joined	17:02
	← tchan left	17:02
	→ CheckDavid joined	17:04
	← tier left	17:05
	→ junaidnaseer2 joined	17:05
	← NoNMaDDeN left	17:06
	← mac_nibblet left	17:06
	← skylite left	17:06
	← listochkin left	17:07
	← zivester left	17:07
	← Literphor left	17:07
	→ listochkin joined	17:07
	→ ajustrun joined	17:07
	← alanwill left	17:07
	Xack → CaveJohnson	17:07
	→ Takle joined	17:08
	→ NoNMaDDeN joined	17:09
	← PerlJam left	17:09
	← joo-_ left	17:09
	← Tuna-Fish left	17:09
	→ ascarter joined	17:10
	→ csstylish joined	17:10
	← suki__ left	17:10
	← CaveJohnson left	17:11
	→ joo-_ joined	17:11
	→ Tuna-Fish joined	17:11
	→ xcesariox joined	17:11
	→ tier joined	17:12
	← dsdeiz left	17:12
	← listochkin left	17:12
	→ Matrixiumn joined	17:13
	→ pantsman- joined	17:13
	← xcesariox left	17:14
	← grep0r left	17:14
	← csstylish left	17:14
	→ Lingo__ joined	17:14
	→ ErKa joined	17:14
	← Lingo__ left	17:15
	← eyeRobut left	17:15
	→ csstylish joined	17:15
	← Lingo_ left	17:15
	← zanchoPa1sa left	17:16
	→ zanchoPansa joined	17:17
	← Xiti left	17:18
	← drswap left	17:19
	← dangerousdave left	17:19
	→ tchan joined	17:20
	→ InvidFlower joined	17:21
	→ Xiti joined	17:21
	← kukks left	17:22
	→ dangerousdave joined	17:23
	← t0th_-__ left	17:23
	→ EminenceHC joined	17:24
	← Duikb00t left	17:24
	→ tgunr joined	17:25
	→ msmith joined	17:25
	→ smccarthy joined	17:26
	→ listochkin joined	17:26
	← ecky--ptang-zoob left	17:26
	→ ecky--ptang-zoob joined	17:27
	← EminenceHC left	17:29
	→ Rastus_Vernon joined	17:29
	→ solker joined	17:31
	← subhojit777 left	17:32
	← Ace left	17:34
	← tier left	17:34
	→ lpax joined	17:34
	← lpax left	17:34
	→ lpax joined	17:34
	→ ruukasu joined	17:35
	→ tuocuggino joined	17:36
	→ smw joined	17:36
	→ skorgon joined	17:38
	← skorgon left	17:38
	→ skorgon joined	17:38
	← Kicer86 left	17:39
	→ Kicer joined	17:39
	→ whomp joined	17:40
	← zumba_addict left	17:42
	← St_Marx left	17:42
	→ zumba_addict joined	17:42
	→ metateck joined	17:43
	← tbxyz left	17:43
	→ MLM joined	17:44
	← listochkin left	17:44
	→ msankhala joined	17:44
	← msankhala left	17:44
	→ msankhala joined	17:44
	← whomp left	17:45
	← hamster left	17:45
	← jab416171 left	17:47
	← nour left	17:47
	→ bdavenport joined	17:47
	→ Duikb00t joined	17:48
	→ crystal77 joined	17:48
	→ hamster joined	17:48
	← przemoc left	17:48
	← dangerousdave left	17:48
	← zumba_addict left	17:49
	→ zumba_addict joined	17:50
	→ lindenle joined	17:50
	← Tuna-Fish left	17:50
	→ przemoc joined	17:50
	← przemoc left	17:50
	→ przemoc joined	17:50
	→ dangerousdave joined	17:52
	← dangerousdave left	17:52
	← Arsonide left	17:52
	← ManikM left	17:52
	→ jab416171 joined	17:52
	→ ManikM joined	17:52
	→ Arsonide joined	17:52
	→ krivenok_dmitry joined	17:53
	← Guest34961 left	17:53
	← Arsonide left	17:53
	→ dangerousdave joined	17:54
	→ Arsonide joined	17:54
	→ SonikBoom joined	17:54
	← lindenle left	17:55
	→ St_Marx joined	17:56
krivenok_dmitry	Hi. I have local branch called "stable" created via "git br stable remotes/origin/linux-3.16.y". There are some minor changes in one file made in that local branch. Now I want to switch to another remote branch "remotes/origin/linux-3.17.y" and get my changes re-applied on top of it or properly merged. What's the right way to do that in Git?	17:57
grawity	krivenok_dmitry: git rebase	17:58
	→ mennea joined	17:58
	← ascarter left	17:59
	→ stamina joined	17:59
	→ The_Phoenix1 joined	17:59
	→ tuocugggino joined	18:00
krivenok_dmitry	grawity: I tried it first, but got some conflicts in files I never touched. My understanding from the doc is that git rebase should re-apply my changes on top of another base, but perhaps I did that wrong.	18:00
	← The_Phoenix left	18:01
	← The_Phoenix1 left	18:01
	→ vrishab joined	18:02
	← vrishab left	18:02
	← tuocuggino left	18:03
	← jheg left	18:03
	← lpax left	18:03
	← dangerousdave left	18:04
	← Gamecubic left	18:06
	→ kyb3r_ joined	18:06
	→ Gamecubic joined	18:06
	→ govg joined	18:07
	← krivenok_dmitry left	18:07
	→ diegoviola joined	18:07
	← dreiss left	18:08
	← marchdown left	18:10
	← msmith left	18:10
	→ iamjarvo joined	18:11
	→ The_Phoenix joined	18:11
	← russt left	18:12
	→ dorkmafia joined	18:13
	← fr33domlover left	18:14
	→ marchdown joined	18:14
	→ gccostabr joined	18:15
	→ mvlabat joined	18:15
	→ troyt joined	18:15
	→ pretzel80 joined	18:15
mvlabat	Hello, comrades	18:16
gitinfo	mvlabat: 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.	18:16
mvlabat	Guys, my git hangs on cloning	18:17
	I enter "git clone --branch master [email@hidden.address]	18:17
	← quitte left	18:17
mvlabat	and everything I get is Cloning into 'userpoints_votingapi'...	18:18
	And nothing else	18:18
	→ RTG joined	18:18
	← RTG` left	18:18
	→ dorkmafi1 joined	18:18
	→ Samual_ joined	18:18
	→ fr33domlover joined	18:19
	RTG → Guest79317	18:19
	← Arsonide left	18:19
	→ Arsonide joined	18:19
	→ Vile joined	18:19
	→ corbe joined	18:19
	← hide left	18:19
	← Schrostfutz left	18:19
	→ ScioMin joined	18:19
	→ hide joined	18:20
	→ Schrostfutz joined	18:20
	← Samual left	18:20
	← ManikM left	18:20
	← InvidFlower left	18:20
	← The_Phoenix left	18:21
	← hohum left	18:21
	corbe → hohum	18:21
	← soerenb left	18:21
	← dorkmafia left	18:21
	← carlosr left	18:21
	→ smccarthy2 joined	18:21
	← ehmatthes left	18:22
	→ pheaver joined	18:23
	→ aidalgol joined	18:23
	← aidalgol left	18:23
	← smccarthy left	18:24
	← angelsl left	18:26
	← mennea left	18:28
	→ aidalgol joined	18:28
	→ mennea joined	18:28
	→ kukks joined	18:29
	→ michelangelo joined	18:30
	→ EminenceHC joined	18:30
	← mvlabat left	18:31
	→ ojacobson joined	18:31
	→ smccarthy joined	18:31
	← faylite left	18:31
	→ amikiri joined	18:31
	→ faylite joined	18:32
	→ dreiss joined	18:32
	← donmichelangelo left	18:33
	→ clauswitt joined	18:33
	← smccarthy2 left	18:34
	→ otter768 joined	18:34
	→ skylite joined	18:35
	← EminenceHC left	18:35
	→ mihaicris joined	18:36
	← skylite left	18:36
	→ skylite joined	18:36
	← skylite left	18:36
	← Rob-ThisIsMe left	18:36
	← ajustrun left	18:38
	← ecky--ptang-zoob left	18:39
	← otter768 left	18:39
	← clauswitt left	18:39
	→ skylite joined	18:39
	→ jceb joined	18:40
	← Duikb00t left	18:41
	→ whomp joined	18:41
	→ txomon\|home joined	18:41
	→ ManikM joined	18:42
	← kyb3r_ left	18:43
	← jcalonso left	18:44
	→ ascarter joined	18:44
	→ Tuna-Fish joined	18:46
	← whomp left	18:46
	← stamina left	18:47
	→ alanwill joined	18:48
	← jacksparrow007 left	18:50
	→ bobdobbs` joined	18:50
	← amikiri left	18:51
	→ Prawnzy joined	18:52
	← iamjarvo left	18:52
	← bdavenport left	18:52
	→ whomp joined	18:52
	← pheaver left	18:52
	→ amikiri joined	18:52
	← alanwill left	18:53
	← mihaicris left	18:54
	→ sigv joined	18:55
	← bobdobbs left	18:55
	→ maestrojed joined	18:55
	→ bdavenport joined	18:55
	→ mihaicris joined	18:57
	→ jacksparrow007 joined	18:58
	← mennea left	18:58
	→ mennea joined	18:58
	← Takle left	19:00
	← maestrojed left	19:00
	← ryah left	19:00
	→ dangerousdave joined	19:00
	← skylite left	19:01
	← ascarter left	19:03
	← Gizburdt_ left	19:03
	← nnyk_ left	19:04
	← shpoont left	19:04
	← gavit left	19:06
	→ skylite joined	19:06
	→ gavit joined	19:06
	→ timwis joined	19:07
	← vmiklos left	19:08
timwis	Hey guys, I'm trying to setup a deployment script for an open source forum (vanilla). It has a folder called /plugins/ with a few sample plugins in there by default. I have about 10 other plugins that I want to include in my deployment. I'm thinking I'll create a "plugins" repo and clone it into the /plugins/ folder, but then I won't be able to update it from within the plugins folder because those other sample plugins are in there. Is ther	19:08
	symbolic links?	19:08
	→ veebers joined	19:09
	Matrixiumn → Xack	19:09
	→ vmiklos joined	19:09
	→ bit_twit joined	19:10
	→ pheaver joined	19:10
	→ IlNominePatre joined	19:11
	→ Cassiopaya joined	19:11
	← kukks left	19:11
	→ Takle joined	19:11
	→ t0th_-__ joined	19:11
	→ hfp_ joined	19:13
	→ hfp__work joined	19:13
phy1729	submodule probably	19:14
	← hfp left	19:14
	hfp_ → hfp	19:14
	← duplex left	19:15
	← zumba_addict left	19:15
	← hfp_work left	19:15
	hfp__work → hfp_work	19:15
	→ zumba_addict joined	19:16
	← t0th_-__ left	19:16
	→ duplex joined	19:16
	← duplex left	19:17
	← hfp left	19:18
	← hfp_work left	19:18
	← mellernoia left	19:19
	→ hfp joined	19:20
	→ hfp_work joined	19:21
	→ devoldmx joined	19:21
	→ Gizburdt joined	19:22
	← israelpattison left	19:23
	→ israelpattison joined	19:24
	→ ehmatthes joined	19:24
	→ DolpheenDream joined	19:25
	← devoldmx left	19:25
	→ devoldmx3 joined	19:25
	→ palcu joined	19:26
	→ Macaveli joined	19:27
	← mennea left	19:28
	→ mennea joined	19:28
	→ shpoont joined	19:29
	← palcu left	19:30
	← jacksparrow007 left	19:30
	→ githogori joined	19:31
	→ punchaga` joined	19:32
	← dangerousdave left	19:32
	← punchaga` left	19:32
	→ EminenceHC joined	19:32
	→ durre joined	19:33
	← ferri left	19:35
	← punchagan left	19:35
	← shpoont left	19:37
	← EminenceHC left	19:37
	→ settermjd joined	19:38
	← dreiss left	19:38
	→ liamkeily joined	19:38
	→ jb55 joined	19:39
	← crystal77 left	19:40
	→ otter768 joined	19:40
	← Artpicre left	19:40
	→ t0th_-__ joined	19:40
	→ punchagan joined	19:41
	← s00pcan left	19:42
	→ Artpicre joined	19:42
	→ Takle_ joined	19:43
	← t0th_-__ left	19:43
	← timwis left	19:43
	→ t0th_-___ joined	19:43
	← t0th_-___ left	19:43
	→ aswen joined	19:44
	← Takle left	19:44
	→ looper joined	19:44
	→ stiffi joined	19:45
	→ s00pcan joined	19:45
	← stiffi left	19:46
	← joo-_ left	19:47
	→ TomyLobo joined	19:47
TomyLobo	hi	19:48
polyzen	hi	19:48
TomyLobo	how do i make git recognize utf-16 as text and diff/merge/partially add it properly	19:48
	← durre left	19:49
	← tuocugggino left	19:50
TomyLobo	especially merging and partially adding is a problem	19:50
	→ dreiss joined	19:52
	← ManikM left	19:52
	→ ManikM joined	19:52
	← MLM left	19:53
	← gavit left	19:53
	→ t0th_-___ joined	19:55
	← msankhala left	19:56
	→ durre joined	19:58
	← mennea left	19:58
	→ mennea joined	19:59
	→ alanwill joined	19:59
	← t0th_-___ left	20:00
	← batrick left	20:00
	← pheaver left	20:00
	← devoldmx3 left	20:00
Seveas	win 32	20:01
	err, does someone have a spare / for me? :)	20:01
	→ sajan joined	20:01
Eugene	`lvcreate -L 10G Seveas-slash LVM`	20:02
moritz	Seveas: //////////////// # here's a few spare ones	20:02
Seveas	ta	20:02
Eugene	`mkfs.ext4 /dev/LVM/Seveas-slash`	20:02
	`mkdir /chroot/Seveas; mount /dev/LVM/Seveas-slash /chroot/Seveas`	20:03
	`debootstrap -I --forgot --the --options /chroot/Seveas`	20:04
Seveas	mkdir: cannot create directory ‘/chroot/Seveas’: No such file or directory	20:04
	→ lindenle joined	20:04
	← a_le left	20:04
_ikke_	mkdir -p	20:04
	→ a_le joined	20:04
	← a_le left	20:04
_ikke_	TomyLobo: Use gitattribute to force the text attribute on the files	20:04
	← PCatinean left	20:06
	← dorkmafi1 left	20:06
	ChanServ set mode: +o	20:06
	Eugene changed the topic to: Welcome to #git, the place for git help and ancient Jedi wisdom \| Current stable version: 2.1.3 \| Start here: http://jk.gs/git \| Getting "cannot send to channel"? /msg gitinfo .voice \| Be careful when rewriting history. It may push you to use the dark side of the --force	20:07
	Eugene set mode: +vv	20:07
	Eugene set mode: -o	20:07
	← ErKa left	20:09
_ikke_	Someone did a 'git push -f' the other day with push.default set to matching, causing their master branch to be overwritten, and nobody had an up-to-date version	20:09
TomyLobo	reflog?	20:09
_ikke_	hosted repo	20:10
	→ batrick joined	20:10
	→ dtrott joined	20:10
_ikke_	So maybe, maybe not	20:10
TomyLobo	github or something?	20:10
_ikke_	bitbucket	20:10
	→ a_le joined	20:10
	← nrsk left	20:13
TomyLobo	who is "their"?	20:13
	their local master branch? in that case i dont understand ^^	20:13
	but i guess you mean the remote mater branch	20:14
	but how would no one have a copy of what they pushed at some point?	20:14
	not even in their reflogs	20:14
_ikke_	TomyLobo: pull requests	20:14
	← amikiri left	20:14
TomyLobo	ah, so all that's lost is a merge commit?	20:15
	← kriks left	20:15
_ikke_	Not a single one, at least a few	20:15
	→ nnyk_ joined	20:15
	← punchagan left	20:15
	→ nrsk joined	20:17
	→ gavit joined	20:18
	← nrsk left	20:18
	← Jackneill left	20:19
	← JohnBat26 left	20:20
	→ amikiri joined	20:21
	← a_le left	20:21
Seveas	_ikke_: get commit sha1's from the 'Recent activity' and grab the raw diffs from bitbucket?	20:22
	← mennea left	20:24
	← petersr left	20:24
	→ jslirola joined	20:25
	→ mennea joined	20:25
	← fr33domlover left	20:25
	← quetz left	20:26
	← amikiri left	20:27
	→ withasmile joined	20:28
	→ amikiri joined	20:29
	← faylite left	20:29
	→ devoldmx joined	20:31
	→ fr33domlover joined	20:31
	← settermjd left	20:34
	→ CEnnis91 joined	20:36
	→ ecky--ptang-zoob joined	20:37
	→ EminenceHC joined	20:39
	→ shigosei joined	20:39
	→ nucatus joined	20:40
	pikaren → pikabot	20:40
	pikabot → pikaren	20:42
	← pikaren left	20:42
	← EminenceHC left	20:44
	→ dorkmafi1 joined	20:44
	→ psoo joined	20:44
CarlFK	ok, I am still floundering with "fixup" and trying to tidy up my commits. I try to squash 2 commits, and now I have 3: https://github.com/CarlFK/gst-switch/commits/master	20:45
	← devoldmx left	20:45
	→ devoldmx3 joined	20:45
	→ t0th_-___ joined	20:45
	→ pikaren joined	20:46
CarlFK	so.. how do I combine the last 3 commits into one?	20:46
	← ecky--ptang-zoob left	20:46
Eugene	CarlFK - `git rebase -i HEAD^3`, and change p to s	20:47
	Sorry, HEAD~3, not ^. I need more booze.	20:48
	← NoNMaDDeN left	20:48
	← Gizburdt left	20:48
Eugene	See also !sausage	20:49
gitinfo	[!sausage_making] Some developers like to "hide the sausage making", transforming their commits before presenting them to the outside world. See http://sethrobertson.github.com/GitBestPractices/#sausage and !perfect	20:49
	→ Literphor joined	20:49
	→ blackmesa joined	20:49
	→ carlosr joined	20:50
	← zumba_addict left	20:51
	→ zumba_addict joined	20:52
	→ a_le joined	20:52
CarlFK	Eugene: git rebase -i HEAD~3 pulled up vim wit the last 25 commits? I was expecting 3	20:52
Eugene	Did you merge recently?	20:52
CarlFK	maybe. I rm-rf the dir and cloned from github again.	20:53
Eugene	....that's a very silly thing to do.	20:53
	← ruukasu left	20:54
CarlFK	maybe. regardless, I am now looking at 25 commits.	20:54
	← mennea left	20:55
	→ NoNMaDDeN joined	20:55
	→ mennea joined	20:55
	← jslirola left	20:55
	← Literphor left	20:56
	→ mribeirodantas joined	20:56
	← a_le left	20:57
	→ astrofog joined	20:57
	→ booboy joined	20:58
	← pretzel80 left	20:58
	→ aarcane joined	20:58
	→ safinaskar joined	20:59
	← Macaveli left	21:02
	→ timwis joined	21:02
	← D-Boy left	21:02
timwis	Hey guys, is there any way to track a file that's in .gitignore?	21:02
	(I'm forking a repo)	21:02
	→ tpollard joined	21:02
timwis	(and don't want to change .gitignore)	21:03
	→ jheg joined	21:03
qsuscs	timwis: git add -f	21:04
	→ hebz0rl joined	21:04
qsuscs	timwis: but maybe it’s ignored for a reason …	21:04
timwis	qsuscs, thanks	21:04
	it's the config file	21:04
qsuscs	!config	21:04
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	21:04
timwis	i use env vars	21:04
	so it's okay to put the config file in	21:04
	the repo i'm forking doesn't use env vars, which is why they don't include it	21:05
	→ D-Boy joined	21:05
	← jheg left	21:05
	← astrofog left	21:06
	→ jimmyy joined	21:06
	→ LucasKA joined	21:06
	→ JDHawke joined	21:06
	← junaidnaseer2 left	21:07
	← liamkeily left	21:08
	→ weevieL joined	21:11
	← aswen left	21:11
	← NoNMaDDeN left	21:12
	← durre left	21:13
	← str left	21:13
	→ MattMaker joined	21:13
	→ yosito joined	21:14
	← nnyk_ left	21:14
	← timwis left	21:14
	→ jgardella joined	21:15
	→ lidaaa joined	21:16
	→ NoNMaDDeN joined	21:16
	← lindenle left	21:16
	→ mtscout6 joined	21:16
	← csstylish left	21:18
	→ csstylish joined	21:21
	→ str joined	21:21
	← str left	21:21
	← nucatus left	21:23
	→ noway_ joined	21:23
	← mennea left	21:25
	→ mennea joined	21:25
	← hamster left	21:26
	→ snuffeluffegus joined	21:27
	← learner left	21:28
	← safinaskar left	21:29
	← m8 left	21:29
	→ ap0c joined	21:31
	→ starmanta joined	21:32
	← jimmyy left	21:33
	→ msmith joined	21:33
	← skorgon left	21:33
	← snuffeluffegus left	21:38
	← HelloShitty left	21:39
	→ mellernoia joined	21:39
	→ ajustrun joined	21:40
	← diegoviola left	21:40
	→ EminenceHC joined	21:40
	→ Lyqyd joined	21:41
	← jceb left	21:42
	← mihaicris left	21:42
	← whomp left	21:43
	← Noldorin left	21:44
	→ Noldorin joined	21:45
	← EminenceHC left	21:45
	← mtscout6 left	21:48
	→ sebhoss joined	21:48
	← sebhoss left	21:48
	← virtualsue left	21:49
	→ danemacmillan joined	21:50
	→ mtscout6 joined	21:51
	← troyt left	21:52
	← ManikM left	21:52
	→ ManikM joined	21:52
	→ aard_ joined	21:54
	← mennea left	21:55
	→ mennea joined	21:55
	→ pheaver joined	21:56
	→ virtualsue joined	21:57
	← mennea left	21:58
	→ mennea joined	21:59
	← bit_twit left	21:59
	→ h4ml3t joined	22:02
	→ kukks joined	22:02
	← shigosei left	22:03
	→ EminenceHC joined	22:04
	→ JSharpe joined	22:04
	← yosito left	22:05
	→ yosito joined	22:05
	← mennea left	22:05
	← mtscout6 left	22:05
	← mellernoia left	22:06
	← aard_ left	22:06
	← mribeirodantas left	22:06
	← devoldmx3 left	22:07
	→ devoldmx joined	22:07
	← Kicer left	22:07
	← looper left	22:07
	← sajan left	22:07
	← danemacmillan left	22:08
	← EminenceHC left	22:08
	← yosito left	22:11
	← dtrott left	22:11
	← barduck left	22:12
	→ joo-_ joined	22:13
	→ a_le joined	22:14
	→ danemacmillan joined	22:14
	→ s8321414 joined	22:15
	→ Literphor joined	22:15
	← dorkmafi1 left	22:15
	← King_Hual left	22:16
	← LucasTT left	22:17
	← puff left	22:18
	← joo-_ left	22:18
	→ paul424 joined	22:18
	→ m0ltar joined	22:21
	→ knighthawk joined	22:22
	← solker left	22:23
	← knighthawk left	22:23
	← zumba_addict left	22:24
	→ zumba_addict joined	22:24
	← psoo left	22:26
	→ eletuchy joined	22:27
	→ dorkmafi1 joined	22:27
	← ScioMin left	22:28
	→ HelloShitty joined	22:28
	← gavit left	22:29
	← fr33domlover left	22:29
	→ fr33domlover joined	22:30
	→ Ademan joined	22:30
	← msmith left	22:30
	→ jimmyy joined	22:31
Ademan	I suspect I may be hosed, but I tried to merge some changes into another branch, then fixed some issues with the original merged code. I'd like to clean up the history so that the fixes are in the branch before it is merged...	22:32
	← jimmyy left	22:34
	← booboy left	22:35
	→ jimmyy joined	22:35
	← jimmyy left	22:35
	→ jimmyy joined	22:36
	← jimmyy left	22:37
	→ jimmyy joined	22:37
	→ adamben joined	22:38
	→ faustvault2196 joined	22:38
	→ kpreid joined	22:39
CarlFK	Ademan: I am completely failing at such things (like the simple squash last 2 commits) but someone pointed me to !sausage	22:40
gitinfo	Ademan: [!sausage_making] Some developers like to "hide the sausage making", transforming their commits before presenting them to the outside world. See http://sethrobertson.github.com/GitBestPractices/#sausage and !perfect	22:40
	→ tier joined	22:40
	→ mribeirodantas joined	22:40
	→ teran joined	22:40
	← withasmile left	22:41
	→ hahuang61 joined	22:41
	← kukks left	22:42
	dorkmafi1 → dorkmafia	22:43
	← Literphor left	22:43
	← starmanta left	22:43
	← phantombeta left	22:43
	← faustvault2196 left	22:44
	→ diegoviola joined	22:44
	→ dtrott joined	22:44
	← LucasKA left	22:44
	← jgardella left	22:45
	→ EminenceHC joined	22:46
	← Prawnzy left	22:46
	→ Nijikokun joined	22:47
	← Nijikokun left	22:47
	← philipandersen left	22:48
	→ Nijikokun joined	22:48
	← Nijikokun left	22:48
	→ Nijikokun joined	22:49
	→ faustvault2196 joined	22:49
	→ starmanta joined	22:50
	← EminenceHC left	22:50
	→ philipandersen joined	22:51
	← mribeirodantas left	22:52
	← Arsonide left	22:52
	→ Arsonide joined	22:53
	← faustvault2196 left	22:53
	← ScottE left	22:53
	→ mtscout6 joined	22:53
	→ Gitzilla joined	22:55
	← HelloShitty left	22:56
Ademan	CarlFK: thanks I'll take a look	22:56
	!perfect	22:56
gitinfo	[!postproduction] So, you want to make your commit history look pretty before pushing? http://sethrobertson.github.com/GitPostProduction talks you through how to use 'rebase -i' to do this.	22:56
	← zumba_addict left	22:57
	→ zumba_addict joined	22:57
	← eletuchy left	22:59
	→ devoldmx3 joined	22:59
	← danemacmillan left	22:59
	← BlaXpirit left	22:59
	← nuck left	23:00
	← ehmatthes left	23:00
	← devoldmx left	23:02
	→ danemacmillan joined	23:02
	← h4ml3t left	23:02
	→ ScottE joined	23:03
	→ crystal77 joined	23:04
	→ lindenle joined	23:05
	← TomyLobo left	23:06
	→ troyt joined	23:07
	→ nucatus joined	23:09
	← lindenle left	23:09
	← mibofra left	23:11
	→ mibofra joined	23:11
	← Skapadapaduu left	23:12
	→ note joined	23:13
	← nucatus left	23:13
	← dreiss left	23:14
	← dtrott left	23:15
	← starmanta left	23:16
	← himikof left	23:17
	→ himikof joined	23:18
	← amikiri left	23:19
	→ russt joined	23:24
	→ solker joined	23:24
	→ iamjarvo joined	23:24
	→ dreiss joined	23:25
	← IlNominePatre left	23:25
	← Cassiopaya left	23:25
	← paul424 left	23:25
	← Zupoman left	23:25
	→ LucasKA joined	23:26
	← iamjarvo left	23:27
	← solker left	23:28
	→ eletuchy joined	23:28
	← hahuang61 left	23:29
	← Sleepy63 left	23:30
	← pantsman- left	23:30
	← jimmyy left	23:30
	→ [R] joined	23:30
	→ dregad joined	23:30
[R]	when i cherry-pick, git diff is showing me the diff between where i am, and where the pick was... i need to look at the diff of where i am now, and where i was before the pick... is there a flag for taht?	23:31
kpreid	if your cherry-pick was successful, you should have just a commit, and therefore no diff. it sounds like you maybe had a conflict in your cherry-pick that you need to resolve.	23:32
[R]	yes that is what happened, sorry	23:32
	i just want to make sure the diff looks good before doing the commit	23:33
kpreid	after you "git add" the conflicted files then "git diff --cached" will show you ordinary diffs (of what you'll commit) instead of the 3-way ones	23:33
	← Arsonide left	23:34
thiago	[R]: git diff HEAD	23:34
	→ Arsonide joined	23:34
	← tier left	23:35
[R]	excellent... thanks	23:35
	→ nocbreak joined	23:35
	← cbreak left	23:35
	→ nnyk_ joined	23:35
kpreid	thiago: ooh, that works? thanks!	23:37
	← weevieL left	23:38
	← zumba_addict left	23:38
kpreid	makes sense in hindsight -- compare HEAD and tree, and ignore the index where the conflict info is	23:38
	→ weevieL joined	23:38
	→ zumba_addict joined	23:38
thiago	git diff = compare tree and index (in the case of a conflicted state, it's a 3-way diff)	23:38
	git diff --cached = compare index and commit	23:39
	git diff HEAD = compare tree and commit	23:39
	git diff --cached HEAD = compare index and commit	23:39
	← zumba_addict left	23:40
[R]	they think of everything	23:40
thiago	wait, one of the four is wrong	23:41
	→ zumba_addict joined	23:41
	← CarlFK left	23:42
	← skylite left	23:44
	← bdavenport left	23:47
	→ EminenceHC joined	23:49
	→ msmith joined	23:50
	← msmith left	23:50
	← Consuela left	23:50
	→ Consuela_ joined	23:50
	→ msmith joined	23:50
	← ManikM left	23:52
	→ ManikM joined	23:52
	← ncd\|leeN left	23:53
	← EminenceHC left	23:54
	nocbreak → cbreak	23:55
	→ r0bby_ joined	23:55
	← DolpheenDream left	23:55
	→ LucasTT joined	23:55
	← robbyoconnor left	23:56
	→ alp82 joined	23:56
	→ kukks joined	23:56
	← kukks left	23:56
	→ kukks joined	23:56
	← St_Marx left	23:58
	→ St_Marx joined	23:58

Logs Search ←Prev date Next date→

Channels Documentation