IRCloggy #git 2014-09-14

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-09-14
	← fstd left	00:00
geri	and cant resolve it now	00:00
	← lasers left	00:00
	→ fling joined	00:00
	→ diegoviola joined	00:00
	→ fstd joined	00:00
	← jftf left	00:01
gfixler	geri: git log -- filename	00:02
	i.e. see if that file exists in any commit	00:02
	if it's in a folder, do git log -- foo/bar/filename	00:02
geri	fatal: ambiguous argument 'training.txt': unknown revision or path not in the working tree.	00:03
	→ Kamilion joined	00:03
gfixler	was it in the folder you're in right now?	00:03
geri	ok	00:03
	seems the file got added to the repo	00:03
	git log training.txt commit 111870788112d53668ec229cc3a556be41c8c448	00:04
gfixler	ok	00:04
geri	which is really bad	00:04
gfixler	how long ago was 11187?	00:04
geri	i added it two times:	00:04
	commit 4e1b6bb0182c589c38a7f4dce384cc5d8c75715d	00:04
	damm everything is broken nice!	00:05
gfixler	added twice, or added, then modified or moved?	00:05
geri	i didnt modifiy it	00:05
	i just tried to delete it	00:05
	but that didnt work for some reason	00:05
gfixler	is this far back in history, or only a few commits?	00:05
	← LLaurent left	00:05
gfixler	you can `git log`, then `/111870` to find it	00:05
geri	a few commits	00:05
gfixler	that's not too bad then	00:06
	← davispuhh left	00:06
gfixler	was it the only thing added in that commit?	00:06
geri	no	00:06
	i added 2 more files	00:06
	which where too big	00:06
	git log svm_model commit e96d72945f929e450a39f6da404bca6a2f6d20af	00:06
	commit 4e1b6bb0182c589c38a7f4dce384cc5d8c75715d	00:06
	← habanany left	00:06
gfixler	I meant was training.txt the only thing added in 11187	00:07
geri	git log test.txt commit 111870788112d53668ec229cc3a556be41c8c448	00:07
	commit 4e1b6bb0182c589c38a7f4dce384cc5d8c75715d	00:07
	i dont understand why the file got added even if its tooooo big!???	00:07
	that doesnt make sense at all	00:07
gfixler	it's not too big for your own local repo	00:08
	it was too big for github, according to their rules	00:08
geri	i pushed it to github	00:08
	→ _lexjm joined	00:08
	← punchagan left	00:09
gfixler	I think I'm not sure why/when it was too big then	00:09
geri	so how can i fix that now?	00:09
	→ punchagan joined	00:09
gfixler	did you not want those files in the repo?	00:09
	← daivyk left	00:09
geri	no if they cant be pushed to github	00:09
gfixler	if not, you could remove them from the repo, then force push to github	00:10
	→ habanany joined	00:10
geri	gfixler: thats what i did	00:10
	with git rm training.txt --cached	00:10
	but it failed	00:10
	→ daivyk joined	00:10
geri	it still wants to upload the bigfile to github	00:10
atrigent	geri: it is still in your history	00:11
	→ Tashi_ joined	00:11
gfixler	geri, I'm trying to walk you to a new state of the repo, where those files won't be in there	00:11
	← blakbunnie27 left	00:11
geri	gfixler: ok	00:11
gfixler	right now, even if they're not in your current working tree, they still exist in the repo	00:11
	that's the entire point of versioning - keeping old versions around	00:12
geri	git rm training.txt fatal: pathspec 'training.txt' did not match any files	00:12
	so they dont currently exist?	00:12
gfixler	so even if you delete them now, the old versions are still there, safe	00:12
	→ blakbunnie27 joined	00:12
gfixler	doesn't seem so	00:12
	but only now - they still exist in the past	00:12
	does that make sense?	00:12
geri	ok	00:12
	← FL1SK left	00:13
	→ FL1SK joined	00:13
	← NBhosting left	00:13
gfixler	something we can look at is commit 111870, which had at least one big file in it	00:13
	you can do a `git show 111870` or `git ls-tree 111870` to see what's in that commit	00:14
	← Tashi__ left	00:14
	→ jontmorehouse joined	00:14
gfixler	I'd actually prefer to remove from the most recent one back, to avoid conflicts	00:14
geri	how do u know its 111870?	00:14
gfixler	17:07 < geri> git log test.txt commit 111870788112d53668ec229cc3a556be41c8c448	00:14
	← jonmorehouse left	00:15
gfixler	17:04 < geri> git log training.txt commit 111870788112d53668ec229cc3a556be41c8c448	00:15
	you told me	00:15
geri	can u get all commits?	00:15
	to be sure	00:15
gfixler	I need to know a couple of things	00:15
	first, how many files are we trying to get rid of here?	00:15
	2? 3?	00:15
geri	3	00:16
	training.txt	00:16
	test.txt	00:16
	svm_model	00:16
gfixler	git log training.txt test.txt svm_model	00:16
	→ jftf joined	00:16
gfixler	that will show you all the commits those are part of, newest first	00:16
	→ kushal3 joined	00:17
	TheSojourner → mjulian	00:17
gfixler	git log --oneline training.txt test.txt svm_model	00:17
	that will keep it to 1 line per commit	00:17
	so it's easy to count	00:17
	how many are there?	00:17
geri	gfixler: http://ideone.com/0FxqjR	00:18
	ehre the log	00:18
	mom	00:18
	http://ideone.com/03GItR	00:18
gfixler	git show --name-status 111870	00:18
	→ Eins_ joined	00:19
gfixler	should see names of added/deleted/modified files at the bottom	00:19
	← punchagan left	00:19
geri	gfixler: http://ideone.com/s1WgZW	00:19
	here the folder i checked in	00:19
gfixler	what do you get for that show --name-status line?	00:20
geri	gfixler: http://ideone.com/Dz7uX1	00:21
	show --name-status line ?	00:21
gfixler	okay, can you just delete all 4 of those files?	00:21
geri	?	00:21
	sure	00:21
gfixler	that's easy to do	00:21
	this is the master branch?	00:21
	→ kcj joined	00:22
gfixler	and you're currently on the master branch?	00:22
geri	yes	00:22
gfixler	great	00:22
	Just in case things go sideways, I'd do:	00:22
	git branch oldmaster	00:22
geri	hu?	00:22
gfixler	that will just put a second name where you are right now to pin it down	00:22
	because master is about to move	00:22
geri	wait i dont like this command	00:23
	→ ezio joined	00:23
gfixler	right now there's a text file called master with the contents 111870...	00:23
	we're just making a second text file called oldmaster with the same contents	00:23
	if you get lost, you'll always be able (while on master) to do `git reset --hard oldmaster`	00:23
	and everything will be like it was	00:23
	it's impossible to change things in git, but you can move pointers around	00:23
	← alxgnon1 left	00:23
	→ alxgnon1 joined	00:23
gfixler	master is just a pointer to a commit	00:24
	alxgnon1 → alxgnon	00:24
	→ tmcmahon joined	00:24
gfixler	we're just adding a second one so we can move master without forgetting where master was	00:24
geri	can i just delete the folder	00:24
gfixler	no	00:24
geri	and do git pull?	00:24
gfixler	no	00:24
	you can't just do anything in your working tree to fix this issue	00:24
	the problem is in the DAG of commits	00:25
	we're about to surgically remove things from that DAG	00:25
	you can't access that from your local project directory	00:25
geri	ok i mad a backup	00:25
gfixler	that's fine	00:25
geri	so what to do now?	00:25
gfixler	but this is really non-dangerous	00:25
	← dreiss left	00:25
gfixler	we don't even need the oldmaster branch, because I remember 11187 now :)	00:25
	→ mkaesz joined	00:25
gfixler	anyway, do this:	00:25
	← Noldorin left	00:25
gfixler	git rebase --onto 11187^ 11187	00:26
geri	what does it do?	00:26
gfixler	it works on the current branch	00:26
geri	Cannot rebase: You have unstaged changes. Please commit or stash them.	00:26
gfixler	and it says "This line of commits is currently based on 11187, but now base them onto the parent of that commit instead"	00:26
	git stash	00:26
	that will create a temp commit to store your local changes	00:26
geri	Saved working directory and index state WIP on master: 6e4a6dd removed file HEAD is now at 6e4a6dd removed file	00:27
gfixler	(which will act like that oldmaster I wanted you to create, holding this position)	00:27
	now do:	00:27
	git rebase --onto 11187^ 11187	00:27
geri	First, rewinding head to replay your work on top of it... error: The following untracked working tree files would be overwritten by checkout: classifier/experiment/svm_model classifier/experiment/test.txt classifier/experiment/training.txt Please move or remove them before you can switch branches. Aborting could not detach HEAD	00:27
gfixler	git status	00:28
	see if you have deleted files	00:28
	or files that aren't tracked	00:28
	if you have untracked files, and you don't care about them, delete them	00:28
geri	On branch master Your branch is ahead of 'origin/master' by 8 commits. (use "git push" to publish your local commits)	00:28
	and some untracked files	00:28
gfixler	do you care about the untracked files? (be sure)	00:28
geri	no but i dont want to delete them	00:28
	← Roots47 left	00:29
gfixler	can you move them out of the repository for now?	00:29
	→ Hello71 joined	00:29
geri	that get ugly now	00:29
gfixler	howso?	00:29
	they're not tracked	00:29
	your git project doesn't even know what they are	00:29
	← mkaesz left	00:30
	← dccc_ left	00:30
geri	there are many files	00:31
gfixler	how did you make that backup?	00:31
	→ P4_Denis joined	00:31
geri	cp -r	00:31
gfixler	throw it out	00:31
	let's make it again with git clone	00:31
	from the directory that contains your repo, let's do `git clone yourrepo newname`	00:32
	that will make a copy without any of the junk in it	00:32
	← evildmp left	00:32
geri	ok cloned	00:32
gfixler	ok, now we can do whatever we want in the clone, hooray	00:32
	git rebase --onto 11187^ 11187	00:33
	→ Consuela joined	00:33
geri	On branch master Your branch is up-to-date with 'origin/master'.	00:33
	ok moment	00:33
	fatal: Needed a single revision invalid upstream 11187	00:33
gfixler	git rebase --onto 111870^ 111870	00:34
geri	git rebase --onto 111870^ 111870 fatal: Needed a single revision invalid upstream 111870	00:34
gfixler	say what	00:34
	are you on master?	00:34
	yeah, you are	00:35
	git log --oneline \| grep 11187	00:35
	← fooforge left	00:35
geri	git log --oneline \| grep 11187 returns nothing!!!	00:35
gfixler	what the what	00:35
	this repo is a house of lies	00:36
	← P4_Denis left	00:36
	→ edwardly joined	00:36
gfixler	git log --oneline training.txt test.txt svm_model	00:36
geri	fatal: ambiguous argument 'training.txt': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git <command> [<revision>...] -- [<file>...]'	00:37
	→ bdavenport joined	00:37
gfixler	are you in the clone repo?	00:37
	← toothrot left	00:37
geri	i have to say that the file did not get commited to github!	00:37
gfixler	and in the same folder in there where you were before?	00:37
geri	i have to say that the file did not get commited to github!	00:38
gfixler	wait, did you clone from github, or from your local repo?	00:38
geri	bc it was too big	00:38
	github	00:38
gfixler	that's not what I said to do	00:38
	no wonder this is so confusing	00:38
	← thumpba left	00:38
geri	i only have my github repo	00:38
gfixler	git log --oneline test.txt svm_model	00:38
geri	fatal: ambiguous argument 'test.txt': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git <command> [<revision>...] -- [<file>...]'	00:38
	they are not commited	00:39
gfixler	git log --oneline svm_model	00:39
geri	git log --oneline svm_model fatal: ambiguous argument 'svm_model': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git <command> [<revision>...] -- [<file>...]'	00:39
gfixler	so you're fine	00:39
	the clone you made from github is a clean copy	00:39
geri	ok lol	00:39
	git is just confusing!	00:39
gfixler	were there new commits in the other local copy that you wanted?	00:39
	geri: it's super confusing until you learn the data model, then it's all really obvious	00:40
geri	i can copy the manually the the new clone	00:40
gfixler	thankfully, the data model is not difficult - it's one of the simplest things I've seen	00:40
geri	gfixler: cant u make a easier version?	00:40
gfixler	geri: probably not, DAGs take some getting used to, but they're exactly right for versioning time and space in alternate dimensions, which is what everyone wants to do	00:40
	well, maybe not everyone	00:41
Eugene	Unfortunately the doctor has managed to loop his DAG	00:41
gfixler	but eventually everyone, when they want to undo a commit from a week ago, which is altering time, and creating a new timeline	00:41
	so probably everyone	00:41
Eugene	I reckon he's managed to collide SHA1 though	00:41
gfixler	what? impossible	00:41
	→ synfinatic joined	00:41
gfixler	in 18 years we've never seen it	00:42
	okay, infinitely possible, but so unlikely	00:42
Eugene	The TARDIS has quite a bit of CPU to throw at the problem	00:42
gfixler	Eugene: I wonder if it's big enough on the inside to contain all SHA-1 hashes	00:42
Eugene	Printed or on flash?	00:43
	→ sebbu joined	00:43
	← _lexjm left	00:43
gfixler	each printed on a proper TPS report	00:43
	let's be official about this	00:43
Eugene	Unlikely	00:43
	← sebbu left	00:43
	→ sebbu joined	00:43
gfixler	okay, TPS flash drives	00:44
	geri: how are you 'copying' over the new commits?	00:44
	→ _lexjm joined	00:44
geri	cp :)	00:45
gfixler	geri: but...	00:45
geri	git add git commit git push origin master	00:45
gfixler	probably good enough	00:45
	but, just for the fun of it, if you had a few commits in another repo (like now) and wanted to copy them over with their original info	00:46
	→ dccc_ joined	00:46
gfixler	you could `git remote add temp ../otherrepo`	00:46
	`git fetch temp`	00:46
	then `git cherry-pick <commit>` for each commit	00:46
	then `git remote remove temp`	00:46
	basically bring another repo in for a moment as a remote, with all its objects, then cherry-pick what you want from those objects, then throw out the remote	00:47
	I aliased cherry-pick to cp, so I kinda do use cp :) - `git cp commit`	00:47
	cherry-pick is basically copying a commit	00:48
	→ cespare joined	00:48
	← jontmorehouse left	00:49
geri	gfixler: whats the advantage of that?	00:49
gfixler	keeps the original commit times, author, and message	00:50
	if you just did a cp and commit, you're only getting the current version	00:50
	you could cp 5 commits, though, and bring all that state-over-time into your repo if you wanted	00:50
	← dccc_ left	00:50
gfixler	you could also use rebase if you had a bunch to cherry-pick	00:50
	→ jon-mac joined	00:50
gfixler	rebasing is basically doing a bunch of cherry-picks in a row	00:51
	→ blackmesa joined	00:51
	← liamkeily left	00:52
	→ toothrot joined	00:52
	→ trewe joined	00:53
geri	gfixler: i already fixed it	00:54
	i only have a few files	00:54
	→ jftf_ joined	00:54
geri	nothing cricital	00:55
	→ curiousmansi_ joined	00:55
geri	thanks anyway gfixler	00:56
gfixler	np	00:56
	→ dccc_ joined	00:57
	→ keithy joined	00:57
	← kaendfinger left	00:57
	← zumba_addict left	00:58
	→ EminenceHC joined	00:58
	← keithy left	00:58
	→ zumba_addict joined	00:59
	→ keithy joined	00:59
	→ kaendfinger joined	00:59
	← shinnya left	01:00
	← zumba_addict left	01:00
	→ punchagan joined	01:00
	← jftf_ left	01:01
	→ mizu_no_oto joined	01:01
	→ zumba_addict joined	01:01
	← eto left	01:01
	← kushal3 left	01:01
	→ eto joined	01:02
	← geri left	01:02
	← EminenceHC left	01:03
	← eletuchy_ left	01:03
	→ eletuchy joined	01:03
	→ watabou joined	01:04
	← SjB left	01:04
	→ shinnya joined	01:05
	← looper_ left	01:05
	← jottr_ left	01:06
	→ nerder joined	01:07
nerder	hello	01:07
gitinfo	nerder: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	01:07
	→ looper joined	01:07
nerder	how can i see the old version of a file on my git repo?	01:07
	i mean, the file before the last commit.	01:07
	← eletuchy left	01:08
	← dccc_ left	01:08
	→ rdbell joined	01:08
	← jftf left	01:10
	→ eletuchy joined	01:11
	← rdbell left	01:11
	→ Noldorin joined	01:12
	→ maqr joined	01:13
	→ Bruce1 joined	01:14
	→ devoldmx joined	01:21
	← JDHawke left	01:21
	← TheEskil left	01:21
	← Steve_Jobs left	01:22
	← blackmesa left	01:22
	→ ajustrun joined	01:22
	→ TheEskil joined	01:23
	→ dccc_ joined	01:23
	← devoldmx3 left	01:23
	← trewe left	01:23
	← keithy left	01:24
	← mizu_no_oto left	01:25
	→ mkaesz joined	01:25
	→ sinkensabe joined	01:26
	→ Floatingman joined	01:26
	← m0ltar left	01:28
	← nath_schwarz left	01:29
	→ LucasTT_ joined	01:30
	← mkaesz left	01:30
	← sinkensabe left	01:30
	→ nath_schwarz joined	01:31
	← oojacoboo left	01:31
	← regreg left	01:32
	← mnavratil left	01:32
	→ jottr_ joined	01:33
	← LucasTT left	01:33
	← maqr left	01:33
	→ kaezarrex joined	01:35
	← SegFaultAX left	01:35
nerder	anybody here? or just zombie?	01:37
	→ SegFaultAX joined	01:37
	→ EminenceHC joined	01:38
	← dagnachew left	01:38
	← jottr_ left	01:38
	→ jftf joined	01:38
kaezarrex	hey	01:41
gitinfo	kaezarrex: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	01:41
nerder	hey kaezarrex	01:41
	← kpreid left	01:43
	→ Vampire0_ joined	01:43
	← watabou left	01:44
	→ jontmorehouse joined	01:45
	← Vampire0 left	01:47
	→ ChinnoDog joined	01:47
	← EminenceHC left	01:49
	→ regreg joined	01:49
	→ v1nt joined	01:49
	← darkbasic left	01:50
	→ hahuang65 joined	01:50
	← _lexjm left	01:50
	→ darkbasic joined	01:51
	← jontmorehouse left	01:51
	← devoldmx left	01:51
	← regreg left	01:53
	← zumba_addict left	01:53
	← v1nt left	01:54
	→ v1nt joined	01:54
	→ zumba_addict joined	01:54
	← hahuang65 left	01:55
	← Eins_ left	01:55
	→ jftf_ joined	01:55
	→ maqr joined	01:56
	→ regreg joined	01:57
	← Bruce1 left	01:58
	→ mizu_no_oto joined	01:58
	→ ojacobson joined	02:00
CareBear\	nerder : hey	02:00
	→ jontmorehouse joined	02:01
	← jftf_ left	02:01
CareBear\	nerder : git show $(git ls-tree $(git log --pretty=format:%H -2 "$filename" \| tail -n 1) "$filename" \| awk '{print $3}')	02:03
	← looper left	02:03
CareBear\	nerder : that shows you the file as it was before the last commit which changed it, regardless how many commits back that is.	02:03
	→ looper joined	02:04
	→ revyd joined	02:04
	← Guest71701 left	02:04
	→ lachesis joined	02:05
	← jftf left	02:05
	→ bezet joined	02:07
	← tmcmahon left	02:08
	← diegoviola left	02:09
nerder	CareBear\: thx, but i dnt get what means: http://pastebin.com/RCzZdwSr	02:10
	← Noldorin left	02:11
	← bezet left	02:12
	FrozenFire[alt] → FrozenFIre	02:14
	FrozenFIre → FrozenFire	02:14
	← m0viefreak left	02:15
	← Consuela left	02:17
	→ josef_ joined	02:19
ojacobson	I "love" the feature that git repos begin with parentless commits, rather than with a null-tree commit.	02:19
	Mercurial does it the other way, and it makes reasoning about the "first" commit much easier	02:19
	(all such commits, for repos with multiple roots)	02:19
	← msonntag left	02:20
	← kcj left	02:20
	→ redrocket joined	02:21
	→ ropav joined	02:21
	← TheEskil left	02:21
	← fesoj left	02:22
	→ msonntag joined	02:22
	← josef_ left	02:23
	→ d2dchat joined	02:23
	→ TheEskil joined	02:23
	→ kpreid joined	02:23
	← looper left	02:25
	→ mkaesz joined	02:25
	← variable left	02:25
	→ fesoj joined	02:25
	→ Noldorin joined	02:26
	← mizu_no_oto left	02:27
	← Lyqyd left	02:28
	→ timwis joined	02:30
timwis	Hey guys, looking for advice - I'm trying to run a PHP forum on my web server but in a best-practice-driven way... The forum is on github, but when you modify parts of the forum in the settings of the app, it modifies the config file on the server. What's the best way to do version control with that, and have a local replica?	02:31
	→ P4_Denis joined	02:31
	← mkaesz left	02:32
	← alexwhitman left	02:32
ojacobson	timwis: same as any other language, really: version the software separately from the configuration.	02:33
	→ jftf joined	02:33
ojacobson	Ideally, use a config management tool such as ansible or puppet to automate applying configuration to the deployment	02:33
	← fesoj left	02:35
	← toothrot left	02:35
	← raven-au left	02:35
ojacobson	Since it's somewhat self-configuring, you can cook up an example config locally and pick it apart. I assume it spits out either a dumb data file (ideal) or a short program fragment (not ideal), either of which are fairly easy to analyze and track.	02:35
	← P4_Denis left	02:35
	→ raven-au joined	02:36
	→ danemacmillan joined	02:36
	→ flowerhack joined	02:36
	← mutley89 left	02:36
	→ alexwhitman joined	02:37
	← amikiri left	02:37
	→ kcj joined	02:37
	→ livingstn joined	02:38
	← ropav left	02:39
	→ kpreid_ joined	02:39
	← kpreid left	02:40
	kpreid_ → kpreid	02:40
	→ robbyoconnor joined	02:41
	← regreg left	02:41
	← gambler left	02:45
	→ JDHawke joined	02:45
	→ toothrot joined	02:46
	← sgen left	02:46
	→ _lexjm joined	02:46
	← jenni_naiaretti left	02:48
mozzarella	guys help	02:50
	→ Pyrogerg joined	02:51
	→ atatat joined	02:53
	Moult_ → Moult	02:53
	← Moult left	02:53
	→ Moult joined	02:53
Moult	mozzarella: with? :)	02:53
	→ fatalhalt joined	02:53
mozzarella	Moult: seems like the git config command is using tabs now… it used to use two spaces to indent stuff	02:54
	← WaReZ left	02:54
mozzarella	so now I have a mix of tabs and spaces inside my .gitconfig	02:54
	→ jftf_ joined	02:56
	← kaendfinger left	02:57
Moult	mozzarella: isn't that an editor configuration?	02:57
mozzarella	never touched it with an editor	02:58
	also, how do I undo a commit?	02:58
	← LucasTT_ left	02:58
	← daivyk left	02:59
	← anomalyst left	03:00
ojacobson	!revert	03:00
gitinfo	That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?	03:00
	← mikecmpbll left	03:01
	← dccc_ left	03:01
	→ St_Marx joined	03:01
mozzarella	ojacobson: I accidentally staged some file in my last commit	03:01
	← jftf_ left	03:02
	→ lazers joined	03:02
	→ stack joined	03:03
	→ ntio joined	03:03
	→ DavidRockin joined	03:04
	→ MattMaker joined	03:05
	← _5kg left	03:05
	← inchut left	03:05
	← TheEskil left	03:09
	→ xSmurf joined	03:09
	← morenoh152 left	03:09
	← Noldorin left	03:10
	→ Malsasa joined	03:14
	→ asakura joined	03:14
	→ TheEskil joined	03:14
	← Azoloth left	03:14
	← DavidRockin left	03:15
	← flowerhack left	03:15
	← v1nt left	03:16
	→ v1nt joined	03:16
	← v1nt left	03:16
	← nerder left	03:17
	→ _5kg joined	03:18
	→ variable joined	03:18
	← variable left	03:18
	→ variable joined	03:18
	→ dccc joined	03:20
	→ ormaaj joined	03:22
	→ rchavik joined	03:22
	← binaryhat left	03:24
	→ binaryhat joined	03:25
	→ Px12 joined	03:26
	→ sinkensabe joined	03:27
	← kerrick left	03:28
	→ LLaurent joined	03:29
	← redrocket left	03:30
	← sinkensabe left	03:31
	→ rypeck joined	03:32
	→ regreg joined	03:32
	← MorpheusBeing left	03:32
	→ Bruce1 joined	03:37
	→ MorpheusBeing joined	03:40
	← TheEskil left	03:42
	→ TheEskil joined	03:43
	← punchagan left	03:43
	→ SjB joined	03:43
	← ClarusCogitatio left	03:44
	→ punchagan joined	03:45
	→ ClarusCogitatio joined	03:45
	← jonyfive left	03:46
	← Bruce1 left	03:47
	→ EminenceHC joined	03:49
	→ _tac joined	03:49
_tac	Is there a way I can perform an "ls" on a particular revision?	03:50
	I can't tell if I have accidentally committed this file or not	03:50
	← rchavik left	03:50
_tac	and I want to check to see if it really is inside git	03:50
	← ojacobson left	03:52
	→ dsdeiz joined	03:52
rudi_s	_tac: git checkout is the simplest way, not sure if git ls-files can do it.	03:53
	git show also works, but you need the exact file namne.	03:53
_tac	hmm. I'll check it out	03:53
	→ tanath joined	03:53
	← hamster_ left	03:53
_tac	ls-files looks like what I want	03:53
	thanks	03:54
	← NightMonkey left	03:54
	← EminenceHC left	03:54
rudi_s	np	03:55
	_tac: But I think git ls-files only works with the current reversion.	03:55
	*revison	03:55
	→ NightMonkey joined	03:55
	← livingstn left	03:56
_tac	for what I need at the moment, that works	03:56
	and I can always checkout and ls-files if I get stuck	03:56
	→ jftf_ joined	03:57
rudi_s	Yeah.	03:57
	← ClarusCogitatio left	03:57
	→ jonyfive joined	03:58
	→ AnujSharma joined	03:59
	→ ClarusCogitatio joined	04:00
	← jftf_ left	04:03
	← jonyfive left	04:03
	← dsdeiz left	04:03
	→ jonyfive joined	04:03
	← jonyfive left	04:04
	→ Steve_Jobs joined	04:04
	→ jonyfive joined	04:05
	→ jonmorehouse joined	04:05
	← AnujSharma left	04:06
	← nfk left	04:07
	← jontmorehouse left	04:07
	→ rchavik joined	04:08
	→ supernaut joined	04:09
	← supernaut left	04:10
	→ supernaut joined	04:10
	→ armyriad joined	04:10
	→ zumba_ad_ joined	04:11
	← muhaha03__ left	04:11
	← ClarusCogitatio left	04:13
	← zumba_addict left	04:14
	→ ClarusCogitatio joined	04:16
	← lyang0 left	04:17
	→ lyang0 joined	04:18
	→ uwjesq joined	04:19
	→ OrpheusP joined	04:19
	← fatalhalt left	04:21
	→ das_beard joined	04:22
	→ Lyqyd joined	04:25
	→ mkaesz joined	04:25
	→ Eins_ joined	04:25
	← eletuchy left	04:26
	→ Tommy[D]_ joined	04:27
	→ mennea joined	04:27
	→ skorgon joined	04:27
	← mkaesz left	04:29
	← RiVale left	04:30
	→ dsdeiz joined	04:30
	← _lexjm left	04:31
	→ _lexjm joined	04:31
	← Tommy[D] left	04:31
	← eliasr left	04:32
	→ P4_Denis joined	04:32
	← P4_Denis left	04:36
	→ fatalhalt joined	04:38
	← toothrot left	04:38
	← ClarusCogitatio left	04:39
	← igor____ left	04:41
	→ ClarusCogitatio joined	04:42
	← kaezarrex left	04:44
	← MAKEDWOK left	04:47
	← asakura left	04:47
	→ sgen_ joined	04:48
	← jonmorehouse left	04:48
	→ asakura joined	04:49
	→ Kicer86 joined	04:52
	→ ehmatthes joined	04:53
	← Lyqyd left	04:55
	← Mitchbones left	04:56
	→ oojacoboo joined	04:56
	← cyphase left	04:56
	→ rdbell joined	04:57
	→ jftf_ joined	04:58
	← stack left	04:58
	← Px12 left	05:01
	← rdbell left	05:01
	→ zumba_addict joined	05:01
	← UmbraMalison left	05:02
	→ UmbraMalison joined	05:02
	← jftf_ left	05:02
	← fatalhalt left	05:03
	← unglid- left	05:04
	← zumba_ad_ left	05:04
	→ reim joined	05:07
	→ morenoh152 joined	05:08
mozzarella	guys help	05:08
	→ unglid joined	05:09
	→ nkouevda joined	05:09
	← d2dchat left	05:11
	→ Px12 joined	05:12
	← __main__ left	05:14
kadoban	mozzarella: Hard without knowing what your problem is	05:15
	→ __main__ joined	05:15
phy1729	it was answered with gitinfo	05:15
	← sohail left	05:17
	← Px12 left	05:17
mozzarella	I accidentally staged some file in my last commit, how can I undo that	05:20
phy1729	you were answered over 2 hours ago !revert	05:20
gitinfo	That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?	05:20
	← mdel_ left	05:22
mozzarella	thank you	05:22
	→ Tashi__ joined	05:24
	→ cagedwisdom joined	05:24
	→ mkaesz joined	05:25
	→ maestrojed joined	05:25
	← Tashi_ left	05:27
	← mkaesz left	05:30
	← JeanCarloMachado left	05:31
	← dsdeiz left	05:33
	→ lindenle joined	05:37
	← Eins_ left	05:38
	→ Eins_ joined	05:39
	← uwjesq left	05:39
	Rmar\|Away → Rmarmorstein	05:40
	← lindenle left	05:41
	→ wrouesnel joined	05:41
	← knownasilya left	05:43
	← Eins_ left	05:44
	← yacks left	05:44
	→ eletuchy joined	05:45
	→ dreiss joined	05:45
	← aidalgol left	05:48
	← zumba_addict left	05:49
	← eletuchy left	05:50
	→ zumba_addict joined	05:50
	→ EminenceHC joined	05:50
	→ yacks joined	05:50
	← Malsasa left	05:54
	← EminenceHC left	05:56
	→ dsdeiz joined	05:57
	← scarabx left	05:57
	→ jftf_ joined	05:58
	← Goplat left	05:58
	→ Malsasa joined	06:01
	← timwis left	06:03
	← jftf_ left	06:03
	← c74d left	06:04
	← ClarusCogitatio left	06:04
	← TheEskil left	06:05
	→ TheEskil joined	06:06
	→ c74d joined	06:06
	→ ClarusCogitatio joined	06:07
	→ bezet joined	06:08
	← starkhallo left	06:09
	← otter768 left	06:11
	← bezet left	06:13
	← das_beard left	06:13
	→ das_beard joined	06:14
	→ jagob joined	06:15
	← TheEskil left	06:15
	← bjeanes__ left	06:16
	→ Eins_ joined	06:16
	← maestrojed left	06:16
	→ TheEskil joined	06:18
	← das_beard left	06:18
	← jftf left	06:20
	← danemacmillan left	06:20
	→ myndzi joined	06:21
	← helgikrs3 left	06:22
	← robbyoconnor left	06:22
	→ helgikrs3 joined	06:23
	← FreezingCold left	06:24
	← ajustrun left	06:25
	→ MorkBork joined	06:25
	→ mkaesz joined	06:25
	→ nekyian_ joined	06:25
	← MorkBork left	06:26
	← oem left	06:27
	← c0ded left	06:27
	→ c0ded joined	06:27
	→ tapout joined	06:27
	→ MorkBork joined	06:27
	→ robbyoconnor joined	06:28
	← mkaesz left	06:30
	→ jftf joined	06:31
	→ thumpba joined	06:31
	→ P4_Denis joined	06:32
	← dsdeiz left	06:34
	← jftf left	06:35
	← ClarusCogitatio left	06:36
	← P4_Denis left	06:37
	← robbyoconnor left	06:38
	→ ClarusCogitatio joined	06:39
	→ phanimahesh joined	06:40
	→ kaictl joined	06:41
	← Gamecubic left	06:42
	→ das_beard joined	06:43
	← ehmatthes left	06:45
	→ hoschi joined	06:45
	→ r0bby_ joined	06:45
	r0bby_ → robbyoconnor	06:46
	← _lexjm left	06:47
	→ arthurvr joined	06:49
	← atatat left	06:49
	← TheEskil left	06:50
	← govg left	06:50
	→ TheEskil joined	06:50
	→ Xethron joined	06:52
	→ irqq joined	06:52
	→ d2dchat joined	06:53
	← OrpheusP left	06:56
	→ aidalgol joined	06:58
	← d2dchat left	06:58
	→ jftf_ joined	06:59
	→ Sijdesign joined	07:00
	← Xethron left	07:01
	← mugenzebra left	07:02
	← robbyoconnor left	07:02
	→ Px12 joined	07:02
	← dreiss left	07:02
	→ Xethron joined	07:03
	← Xethron left	07:03
	→ Xethron joined	07:03
	← jftf_ left	07:04
	← mennea left	07:07
	→ sinkensabe joined	07:08
	← Px12 left	07:08
	← Eins_ left	07:09
	← nekyian_ left	07:12
	← thiago left	07:12
	→ robbyoconnor joined	07:15
	→ King_Hual joined	07:19
	← TheEskil left	07:21
	→ Px12 joined	07:21
	→ curiousmansi__ joined	07:21
	→ TheEskil joined	07:21
	← curiousmansi_ left	07:22
	→ eburcat joined	07:23
	→ petersr joined	07:23
	→ jonmorehouse joined	07:25
	← ezio left	07:25
	→ mkaesz joined	07:25
	→ longbeach joined	07:25
	← skoop left	07:26
	→ skoop joined	07:26
	→ dsdeiz joined	07:28
	→ eletuchy joined	07:29
	← das_beard left	07:29
	→ das_beard joined	07:29
	← mkaesz left	07:29
	← jonmorehouse left	07:31
	← Xethron left	07:33
	← TheEskil left	07:34
	← aidalgol left	07:34
	← das_beard left	07:34
	→ Xethron joined	07:35
	→ TheEskil joined	07:35
	← robbyoconnor left	07:35
	→ robbyoconnor joined	07:36
	← vals_ left	07:37
	← V1s1ble left	07:37
	→ jonmorehouse joined	07:38
	→ V1s1ble joined	07:38
	→ cyphase joined	07:38
	→ lindenle joined	07:38
	→ tango_ joined	07:38
	→ drbean joined	07:39
	→ adac joined	07:40
	→ kriks joined	07:41
	→ b0x joined	07:42
	← thumpba left	07:43
	← lindenle left	07:43
	← ClarusCogitatio left	07:44
	→ GODDOG joined	07:45
	→ ClarusCogitatio joined	07:48
	← irqq left	07:49
	→ EminenceHC joined	07:51
	← Xethron left	07:53
	→ bezet joined	07:53
	← EminenceHC left	07:55
	→ Xethron joined	07:55
	← Xethron left	07:55
	→ Xethron joined	07:55
	← arthurvr left	07:56
	→ arthurvr joined	07:56
	← GODDOG left	07:57
	← sinkensabe left	07:58
	← uber left	07:59
	→ GODDOG joined	07:59
	→ sinkensabe joined	07:59
	← sinkensabe left	07:59
	→ jftf_ joined	08:00
	← bezet left	08:00
	→ sinkensabe joined	08:01
	← arthurvr left	08:01
	← Px12 left	08:03
	→ jacobt joined	08:04
	→ arthurvr joined	08:04
	← oojacoboo left	08:04
	← jftf_ left	08:04
	← GODDOG left	08:05
	→ GODDOG_ joined	08:05
	→ uber joined	08:06
	← arthurvr left	08:06
	→ arthurvr joined	08:06
	← hxm- left	08:07
	→ hxm- joined	08:07
	hxm- → hxm	08:07
	→ mkaesz joined	08:09
	← sarkis left	08:09
	→ mskaesz joined	08:10
	← mkaesz left	08:10
	→ mennea joined	08:11
	← arthurvr left	08:11
	→ jftf joined	08:12
	→ arthurvr joined	08:13
	← sinkensabe left	08:14
	→ hexagoxel joined	08:14
	→ sinkensabe joined	08:15
	← jughead left	08:16
	→ Gizburdt joined	08:16
	→ hahuang65 joined	08:17
	← jftf left	08:19
	→ Px12 joined	08:20
	← sinkensabe left	08:20
	→ Kwpolska joined	08:20
	← arthurvr left	08:20
	→ arthurvr joined	08:21
	→ Eins_ joined	08:21
	← GODDOG_ left	08:21
	← hahuang65 left	08:22
	← robbyoconnor left	08:22
	← Gizburdt left	08:23
	→ Gizburdt joined	08:24
	→ bvi joined	08:25
	← mskaesz left	08:28
	← bvi left	08:29
	→ HelperW joined	08:29
	← dsdeiz left	08:30
	→ dsdeiz joined	08:30
	→ Malsasa_ joined	08:31
	Rmarmorstein → Rmar\|Away	08:31
	← Malsasa left	08:32
	→ aidalgol joined	08:33
	→ P4_Denis joined	08:33
	→ booboy joined	08:33
	← xobb left	08:33
	← arthurvr left	08:34
	← ClarusCogitatio left	08:34
	→ sarkis joined	08:36
	← jacobt left	08:36
	← Malsasa_ left	08:37
	← P4_Denis left	08:37
	→ ClarusCogitatio joined	08:37
	→ Malsasa joined	08:38
	→ danicampa901 joined	08:39
	→ AnujSharma joined	08:39
	→ SimonNa joined	08:40
	← sarkis left	08:41
	← geomyidae_ left	08:41
	→ xobb joined	08:43
	← SimonNa left	08:46
	← joki left	08:47
	← TheEskil left	08:47
	← HelperW left	08:48
	→ TheEskil joined	08:49
	→ Malsasa_ joined	08:50
	← Malsasa left	08:50
	→ joki joined	08:51
	← adac left	08:51
	→ pantsman- joined	08:54
	← jonmorehouse left	08:54
	→ stamina joined	08:54
	→ FunkyAss joined	08:54
	← curiousmansi__ left	08:55
	← Malsasa_ left	08:56
	→ Malsasa joined	08:56
	→ jenni_naiaretti joined	08:57
	← soren_ left	08:57
	→ soren_ joined	08:57
	soren_ → soren	08:57
	→ sarkis joined	08:57
	→ mkaesz joined	08:58
	→ Polymorphism joined	08:59
	→ jftf_ joined	09:01
	← Polymorphism left	09:02
	← sarkis left	09:02
	← mkaesz left	09:02
	→ SittingShiva joined	09:02
	← jenni_naiaretti left	09:04
	← ValicekB left	09:05
	→ jenni_naiaretti joined	09:05
	→ nnyk_ joined	09:05
	← jftf_ left	09:05
	← roflik left	09:05
	← jenni_naiaretti left	09:08
	→ jenni_naiaretti joined	09:09
	← Gizburdt left	09:09
	← habanany left	09:09
	← Xethron left	09:09
	→ Kulrak joined	09:09
	→ slmult0 joined	09:09
	← jenni_naiaretti left	09:10
	→ Xethron joined	09:12
	← lymmz_ left	09:13
	← Px12 left	09:14
	← phanimahesh left	09:14
	← ClarusCogitatio left	09:16
	babilen_ → babilen	09:16
	→ jenni_naiaretti joined	09:17
	→ ClarusCogitatio joined	09:17
	→ Baluse joined	09:19
	← catsup left	09:20
	→ catsup joined	09:20
	→ tvw joined	09:22
	→ roflik joined	09:22
	← ClarusCogitatio left	09:22
	→ ClarusCogitatio joined	09:24
	← raven-au left	09:24
	← AnujSharma left	09:24
	→ Error404NotFound joined	09:26
	→ AnujSharma joined	09:29
	← dsdeiz left	09:30
	→ WaReZ joined	09:32
	→ raven-au joined	09:32
	→ aspiers joined	09:34
	← nnyk_ left	09:36
	→ zapb_ joined	09:36
	← eletuchy left	09:37
	→ eletuchy_ joined	09:38
	← tvw left	09:38
	← SittingShiva left	09:39
	→ lindenle joined	09:40
	← drbean left	09:41
	→ flipp joined	09:42
	← eletuchy_ left	09:43
	→ eletuchy joined	09:43
	→ bzzrb joined	09:43
	→ ande joined	09:44
	← lindenle left	09:45
	← teran left	09:46
	→ bddy joined	09:48
	→ IlNominePatre joined	09:48
bddy	Hello, I want to discard changes from work tree. I do "git checkout -p HEAD file.c". And it tires to discard changes from index and working tree. But I want to discard changes only from working tree.	09:49
	→ Fomina joined	09:50
	← TheEskil left	09:50
bddy	ah! Replaced HEAD with -- and it worked	09:51
	→ TheEskil joined	09:51
b0x	im new to git.. still getting my head around things.. ive cloned a repo from github, it has master & develop branches (and some other ones)	09:52
	→ EminenceHC joined	09:52
b0x	ive created a new branch FROM the develop branch	09:52
	and started making my changes	09:52
	adding files etc	09:52
	is this the correct flow?	09:52
	also, ive needed to change certain files (including .gitignore) within the repo for local dev .. and then commited the changes normally to this branch	09:53
	→ LeMike joined	09:56
	← EminenceHC left	09:56
	← rchavik left	09:58
	→ dsdeiz joined	09:58
	→ sarkis joined	09:58
	← AnujSharma left	09:59
	← ELFrederich_ left	10:00
	→ ELFrederich_ joined	10:00
	← KevinMGranger left	10:01
	→ jftf_ joined	10:01
	← danicampa901 left	10:02
	← xSmurf left	10:02
	← sarkis left	10:02
	→ teran joined	10:02
	→ HelperW joined	10:04
	→ TheToubs joined	10:06
	← jftf_ left	10:06
	→ KevinMGranger joined	10:08
LLaurent	b0x, I am in the process of learning how to use git too, and I have found that your way of doing it is good if you have several developers working on various features. Once you have finished working on your changes, you can just do a "pull" of your branch into the develop branch	10:09
	→ eliasr joined	10:09
LLaurent	If there is a limited amount of people (2-3), it might be worth just checking out the develop branch and committing/pushing into that	10:09
Silex	b0x: http://nvie.com/posts/a-successful-git-branching-model/	10:09
b0x	yeah there are a few people working on different things	10:10
	thats what ive worked off Silex :)	10:10
LLaurent	Thanks Silex, good link	10:11
	→ AnujSharma joined	10:11
	→ [diablo] joined	10:12
	→ Jackneill joined	10:13
Silex	yw	10:13
	I'd say that beginners should first learn how to use "git reflog" so they know how to recover when they fuckup	10:14
	with this safety net knowledge in place, they can then explore all sorts of dangerous things	10:15
	← Tuna-Fish left	10:17
	→ deathshadow joined	10:17
	→ Sceorem joined	10:20
	→ vital joined	10:23
	← slmult0 left	10:23
	← txdv left	10:26
	→ txdv joined	10:26
	→ Gizburdt joined	10:26
	→ Tuna-Fish joined	10:27
	← Sceorem left	10:28
	→ Advocation joined	10:28
osse	that's why i have reflog aliased to social-democracy	10:29
cbreak	git add && git commit	10:29
	← ELFrederich_ left	10:30
cbreak	the basis of building history.	10:30
	→ nfk joined	10:30
	← Advocation left	10:32
	→ asdpew joined	10:33
	→ P4_Denis joined	10:33
osse	those how cannot learn from git log are doomed to revert it	10:34
	← wrouesnel left	10:35
	→ sarkis joined	10:37
	← P4_Denis left	10:38
osse	hmm. since the original quote is "... doomed to repeat it" I suppose cherry-pick would be better than revert. But you more or less need to see the log in order to use those... :/	10:39
	Kiff, we have a conundrum!	10:39
	→ evildmp joined	10:39
	← aidalgol left	10:39
	← hoschi left	10:40
	→ FilipNortic joined	10:40
	→ mikecmpbll joined	10:41
	← _tac left	10:41
rixx	osse: :)	10:41
	← sarkis left	10:41
	→ brovador joined	10:45
	→ kzar joined	10:45
	← brovador left	10:45
	→ brovador joined	10:45
	← brovador left	10:45
	→ brovador joined	10:46
kzar	I have two branches, both with a bunch of changes automated changes and one with some manual ones. Is there a way to do a merge or similar whereby every change that's the same in both branches is removed? (I'm trying to figure out a way to make a clean branch that only has the manual changes committed)	10:47
	← MorpheusBeing left	10:48
	← Xethron left	10:48
osse	if you rebase one branch onto the other then commits that git can detect as duplicates will be dropped	10:48
	← sunfun` left	10:49
	→ dsdeiz_ joined	10:50
kzar	osse: All the changes are in one commit though unfortunately (long story)	10:50
	→ sunfun joined	10:50
kzar	well two commits, one in each branch	10:50
	→ LeVoDECoM joined	10:50
	← dsdeiz left	10:51
	→ kukks joined	10:51
	← kukks left	10:51
	→ kukks joined	10:51
	→ vire joined	10:51
	← LeVoDECoM left	10:54
	→ Segfault_ joined	10:55
cbreak	kzar: sounds like a total mess	10:57
kzar	Yes it does	10:57
cbreak	can't you identify automated commits?	10:58
	they probably have shitty commit messages	10:58
kzar	As I say it's a long story	10:58
	← teran left	10:58
kzar	cbreak: so I can diff the two branches to get the difference OK, now I want to create a patch or something from that so I can apply it to master	10:58
	← Sijdesign left	10:58
	← thumpba_ left	10:59
cbreak	kzar: you can try that. But don't rely on the output of diff to be an appliable patch in general.	10:59
	→ teran joined	11:01
	→ Gavrisimo joined	11:01
	→ jftf_ joined	11:02
kzar	cbreak: Is there something similar that I can do that will work better?	11:03
osse	kzar: how do you have one long list if there are two branches that have duplicates? o_O	11:03
cbreak	as I said:	11:03
	find the commits that you don't want	11:03
	and cherry-pick the others	11:03
	kzar: you could try git cherry	11:03
	kzar: see man git-cherry	11:04
gitinfo	kzar: the git-cherry manpage is available at http://jk.gs/git-cherry.html	11:04
	← King_Hual left	11:05
	← deathshadow left	11:05
	→ King_Hual joined	11:05
	← teran left	11:05
	← kcj left	11:05
	← vire left	11:07
	← jftf_ left	11:07
	→ ncd\|leeN joined	11:08
kzar	OK I figured it out, diff the two branches and then on parent checkout each file from the newer branch. Then you just have the manual changes in the parent branch but not the automated ones	11:08
	Zarthuss → Zarthus	11:10
	← bzzrb left	11:11
	← bddy left	11:11
kzar	Something like this: `git diff temp temp2 --name-only --diff-filter=ACMRTUXB \| xargs git checkout temp2 --` to checkout the new files and	11:13
	`git diff temp temp2 --name-only --diff-filter=D \| xargs git rm` to delete the deleted ones	11:13
	← sunfun left	11:17
	→ sunfun joined	11:18
	← descala left	11:21
	→ freeman42 joined	11:21
	← W0rmDr1nk left	11:22
	→ gvdm joined	11:26
	→ BSaboia joined	11:26
	← Tommy[D]_ left	11:26
	→ hoschi joined	11:26
	→ wrouesnel joined	11:28
	→ kristofferR joined	11:28
	← TheToubs left	11:29
	→ dangerousdave joined	11:32
	→ NBhosting joined	11:32
	← kristofferR left	11:32
Silex	~	11:33
	oops sorry	11:33
	← dangerousdave left	11:33
	→ blackmesa joined	11:34
	← hoschi left	11:34
	→ spareproject joined	11:35
osse	kzar: won't that make them equal?	11:36
	→ TheFuzzball joined	11:37
	→ m0viefreak joined	11:38
kzar	osse: So I had a bunch of automated changes mixed with a bunch of manual changes, I needed to grab only the manual changes. So I created two branches, one with all the changes, one with only the automated changes (I re-ran the script that generated them on the previous version). The commands above helped me apply only the changes not in both branches - the manual ones - to my current branch	11:38
	→ sarkis joined	11:38
kzar	exactly why this was required... don't ask but there you go it's all solved now at least	11:38
osse	ok, if you say so. Iwas just thinking that 'git checkout temp2 -- .' would the same thing easier :)	11:39
	→ lhvwb joined	11:39
	← lhvwb left	11:39
kzar	osse: well that would bring in the manual changes + a crap load of automatically generated ones	11:39
osse	then I don't see how your git diff thing manages to exclude those. seems to me you diff everything	11:40
kzar	temp branch has the manual changes but autmatic ones mixed in	11:40
	temp2 has only automatic changes	11:41
	oh sorry that's backwards	11:41
	either way I wouldn't worry about it, it was a big mess and you will hopefully never be in such a mess	11:42
	→ godgodgodgo joined	11:42
	→ lindenle joined	11:42
osse	i'm saying that I don't see the difference between `git diff temp temp2 --name-only --diff-filter=ACMRTUXB \| xargs git checkout temp2 --` and `git checkout temp2 -- .`	11:42
	→ Polymorphism joined	11:42
	← sarkis left	11:42
osse	i'm curious how the former solved the problem	11:42
kzar	OK so a script made changes to crap loads of files automatically, but also there were a few files changed manually at the same time	11:43
	so I obtained the version previous to all the changes, ran the automated script again and created a git branch called temp	11:43
	so that only had the automated changes inside	11:43
	and then I created another git branch called temp2 which was taken from the current state, automated + manual changes all together	11:43
	← LLaurent left	11:46
	← lindenle left	11:46
	→ irqq joined	11:46
	→ LLaurent joined	11:47
	← IlNominePatre left	11:48
	← Fomina left	11:48
	← sgen_ left	11:48
	→ jottr_ joined	11:51
	← k4r1m left	11:51
	← ferreum left	11:52
	→ EminenceHC joined	11:53
	← jenni_naiaretti left	11:53
	← King_Hual left	11:53
	← nkouevda left	11:54
	← LLaurent left	11:54
	→ hichamat joined	11:55
	→ King_Hual joined	11:55
	→ LLaurent joined	11:56
	→ argoneus joined	11:56
	← argoneus left	11:56
	← Error404NotFound left	11:56
	→ Xethron joined	11:56
	→ gauke joined	11:57
	→ ValicekB joined	11:57
	← EminenceHC left	11:57
	→ bezet joined	11:57
	← Zarthus left	11:58
	← gauke left	11:58
	→ Px12 joined	11:58
	→ Zarthuss joined	11:58
	← spareproject left	11:59
	← fstd left	12:00
	→ fstd joined	12:00
	← LLaurent left	12:00
	→ amikiri joined	12:00
	← blackmesa left	12:00
	← Akagi201 left	12:00
	← hichamat left	12:00
	→ LLaurent joined	12:01
	→ Akagi201 joined	12:02
	← bezet left	12:02
	→ spikedbanana joined	12:03
	→ jftf_ joined	12:03
	← Polymorphism left	12:03
	→ bezet joined	12:05
	← bezet left	12:05
	→ bezet joined	12:06
	→ mkaesz joined	12:07
	→ vire joined	12:07
	← Px12 left	12:07
	← jftf_ left	12:08
	← Gizburdt left	12:08
	→ Gizburdt joined	12:09
	← i_ron left	12:09
	← mikedep333 left	12:10
	→ i_ron joined	12:10
	→ davispuh joined	12:12
	← Gizburdt left	12:13
	→ mikedep333 joined	12:13
	→ Gizburdt joined	12:13
	→ gluten_hell joined	12:14
	→ teran joined	12:15
	→ jenni_naiaretti joined	12:15
	→ sinkensabe joined	12:16
	← HelperW left	12:17
	← jenni_naiaretti left	12:18
	← jottr_ left	12:18
	← Gizburdt left	12:18
	← [diablo] left	12:20
	← sinkensabe left	12:21
	← Blaguvest left	12:21
	← brovador left	12:23
	→ looper joined	12:26
	→ hoschi joined	12:26
	→ diegoviola joined	12:26
	← Xethron left	12:26
	→ Px12 joined	12:26
	→ Gizburdt joined	12:27
	→ nerder joined	12:28
nerder	hello	12:28
	← looper left	12:29
	→ daivyk joined	12:30
	→ Xethron joined	12:31
	← hoschi left	12:32
	← Gizburdt left	12:32
	← kadoban left	12:33
	→ P4_Denis joined	12:34
	→ netcarver joined	12:36
	← netcarver left	12:37
	← P4_Denis left	12:38
	→ sarkis joined	12:39
	← dsdeiz_ left	12:40
	→ jottr_ joined	12:41
	← AnujSharma left	12:42
	← spikedbanana left	12:43
	← sarkis left	12:43
	← Xethron left	12:44
	→ Gavrisimooo joined	12:45
	→ Xethron joined	12:47
	← Xethron left	12:47
	→ Xethron joined	12:47
	← Gavrisimo left	12:47
	← kzar left	12:47
	← bezet left	12:47
	← vire left	12:50
	← teran left	12:52
	← TheEskil left	12:52
	← eburcat left	12:53
	→ teran joined	12:53
	→ TheEskil joined	12:53
	→ toothrot joined	12:54
	← mkaesz left	12:58
	→ JeanCarloMachado joined	12:58
	→ Skapadapaduu joined	12:59
	Mapley → qksjfmcopozcuvxj	12:59
	← Xethron left	12:59
	→ tvw joined	13:00
	→ chimay joined	13:00
	→ Mitchbones joined	13:02
	Zarthuss → Zarthus	13:03
	← jnewt left	13:03
	→ hoschi joined	13:03
	← daivyk left	13:04
	← stamina left	13:04
	→ jftf_ joined	13:04
	→ Xethron joined	13:04
	← JeanCarloMachado left	13:05
	← JanC left	13:07
	→ Guest49931 joined	13:07
	→ Zifre joined	13:07
	→ mizu_no_oto joined	13:08
	← teran left	13:08
	← jftf_ left	13:09
	← babilen left	13:09
	→ sinkensabe joined	13:09
	→ babilen joined	13:09
	→ teran joined	13:10
	→ danicampa901 joined	13:10
	← Zifre_ left	13:11
	→ Polymorphism joined	13:14
	← mkoskar left	13:15
	← pantsman- left	13:17
	← Gavrisimooo left	13:19
	→ JanC joined	13:21
	← petersr left	13:21
	→ Roots47 joined	13:21
	→ seanmerron joined	13:25
	→ Gizburdt joined	13:27
	→ AnujSharma joined	13:29
	← osse left	13:31
	← hoschi left	13:31
	→ hoschi joined	13:33
	→ osse joined	13:33
	→ HelperW joined	13:34
nerder	hey	13:34
	if i do git fsck i have to dangling commit, but if i merge one of them first and the other one later, i get a merge conflict, what is that means?	13:35
qsuscs	!dangling	13:35
gitinfo	Dangling objects represent things added to git which are no longer needed based on the git commands you typed in. This can be normal workflow (rebase, reset, add, etc) or errors you made. Typing "!dangling_commit" "!dangling_blob" and "!dangling_tree" into a query to me will get you more information about each type.	13:35
	→ nour joined	13:36
	← LLaurent left	13:36
	← teran left	13:36
	→ Advocation joined	13:37
	→ studmuf joined	13:37
	← seanmerron left	13:38
	← Gizburdt left	13:38
	→ Sijdesign joined	13:38
	→ sarkis joined	13:39
	→ teran joined	13:40
	← punchagan left	13:40
	→ liamkeily joined	13:40
	→ lindenle joined	13:43
	← sarkis left	13:45
cbreak	nerder: you get a conflict because both histories try to change the same areas in code	13:45
	nerder: !eek	13:45
gitinfo	nerder: [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, don't panic. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II	13:45
	→ punchagan joined	13:45
	← Px12 left	13:46
	← amikiri left	13:46
	← sinkensabe left	13:47
	← teran left	13:47
	← mtk left	13:48
	← lindenle left	13:48
	→ teleporting_cat joined	13:49
	→ teran_ joined	13:49
	→ Px12 joined	13:49
	→ Gavrisimo joined	13:50
	← mizu_no_oto left	13:52
	← polyzen left	13:52
nerder	what are the unreachable commit/tree/blob?	13:53
	→ EminenceHC joined	13:53
	← teran_ left	13:54
	← Advocation left	13:54
	→ bezet joined	13:54
	← nicoo left	13:54
	← Gavrisimo left	13:54
	← AnujSharma left	13:55
	← punchagan left	13:57
	← EminenceHC left	13:58
	← bezet left	13:58
	← Segfault_ left	13:59
Silex	nerder: when you amend a commit (or any history rewriting operation), the commits rewritten get "lost"	14:00
	→ Segfault_ joined	14:00
Silex	they are call unreachable, because no branch/tag point to them anymore	14:00
	called*	14:00
nerder	if i do git fsck --unreachable i got 2 unreachable commit 2 unrachable tree and 2 uncreachable blog	14:00
	how can i see that?	14:01
Silex	how can you see what?	14:01
	and why do you want to?	14:01
	I only bother about git fsck when I lost something I didn't mean to and I want to recover it	14:02
	← bakabakabaka left	14:02
nerder	cause i want to see what there was in the commit	14:02
Silex	git show SHA1 will show you	14:02
nerder	yep, that what i want to do	14:02
Silex	altnernatively gitk can too	14:02
	more oftne than not "git reflog" is a better mean to recover lost commits	14:03
	you just go back to where you were before and start over	14:03
	(in association with git reset --hard)	14:03
	→ jftf_ joined	14:05
	← hoschi left	14:05
nerder	ok and if i do git merge SHA1 (of the unreach commit)	14:07
	i got my commit back?	14:08
	→ ezio joined	14:08
	← jftf_ left	14:10
	→ FreezingCold joined	14:11
	→ amikiri joined	14:12
	← Segfault_ left	14:12
	→ Segfault_ joined	14:13
	→ hebz0rl joined	14:14
	← Xethron left	14:16
	→ LLaurent joined	14:16
	→ Xethron joined	14:17
	← Xethron left	14:17
	→ Xethron joined	14:17
cbreak	nerder: then you have both, obviously	14:18
	nerder: !lol	14:19
gitinfo	nerder: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	14:19
	→ punchagan joined	14:19
	→ cannonball joined	14:22
	→ fold joined	14:23
	→ lsiv568 joined	14:23
	→ kushal3 joined	14:24
	→ Oejet joined	14:25
	→ pantsman- joined	14:25
	→ Gamecubic joined	14:25
	← kpreid left	14:29
	→ kpreid joined	14:30
	→ nbl joined	14:31
	← txdv left	14:31
	→ dagnachew joined	14:32
	← nbl left	14:32
	← cagedwisdom left	14:32
	→ txdv joined	14:33
	← chimay left	14:34
	→ P4_Denis joined	14:34
	→ Gizburdt joined	14:35
	← mechanicalduck left	14:35
	← Gizburdt left	14:35
	→ Gizburdt joined	14:35
	← jstemmer left	14:39
	→ jstemmer joined	14:39
	← P4_Denis left	14:39
	→ sarkis joined	14:40
	→ jftf_ joined	14:41
	→ eburcat joined	14:41
	← sarkis left	14:44
	← irqq left	14:45
	→ irqq joined	14:46
	→ B1x1t0 joined	14:47
	→ kburdett joined	14:47
	→ terribleplan joined	14:48
	→ teran joined	14:48
	← jftf_ left	14:49
	→ dreiss joined	14:50
	← Lunatrius left	14:50
	← lskr left	14:51
	← lsiv568 left	14:51
	→ lskr joined	14:52
	→ Lunatrius joined	14:52
	→ DaisyTheCow joined	14:53
	← CraigyDavi` left	14:53
	→ Gavrisimo joined	14:54
	← Roots47 left	14:54
	← regreg left	14:54
	→ CraigyDavi joined	14:55
	→ atomx__ joined	14:57
	← Gavrisimo left	14:58
	← atomx_ left	14:58
	→ mechanicalduck joined	15:00
	→ ehmatthes joined	15:00
	← bsm117532 left	15:02
	jottr_ → jottr	15:02
	→ jftf joined	15:04
	← mennea left	15:04
	→ blackmesa joined	15:04
	← Sijdesign left	15:04
	← TheEskil left	15:06
	→ TheEskil joined	15:07
	→ hoschi joined	15:08
	→ dsdeiz joined	15:08
	← MattMaker left	15:08
	← DaisyTheCow left	15:09
	→ Trudko joined	15:09
	→ danemacmillan joined	15:09
	→ regreg joined	15:10
	← jftf left	15:10
	→ sarkis joined	15:10
	← teran left	15:11
	→ flowerhack joined	15:13
	← TheEskil left	15:16
	→ MattMaker joined	15:16
	→ maqr_ joined	15:17
	→ fr33domlover joined	15:17
	→ Tashi_ joined	15:17
	→ TheEskil joined	15:17
	→ kushal2 joined	15:17
	→ fstd_ joined	15:17
	→ mueslo joined	15:18
	→ zumba_ad_ joined	15:19
	→ leen^\| joined	15:20
	→ Cathy joined	15:20
	→ lachesis_ joined	15:20
	Cathy → Guest70129	15:20
	→ CraigyDavi` joined	15:20
	→ pantsman_ joined	15:20
	→ babilen_ joined	15:20
	→ ezioa joined	15:20
	→ shinnya_ joined	15:21
	← dreiss left	15:22
	← diegoviola left	15:22
	drathir87 → drathir	15:22
	→ a_le_ joined	15:22
	→ supernaut_ joined	15:22
	→ Sajbar_ joined	15:22
	→ flowerha_ joined	15:22
	→ spareproject joined	15:22
	→ punchagan1 joined	15:22
	→ netameta_ joined	15:22
	→ bsm117532 joined	15:23
	← hagabaka left	15:23
	→ liamkeily1 joined	15:23
	→ asdpew_ joined	15:23
	→ binaryhat_ joined	15:24
	→ GodEater` joined	15:24
	← GodEater` left	15:24
	→ GodEater` joined	15:24
	→ wrouesnel2 joined	15:24
	→ Silverwaves_ joined	15:24
	→ Novacha joined	15:24
	← Novacha left	15:24
	→ Novacha joined	15:24
	→ Xethron_ joined	15:24
	← Xethron left	15:24
	← zumba_addict left	15:24
	← lachesis left	15:24
	← shinnya left	15:24
	← Novacha_ left	15:24
	← ncd\|leeN left	15:24
	← supernaut left	15:24
	← frobware left	15:24
	← jab416171 left	15:24
	← netameta left	15:24
	← Guest33000 left	15:24
	← pantsman- left	15:24
	← kushal3 left	15:24
	← punchagan left	15:24
	← LLaurent left	15:24
	← ezio left	15:24
	← babilen left	15:24
	← Guest49931 left	15:24
	← Tashi__ left	15:24
	← dccc left	15:24
	← maqr left	15:24
	← asdpew left	15:24
	← msonntag left	15:24
	← st5ve left	15:24
	← fstd left	15:24
	← King_Hual left	15:24
	← freeman42 left	15:24
	← binaryhat left	15:24
	← a_le left	15:24
	← CraigyDavi left	15:24
	← longbeach left	15:24
	← flowerhack left	15:24
	← Sajbar left	15:24
	← godgodgodgo left	15:24
	← wrouesnel left	15:24
	← kaictl left	15:24
	→ King_Hual joined	15:24
	← GodEater left	15:24
	→ jab416171 joined	15:24
	→ hays joined	15:24
	← liamkeily left	15:24
	← morenoh152 left	15:24
	→ LLaurent joined	15:24
	lachesis_ → lachesis	15:24
	← regreg left	15:24
	fstd_ → fstd	15:24
	← King_Hual left	15:25
	→ King_Hual joined	15:25
	← hays left	15:25
	→ hays joined	15:25
	← darkbasic left	15:25
	← amikiri left	15:25
	→ darkbasic joined	15:25
	→ msonntag joined	15:25
	→ dccc joined	15:25
	→ hagabaka joined	15:26
	→ mmitchel_ joined	15:26
	→ xSmurf joined	15:27
	→ kaictl joined	15:27
	← punchagan1 left	15:27
	→ punchagan joined	15:27
	→ regreg joined	15:28
	← m0viefreak left	15:29
	→ m0viefreak joined	15:29
	→ frobware joined	15:29
	→ ciampix joined	15:30
	→ gtmanfre- joined	15:30
	→ lsiv568 joined	15:30
	→ kennon_ joined	15:30
	→ sohail joined	15:30
	→ sebbu2 joined	15:30
	→ rvsjoen joined	15:30
	→ Mitchbon_ joined	15:31
	→ FilipNor1ic joined	15:31
	← sebbu2 left	15:31
	→ sebbu2 joined	15:31
	→ gluten_hell_ joined	15:31
	→ brett_ joined	15:31
	→ dreiss joined	15:32
	→ ncd\|leeN joined	15:33
	← MattMaker left	15:33
	→ hagebake joined	15:33
	→ kriskropd joined	15:33
	→ Baluze joined	15:33
	← revyd left	15:34
	→ dsdeiz_ joined	15:34
	→ davispuhh joined	15:35
	→ Zarthuss joined	15:37
	→ cathyjf joined	15:37
	cathyjf → Guest68661	15:37
	→ eletuchy_ joined	15:37
	← hagabaka left	15:38
	← GodEater` left	15:38
	← leen^\| left	15:38
	← Guest70129 left	15:38
	← dsdeiz left	15:38
	← dagnachew left	15:38
	← fold left	15:38
	← osse left	15:38
	← Mitchbones left	15:38
	← gluten_hell left	15:38
	← davispuh left	15:38
	← Zarthus left	15:38
	← FilipNortic left	15:38
	← Tuna-Fish left	15:38
	← eletuchy left	15:38
	← Baluse left	15:38
	← xobb left	15:38
	← Oejet left	15:38
	← reim left	15:38
	← sebbu left	15:38
	← FL1SK left	15:38
	← _W_ left	15:38
	← kennon left	15:38
	← monokrome left	15:38
	← gtmanfred left	15:38
	← green_man left	15:38
	← lokus left	15:38
	← kriskrop1 left	15:38
	← Chinorro_ left	15:38
	← harish__ left	15:38
	← rvsjoen_ left	15:38
	← xSmurf left	15:38
	← Segfault_ left	15:38
	← asakura left	15:38
	← skorgon left	15:38
	← tanath left	15:38
	← ntio left	15:38
	← St_Marx left	15:38
	→ Chinorro joined	15:39
	← Px12 left	15:39
	→ _W_ joined	15:39
	→ GodEater joined	15:39
	← GodEater left	15:39
	→ GodEater joined	15:39
	→ harish__ joined	15:39
	→ xobb joined	15:39
	→ uwjesq joined	15:39
	→ Tuna-Fish joined	15:40
	→ fold joined	15:40
	→ green_man joined	15:40
	→ osse joined	15:40
	→ dagnachew joined	15:41
	→ Oejet joined	15:41
	→ Px12 joined	15:42
	← Mitchbon_ left	15:42
	davispuhh → davispuh	15:43
	→ lindenle joined	15:45
	← NBhosting left	15:45
	← kukks left	15:46
	← lsiv568 left	15:46
	← belak left	15:46
	← ezioa left	15:47
	→ mtk joined	15:47
	→ mnavratil joined	15:47
	← mnavratil left	15:47
	→ mnavratil joined	15:47
	→ stealthii joined	15:47
	← punchagan left	15:49
	→ gauke joined	15:49
	→ belak joined	15:49
	← lindenle left	15:49
	→ reim joined	15:49
	← regreg left	15:50
	→ kukks joined	15:51
	← Gizburdt left	15:51
	→ morenoh152 joined	15:51
	← joelm left	15:52
	→ madewokherd joined	15:53
	← Xethron_ left	15:53
	→ redrocket joined	15:53
	← ehmatthes left	15:53
	→ EminenceHC joined	15:54
	→ Gavrisimo joined	15:54
	→ nkouevda joined	15:55
	← jagob left	15:56
	→ Xethron joined	15:56
	→ amikiri joined	15:56
	→ ajustrun joined	15:57
	← Gavrisimo left	15:58
	← EminenceHC left	15:59
	→ ojacobson joined	16:00
	← nkouevda left	16:00
	→ monokrome joined	16:01
	← liamkeily1 left	16:01
	→ HelperW_ joined	16:02
	Zarthuss → Zarthus	16:02
	→ SonikBoom joined	16:03
	← cannonball left	16:03
	← eburcat left	16:03
	→ curiousmansi_ joined	16:03
	→ adac joined	16:04
	← HelperW left	16:05
	→ OrpheusP joined	16:06
	→ mennea joined	16:06
	← shinnya_ left	16:06
	→ Blaguvest joined	16:07
	← hoschi left	16:07
	← atomx__ left	16:07
	← ERROH left	16:08
	→ polyzen joined	16:08
	→ ERROH joined	16:08
	← Trudko left	16:09
	→ revyd joined	16:09
	redrocket → redr0ket[DEN]	16:09
	← spareproject left	16:10
	Tashi_ → Tashi	16:10
	→ thiago joined	16:11
	← jottr left	16:11
	→ pandeiro joined	16:11
	← Baluze left	16:11
	→ descala joined	16:12
	← gevatter_ left	16:12
	← tgunr left	16:13
	← HelperW_ left	16:14
	→ HelperW_ joined	16:14
	→ maestrojed joined	16:16
	→ jottr joined	16:18
	→ scarabx joined	16:18
	→ spareproject joined	16:19
	→ jnewt joined	16:19
	→ Manny joined	16:20
jnewt	i've a file, that git diff shows the whole file being changed (every line removed, all new ones added), whereas difftool shows only a couple of lines removed / changed. out of curiosity, what would cause the difference?	16:20
Eugene	!eol	16:21
gitinfo	The option/attribute to use when you need to care about different line-endings in your file: http://timclem.wordpress.com/2012/03/01/mind-the-end-of-your-line/	16:21
Eugene	CRLF vomit	16:21
	→ Goplat joined	16:21
	← himikof left	16:22
	← pandeiro left	16:23
	→ himikof joined	16:23
jnewt	Eugene, I think that's the reason. i tried setting core.eol to the three different options (native, crlf, lf), and then running diff after each change, no difference.	16:24
	→ eburcat joined	16:24
Eugene	Figure out which way the file is, and then make it be the other way	16:25
	LF is the "correct" way for almost all projects, fwiw	16:25
	← dreiss left	16:25
	→ otter768 joined	16:26
cbreak	it doesn't depend on the project, it mostly depends on the file	16:26
	← kushal2 left	16:26
cbreak	text files should be LF. .bat files or visual studio projects should be CRLF	16:26
	← nfk left	16:27
jnewt	well, all my files are test, .c, .s, .h, etc, software for embedded microcontrollers	16:27
Eugene	s/CRLF/mercilessly deleted/	16:27
	← mikejw left	16:27
Eugene	Unless there's a Damned Good Reason (tm) for something to be Windows-specific, make it LF.	16:27
	← LLaurent left	16:28
jnewt	looks like the file is all LF, no CRLF	16:28
	→ nfk joined	16:28
Eugene	So what did it used to be? ;-)	16:28
	→ Muinasjutuvestja joined	16:29
	← flowerha_ left	16:30
jnewt	yup. used to all be CRLF. not sure how i want to deal with that. not really a code change / worthy of a commit	16:30
	→ liamkeily joined	16:30
	→ dreiss joined	16:30
osse	jnewt: then you need to stop using the software that changed the file behind your back	16:31
	jnewt: for now, unix2dos {file}	16:32
	babilen_ → babilen	16:32
	← revyd left	16:34
	→ P4_Denis joined	16:35
	← amikiri left	16:36
	→ CheckDavid joined	16:36
	→ eburcat_ joined	16:37
	→ Advocation joined	16:38
	← P4_Denis left	16:39
	← BSaboia left	16:39
	← ClarusCogitatio left	16:40
	← eburcat left	16:40
	→ m8 joined	16:40
	← D-Boy left	16:41
	← Xethron left	16:41
	← maestrojed left	16:42
	→ ClarusCogitatio joined	16:43
	→ Xethron joined	16:44
	→ maestrojed joined	16:45
	← jottr left	16:45
	→ jftf_ joined	16:46
	← maestrojed left	16:48
	→ D-Boy joined	16:49
	→ Dougie187 joined	16:50
	→ Gavrisimo joined	16:50
	← jftf_ left	16:51
	→ jottr joined	16:52
	← Malsasa left	16:52
	← gvdm left	16:53
	→ joo-_ joined	16:53
	→ gluten_hell__ joined	16:54
	→ petersr joined	16:55
	← Gavrisimo left	16:55
	← gluten_hell_ left	16:55
	→ sinkensabe joined	16:56
	→ dc5ala joined	16:57
	← sin3t_ left	16:58
	→ das_beard joined	17:03
	→ sq-one joined	17:03
	← Xethron left	17:03
	← Polymorphism left	17:03
	→ jftf joined	17:04
	→ tac_ joined	17:04
	← blackmesa left	17:05
	→ Polymorphism joined	17:05
	→ kadoban joined	17:07
	→ livingstn joined	17:07
	← kukks left	17:08
	→ Xethron joined	17:08
	← jftf left	17:10
	← joo-_ left	17:10
	→ BSaboia joined	17:11
	← adac left	17:11
	→ adac joined	17:12
	→ vurma joined	17:12
	← BSaboia left	17:13
	→ BSaboia joined	17:13
	← BSaboia left	17:14
	→ Sijdesign joined	17:15
	→ freeman42 joined	17:17
	→ ferreum joined	17:19
	→ jftf joined	17:19
	← B1x1t0 left	17:19
	→ B1x1t0 joined	17:19
	→ noxd joined	17:20
	Megaf_ → Megaf	17:20
	→ paolooo joined	17:20
	← sinkensabe left	17:21
	→ sinkensabe joined	17:21
	← eburcat_ left	17:23
	→ LeVoDECoM joined	17:23
	← curiousmansi_ left	17:23
	← doener_ left	17:24
	gitinfo set mode: +v	17:26
	tvl → tobiasvl	17:26
	→ St_Marx joined	17:28
	→ cannonball joined	17:29
	→ WormDrink joined	17:29
	← WormDrink left	17:30
	→ WormDrink joined	17:30
	← mmitchel_ left	17:31
	← JDHawke left	17:31
	→ JDHawke joined	17:32
	→ Lyqyd joined	17:33
	→ xSmurf joined	17:34
	→ ehmatthes joined	17:36
	← yacks left	17:36
	← OrpheusP left	17:37
	→ OrpheusP joined	17:37
	← ferreum left	17:38
	→ skorgon joined	17:38
	← toothrot left	17:39
	→ hoschi joined	17:39
	→ nabblet joined	17:39
	← noxd left	17:39
nabblet	hi, i worked on master and commited something that was stupid, so i did git revert <short commit-id> ... here is the result:	17:40
	* 8c9ec9e (HEAD, master) Revert "decreased ABLmap resolution"	17:40
	* 24482ad (origin/master) logging value of stronges hebbian link for colormap aligning in MATLAB (just ntoice that's bull****! I already have that data in my hebbian link vector!!!)	17:40
	* 6cc4fc6 decreased ABLmap resolution	17:40
	→ kaendfinger joined	17:41
nabblet	what i want is to return to commit 6cc4fc6 and act as if nothing happened. how do i do that?	17:41
	→ ferreum joined	17:41
Oejet	See 'git reset'.	17:42
tobiasvl	nabblet: !revert	17:42
gitinfo	nabblet: That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?	17:42
	→ Gizburdt joined	17:43
	→ tanath joined	17:43
	→ roelmonnens joined	17:43
nabblet	Oejet: tobiasvl thank you. if i reset (option e) origin will also take over that reset I presume. Correct?	17:44
	← Tuna-Fish left	17:44
	← OrpheusP left	17:44
	← Walex2 left	17:45
	→ Tuna-Fish joined	17:45
	→ bollullera joined	17:45
	→ jonmorehouse joined	17:46
	← teleporting_cat left	17:46
	← scarabx left	17:46
	← livingstn left	17:47
	→ lindenle joined	17:47
nabblet	i just tried. nope it does not. now, origin is ahead of local copy by 1 commit (which is the commit i want to get rid of)	17:47
	← ajustrun left	17:47
	→ jftf_ joined	17:47
nabblet	so i think git revert is the only feasible option.	17:48
	→ slmult0 joined	17:48
	← uwjesq left	17:48
nabblet	Oejet: tobiasvl thank you both for your input and sorry for my monologoue ;)	17:50
	← hoschi left	17:50
Oejet	nabblet: You would have to force push your branch to origin, I think.	17:50
	→ blackmesa joined	17:50
	← shafox left	17:50
	cworth` → cworth	17:51
	→ Gavrisimo joined	17:51
	← lindenle left	17:51
	← redr0ket[DEN] left	17:52
	← jftf_ left	17:52
nabblet	Oejet: hm, good point! didn't think of that option. Anyway, seeing some sausage-making in my repo doesn't hurt anyone ('cept my pride maybe :P)	17:52
Oejet	If others might have pulled from origin, then a revert is the correct solution. Otherwise you can mutate the history of origin, perhaps forcefully. This is just what my memory says.	17:54
osse	!sausage	17:54
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	17:54
	→ qohelet_ joined	17:54
	← LeVoDECoM left	17:55
	→ EminenceHC joined	17:55
	→ bezet joined	17:55
	← Gavrisimo left	17:55
	→ MeltedLux joined	17:56
	→ qt-x joined	17:57
nabblet	Oejet: force-pushing the reset does as you said. See the result:	17:57
	* 6cc4fc6 (HEAD, origin/master, master) decreased ABLmap resolution	17:58
	→ Noldorin joined	17:58
	→ ntio joined	17:58
	← sq-one left	17:58
	← bezet left	17:59
	← Advocation left	18:00
nabblet	Oejet: I'm the only one pulling and pushing to origin (from different computers though) so i think it's ok. revert surely is the cleaner/more transparent solution though. Thank you. osse thanks	18:00
Oejet	nabblet: Great!	18:00
	← EminenceHC left	18:00
	← cannonball left	18:00
	← LeMike left	18:01
	← Sijdesign left	18:01
	← dreiss left	18:01
	→ trewe joined	18:01
	→ Segfault_ joined	18:01
	→ vire joined	18:03
	→ godgodgodgo joined	18:03
	← paolooo left	18:04
	→ kukks joined	18:04
	← danicampa901 left	18:05
	← jftf left	18:07
	← Muinasjutuvestja left	18:09
	← St_Marx left	18:10
	→ St_Marx joined	18:10
	← asdpew_ left	18:11
	→ asdpew joined	18:12
	← asdpew left	18:12
	→ OrpheusP joined	18:12
	← jonmorehouse left	18:12
	→ asdpew joined	18:12
	→ ajustrun joined	18:15
	← skynxnex left	18:15
	→ jonmorehouse joined	18:16
	→ [twisti] joined	18:19
	← [twisti] left	18:19
	← Manny left	18:20
	→ Manny joined	18:20
	← irqq left	18:20
	→ asakura joined	18:21
	→ jheg joined	18:22
	→ uwjesq joined	18:24
	→ ockham joined	18:26
	← mattcen left	18:27
	→ Marcus___ joined	18:27
	→ irqq joined	18:27
	→ starkhallo joined	18:27
	→ jenni_naiaretti joined	18:27
	← liamkeily left	18:28
	→ mattcen joined	18:28
	← Marcus left	18:30
	→ SimonNa joined	18:30
	→ upene joined	18:30
	← dc5ala left	18:31
	→ shinnya joined	18:33
	← qohelet_ left	18:33
	← jenni_naiaretti left	18:34
	→ teran joined	18:34
	← ajustrun left	18:34
	→ amikiri joined	18:34
	← myndzi left	18:35
	→ jenni_naiaretti joined	18:35
	→ P4_Denis joined	18:35
	← spareproject left	18:36
	→ LucasTT joined	18:36
	→ LucasTT_ joined	18:36
	← LucasTT_ left	18:37
	→ LucasTT_ joined	18:37
	← LucasTT_ left	18:38
	→ LucasTT_ joined	18:38
	← kukks left	18:39
	→ Domhack joined	18:39
	← P4_Denis left	18:40
	← dsdeiz_ left	18:40
	← upene left	18:41
	→ Roots47 joined	18:42
	← ClarusCogitatio left	18:43
	→ sq-one joined	18:43
	← Marcus___ left	18:45
	→ Marcus joined	18:45
	→ Padawan joined	18:45
	← studmuf left	18:45
	→ ClarusCogitatio joined	18:45
	→ studmuf joined	18:46
	← LucasTT_ left	18:46
	← uwjesq left	18:46
	← nabblet left	18:47
	← SjB left	18:47
	→ lindenle joined	18:47
	→ toothrot joined	18:48
	→ jftf_ joined	18:48
	← freeman42 left	18:48
	← studmuf left	18:49
	→ studmuf joined	18:50
	gitinfo set mode: +v	18:51
Padawan	whenever i modify a file i have to [git add it] again to the stage area and then commit?	18:51
	→ dadamssg_ joined	18:51
	→ upene joined	18:51
	→ SjB joined	18:51
	← lindenle left	18:52
	← cyphase left	18:52
	→ Gavrisimo joined	18:52
qsuscs	you can also discard your modifications	18:52
	→ oojacoboo joined	18:52
kadoban	Padawan: Yes. You can do it in one go with git commit -a, but it's a good habit to get used to git add first, it's much more flexible	18:53
	← jftf_ left	18:53
	→ nkouevda joined	18:53
Padawan	oh, commit -a includes the git add in it?	18:54
	→ cyphase joined	18:54
	← robustus left	18:54
	→ uwjesq joined	18:54
kadoban	Padawan: Basically, yeah. It commits all modifications/deletions	18:55
	→ mechanicalduck_ joined	18:55
	← uwjesq left	18:56
	← Gavrisimo left	18:56
	← mechanicalduck left	18:56
	→ pandeiro joined	18:57
	← studmuf left	18:57
	mechanicalduck_ → mechanicalduck	18:57
	→ studmuf joined	18:58
	← Gizburdt left	18:59
Padawan	My head is kind of hurting since i want to get this repo i just created and i want to put it on github. So, as i see now, i do things and add things, i commit things I'm sure its right and those things is in my local repo. So far ok.	18:59
	→ robustus joined	18:59
thiago	yes	18:59
Padawan	Now, if i want to put them into another repo... i have to push them is that right?	19:00
	→ OneEyedWill joined	19:00
_ikke_	correct	19:00
kadoban	Basically, yes	19:00
	← studmuf left	19:00
Padawan	and if i am pushing it, it means the things it is commited is going to be pushed?	19:00
thiago	yes	19:00
	→ [diablo] joined	19:01
Padawan	ok, thanks	19:01
	→ hoschi joined	19:02
	← OrpheusP left	19:03
Padawan	Ok, i think this git thing is gonna be magical once i start to understand more.	19:03
qsuscs	!book	19:04
gitinfo	There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	19:04
kadoban	Ya, git is great stuff once you get used to it	19:04
qsuscs	easy to learn it is, as long as svn you forget, young padawan.	19:04
	← qt-x left	19:05
	→ ajustrun joined	19:05
	← kpreid left	19:06
	← hoschi left	19:07
	← OneEyedWill left	19:07
	→ LLaurent joined	19:08
	→ studmuf joined	19:08
	→ Gizburdt joined	19:08
Padawan	svn i already do not know, so need to forget i do not need master!	19:09
	→ shafox joined	19:10
	← jonmorehouse left	19:12
	← studmuf left	19:13
	← aspiers left	19:13
	← Ratler left	19:15
	→ Ratler joined	19:15
	→ mugenzebra joined	19:15
	→ Marcus___ joined	19:16
	← jnewt left	19:16
	→ jnewt joined	19:17
	← [diablo] left	19:18
	← Marcus left	19:18
	← JanC left	19:19
	→ Marcus joined	19:22
	→ studmuf joined	19:22
	→ liamkeily joined	19:23
	→ anomalyst joined	19:23
	← roelmonnens left	19:23
	← Marcus left	19:24
	← liamkeily left	19:24
	← Marcus___ left	19:24
	→ Marcus joined	19:24
	Vampire0_ → Vampire0	19:24
	→ sin3t joined	19:24
	← nsfw left	19:25
	→ eburcat joined	19:26
	→ xnrand joined	19:26
	← ojacobson left	19:26
	← dccc left	19:27
	← jjasinski left	19:27
	→ aswen joined	19:27
	→ liamkeily joined	19:28
	← ajustrun left	19:28
	→ Shadeness joined	19:30
	← gccostabr left	19:30
	← Gizburdt left	19:31
	← jheg left	19:31
	← Shadeness left	19:31
	← V1s1ble left	19:31
	← kadoban left	19:32
	→ dccc joined	19:33
	→ JanC joined	19:33
	→ [diablo] joined	19:35
	→ kaendfinger_ joined	19:36
	← danemacmillan left	19:37
	→ govg joined	19:37
	→ iauns joined	19:37
	← kaendfinger_ left	19:37
Padawan	why after i created a folder, moved files to it, did [git init], git add *, and when i do a git status i got a untracked content? As i understand it would only show that if i never got added it right?	19:39
	→ _lexjm joined	19:39
	← ehmatthes left	19:39
	← Jackneill left	19:39
	← das_beard left	19:39
styx_	Padawan: is your untracked content beginning with a .?	19:40
Padawan	so, if did not add something it is untracked, but isn't [git add *] supposed to add everything recursively inside the repo?	19:40
	→ JayLeon joined	19:40
Padawan	styx_: no	19:40
	← JayLeon left	19:40
	← Tuna-Fish left	19:40
Vampire0	Padawan, what is the untracked content?	19:40
	→ bddy joined	19:40
	← anomalyst left	19:41
Padawan	Vampire0: vim/bundle/tComment (untracked content)	19:41
	it is a vim plugin	19:41
	← irqq left	19:41
Padawan	should i just try to re-git-add it?	19:41
Vampire0	Padawan, usually you use "git add ." to add all, which tells git to add the current dir and all beneath. "git add *" is expanded by the shell and there e. g. things starting with "." are missing then	19:41
	Why that subfolder was not added I don't know though	19:42
	← eliasr left	19:42
Vampire0	It should have worked	19:42
Padawan	i see	19:42
	how do i delete git insite a folder to restart over?	19:42
Vampire0	But yes, you can try to re-add and if it worked properly to a commit with --amend, or create a new commit, whatever suits you better	19:42
bddy	Hello. If I did push to origin and saw message that push was successful. And then I told my buddy to do pull. Is it possible that he didn't pull my commits because they were still arriving?	19:42
styx_	Padawan: rm -rf .git	19:42
bddy	Or it depends?	19:42
Vampire0	bddy, I don't think so. When you see that the push was successful, the push should be finished	19:43
	bddy, maybe you didn't push what you think you pushed?	19:43
	bddy, are there more than one branch and you pushed only one while your buddy is looking for another branch?	19:44
bddy	Vampire0: No, that was an abstract question. Probably there is a bug in our build bot. (I called build bot a buddy for simplicity)	19:45
	← ClarusCogitatio left	19:45
	→ ajustrun joined	19:45
bddy	Thanks for clarificatin	19:45
	← txdv left	19:46
Padawan	Even when i do a [git add .] that folder contec get the status of untracked	19:46
	gonna google a bit	19:46
	→ txdv joined	19:46
styx_	can't you paste us your folder?	19:46
	dwmw2_go` → dwmw2_gone	19:46
Padawan	i did: vim/bundle/tComment (untracked content)	19:47
	→ kerrick joined	19:47
_ikke_	That's a submodule	19:47
Padawan	you mean the entire path?	19:47
	← Roots47 left	19:47
	→ ClarusCogitatio joined	19:47
Padawan	but there's more submodules and only this one got this state of untracked	19:48
_ikke_	Padawan: Go to the submodule and do git status	19:48
	→ jftf_ joined	19:49
	ChanServ set mode: +o	19:50
	← dccc left	19:50
	← Silverwaves_ left	19:50
	← ValicekB left	19:50
	→ dccc joined	19:51
	→ jftf joined	19:51
gitinfo	bddy: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person, but please do it via private message to avoid mass highlighting people.	19:51
	cbreak set mode: -o	19:51
	→ Tuna-Fish joined	19:51
	→ pioneeraxon joined	19:52
	→ Gavrisimo joined	19:52
pioneeraxon	Hi all, I'm trying to apply a diff that is generated by "git diff" using "git apply". But it ignores all the files that have been added to the repository.	19:53
	Is there a way to include all the new files?	19:53
_ikke_	git apply ignores it?	19:53
Padawan	holy fuck i see it now, it had some unfrocked files/folders, thanks _i	19:53
	→ jonmorehouse joined	19:53
	← jftf_ left	19:54
pioneeraxon	Also, I'm using filters like "--include" and "--exclude", but the new files do pass the conditions..	19:55
	→ bezet joined	19:55
	→ EminenceHC joined	19:56
pioneeraxon	Oops! I'm too dumb!! I was using git diff instead of simple "diff" after using "git apply"..	19:56
	Sorry..	19:56
Padawan	Thanks _ikke_, qs	19:56
	← jftf left	19:57
	← petersr left	19:57
	← Gavrisimo left	19:57
pioneeraxon	Thank you _ikke_ :)	19:57
	Rmar\|Away → Rmarmorstein	19:57
	← ajustrun left	19:57
	→ thibaultcha joined	19:58
	← aswen left	19:58
_ikke_	yw	19:59
	→ diegoviola joined	20:00
	← bezet left	20:00
	← EminenceHC left	20:01
	← Marcus left	20:01
	→ atatat joined	20:02
	→ Marcus joined	20:02
	← Marcus left	20:02
	→ Marcus joined	20:02
	→ plilq joined	20:02
	← Marcus left	20:02
	→ danemacmillan joined	20:03
	→ Marcus joined	20:03
	→ cannonball joined	20:03
	← Xethron left	20:03
	← toothrot left	20:06
	→ Xethron joined	20:06
	← Xethron left	20:06
	→ Xethron joined	20:06
	← mechanicalduck left	20:07
plilq	I'm doing some code formatting and whitespace cleanup and I'd like to make sure nothing "real" changes. Diffing with --ignore-all-space takes care of most of my needs, but I haven't been able to find a setting to ignore line breaks. By this I mean stuff like moving a function opening bracket that has been on the same line to the next one. Is there a setting that would ignore this?	20:07
	← Marcus left	20:08
	← upene left	20:08
	→ ajustrun joined	20:08
Seveas	plilq: not really. diffs are very much line-oriented.	20:09
	← danemacmillan left	20:09
	→ anomalyst joined	20:09
	← anomalyst left	20:09
	→ anomalyst joined	20:10
plilq	Alright, thanks. Would have been nice to see an empty diff to know only whitespaces changed, even if it was accross rows.	20:10
grawity	well, I think one could configure `indent` as a diff filter	20:10
Seveas	grawity: oh ew... but yes, that may work	20:10
grawity	but that'd also affect checkouts and checkins (commits)	20:10
	→ ValicekB joined	20:11
	← Xethron left	20:12
	→ dreiss joined	20:13
	← jonmorehouse left	20:13
	→ felixjet_ joined	20:14
	→ aswen joined	20:14
	→ hoschi joined	20:14
	← studmuf left	20:15
	→ netcarver joined	20:15
	← atatat left	20:16
	→ gccostabr joined	20:16
	→ spareproject joined	20:17
	→ Xethron joined	20:17
	← Xethron left	20:17
	→ Xethron joined	20:17
	← felixjet left	20:17
	→ danicampa901 joined	20:17
	→ jonmorehouse joined	20:18
	→ atatat joined	20:18
	→ felixjet joined	20:18
	← Blaster left	20:19
	← Manny left	20:20
	→ Manny__ joined	20:20
	← ajustrun left	20:20
	← [diablo] left	20:21
	← aswen left	20:21
	← felixjet_ left	20:21
	← slmult0 left	20:22
	← dreiss left	20:22
	← hoschi left	20:24
	→ studmuf joined	20:24
	← oojacoboo left	20:24
	→ ultrapro joined	20:24
	→ pingo joined	20:24
	← Guest18001 left	20:25
	→ maestrojed joined	20:25
	→ forgot joined	20:25
	→ ajustrun joined	20:26
	← maestrojed left	20:26
	← Px12 left	20:27
	→ cagedwisdom joined	20:27
	→ das_beard joined	20:28
	← pioneeraxon left	20:29
	→ bit_twit joined	20:29
	← kaendfinger left	20:30
	sebbu2 → sebbu	20:31
	← sq-one left	20:31
	← ianbrandt left	20:32
	← das_beard left	20:32
	← ajustrun left	20:32
	→ danemacmillan joined	20:33
	← pingo left	20:34
	→ dreiss joined	20:35
	→ P4_Denis joined	20:36
	← tyreld left	20:37
	→ das_beard joined	20:37
	← Padawan left	20:38
	← ultrapro left	20:39
	→ ianbrandt joined	20:39
	→ das_bear_ joined	20:39
	← das_beard left	20:39
	→ aidalgol joined	20:40
	← danicampa901 left	20:40
	← P4_Denis left	20:40
	← das_bear_ left	20:41
	→ das_beard joined	20:41
	→ b240 joined	20:44
	← das_beard left	20:46
zumba_ad_	hi _ikke_ I have another question about the topic we were discussing yesterday. Am I right that if let's say I have 3 features to finish, I'll complete those 3 features first before I make a release branch? I was thinking it would be so much work if I make a release for every feature	20:47
canton7	depends whether you want 3 separate releases, or 1 single release :P	20:49
	→ lindenle joined	20:49
	← wwalker left	20:49
	← rainabba_ left	20:49
anomalyst	granularity is a good thing	20:49
	→ jftf_ joined	20:50
anomalyst	push updates frequently	20:50
	→ wwalker joined	20:50
	→ tyreld joined	20:50
anomalyst	even in mid feature	20:51
	you can always squash the posts later if you dont want to save the intermediates	20:51
	← lindenle left	20:53
	← bddy left	20:53
	← jftf_ left	20:54
	→ B1x1t0_ joined	20:55
	→ V1s1ble joined	20:56
	← B1x1t0 left	20:56
	→ jottr_ joined	20:56
	→ Padawan joined	20:58
	→ mechanicalduck joined	20:58
	gitinfo set mode: +v	20:59
	← jottr left	20:59
	← aidalgol left	21:00
	← atatat left	21:00
zumba_ad_	ok	21:00
	← SjB left	21:01
	→ EminenceHC joined	21:01
zumba_ad_	canton7: correct me if I am wrong that release is the one that's going to be tested by our QA testers	21:01
	→ devoldmx joined	21:02
	← b240 left	21:02
j416	zumba_ad_: when you make a release branch, at least according to the suggestion on nvie's blog, it would mean that it is frozen for new development and that only bug fixes may be merged to it	21:02
	https://github.com/jsageryd/gaku	21:02
	bah wrong link, apologies	21:02
zumba_ad_	k	21:02
j416	http://nvie.com/posts/a-successful-git-branching-model/	21:02
	^	21:02
zumba_ad_	yup, i was reading that yesterday	21:02
	← cannonball left	21:03
zumba_ad_	i was told too that if qa tester found a bug in release, I will directly make changes to the release branch and not create another branch	21:03
	→ AaronMT joined	21:03
	← asdpew left	21:03
j416	not necessarily	21:03
	depends on your workflow	21:03
	→ kalypso joined	21:03
	→ slash77 joined	21:03
zumba_ad_	using that workflow you sent	21:03
	← slash77 left	21:03
j416	for example, in our team each dev would always work in his own branch, and we'd merge that to master when it's ready	21:04
	→ b240 joined	21:04
zumba_ad_	k	21:05
	← b240 left	21:05
j416	we do rolling releases so we don't have the concept of versions but if we would do that, we would merge developer branches into release branches if they're bug fixes	21:05
zumba_ad_	i'm actually going to follow the one from nvie. I already created a develop branch	21:05
	got it	21:05
j416	I've found it useful to pick parts of nvie, using all of it is sometimes overkill and creates more overhead than necessary	21:06
zumba_ad_	k	21:06
canton7	yeah, gitflow is a collection of techniques to solve lots of different problems in elegant ways	21:06
	← netameta_ left	21:06
	→ tpollard joined	21:06
zumba_ad_	i'm actually a bit confuse on my code and git. it's because my code needs to be compiled to make it work in Apache. However, I don't git the compiled code	21:07
j416	sane.	21:07
zumba_ad_	It's an AngularJS application	21:07
	Actually, it will run but when I said compiling, I meant minification and uglification	21:07
	→ netameta joined	21:07
canton7	yup?	21:08
	← Oejet left	21:08
	← fr33domlover left	21:09
zumba_ad_	so the minified code is the one that gets uploaded to Apache	21:09
	← EminenceHC left	21:09
	→ veebers joined	21:09
j416	zumba_ad_: is there a question, too?	21:10
zumba_ad_	no, I was just mentioning it	21:10
	I just realized that I was just minifying it :)	21:10
	← Skapadapaduu left	21:10
j416	and the confusion?	21:10
zumba_ad_	the confusion is the raw code and minified code, I was thinking if I should also push minified code to bitbucket	21:11
	there is no reason to git push it	21:11
	i answered myself	21:11
j416	generated things, be it minified code, compiled binaries, don't need to be tracked usually	21:11
	indeed not	21:11
zumba_ad_	yup	21:11
	am I right that when I need to make a new server, I clone from tag?	21:12
	assuming the one I tag is the most recent stable	21:12
j416	not sure what you mean by that	21:12
	you clone a repo, not a tag	21:12
zumba_ad_	ok	21:12
	i thought tag can also be clone	21:13
j416	but sure, you can checkout a tag	21:13
zumba_ad_	oh	21:13
j416	a tag is like a branch except it won't change	21:13
zumba_ad_	yes	21:13
	especially, I was planning of just putting it on a new web server	21:13
	so either tag or the repo that has the same version will be fine	21:13
	← blackmesa left	21:13
zumba_ad_	ah, although my repo or tag isn't minified	21:14
	would that mean that once I clone it, I'll have to run my minification script on the server?	21:14
j416	yes.	21:14
zumba_ad_	oh, gotcha	21:14
canton7	you're trying to use git for !deployment	21:14
gitinfo	[!deploy] 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	21:14
j416	^	21:14
zumba_ad_	canton7: no	21:14
	→ MorpheusBeing joined	21:14
canton7	git is not a deployment tool :P	21:14
zumba_ad_	canton7: but using git clone to copy	21:15
	we have Opworks	21:15
	they decommissioned Jenkins	21:15
	← eburcat left	21:15
	← FunkyAss left	21:15
zumba_ad_	though I haven't seen an Opworks script yet	21:15
	→ aidalgol joined	21:15
	→ eburcat joined	21:16
zumba_ad_	quick question about tag and features	21:16
	let's say I was asked to work on 3 features that will be on the October release	21:16
	They want the version to be released as 1.2	21:17
	each 3 features are big. So I start working on first feature. I pushed it and make a release 1.2.1 and hand it over to QA. I tell QA start testing it, I'll start working on the next feature	21:17
j416	zumba_ad_: you should read http://semver.org	21:18
zumba_ad_	yeah, that was given to me yesterday, I should read it again :)	21:18
j416	if QA needs to test each feature directly after it's ready, before public release, I would create some kind of internal release and name it something like 1.2-<sha of commit>	21:19
	without tagging it	21:19
	sorry 1.1-<sha of commit>	21:20
	(because it's before 1.2)	21:20
	-or- I would have a system where there are pre-release versions, with some predetermined suffix system	21:20
	→ ehmatthes joined	21:20
zumba_ad_	ok	21:21
	→ dougsland joined	21:22
zumba_ad_	i like that, sha of commit	21:22
	← jon-mac left	21:22
zumba_ad_	we actually have a release this coming 19th	21:22
	I've finished most of the features and are currently being tested	21:22
	though I completed it last week and it was only today that I created a develop branch	21:23
	← mattcen left	21:23
zumba_ad_	also, I upload minified code manually using scp	21:23
	I haven't employed release nor tagging	21:23
	but would really love to	21:23
	← Xethron left	21:23
	→ andschwa joined	21:24
zumba_ad_	maybe, I can now make a release version since I don't have any changes nor new code. What do you think folks?	21:24
	git checkout -b release/v1.0.0 develop	21:25
	← bit_twit left	21:25
	← studmuf left	21:25
	← thibaultcha left	21:25
	→ acharlieh joined	21:26
	← Polymorphism left	21:28
	← mennea left	21:28
j416	zumba_ad_: http://semver.org	21:29
	j416 off to bed o/	21:29
zumba_ad_	thanks	21:29
	← godgodgodgo left	21:29
j416	zumba_ad_: "How do I know when to release 1.0.0?" in the FAQ	21:29
	j416 off to bed fr o/	21:29
zumba_ad_	k	21:29
	← Noldorin left	21:29
	← amikiri left	21:30
zumba_ad_	that question is perfect for me since my code is also in production though with no version right now	21:30
	that means, my code version will stay for a long time at 1.x.x since I don't know if it will ever become incompatible	21:31
	→ rdbell joined	21:32
	→ jon-mac joined	21:32
	→ Noldorin joined	21:33
	← jon-mac left	21:34
	→ das_beard joined	21:35
	→ mattcen joined	21:35
zumba_ad_	hey folks, I'm going to create a release branch now. I would like to make it meaningful rather than my current command git checkout -b release/v1.0.0 any suggestions?	21:37
	← zling______ left	21:37
	← MorpheusBeing left	21:37
	→ eliasr joined	21:38
	→ n-st joined	21:38
	→ anaran joined	21:39
	← sinkensabe left	21:39
	← das_beard left	21:40
	→ MorpheusBeing joined	21:40
	→ zlinn joined	21:40
	← gauke left	21:40
osse	how about tagging stuff as RC	21:40
	→ das_beard joined	21:40
zumba_ad_	RC is release candidate right?	21:40
	but right now, I'm only at the release branch creation and not at the tagging yet	21:41
	← King_Hual left	21:41
zumba_ad_	if I remember correctly, I should tag only when code has been tested thoroughly and no bugs found	21:41
anaran	I would like to add commit comments per git hunk as I go through git commit -p; possible?	21:42
	→ das_bear_ joined	21:42
zumba_ad_	maybe, I should git checkout -b release/ourappname-v1.0.0 Is this yucky?	21:43
	← vurma left	21:43
zumba_ad_	or maybe like what j416 told me earlier - git checkout -b release/v1.0-17ea5b904f0cc479060a1599d8fea726f76f571e	21:44
	← das_beard left	21:44
zumba_ad_	but how will I know the sha if I'm just about to create the branch	21:45
	← tac_ left	21:45
zumba_ad_	maybe he meant the last commit	21:45
	→ preyalone joined	21:45
	→ blackmesa joined	21:46
	← das_bear_ left	21:46
	→ jftf_ joined	21:50
	← pantsman_ left	21:53
	← jftf_ left	21:55
	→ bezet joined	21:56
	→ devoldmx3 joined	21:56
	← devoldmx left	21:56
	→ kadoban joined	21:56
	→ Turicas joined	21:57
	→ kaendfinger joined	21:57
	← kalypso left	21:58
	← LLaurent left	21:58
osse	anaran: no, but you can write notes into any file and when it's time to commit you can do git commit -eF notes.txt	21:59
	anaran: or git commit -F notes.txt if there is no need to edit it before committing	21:59
	→ devoldmx joined	21:59
	← nour left	22:00
	← bezet left	22:00
	← devoldmx3 left	22:01
osse	zumba_ad_: is there parallel development ongoing on the next version?	22:01
	← rdbell left	22:02
	→ [diablo] joined	22:02
	→ rdbell joined	22:02
	← diegoviola left	22:03
	→ devoldmx3 joined	22:03
	← dreiss left	22:03
	→ mizu_no_oto joined	22:04
	→ autochthon joined	22:04
	← midnightmagic left	22:05
	→ midnightmagic joined	22:05
	← [diablo] left	22:05
	→ rdbell_ joined	22:06
	← rdbell_ left	22:06
	→ toothrot joined	22:06
	← rdbell left	22:06
	← devoldmx left	22:06
	→ rdbell_ joined	22:06
	→ noxd joined	22:07
	← allouis________ left	22:08
osse	gotta go. my point was merely that if there isn't then there's no need to create a branch at all. actual released (or to be) deserves a tag. branch names aren't as important. do what makes sense.	22:08
	← eburcat left	22:09
	ncd\|leeN → leeN	22:10
	→ eburcat joined	22:11
	← rdbell_ left	22:11
	← ehmatthes left	22:11
	← adac left	22:11
	← SimonNa left	22:11
	→ allouis________ joined	22:11
	← eburcat left	22:12
	→ scarabx joined	22:13
anaran	osse: thanks!	22:13
	← jottr_ left	22:15
	← mizu_no_oto left	22:16
	→ rdbell_ joined	22:18
	→ morphix0 joined	22:18
	→ mizu_no_oto joined	22:19
	← Manny__ left	22:20
	→ Manny joined	22:20
	→ gasull joined	22:21
	→ jottr_ joined	22:23
	← rdbell_ left	22:23
	→ rdbell_ joined	22:24
	← rdbell_ left	22:24
	← gasull left	22:24
	→ rdbell_ joined	22:25
	← morphix0 left	22:28
	← m8 left	22:28
	← midnightmagic left	22:29
	← rdbell_ left	22:29
	→ rdbell_ joined	22:30
	← blackmesa left	22:31
	← israelpattison left	22:31
	→ midnightmagic joined	22:31
	→ israelpattison joined	22:32
	→ DanMAbraham joined	22:34
	← rdbell_ left	22:35
	→ cannonball joined	22:36
	→ das_beard joined	22:36
	→ P4_Denis joined	22:36
	← nkouevda left	22:37
	→ robbyoconnor joined	22:37
	← B1x1t0_ left	22:37
	→ wabash joined	22:38
	← spareproject left	22:38
wabash	Howdy. I want to rebase branch B on branch A. Is it as simple as rebase -i A-HEAD?	22:38
	← veebers left	22:39
	← evildmp left	22:39
osse	wabash: git checkout B; git rebase A	22:39
	→ veebers joined	22:39
wabash	excellent, thank you.	22:39
	That just keeps the commit messages of B, but makes new hashes of course, since the ancestry changes?	22:40
osse	yes	22:40
	→ HelperW__ joined	22:40
wabash	thank you.	22:40
osse	add -i if you want	22:40
	→ das_bear_ joined	22:40
wabash	What will that get me, the chance to change messages and squash the commits in B, correct?	22:40
osse	stuff like that	22:41
wabash	thank you so much.	22:41
	← P4_Denis left	22:41
osse	reorder them too	22:41
	← Kicer86 left	22:41
wabash	When I reorder, the ancestry changes. Will the dates on all of them be "NOW" though?	22:41
osse	no	22:41
wabash	And, what happens to the dates on the rebase?	22:41
	all changed to "now"?	22:41
	oh.	22:41
	← das_beard left	22:41
wabash	So when I rebase B on A, what happens to the dates of B?	22:42
osse	author date is untouched. commit date is now	22:42
	← zapb_ left	22:42
wabash	will some children have author dates before their parents?	22:42
osse	perhaps	22:42
wabash	freaky!!!!	22:42
	:)	22:42
	← kriks left	22:42
osse	i sleeep ar night	22:43
	← WaReZ left	22:43
	→ mellernoia joined	22:43
	← HelperW_ left	22:43
	← anaran left	22:43
	← das_bear_ left	22:45
	← HelperW__ left	22:45
	← madewokherd left	22:45
	← mizu_no_oto left	22:50
	→ lindenle joined	22:50
	← Vinnie_win left	22:51
	→ jftf_ joined	22:51
	← TheEskil left	22:54
	← lindenle left	22:55
	→ TheEskil joined	22:55
	← jftf_ left	22:56
	→ SjB joined	22:56
	← saurik left	22:57
	← wrouesnel2 left	22:57
	← vire left	22:57
	← jenni_naiaretti left	23:00
	→ jenni_naiaretti joined	23:01
	← mozzarella left	23:01
	← WakiMiko left	23:02
	→ WakiMiko joined	23:02
	→ mozzarella joined	23:02
	← aidalgol left	23:02
	← teran left	23:04
	→ EminenceHC joined	23:05
	← lachesis left	23:05
	→ aidalgol joined	23:05
	→ amikiri joined	23:06
	← _lexjm left	23:07
Padawan	hey guys, do i need to create a repo on github website in order to place my local one??	23:07
	→ diegoviola joined	23:09
	→ wrouesnel joined	23:09
	→ lachesis joined	23:09
	← fold left	23:09
	← EminenceHC left	23:09
	→ HelperW__ joined	23:10
	← toothrot left	23:12
	← HelperW__ left	23:13
	→ Vinnie_win joined	23:13
	→ HelperW__ joined	23:13
	← n-st left	23:13
	→ saurik joined	23:13
	← ockham left	23:14
	← jenni_naiaretti left	23:14
	← Guest92862 left	23:16
	← HelperW__ left	23:18
	← pandeiro left	23:20
	→ jenni_naiaretti joined	23:20
	← TheEskil left	23:20
	→ akiva joined	23:23
	← gluten_hell__ left	23:23
	→ TheEskil joined	23:23
	← netcarver left	23:24
	← starkhallo left	23:27
	→ starkhalo joined	23:27
	← mikecmpbll left	23:28
	← Zarthus left	23:28
	← darkbasic left	23:28
	→ ncd\|leeN joined	23:28
	→ darkbasic joined	23:28
	→ Zarthuss joined	23:28
	← GodEater left	23:29
	← Ornacia left	23:29
	→ pandeiro joined	23:29
	← MorpheusBeing left	23:29
	← noxd left	23:29
	← leeN left	23:29
	← frobware left	23:29
	← liamkeily left	23:30
	→ madewokherd joined	23:30
	← cagedwisdom left	23:30
	← _W_ left	23:30
	→ GodEater joined	23:31
	← GodEater left	23:31
	→ GodEater joined	23:31
	← roflin left	23:31
	→ sjmikem joined	23:31
	→ _W_ joined	23:32
	→ cagedwisdom joined	23:32
	→ MorpheusBeing joined	23:33
	← Padawan left	23:33
	→ Padawan joined	23:33
	→ das_beard joined	23:34
	→ teran joined	23:35
	← lu_zero left	23:36
	→ toothrot joined	23:36
	← someplace left	23:36
	→ frobware joined	23:36
	← Padawan left	23:37
	← trewe left	23:38
	← shinnya left	23:38
	← hypera1r left	23:39
	← das_beard left	23:39
	→ HelperW__ joined	23:39
	→ trewe joined	23:40
	→ bug_sniper_ joined	23:40
	→ noxd joined	23:40
	gitinfo set mode: +v	23:40
	→ das_beard joined	23:40
	→ sinkensabe joined	23:40
	→ Ornacia joined	23:40
	← teran left	23:40
bug_sniper_	I think I need some help with something	23:40
	→ shinnya joined	23:41
	→ habanany joined	23:41
bug_sniper_	https://github.com/CleverRaven/Cataclysm-DDA/pull/9003 is there a way to remove the extra commits from a push request after I accidentally used the command "git push origin master"?	23:41
	→ Consuela joined	23:41
	→ HelperW___ joined	23:41
	← HelperW__ left	23:42
kadoban	bug_sniper_: I'm not really sure. Maybe just cancel the pull request and do it again with what you want, unless there's some way in the interface?	23:42
	→ _lexjm joined	23:43
	→ jftf joined	23:43
kadoban	bug_sniper_: I don't really use that github feature, sorry that's a bit vague...	23:43
jenni_naiaretti	Padawan yes. You can do that on the website or using curl on your terminal.	23:43
bug_sniper_	thanks, I'll wait and see if someone else can anser	23:44
	*answer	23:44
jenni_naiaretti	https://gist.github.com/pongstr/e0edcf98896b791f2cd4	23:44
	← sinkensabe left	23:45
	← ValF left	23:45
	← das_beard left	23:45
	→ jorj joined	23:45
	→ someplace joined	23:45
	← HelperW___ left	23:46
	→ nkouevda joined	23:48
kadoban	You could try just the branch back to what you want it to be (make a backup first), then force push. I have no idea if that works though.	23:48
	→ Virox joined	23:49
	← hexagoxel left	23:50
	← autochthon left	23:51
	← preyalone left	23:51
	→ jftf_ joined	23:52
	→ nanashiRei joined	23:52
	→ lsiv568 joined	23:53
	→ lu_zero joined	23:54
	← lu_zero left	23:55
	→ lu_zero joined	23:55
	→ OrpheusP joined	23:55
	→ bezet joined	23:56
	← jftf_ left	23:56
	→ sgen joined	23:56
	→ JDHawke2 joined	23:58
	→ roflin joined	23:58
	→ ThiefMasterrr_a joined	23:58
	← ThiefMasterrr left	23:58
	ThiefMasterrr_a → ThiefMasterrr	23:58
	→ Vinnie_win_l joined	23:59
	→ leen^\| joined	23:59
	→ offbyone_ joined	23:59
	→ DSH105- joined	23:59

Logs Search ←Prev date Next date→

Channels Documentation