IRCloggy #git 2016-04-26

Provider of IRC logs since 2005.

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

	2016-04-26
	→ aspiers_ joined	00:00
	← imachuchu left	00:00
	← raijin left	00:00
	← MattMaker left	00:01
	← _wwwBukoLaycom left	00:03
	→ madewokherd joined	00:03
	← ToBeCloud left	00:03
mustmodify	not...	00:05
	← kasisnu left	00:07
	← aspiers_ left	00:07
foul_owl	Thank you	00:07
	→ kasisnu joined	00:08
	→ kasisnu_ joined	00:09
	← timvisher left	00:09
	gitinfo set mode: +v	00:10
	→ timvisher joined	00:10
	→ kasisnu__ joined	00:10
	→ kasisn___ joined	00:12
	← kasisnu left	00:12
	→ kasisnu joined	00:13
	← kasisnu_ left	00:14
	← kasisnu__ left	00:14
	← abyx left	00:15
	→ kasisnu_ joined	00:15
sangy	Hello everyone. I have a theoretical question: If you have a merge without conflicts, can you assume that all blobs in the resulting tree must either be in the tree of branch A or in the tree of branch B? That is, could new blobs be created by an automatic merge?	00:15
	→ fuchstronaut joined	00:15
ojacobson	Yes, non-conflicting merges can generate novel blobs.	00:16
	→ neonKow joined	00:16
	← kasisn___ left	00:17
	→ zZap-X joined	00:17
	← kasisnu left	00:17
zZap-X	git init	00:17
	git status	00:17
	git add .	00:18
	→ jimi_ joined	00:18
zZap-X	git commit -m "I'm learning GIT"	00:18
sangy	ojacobson: that's what I tought, do you know where I can find an example?	00:18
	← akushner left	00:18
sangy	zZap-X: ?	00:18
zZap-X	:D	00:18
	→ Boniche joined	00:18
	← tvw left	00:19
	← cyphase left	00:19
arahael	zZap-X: excwellent progress. now you just gotta do that in the bash shell, rather than your irc shell.	00:19
zZap-X	aye good point	00:19
	← diegoaguilar left	00:20
zZap-X	I trying to figure out merge, its getting complicated now	00:20
	← kasisnu_ left	00:20
zZap-X	Rule No.1 type: git status _BEFORE_ anything you do	00:20
	← fuchstronaut left	00:20
zZap-X	is it possible to mess up the whole repo if git is used incorrectly?	00:21
vishal	zZap-X: git is pretty resilient, but yeah, anything is possible :)	00:22
sangy	zZap-X: yep, but you can copy the repo and try when you are not sure about what could happen	00:22
	zZap-X: http://gitolite.com/tias.html	00:23
	!tias	00:23
gitinfo	Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/tias.html may help with git-specific TIAS.	00:23
	→ raijin joined	00:23
	→ abyx joined	00:23
	← livingstn left	00:23
	← cagedwisdom left	00:24
	← mischat left	00:24
zZap-X	commit should be called snapshot	00:24
	→ slappymcfry joined	00:25
bremner	make an alias, if you like	00:25
zZap-X	how does GIT respond when working with large files?	00:26
	→ eletuchy joined	00:26
orlock	zZap-X: poorly, generally	00:27
zZap-X	ok	00:27
	← knighthawk left	00:27
orlock	depends on how large	00:27
	theres a thing called LFS	00:27
zZap-X	imagine i had 6GB photoshops files	00:27
	lots of them	00:27
	→ mischat joined	00:27
zZap-X	i think git is more designed for text and code	00:28
orlock	yes	00:29
	not for binary blobs	00:29
	look at git lfs	00:29
zZap-X	ok	00:29
	← abyx left	00:29
zZap-X	oh interesting	00:29
orlock	i'm here because i have to implement it at work	00:30
	← staticshock left	00:30
orlock	one of the products we use implements an LFS file server however	00:30
	← peepsalot left	00:31
	→ jjido joined	00:31
	← mellernoia left	00:31
	← eletuchy left	00:31
jjido	After pull I have both modified: tests.js	00:31
	what do I do now?	00:32
	← s00pcan left	00:32
ojacobson	!eek	00:32
gitinfo	[!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	00:32
zZap-X	I think one can edit the affected file manually when there is a merge conflict?	00:33
	→ JanC_ joined	00:33
	→ s00pcan joined	00:34
	→ jeffreylevesque joined	00:34
	← s00pcan left	00:35
	← JanC left	00:35
bremner	zZap-X: yes, that's what the links about talk about. It just doesn't work well with most binary files	00:35
zZap-X	indeed	00:35
	→ mellernoia joined	00:36
zZap-X	git could damage a binary if it writes into it?!	00:36
	→ s00pcan joined	00:36
	→ cagedwisdom joined	00:36
jjido	ok sorted thanks!	00:37
	→ staticshock joined	00:37
	← timvisher left	00:37
	→ kandinski joined	00:38
	→ timvisher joined	00:38
	← JanC_ left	00:38
	→ Nikesh joined	00:38
	→ JanC joined	00:39
	← mwhooker left	00:41
kandinski	I'm trying to learn about git-subtree, and I can't find anything about it either on git-scm.com/docs nor on git-scm.com/book; they both talk about git-submodule. Where is something more tutorial-y than `man git-subtree` that isn't a Medium post? (best result so far: https://medium.com/@v/git-subtrees-a-tutorial-6ff568381844#.l6e3arykq)	00:41
	→ livingstn joined	00:41
	← cagmz left	00:44
SporkWitch	kandinski: http://blogs.atlassian.com/2013/05/alternatives-to-git-submodule-git-subtree/	00:45
	← bruce_lee left	00:45
kandinski	SporkWitch: thanks a bunch.	00:45
	→ s00pcan_ joined	00:45
SporkWitch	kandinski: no problem, and thanks for mentioning it, because i was about to add an API we want to support as a submodule, and now i might not, once i read that article and the follow-up linked at the top of it lol	00:45
kandinski	yeah	00:45
SporkWitch	(still need to read, i just found that article now, because i knew atlassian has a ton of great git tutorials, since they make bitbucket and want you to pay them lol)	00:46
kandinski	I came upon it when trying to decide how to integrate an OS library I'm working on with two lower-level upstream libraries	00:46
SporkWitch	exactly; we have a service we want to integrate into a bot. so we wrote a wrapper for the API in python, now we need that API in the main bot project.	00:47
	the wrapper in the bot, that is	00:47
kandinski	yeah, in my case I need to make lockstep changes into all three projects and manage upstream adoption/rejection of my patches	00:47
	← unbalancedparen left	00:47
kandinski	which reminds me that tutorials are fine, but "why/when to use X" is as important or more as "how to use X"	00:48
	← username17 left	00:48
kandinski	`man X` already does the latter, and can never cover the former extensively enough	00:49
	← Yarne left	00:49
	← mingwandroid left	00:49
SporkWitch	hear hear	00:49
	it's the hardest thing to teach, as well	00:49
	i can teach someone to do pretty much anything, what is hard to teach is how to THINK	00:50
	← kaiza left	00:55
	← s00pcan_ left	00:56
kandinski	I recently got a workmate on my day job, and we learn "how to do X" separately, but we put our heads together for all our "why do X and not Y" decisions	00:57
	→ cyphase joined	00:57
	← cyphase left	00:57
	→ cyphase joined	00:57
	← SwiftMatt left	00:58
	← harish_ left	00:59
	← jjido left	01:00
	→ bronson joined	01:02
	→ username17 joined	01:02
	→ s00pcan_ joined	01:02
	→ espindola joined	01:06
	← bronson left	01:06
	← ferr left	01:08
	← ncd\|leeN left	01:08
	← durham left	01:08
	← radsy left	01:08
	← livingstn left	01:08
	→ radsy joined	01:09
	← jbitdrop left	01:09
	→ carif joined	01:10
	→ russoneto joined	01:10
	← timvisher left	01:10
	← cyphase left	01:10
	→ timvisher joined	01:11
	→ jaguarmagenta joined	01:11
russoneto	I need to understand something here... I cloned my project that has a few branches. The thing is, my "master" local branch (fresh clone) is showing me all commits from remote/alpha branch... does it make sense?	01:13
	← espindola left	01:13
	← Seban left	01:13
ojacobson	I would assume the remote has alpha set up to be its default branch	01:15
	→ harish_ joined	01:16
	→ fuchstronaut joined	01:16
russoneto	no it's not...	01:17
SporkWitch	that should just have you start on the alpha branch, not have master match the contents of the alpha branch	01:17
russoneto	but I entered some commands before (my previous local git got corrupted).. in order: git clone --depth 1 / git fetch --unshallow	01:18
	does it explains?	01:18
	→ SimonNaa joined	01:19
	← peeps[lappy] left	01:20
	← digidog left	01:20
	→ CheckDavid joined	01:21
	→ weox joined	01:21
	hwrdprkns → hwrd[away]	01:21
	← fuchstronaut left	01:22
	← SimonNa left	01:22
	→ theskillwithin joined	01:23
	← hwrd[away] left	01:23
	→ hwrdprkns joined	01:23
rewt	why not do a normal clone?	01:24
	→ deadnull_ joined	01:25
	← jimi_ left	01:25
	← deadnull_ left	01:25
	← harish_ left	01:25
	→ deadnull_ joined	01:25
	→ fahadash joined	01:25
	← deadnull left	01:26
	← deadnull_ left	01:27
	→ deadnull joined	01:28
russoneto	rewt I followed a brief guide on stack overflow.. I was having this error: fatal: early EOF fatal: index-pack failed	01:28
	hwrdprkns → hwrd[away]	01:28
russoneto	This is what I did (most voted answer): http://stackoverflow.com/questions/21277806/fatal-early-eof-fatal-index-pack-failed	01:28
	anyway	01:28
	hwrd[away] → hwrdprkns	01:29
	← deadnull left	01:29
rewt	i'd go with the 2nd answer	01:29
	as for your original question, that does seem weird	01:30
	→ deadnull joined	01:30
rewt	maybe have a look at what `gitk --all` shows	01:30
	← acton left	01:32
	← JanC left	01:33
russoneto	gitk --all says I'm on master and all commits are in fact from remote/alpha	01:34
	→ Lewoco__ joined	01:34
	hwrdprkns → hwrd[away]	01:34
russoneto	even the hash is the same lol	01:34
Lewoco__	Suppose I add a subtree with a prefix. If the upstream adds new files and I merge them will the new files automagically get the prefix used when the subtree was originally added?	01:35
	← hwrd[away] left	01:35
	→ haoli joined	01:35
	← user083 left	01:35
russoneto	wait, what? this is VERY weird. (wait a sec)	01:36
rewt	where are the branch pointers?	01:36
	is remote/alpha at the same point as master?	01:36
russoneto	http://i.imgur.com/I9ZjR5T.png	01:37
	how weird is that? check commiters, log messages and the hash	01:38
	← jagob left	01:38
	→ mablae__ joined	01:38
russoneto	go home git, you are drunk lol	01:38
rewt	is this a public repo?	01:38
	that does look weird	01:39
	where's remote/alpha in gitk?	01:39
	remotes/origin/alpha	01:39
	→ kadoban joined	01:40
russoneto	when I browser remote, there is NOTHING	01:40
	just master	01:40
	→ cyphase joined	01:40
russoneto	its not a public repo	01:40
	← mablae_ left	01:41
rewt	remotes/origin/alpha should show in `gitk --all`	01:41
	→ peeps[lappy] joined	01:41
rewt	oh	01:41
	maybe that's right, and 0bf3a1e is the start of alpha	01:42
	← raijin left	01:42
rewt	anything prior to where alpha branched from master is still "in alpha"	01:42
russoneto	no man..	01:42
	let me try other thing	01:42
	← joki left	01:43
russoneto	This is the log from the corrupted repo: http://i.imgur.com/dJLc01V.png (using tortoise git)	01:43
	all of that is remote/alpha	01:43
	← ojdo left	01:46
rewt	i just tried that --depth 1 / --unshallow method, and it doesn't seem to fetch remote branches for me	01:47
russoneto	hm!	01:48
	so if I just do a normal clone everything should work	01:48
rewt	i would think so, yeah	01:48
	← pks left	01:48
russoneto	cool..	01:49
	→ hwrdprkns joined	01:49
	→ joki joined	01:49
	← kam270 left	01:50
	← deadnull left	01:50
	→ pks joined	01:50
	→ ojdo joined	01:52
	← mischat left	01:55
	← mikiones left	01:58
	→ knighthawk joined	01:58
	→ SwiftMatt joined	01:58
	← EvilPenguin left	01:59
	→ astrofog joined	02:00
	← SwiftMatt left	02:00
	← bitkiller left	02:00
	→ The_Phoenix joined	02:01
_xor	Ok, another dumb question.	02:03
	I'm trying to do this: git diff --no-index --summary ":(top,exclude).git" "../T"	02:03
	I'm trying to do a diff between the root of the tracked working tree & a directory outside of the repo.	02:04
	← JBlazeCoder21 left	02:04
	← astrofog left	02:04
	← Dazzyp left	02:04
_xor	It's complaining though with "error: Could not access ':(top,exclude).git'	02:04
	← knighthawk left	02:05
_xor	I'm either messing up the pathspec somehow or something else is going on.	02:05
	→ Dazzyp joined	02:05
_xor	Without that path spec (that is: git diff --no-index -summary . ../T) it works as I want it to, but it includes the .git directory in the diff and I don't want that obviously.	02:05
	← axisys left	02:07
	→ axisys joined	02:08
	← naitsirhc_ left	02:08
	hwrdprkns → hwrd[away]	02:08
	← hwrd[away] left	02:09
	← staticshock left	02:12
	→ whomp_ joined	02:13
whomp_	how can i see all of the commits i've recently set head to?	02:13
	← jaguarmagenta left	02:13
whomp_	even better, how can i see all of the commits that a branch's tip has been set to?	02:14
	→ jaguarmagenta joined	02:14
	→ hwrdprkns joined	02:15
	← CEnnis91 left	02:16
	→ fracting joined	02:16
	← fracting left	02:17
	→ staticshock joined	02:17
	→ dreiss joined	02:18
	← al-damiri left	02:19
	← mofai left	02:19
	→ naitsirhc joined	02:20
	← naitsirhc left	02:20
	→ naitsirhc joined	02:21
	← The_Phoenix left	02:21
jpleau	whomp_: is "git reflog" what you might be after?	02:22
	← ericvw left	02:23
	→ SwiftMatt joined	02:23
	→ mofai joined	02:23
	→ fracting joined	02:25
	→ Saylen joined	02:26
	→ robogoat joined	02:26
	← SwiftMatt left	02:26
	→ Shentino joined	02:26
	← fracting left	02:26
	→ SwiftMatt joined	02:27
	← Shentino left	02:27
	→ fracting joined	02:27
	→ locrian9 joined	02:28
	→ livingstn joined	02:28
	← fracting left	02:28
	→ fracting joined	02:29
	← Saylen left	02:30
	← fracting left	02:30
	→ bilb_ono joined	02:30
	→ Dreamer3 joined	02:32
	← Dreamer3 left	02:32
bilb_ono	can someone help me undestand this? https://bpaste.net/show/33998684d1c8	02:32
	I clearly commited tons of stuff	02:32
	but when I push it says everything up to date	02:32
	I want to push those changes to develop	02:33
ojacobson	> [detached HEAD ab558d9]	02:33
jpleau	bilb_ono: looks like you are not working on the develop branch	02:33
ojacobson	you're not on any branch, and unqualified 'git push' pushes branches only	02:33
bilb_ono	ah ok. git branch says * (HEAD detached from 8104488)	02:33
ojacobson	either be explicit or be on a branch (and then be explicit)	02:33
bilb_ono	so how do I get back onto develop, push my changes up	02:33
ojacobson	!reattach	02:33
gitinfo	Letters refer to !detached. (a) and (b): 'git checkout branchname' to continue working on another branch, or 'git checkout -b branchname' to start a new one here; (c) git am --continue; (d) git rebase --continue	02:33
	→ a_thakur joined	02:34
	← josuebrunel left	02:34
bilb_ono	if I just do a git checkout develop, I will loose the changes I just made no?	02:34
	oh like git reattach?	02:34
ojacobson	you should probably start by giving the current, anonymous branch a name (see above)	02:34
bilb_ono	does that make the changes I just made change to develop as well?	02:34
	ok how do I do that?	02:34
ojacobson	then, once it has a name and you can reason about it, decide how you want to integrate it into the upstream	02:34
bilb_ono	how would I rename by branch?	02:35
	or I guess this is just naming it	02:35
	← Sasazuka left	02:36
ojacobson	'git checkout -b some-name'	02:36
	will check out the current commit, creating a branch in the process	02:36
	→ AndroidVaan joined	02:36
ojacobson	s/a branch/a named branch/	02:36
_xor	He's saying that you should name the implicit branch that you're on, and then figure out what you want to do with it. For you, that sounds like you want to merge or rebase it to the develop branch.	02:37
bilb_ono	sure	02:37
	git checkout -b some-name won’t loose my changes because of the -b right	02:38
	because its a new branch	02:38
	and now that I do git checkout -b new-branch, how do I push new branch up to bitbucket?	02:39
	← AndroidVaan left	02:39
	← mmlb left	02:39
bilb_ono	when I do git status, there is nothing new added	02:39
	→ rkazak joined	02:41
	→ josuebrunel joined	02:42
	← d4rklit3 left	02:42
	← josuebrunel left	02:42
	→ AndroidVaan joined	02:42
_xor	ojacobson: Dumb question, but when doing a push --force from a new local branch, does that create a new branch on the remote if it doesn't exist?	02:43
	→ mangolisk joined	02:43
_xor	Oh, nevermind, found my answer.	02:43
	← moei left	02:43
	← mangolisk_ left	02:43
ojacobson	yes; push --force blindly copies the values of refs, ignoring any value already present if one _is_ present	02:44
_xor	ojacobson: I'm reading the man page and trying to figure out when to use --force and when to use --set-upstream.	02:45
ojacobson	I... I'm not sure I know how to help with that. They're so different that I can't imagine confusing the two, so I don't think I can reconstruct your mental state. :)	02:46
	Clearly they can be confused -- you just did -- so consider this a failure of my imagination, not of you	02:46
	← lolmac left	02:46
	← jeffreylevesque left	02:47
	← Bruce____ left	02:47
	→ harish_ joined	02:47
	← AndroidVaan left	02:47
_xor	Lol, no you're right. I just misread it hah.	02:47
ojacobson	_xor: 'git push --force remote foo:bar' blindly copies the 'foo' ref (or ref pattern) to the 'bar' ref (or ref pattern) in the repo 'remote'	02:47
	'git push --set-upstream remote foo:bar' non-blindly copies as above, and amends the repo's git-config to make bar the upstream branch, and remote the upstream remote, of the local foo branch	02:47
_xor	Ah ok, so it sounds like I'd probably want to use both then?	02:49
ojacobson	Depends on your goals	02:49
	← livingstn left	02:49
ojacobson	They're "just tools," so there's no generic advice to give besides "--force is a really big hammer, use --force-with-lease if you can"	02:49
	(and only use either if you have to)	02:49
_xor	The workflow I'm thinking of in my head is when I'm working in my local repo, create a new branch, make some changes & commit them. This new branch doesn't exist in the remote repo.	02:49
ojacobson	Creating a branch doesn't require --force	02:50
_xor	I want to push this new branch to the remote repo such that in the remote repo, it's created and the changes are accepted.	02:50
ojacobson	("Creating" a branch with --force runs a risk of overwriting someone else's branch)	02:50
	← xaa left	02:50
_xor	Yup, I'm not really wanting to use --force, just looking to understand it all better. I'm still pretty newbish.	02:50
	→ Es0teric joined	02:50
	aidalgol → e1f	02:51
	e1f → aidalgol	02:52
	← hexagoxel left	02:53
_xor	Ah ok, I was under the mistaken impression that the remote would flately refuse to accept a push to a branch that doesn't exist already.	02:53
ojacobson	By default, git will accept any push that ensures that all reachable objects remain reachable	02:53
	new branches can't possibly render objects unreachable, so they're accepted	02:54
	← italoacasas1 left	02:54
_xor	Ah ok, that makes sense.	02:54
	→ Goplat joined	02:54
	→ hexagoxel joined	02:54
_xor	Some of my initial confusion was coming from this: "In all these cases, you first have to explicitly push the new branch (git push <remote> <branch>), and some do require an upstream (git push -u <remote> <branch>)."	02:54
	I read another comment that said --force would be required, but that's obviously incorrect.	02:55
	← sdothum left	02:55
	← harish_ left	02:55
	← madewokherd left	02:55
	→ Bruce____ joined	02:56
	→ akiva joined	02:58
	← chachasmooth left	02:59
	→ chachasmooth joined	03:01
	→ Sasazuka joined	03:01
	→ nnyk joined	03:02
	→ mehola joined	03:02
	→ MattMaker joined	03:02
	← bilb_ono left	03:03
	→ bronson joined	03:04
	← albel727 left	03:04
	→ AndroidVaan joined	03:05
	← AndroidVaan left	03:05
	→ AndroidVaan joined	03:05
	← AndroidVaan left	03:05
	→ AndroidVaan joined	03:06
	← AndroidVaan left	03:06
	← watabou left	03:06
	→ AndroidVaan joined	03:07
	← diegoviola left	03:07
	← bronson left	03:09
	→ watabou joined	03:10
	← MattMaker left	03:11
	← chachasmooth left	03:11
	→ chachasmooth joined	03:12
	→ stantonk joined	03:16
	→ fuchstronaut joined	03:19
	← akiva left	03:20
	← whomp_ left	03:23
	← fuchstronaut left	03:23
	← radsy left	03:26
	→ gravitron joined	03:26
	→ whomp joined	03:28
	← username17 left	03:28
arahael	_xor: Consider also the case where you push a change, but someone else has already pushed a newer change to the same branch.	03:28
	→ fedexo joined	03:28
arahael	_xor: You absolutely don't want to be using --force in this case, as you'll loose changes.	03:29
	← Noldorin left	03:29
	← whomp left	03:32
	← Sasazuka left	03:33
	→ whomp joined	03:33
	← ensyde left	03:33
	← Nikesh left	03:33
	→ SteffanW2 joined	03:35
	← whomp left	03:38
	→ irqq joined	03:40
	→ username17 joined	03:41
	hwrdprkns → hwrd[away]	03:42
	→ whomp joined	03:43
	→ foodtooth joined	03:44
	← cyphase left	03:44
	→ bb010g joined	03:44
	gitinfo set mode: +v	03:44
	← nidr0x left	03:45
	← fscala left	03:46
	← foodtooth left	03:46
	← hwrd[away] left	03:47
	→ fscala joined	03:47
	→ MattMaker joined	03:49
	← CheckDavid left	03:52
	← axisys left	03:54
	→ cwong_on_irc joined	03:54
	→ knighthawk joined	03:54
	← SwiftMatt left	03:55
	← Joanna___ left	03:56
	→ Peter__ joined	03:57
	→ nevodka joined	03:58
	→ hwrdprkns joined	03:58
	← knighthawk left	03:58
	→ mikiones joined	03:58
	← ome left	03:58
	→ axisys joined	04:00
	← ariel_17 left	04:00
	← Peter__ left	04:01
	← Sleepy63 left	04:01
	← mellernoia left	04:02
	← sagerdearia left	04:02
	→ eletuchy joined	04:03
	← mikiones left	04:03
	← Tylak left	04:04
	→ sagerdearia joined	04:05
	← robotroll left	04:06
	← eletuchy left	04:07
	← Gamecubic_ left	04:08
	→ muthu joined	04:10
	→ cyphase joined	04:10
	→ _rht joined	04:11
	→ CEnnis91 joined	04:11
	→ rscata joined	04:13
	← cyphase left	04:15
	← SteffanW2 left	04:16
	← irqq left	04:17
	← timvisher left	04:20
	→ t-mart__ joined	04:21
	→ timvisher joined	04:21
	← MattMaker left	04:22
	→ Sleepy63 joined	04:22
	→ cagmz joined	04:22
	→ harish_ joined	04:22
	← SimonNaa left	04:23
	← harish_ left	04:24
	← t-mart_ left	04:24
	← robogoat left	04:25
	→ robogoat joined	04:25
	← stantonk left	04:26
	→ stantonk joined	04:26
	→ harish_ joined	04:27
	← stantonk left	04:28
	← Cabanossi left	04:28
	→ mohabaks joined	04:28
	← lindenle left	04:31
	→ Cabanossi joined	04:31
	← robogoat left	04:31
	→ SimonNa joined	04:33
	← peeps[lappy] left	04:33
	→ robogoat joined	04:34
	→ IWishIKnew joined	04:34
	← IWishIKnew left	04:35
	← a_thakur left	04:36
	→ a_thakur_ joined	04:36
	→ SwiftMatt joined	04:37
	← thiago left	04:39
	→ cyyuen joined	04:42
	← mohabaks left	04:42
	→ fracting joined	04:43
	→ whomp_ joined	04:44
	→ voice_of_me joined	04:44
	← whomp left	04:45
	→ ewet joined	04:45
	← arescorpio left	04:45
	→ caudill joined	04:47
	← FuzzySockets left	04:49
	← whomp_ left	04:49
	→ bilb_ono joined	04:51
	← dreiss left	04:52
	← caudill left	04:55
	→ IWishIKnew joined	04:55
	← timvisher left	04:55
	← rossome left	04:56
	→ timvisher joined	04:56
	→ mohabaks joined	04:56
	→ nitin_ joined	04:57
	→ circ-user-m8dfI joined	04:57
	← skylite left	05:00
	→ subhojit777 joined	05:01
	← nitin_ left	05:02
	→ skylite joined	05:03
	← Bruce____ left	05:05
	→ bronson joined	05:06
	→ Bruce____ joined	05:07
	→ sauvin joined	05:07
	← a_thakur_ left	05:07
	← bronson left	05:11
	← Bruce____ left	05:12
	← fracting left	05:12
	→ eletuchy joined	05:14
	→ fracting joined	05:14
	← mohabaks left	05:15
	← fracting left	05:15
	→ fracting joined	05:16
	→ thiago joined	05:16
	← gravitron left	05:16
	→ gravitron joined	05:16
	→ victortyau joined	05:18
	→ whomp joined	05:20
	← IWishIKnew left	05:20
	→ fuchstronaut joined	05:20
	→ inflames joined	05:21
	→ xaa joined	05:21
	← harish_ left	05:24
	← arooni left	05:25
	← fuchstronaut left	05:25
	← whomp left	05:26
	→ harish_ joined	05:27
	→ tvw joined	05:28
	→ IWishIKnew joined	05:28
	→ stantonk joined	05:28
	→ mohabaks joined	05:29
	← PryMar56 left	05:30
	→ d4rklit3 joined	05:30
	← cyyuen left	05:30
	← IWishIKnew left	05:31
	← fahadash left	05:32
	→ a_thakur joined	05:33
	← timvisher left	05:34
	← stantonk left	05:34
	→ BrunoSaboia joined	05:34
	← weox left	05:34
	→ timvisher joined	05:34
	→ cyphase joined	05:36
	← nnyk left	05:36
	← BSaboia left	05:37
	← mohabaks left	05:38
	← tyreld left	05:40
	← d4rklit3 left	05:43
	→ rossome joined	05:44
	→ Macaveli joined	05:45
	← cagedwisdom left	05:46
	→ albel727 joined	05:46
	→ phaleth joined	05:48
	→ xelxebar_ joined	05:50
	← grawity left	05:50
	→ cagedwisdom joined	05:50
	← serapath left	05:51
	→ grawity joined	05:51
	→ abyx joined	05:52
	← bilb_ono left	05:52
	← grawity left	05:54
	→ freimatz joined	05:54
	→ grawity joined	05:55
	→ knighthawk joined	05:55
	← mauzilla left	05:56
	→ mikiones joined	05:59
	← aidalgol left	05:59
	← hwrdprkns left	06:00
	← dermoth left	06:00
	← ahr3n left	06:00
	← knighthawk left	06:00
	→ dermoth joined	06:00
	→ algun joined	06:01
	→ ciampix joined	06:02
	→ s841 joined	06:02
	← fracting left	06:02
	← mikiones left	06:03
	→ emPi joined	06:04
	← s84 left	06:04
	← Es0teric left	06:05
	→ dineshp joined	06:05
	→ drbean_ joined	06:06
dineshp	People who contribute to the git repo itself, which email client do you use to import/send patches to the git mailing list?	06:06
	← Olipro left	06:07
	← drbean left	06:07
	→ cyan__ joined	06:07
	← timvisher left	06:08
dineshp	I assume a commandline based email client would make the process of working with patches easier	06:08
	→ timvisher joined	06:09
grawity	I think most people just use git-send-email	06:09
	← voice_of_me left	06:09
	← przemoc left	06:10
sangy	dineshp: git-send-mail is usually the best way to go	06:11
	→ drbean joined	06:11
sangy	dineshp: also check git-format-patch.	06:11
	send-email*	06:11
	→ przemoc joined	06:12
	→ solars joined	06:12
dineshp	git-send-mail is used to send the patch to the mailing list, but what about importing patches from your inbox? I have a gmail account and what I do is to view the source of the email in gmail and save the file as a .mbox file to import it	06:13
	Is there a better way?	06:13
	→ drbean- joined	06:13
sangy	dineshp: I use mutt for that	06:13
	← Strout left	06:13
	→ dotpot joined	06:13
grawity	dunno what clients the maintainers use, but as long as it can export messages to mbox-ish files, passing those through `git am` should work	06:13
	→ Joanna___ joined	06:13
nevyn	fetchmail?	06:14
	← neonKow left	06:14
nevyn	or offlineimap (does gmail still do imap?	06:15
	← drbean_ left	06:15
	→ ksinkar joined	06:15
nevyn	it does	06:15
	→ drbean_ joined	06:15
grawity	I'd go with Mutt tbh	06:15
	← drbean left	06:15
nevyn	mutt is overkill.	06:16
grawity	and fetchmail isn't.	06:16
	→ nnyk joined	06:16
ksinkar	I had a big repository and I was happily splitting it into smaller repositories using the git subtree command, when suddenly the git command stopped identifying my mother repo on the local machine as a valid git repo. After that I am not unable to push changes from my other unrelated git repos to the remote git servers. How do I debug this?	06:17
nevyn	grawity: fetchmail is probably worse but offline imap is probably the sweet spot.	06:17
	← drbean- left	06:18
nevyn	http://www.offlineimap.org/doc/use_cases.html#sync-from-gmail-to-a-local-maildir-with-labels	06:18
ksinkar	edit "am not unable" -> "am unable"	06:18
dineshp	Another question, so when sending an email using git-send-mail, it asks for the email and password for authentication, but sometime back gmail switched to 2 factor/stage login process as the default, so git-send-mail fails to authenticate with the gmail servers. I found a workaround by enabling "legacy login" through gmail. Is there a way to get git-send-mail to work with 2 factor/stage login for gmail?	06:18
nevyn	ksinkar: can you still clone it?	06:18
	← tpollard left	06:19
sangy	So, Junio seems to use Gnu's	06:19
	the other maintainers i can't see their UA string	06:19
dineshp	sangy: thanks, i'll checkout gnu's as well	06:20
nevyn	dineshp: use a credential store and setup a application password for it	06:20
	→ Strout joined	06:20
	→ lamppid joined	06:20
ksinkar	nevyn: clone a new repo? No I can't. It seems to be a credential problem that suddenly arose	06:21
dineshp	nevyn: any pointers to some guide/article explaining this process as I am not familiar with it?	06:21
	→ fuchstronaut joined	06:21
ksinkar	I can see in my bash history the last time the git command worked as expected.	06:21
	→ dreiss joined	06:22
sangy	dineshp: https://support.google.com/accounts/answer/185833?hl=en	06:22
nevyn	dineshp: http://stackoverflow.com/questions/5343068/is-there-a-way-to-skip-password-typing-when-using-https-on-github/5343146#5343146	06:23
	that's for https.. but it works for imap too.	06:23
	dineshp: oh.. which bit? app passwords or a credential store?	06:23
	→ acolson joined	06:23
	← harish_ left	06:23
nevyn	sangy's url is for the former (guess) mine is for the latter	06:24
sangy	unintended teamwork	06:24
dineshp	nevyn: thanks	06:24
	sangy: thanks	06:24
	→ harish_ joined	06:25
	← fedexo left	06:25
	← fuchstronaut left	06:26
nevyn	ksinkar: how many git repo's are you dealing with here?	06:26
	← SimonNa left	06:27
nevyn	dineshp: if you're recieving a lot of patches then a local imap client or clone tool might be handy	06:27
	→ Es0teric joined	06:27
	→ jrmiah joined	06:29
ksinkar	nevyn: around 20. Another observation: I am able to push to github, but the problem seems to persist for gitlab. Also, while doing subtreeing, we generally pull from the repo on our local filesystem 'git pull ../frameworks pascal'. This was working and then it suddenly stopped working. It gives me 'repo does not exist or I have insufficient rights error'. Same issue with remote gitlab server as well. I am not able t	06:29
	o push code changes to the remote gitlab server.	06:29
	→ mase-tech joined	06:30
nevyn	pull?	06:30
	→ barduck joined	06:30
	← mase-tech left	06:30
	← sangy left	06:31
nevyn	if you have any local changes that's going to get... interesting	06:31
	!pull	06:31
gitinfo	pull=fetch+merge (or with flags/config also fetch+rebase). It is thus not the opposite of push in any sense. A good article that explains the difference between fetch and pull: http://longair.net/blog/2009/04/16/git-fetch-and-merge/	06:31
jrmiah	how many questions do you guys get for something thats easy in other SCMs? like .. i have a commit that needs merged with remote .. and boy that sure seems simple .. why is git tough?	06:31
nevyn	jrmiah: most people don't read any of the docs.	06:31
	operating git based on a flawed model of what it's doing ends badly.	06:32
	once you know how it works. which requires a passing familiartiy with the internal data structures things are actually really simple	06:32
	jrmiah: some people like !book I personally prefer !gcs	06:33
gitinfo	jrmiah: 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	06:33
	jrmiah: [!concepts] "Git Concepts Simplified" explains the basic structures used by git, which is very helpful for understanding its concepts. http://gitolite.com/gcs.html	06:33
	→ PCatinean joined	06:33
jrmiah	is that the right place to start?	06:33
	I mean some of us have been in silicon software engineering using things like perforce that while they dont allow offline interaction, rule git in every other way for usage.	06:34
	not debatable thats just a fact.	06:34
	yes I get it .. its a local atomic version of scm .. yay! its only better than SVN its not a good model for a small team is it?	06:34
nevyn	git's ui is a horror.. it's author has publicly stated that if he were stranded on a island and the only way to get off the island was to build a graphical ui he'd die there.	06:34
	← cyan__ left	06:35
ksinkar	nevyn: this is what I was doing (http://stackoverflow.com/questions/359424/detach-subdirectory-into-separate-git-repository/17864475#17864475). I have done this many times before, but this time it seems some configuration file has changed that my access is suddenly being denied.	06:35
grawity	it's getting better	06:35
	...slowly.	06:35
	→ Alienpruts joined	06:35
jrmiah	ney: 'gits authoer"? Linus? yeah Ive been using linux since 2.2	06:35
nevyn	grawity: I'm not sure about that the reflog is really useful in practial use. but nonsense unless you understand the DAG	06:36
jrmiah	see, git was developed because of Linus's problem: he had to merge 200 commits a day to the kernel from arbitrary sources and somehow keep track of which versions those diffs went to. Makes sense to make a pretty good distributed system. But what are you lunatics using this shit for to develop a website with 4 guys for? haha	06:36
	sorry just venting ;)	06:36
nevyn	jrmiah: sure. but it's eating the world (for better or worse)	06:36
grawity	nevyn: what do you mean, not useful in practical use	06:37
osse	the reflog is useful if you need to use rebase --onto	06:37
jrmiah	nevyn: http://stackoverflow.com/questions/449541/how-do-you-merge-selective-files-with-git-merge	06:37
	→ radsy joined	06:37
grawity	nevyn: are you saying people should just not make mistakes in the first place?	06:37
jrmiah	is that really the answer to something that's a one liner with a 'unified' scm?	06:37
	← timvisher left	06:37
jrmiah	grawity: yes he is	06:37
	grawity: he has a beard too	06:37
nevyn	understanding the contents of the reflog requires understandingwhat it is. (a history of where HEAD has been)	06:37
	→ timvisher joined	06:38
nevyn	which requires understanding what HEAD is.	06:38
	which requires knowlege of the DAG	06:38
	→ shmuli joined	06:38
nevyn	and how commits are attomic and that's why wen you commit --amend you get a entry in the reflog	06:39
	gravitron: ^^	06:39
	ugh sorry	06:39
	grawity: ^^	06:39
	← NeverDie left	06:40
nevyn	jrmiah: so the right answer is that commits should be atomic and then it's a simple matter of getting the required commits.	06:40
	→ NeverDie joined	06:40
jrmiah	http://stackoverflow.com/questions/449541/how-do-you-merge-selective-files-with-git-merge	06:40
	yeah .. well actually its more like this: deal with commits in a way that still gives you a lot of granularity. Folks that use client-server systems just dont think that way..	06:41
nevyn	you can't have certain garuntees that git provides AND arbitary file merging behaviors into other branches	06:41
jrmiah	you guys avoid the 'remove a file from a commit' problem probably by having 20 commits for 10 files in an hour right?	06:41
	→ zeroed joined	06:41
nevyn	jrmiah: because I signed of commit X to file A B and C which implements feature Y	06:42
jrmiah	no its just that unlike other SCMs git doesnt allow for files to be managed easily within a commit .. a commit is king I think	06:42
nevyn	if you merged b and c missing A and it's busted...	06:42
	or if you missed a prerequisite commit in my tree that's your problem too	06:42
	jrmiah: commits are IMMUTABLE	06:43
jrmiah	yup, which is _sound_	06:43
	and how all other systems are too	06:43
nevyn	nope	06:43
	well	06:43
jrmiah	so .. commit is a commit in any SCM, true	06:43
nevyn	in git commits are universally immutable	06:43
jrmiah	yup .. i think that kinda solves it	06:44
	→ nitin_ joined	06:44
jrmiah	the problem being that remote and local out of wack leads to learning a whole base of lore thats needless	06:44
	just for merging - thats broken	06:44
nevyn	so..	06:44
	← shmuli left	06:44
nevyn	if you want	06:44
jrmiah	so... whats the benefit heh	06:44
	offline, local committing?	06:44
	i have that in my IDE heh	06:44
nevyn	and imo preferable..	06:44
	is to rebase private trees onto public trees	06:45
	→ MrWoohoo joined	06:45
jrmiah	well its all well and good mna	06:45
nevyn	and this is still a merge.	06:45
jrmiah	and a million 25 year old ruby programmers cant be wrong	06:46
nevyn	I did say it's eating the world ;)	06:46
	← nnyk left	06:46
jrmiah	insanity	06:46
	i think you will see that while yeah .. a16z bought into it .. this wont last long	06:46
	this is _terrible_ for small teams not doing mass merges	06:46
	from random sources. the worst in fact.. Im convinced they just dont know better	06:47
osse	I work in a small team and have no problems	06:47
nevyn	jrmiah: it's got some benefits.	06:47
osse	wait, what are we discussing?	06:47
nevyn	jrmiah: offline is nice (A copy on my laptop / in the test env /blah)	06:48
	← abyx left	06:48
nevyn	jrmiah: most small orgs end up using a central server model rather than a peer to peer model	06:48
	→ cyan__ joined	06:49
nevyn	either bitbucket/github or a hosted solution such as github appliance, gitolite, or gitlab	06:49
	jrmiah: the interactions of the graph in peer to peer get scary.	06:49
	→ kareeoleez joined	06:49
	→ shmuli joined	06:50
	→ voice_of_me joined	06:50
kareeoleez	I have a branch "setup" and "master". I usually do some changes in "Setup" and then push them, then checkout "master" and merge setup. I realised I can also do rebase setup. What is the difference between rebase and merge ?	06:50
	Is it wrong to do a rebase in master always ?	06:50
nevyn	5 people in the team 5! remote relationships	06:50
dineshp	Where can I access the logs for this channel(so I can view the past conversations without logging it myself)?	06:51
osse	kareeoleez: https://raw.githubusercontent.com/Osse/git-stuff/master/merge-vs-rebase.txt	06:51
nevyn	!log	06:51
gitinfo	[!irclog] Public logs of #git are kept at: http://colabti.org/irclogger/irclogger_log/git or look at stats for the last 30 days: http://itvends.com/irc/git.html or since Jan 1, 2012: http://itvends.com/irc/git-all.html	06:51
	← kadoban left	06:51
dineshp	*sorry to interrupt	06:51
nevyn	ooh that was neat	06:51
kareeoleez	what is the common way to do this?	06:52
jrmiah	baloney: thanks for the insights..	06:52
	← nitin_ left	06:52
jrmiah	nevyn: thanks for convo was just venting	06:52
kareeoleez	I just want master to be updated with the latest commits always	06:52
	→ nitin_ joined	06:52
jast	!merge_vs_rebase	06:52
gitinfo	[!merge_or_rebase] For a detailed discussion of the dis-/advantages of merge and rebase, and when to best use which, see: https://coderwall.com/p/ny1hia -- and here's how Linus explains which one to use: http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html	06:52
osse	sounds like you want rebase	06:52
	→ JeroenT joined	06:52
	← cagmz left	06:53
jrmiah	nevyn: fact is that I cant even ask you for quick help with mine and my buddy's merge stuff cuz honestly its all abotu the state of a tree - it will take 30 minutes to resolve I guarantee	06:53
	→ jceb joined	06:53
jrmiah	nevyn: so whats the command for pave push? -f ? I've had that erally screw stuff up before	06:53
kareeoleez	osse: thanks for the references	06:53
	→ againcode joined	06:53
	→ weox joined	06:53
nevyn	jrmiah: so there are two things I'd say	06:53
	jrmiah: use more branches. and write more commits (not too many)	06:54
jrmiah	exactly	06:54
nevyn	jrmiah: have a look at !gitflow	06:54
gitinfo	jrmiah: The description of the gitflow branch workflow model is at http://nvie.com/posts/a-successful-git-branching-model/ while a tool to help implement this workflow is at https://github.com/petervanderdoes/gitflow See http://sethrobertson.github.com/GitBestPractices/#workflow for other workflow suggestions/references	06:54
	← JeroenT left	06:54
jrmiah	thats the thing that our convo helped with ... and its stuff I know but no one will typically take their local branch 'serious' because its not pushed to main yet	06:54
	→ pantsman- joined	06:55
jrmiah	thats just normal for people using every other SCM for 20 years heh. its not even my fault. Then you go to push your local commit (err ok whatever) and its completely insane what has to be done.	06:55
nevyn	jrmiah: one of the challenges is that git is a raw mechanism which doesn't dictate aything about workflow	06:55
	you really do need one	06:56
	→ SimonNa joined	06:56
nevyn	but git doesn't provide out of the box a workflow for working with multiple repos	06:56
	← duderonomy left	06:56
nevyn	you can pick one (the kernel have one using lots of humans)	06:56
	but in the same way 'don't break the build' was the catchcry of traditional scm's forever	06:57
	→ Sceorem joined	06:57
nevyn	'don't forcemerge and push ancient shit into the canonical repo' is the git version	06:57
	jrmiah: force push is particularly nasty	06:58
	jrmiah: get back from 4 weeks off git pull && git push -f makes everyone want to stab you.	06:59
	→ Fijit joined	06:59
jrmiah	and I can even tell you why :)	07:00
	see I dont like it cuz I understand it ;)	07:00
	→ JeroenT joined	07:00
nevyn	jrmiah: rebase private repos merge public repos	07:01
	← zeroed left	07:01
nevyn	jrmiah: so. options	07:01
osse	actually, if the pull goes without a hitch then there shouldn't be any difference between push and push -f	07:01
nevyn	osse: 4 weeks off...	07:01
osse	yes...	07:02
nevyn	you just rewrote the cannonical repo with 4 weeks ago plus a giant merge of everything in the last 4 weeks and your work	07:02
	← dreiss left	07:02
	→ Brain joined	07:02
	← nitin_ left	07:02
osse	yes...	07:03
	there doesn't have to be any "rewritey" about it	07:03
	→ dan2k3k4 joined	07:03
nevyn	oh right so you get a new merge commit on top	07:05
	but eww.	07:05
	nevyn likes rebase ;)	07:05
	← victortyau left	07:05
	← harish_ left	07:06
arahael	nevyn: what's wrong with merges?	07:06
osse	there are much worse things: the other day I had to help a colleague because one of his collaborators had apparently done a pull, but made a copy of all the file and then replaced them when finishing the merge. effectively doing a -s ours	07:06
	→ victortyau joined	07:06
	→ ubuntu joined	07:07
	ubuntu → Guest12711	07:07
	← dineshp left	07:08
	← barduck left	07:10
	← shmuli left	07:10
	→ fracting joined	07:11
	← Es0teric left	07:12
	← cyan__ left	07:13
	← The_Rebel_G0d left	07:14
	→ The_Rebel_G0d joined	07:14
nevyn	arahael: mostly I don't like the effect on bisect	07:14
	osse: that's common	07:14
arahael	what effect is that?	07:15
	← fracting left	07:15
nevyn	bisect on a linear history is a thing of beauty.	07:15
	← againcode left	07:15
nevyn	bisect on a more 'correct' merge history can be horrible	07:16
	→ Gonzo89 joined	07:16
	→ againcode joined	07:16
	→ ki0 joined	07:16
	→ josuebrunel joined	07:17
	→ nnyk joined	07:18
	→ [Brain] joined	07:18
	→ ayaz joined	07:19
	← lamppid left	07:20
	→ ahmedelgabri joined	07:20
	← Brain left	07:21
	→ lamppid joined	07:21
SporkWitch	is it possible to pull with interactive rebase? it doesn't seem to like the -i flag...	07:21
jast	no, it's not	07:22
osse	wasn't that added recently=	07:22
	→ fuchstronaut joined	07:22
nevyn	SporkWitch: at that point just fetch & rebase -i ?	07:22
SporkWitch	grrr	07:22
osse	SporkWitch: it's fixed in 2.8.0	07:23
SporkWitch	osse: is that available packaged for debian or am i building from source?	07:23
osse	i don't know	07:23
SporkWitch	because being able to do a pull with interactive rebase, that would make my life much easier right now	07:23
	→ testild joined	07:23
osse	there are probably .debs somewhere.	07:24
	if not, the setting up an alias to do fetch and rebase is probably easier	07:24
SporkWitch	how would the procedure differ? i didn't think fetch actually grabbed any data? sorry, still pretty new to the more advanced features of git, learning it as i go	07:26
osse	SporkWitch: pull = fetch + merge	07:26
	SporkWitch: pull --rebase = fetch + rebase	07:26
	← voice_of_me left	07:26
SporkWitch	i have a file i rewrote about 70% of, butt had a hotfix upstream that i need	07:26
	ah, ok	07:26
osse	fetch is the one that actually retrieves data	07:26
SporkWitch	ah, ok	07:27
	← fuchstronaut left	07:27
	← Goplat left	07:27
SporkWitch	so doing fetch and then rebase -i would be the same as pull with interactive rebase	07:27
osse	yes	07:27
	assuming you just want 'git pull -i' and not 'git pull -i otheremote fancybranch'	07:28
	→ fracting joined	07:28
SporkWitch	nope, i'm on my feature branch, and i want to rebase it to the current head of release/testing	07:28
	so then i would just either squash or pick everything (and pick on the one listed on bottom, the most recent commit) and update the comment to summarize all the changes, yes?	07:29
	← threeminutemonta left	07:35
	→ voice_of_me joined	07:36
	→ d4rklit3 joined	07:37
	← nnyk left	07:38
	← pantsman- left	07:41
	← staticshock left	07:42
	← wviana left	07:42
	→ MattMaker joined	07:45
	→ bruce_lee joined	07:46
	→ Darcidride joined	07:48
	→ ffio joined	07:48
	→ mikiones joined	07:48
	← circ-user-m8dfI left	07:53
	→ circ-user-m8dfI joined	07:54
	→ Balliad joined	07:54
	← Sazhen86 left	07:55
	→ encod3 joined	07:57
	← theskillwithin left	07:57
	→ Jellyg00se joined	07:57
	→ fees joined	07:58
	→ knighthawk joined	07:59
	→ xcesariox joined	08:00
	→ jbitdrop joined	08:02
	← rossome left	08:02
	→ trudko joined	08:02
	← encod3 left	08:03
trudko	Hi, how can I setup filters in git ? something like this http://pastie.org/10813247. Is this what git config is for? if yes how would the command look like exactly ?	08:03
	→ encod3 joined	08:04
	← josuebrunel left	08:04
	→ josuebrunel joined	08:05
	→ bongjovi joined	08:05
	→ radsy_ joined	08:05
	← thiago left	08:05
	← radsy_ left	08:05
	→ nnyk joined	08:06
trudko	ou nvm i can paste it into ~/.gitconfig I did realize thats the folder with the config	08:06
	← d4rklit3 left	08:07
	→ afuentes joined	08:08
	← cagedwisdom left	08:08
	← radsy left	08:08
	→ metalraiden joined	08:10
	→ _pix joined	08:11
	→ chll joined	08:11
	→ rossome joined	08:12
	→ Shashikant86 joined	08:13
	→ nilg joined	08:14
	→ ahmed_elgabri joined	08:15
	bongjovi → ZGD	08:16
	→ nilg` joined	08:16
	← nilg left	08:16
	→ Raging_Hog joined	08:17
	← ahmedelgabri left	08:18
	→ sathya joined	08:18
	← nilg` left	08:19
	→ LiohAu_ joined	08:20
	→ bollullera joined	08:20
	← timvisher left	08:20
	← a_thakur left	08:21
LiohAu_	Hey guys, someone has started a "feature branch" and has pushed it on the main repo, how do I get this branch and complete it ?	08:21
	→ ferr joined	08:21
	→ timvisher joined	08:21
selckin	what does complete it mean	08:21
LiohAu_	selckin: I want to add some stuff, and share what I added with the branch author	08:21
	but I won't finish that feature	08:22
	→ intelly joined	08:22
selckin	git fetch; git checkout -b localbranchname origin/branch-name	08:22
LiohAu_	I have done this : "git pull origin feature-branch-name" should I undo this?	08:22
	→ fuchstronaut joined	08:23
selckin	probably	08:24
	→ tlaxkit joined	08:24
selckin	pull = fetch + merge (or rebase)	08:24
	← subhojit777 left	08:24
	→ Rish joined	08:25
	→ FuzzySockets joined	08:25
	← CrypticGator left	08:25
	← tvw left	08:25
	→ dcpc007 joined	08:26
LiohAu_	selckin: so you mean that if I push, I will send the merge of the branch on the branch that was active locally ?	08:27
	→ a_thakur joined	08:27
	← fuchstronaut left	08:27
	← josuebrunel left	08:28
	← ahmed_elgabri left	08:28
	← cybernite left	08:28
	→ Anupkumar joined	08:29
	→ jottr joined	08:30
	← MattMaker left	08:30
	→ marcogmonteiro joined	08:30
	→ acton joined	08:30
	→ t4nk531 joined	08:31
	gitinfo set mode: +v	08:31
	→ troulouliou_div2 joined	08:31
	← jottr left	08:31
	→ jottr joined	08:31
t4nk531	Does anyone use git-shell? How do you set umask for this shell? Whenever files are pushed to the repository, files under the subfolders in Objects are created with permissions 444 causing subsequent commits to fail.	08:33
ksinkar	LiohAu_: yes	08:33
LiohAu_	ksinkar: ok so how do I undo what I did ?	08:33
ksinkar	LiohAu_: what branch are you on now?	08:34
LiohAu_	"develop"	08:34
	→ lindenle joined	08:34
ksinkar	do you have any local changes on develop?	08:34
LiohAu_	git status says : On branch develop Your branch is ahead of 'origin/develop' by 4 commits. (use "git push" to publish your local commits)nothing to commit, working directory clean	08:35
	so I guess I have no local changes, right?	08:35
	and here are my branches : https://gist.github.com/LiohAu/71d538dd9bff055478581f7996d30e13 (if that helps)	08:36
	→ mar77i joined	08:37
	→ harish_ joined	08:37
	← lindenle left	08:38
	← mikiones left	08:38
	→ staticshock joined	08:38
ksinkar	An easier way out of this mess is to check out my comment on your gist.	08:39
	→ ahmed_elgabri joined	08:39
	→ jimi_ joined	08:41
LiohAu_	ok	08:41
	ksinkar: so git checkout change the active branch right?	08:43
	← Darcidride left	08:43
	→ ncd\|leeN joined	08:44
	← staticshock left	08:44
	→ ahr3n joined	08:44
LiohAu_	ksinkar: also what is the difference between doing "git checkout feature-branch-name" and "git checkout remotes/origin/feature-branch-name" ?	08:45
	← robbyoconnor left	08:45
	← timvisher left	08:45
	→ robbyoconnor joined	08:46
	→ timvisher joined	08:46
	← SimonNa left	08:46
	← Macaveli left	08:48
	← jimi_ left	08:48
	→ jimi_ joined	08:48
	→ Rish_ joined	08:48
	← intelly left	08:48
	→ clarens joined	08:50
	← jaguarmagenta left	08:50
	← Rish left	08:51
	→ subhojit777 joined	08:51
	← eletuchy left	08:52
	→ Macaveli joined	08:52
	→ IndigoTiger joined	08:53
	→ CheckDavid joined	08:53
	→ whomp joined	08:53
	→ eletuchy joined	08:54
	← metalraiden left	08:54
	→ metalraiden joined	08:54
	→ rominronin joined	08:55
	→ strk joined	08:55
	→ dineshp joined	08:57
	→ mahendra_ joined	08:58
	← mahendra_ left	08:58
	← whomp left	08:58
LiohAu_	ok I understood that I needed to add a "-b feature-branch-name" with the 2nd syntax	08:58
	← Macaveli left	09:00
	← jimi_ left	09:02
	← ferr left	09:03
	→ moei joined	09:04
	← dineshp left	09:04
	← CEnnis91 left	09:06
	→ mase-tech joined	09:06
	← jottr left	09:06
	→ King_Hual joined	09:08
	→ randomgry joined	09:08
	← eletuchy left	09:09
	→ whomp joined	09:10
	→ mrkat joined	09:10
	← timvisher left	09:11
	→ timvisher joined	09:11
	→ Macaveli joined	09:11
	← elementalest left	09:11
	→ elementalest joined	09:12
	→ isxek joined	09:12
	← randomgry left	09:13
	← isxek left	09:13
strk	does "git push" also push annotated tags ?	09:14
	← nevodka left	09:14
strk	or is there any way to push only annotated tags with no light tags ?	09:14
	← whomp left	09:14
	→ eletuchy joined	09:14
	→ irqq joined	09:15
	→ fuchstronaut joined	09:15
	→ isxek joined	09:15
	← Joanna___ left	09:16
	← SwiftMatt left	09:18
	← _rht left	09:20
	← Sceorem left	09:20
	← knighthawk left	09:20
	→ wxg joined	09:22
	← fracting left	09:23
	→ clmsy joined	09:25
solars	quick question: I need to revert an older commit, and I'd like to extend it before adding it again - how can I get the changes of this commit into a separate (uptodate) branch?	09:25
	→ aidalgol joined	09:26
	← doppo left	09:28
	→ redasus joined	09:29
	→ redasus2 joined	09:30
	→ stantonk joined	09:32
solars	nevermind, I'll do it in 2 commits	09:33
	→ lindenle joined	09:35
	← mattfoo left	09:36
	← stantonk left	09:36
	→ doppo joined	09:36
	← johnwhitton left	09:36
strk	rebase -i	09:36
	use "e" for edit	09:36
	← voice_of_me left	09:37
	→ mdw joined	09:37
strk	"how can I get the changes of this commit into a separate (uptodate) branch?" <-- using `git cherry-pick <that_commit>` from the uptodate branch	09:37
	→ fracting joined	09:39
	← mehola left	09:39
	← lindenle left	09:39
	← timvisher left	09:40
	→ staticshock joined	09:41
solars	thanks strk	09:41
	→ timvisher joined	09:41
	→ josuebrunel joined	09:41
	← doppo left	09:41
	→ Rish joined	09:45
	→ dsdeiz joined	09:45
	← Rish_ left	09:45
	← cdg left	09:45
	← staticshock left	09:45
	← grift left	09:47
	→ johnny56_ joined	09:47
	← Rish left	09:47
	→ SwiftMatt joined	09:47
	→ mikiones joined	09:47
	→ grift joined	09:49
	→ Olipro joined	09:49
	← johnny56 left	09:49
	← metalraiden left	09:49
	→ digidog joined	09:50
	→ mattfoo joined	09:50
	→ doppo joined	09:52
	← clarens left	09:52
	← cwong_on_irc left	09:53
	→ ManDay joined	09:53
	→ clarens0000 joined	09:53
ManDay	Little oops: I git commit -a'ed, then `git checkout @^ some/file`. Expectation: Replaced some/file in the working tree by the old version. Reality: `git diff` shows nothing. Did I break somethiing?	09:54
	← isxek left	09:54
	← jceb left	09:54
	→ krnex joined	09:55
	→ cyan__ joined	09:55
ManDay	Uhm well, `git status` says that some/file is modified, as I'd have expected.	09:56
	But why does that not show up in `git diff` ?	09:56
	→ acetakwas joined	09:57
	← clarens0000 left	09:57
	→ cwong_on_irc joined	09:57
	← redasus2 left	09:58
	← redasus left	09:58
	← doppo left	09:58
	→ klear joined	10:00
	← mkoskar left	10:01
	← Shashikant86 left	10:02
	← acetakwas left	10:04
	→ isxek joined	10:04
	→ Borkr joined	10:05
	← klear left	10:06
	→ acetakwas joined	10:06
	← MrWoohoo left	10:06
	← King_Hual left	10:06
	→ Sceorem joined	10:07
osse	ManDay: diff --staged	10:08
	← cwong_on_irc left	10:08
	← cyan__ left	10:09
	← JeroenT left	10:09
ManDay	Osse: So git checkout ... some/file automatically added some/file?	10:09
	→ kits joined	10:09
osse	yes	10:10
	git status tells you this	10:10
	→ bronson joined	10:10
	← timvisher left	10:10
	→ cyan__ joined	10:10
	→ doppo joined	10:10
	→ timvisher joined	10:11
	← victortyau left	10:11
t4nk531	I'm using sharedrepository = true but files are still being created with 444 permissions	10:12
	~/.bashrc has umask 002 but I'm not convinced that git-shell uses .bashrc	10:12
	→ Yarne joined	10:12
	→ Lomex joined	10:13
arahael	t4nk531: it doesn't. but it still inherits the env.	10:13
	→ sgambino joined	10:13
t4nk531	arahael: Have I missed some setting somewhere then?	10:13
	Additionally, the folder has the owner and group to the git-shell user	10:14
	^owner and group set to the git-shell user	10:14
	← bronson left	10:15
	← fracting left	10:15
	← doppo left	10:16
	← mdw left	10:16
arahael	wow, the man page is hard to jnderstand on this topic.	10:17
t4nk531	The man page isn't particularly helpful	10:17
arahael	what does umask say?	10:17
t4nk531	I've set umask to 002 in .bashrc but I'm not sure that's what's read by git-shell	10:18
arahael	no, run "umask"	10:18
	→ MadHatter42 joined	10:18
osse	is it a bare repo that people push to ?	10:18
t4nk531	I can't read umask from the user because it's using git-shell	10:18
	→ raijin joined	10:18
arahael	t4nk531: irrelevant.	10:18
t4nk531	It's a bare repo that other users will push to	10:18
	arahael: You can't get an interactive shell with git-shell	10:18
	← ki0 left	10:18
arahael	ah. you're right, sorry.	10:18
osse	do they all push as the same user?	10:19
t4nk531	arahael: It's why I can't find out if it's reading .bashrc (which I'm pretty sure it's not)	10:19
	→ ki0 joined	10:19
t4nk531	They do push as the same user, osse	10:19
osse	then what does it matter?	10:19
	you may want to set the sticky bit on some dirs	10:19
arahael	t4nk531: man git-shell looks hopeful. you could perhaps source it explicitly.	10:20
gitinfo	t4nk531: the git-shell manpage is available at http://jk.gs/git-shell.html	10:20
t4nk531	Because all files are currently created 444	10:20
osse	and?	10:20
t4nk531	Files within the Object/subfolder/files are created 444	10:20
	← ykrons left	10:20
t4nk531	The user can't overwrite their own files	10:20
osse	they won't ever be overwritten	10:20
t4nk531	So subsequent push commands say 'Permission denied'	10:21
osse	that's strange	10:21
t4nk531	When I chmod 774 -R the objects folder, then they can push	10:21
	← ahr3n left	10:21
osse	O don't think it's a permission problem on objects/xy/abc though	10:21
	→ CrypticGator joined	10:21
t4nk531	Until new files are created, and then it's the permission error again	10:21
	→ rdvdet joined	10:22
	→ jstimm joined	10:23
	→ mdw joined	10:24
	→ jceb joined	10:25
t4nk531	osse: If not a permissions issue, in the object folder, what do you reckon it could be?	10:25
	← eletuchy left	10:26
	→ Shashikant86 joined	10:26
	→ radsy joined	10:26
	→ Isla_de_Muerte joined	10:27
	← josuebrunel left	10:27
	→ attila_ joined	10:28
	← sgambino left	10:29
	→ ki0_ joined	10:29
	→ fracting joined	10:30
	← againcode left	10:30
	← NwS left	10:30
	← ki0 left	10:32
	← dan2k3k4 left	10:34
	→ NwS joined	10:35
	← Shashikant86 left	10:35
_ikke_	anything in .git/refs	10:36
	packs	10:36
	→ redasus2 joined	10:36
	→ redasus joined	10:36
jast	pack files are not usually updated during a push	10:36
_ikke_	Right	10:36
	← Isla_de_Muerte left	10:37
	→ mehola joined	10:39
	→ st0opkid joined	10:39
t4nk531	_ikke_: Nothing in refs that doesn't have r/w access to the user	10:40
	→ mischat joined	10:42
	→ mandrex joined	10:42
	← Anupkumar left	10:43
	← mandrex left	10:43
	← mehola left	10:44
	← ki0_ left	10:44
	→ doppo joined	10:45
comps	what's the safe way of repacking on the server-side? .. just repack (creating duplicate packs) and git-pack-redundant at a later date?	10:45
	← fracting left	10:45
comps	I seem to remember that repack -a caused a race-condition	10:45
	→ jimi_ joined	10:49
	→ Linkandzelda joined	10:50
	→ dan2k3k4 joined	10:50
	→ JeroenT joined	10:51
	→ ki0 joined	10:51
	→ jaguarmagenta joined	10:51
	← JeroenT left	10:52
	← gniourf left	10:52
	→ Shashikant86 joined	10:52
	← ahmed_elgabri left	10:53
	→ eletuchy joined	10:54
	← doppo left	10:54
	← boombatower left	10:55
	→ al-damiri joined	10:55
	→ ahmed_elgabri joined	10:55
	← jaguarmagenta left	10:56
	→ johnmilton joined	10:56
	← eletuchy left	10:58
	→ gniourf joined	10:58
	← ki0 left	11:00
osse	t4nk531: What about the objects/xy dirs themselves?	11:00
	← jefus left	11:00
	← circ-user-m8dfI left	11:01
	← Lomex left	11:02
	→ fracting joined	11:02
	← jceb left	11:02
	→ jefus joined	11:03
	← ewet left	11:03
	← Shashikant86 left	11:04
	← aidalgol left	11:05
	← a_thakur left	11:07
	→ JeroenT joined	11:07
	→ a_thakur joined	11:07
	→ pwnawannab[NE] joined	11:07
	→ pwnawannab_ joined	11:07
	→ Lomex joined	11:09
	← JeroenT left	11:09
	→ JeroenT joined	11:09
	→ ewet joined	11:11
Linkandzelda	hi, im quite new to git. i forked a repo and added/changed/restructured some code, then the repo i forked had some changes and new code added. can i use git to bring those changes into the fork and still keep my additions/changes/restructuring?	11:11
canton7	Linkandzelda, https://help.github.com/articles/syncing-a-fork/	11:11
Linkandzelda	thanks	11:12
	→ doppo joined	11:13
	← SwiftMatt left	11:14
	→ Novitsh joined	11:14
	← krnex left	11:14
	← Lomex left	11:14
	← realz left	11:15
	→ mdw_ joined	11:15
	← encod3 left	11:15
	→ krnex joined	11:15
	← wxg left	11:17
	← ffio left	11:18
	→ krnex1 joined	11:18
	← timvisher left	11:18
	→ jceb joined	11:18
	← mdw left	11:18
	→ timvisher joined	11:19
	→ ki0 joined	11:19
	← doppo left	11:19
	← krnex1 left	11:19
	→ ffio joined	11:19
	← krnex left	11:20
	← bsanford left	11:20
	→ krnex joined	11:21
	← fuchstronaut left	11:23
zZap-X	is git merge the hardest part of git to figure out?	11:24
frogonwheels_	zZap-X: !git	11:25
	errm.	11:25
	zZap-X: !simple	11:25
gitinfo	zZap-X: At its heart git is made up of many concepts that are individually simple. Getting the whole picture right is often tricky, and it is usually about breaking up the complex concept into its simple, individual parts and grokking those. Both !bottomup and !cs will help with that.	11:25
frogonwheels_	zZap-X: Rebase is potentially.	11:25
	→ doppo joined	11:25
	→ chris64 joined	11:25
	→ otho joined	11:25
zZap-X	i am learning git as a single user, i can imagine things could get complicated if there are 100 developers working on the same project?	11:25
frogonwheels_	zZap-X: or n-way merges. or rerere :)	11:26
chris64	hi. Altough I know that this channel is about git mainly.. Do you know if there's a way to update a github pull request if the corresponding branch was deleted?	11:26
frogonwheels_	zZap-X: git scales pretty well. learning to use it in a small group gives you a pretty good insight into using it in a large group.	11:27
	← st0opkid left	11:27
frogonwheels_	chris64: have you tried on #github ??	11:28
	→ rnsanchez joined	11:28
chris64	frogonwheels_: Oh, I tried ##github only. Thank you!	11:29
frogonwheels_	zZap-X: My tip is to learn to make good commits in git. My preferred way is commit early, commit often and !sausage make the branch to look good.	11:29
gitinfo	zZap-X: [!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	11:29
	← nnyk left	11:29
zZap-X	am i right in thinking, that _BEFORE_ anything you do, always do a: git status ?	11:30
bremner	it doesn't hurt, but it depends what you are doing	11:31
	→ bilb_ono joined	11:31
bremner	for example, not much point before running "git add -p"	11:31
zZap-X	aye ok	11:31
	← doppo left	11:31
bremner	before running "git commit -a", definitely. But I'd also say avoid git commit -a	11:32
zZap-X	there are 3x parts to git, [WORKING DIRECTORY] + [STAGING] + [HISTORY]	11:32
	→ doppo joined	11:32
	→ knighthawk joined	11:33
zZap-X	if i modify a file in working directory and commit the change, does GIT overwrite the file or does GIT edit the change in the file?	11:33
grawity	neither	11:33
zZap-X	it snapshots / commits and goes into HISTORY	11:33
	← ciampix left	11:33
grawity	yes – it copies a whole new snapshot into the history	11:33
zZap-X	so it takes a snapshot of the file and that is stored in the .git database	11:33
grawity	yes	11:33
zZap-X	ok	11:34
	so that means .git repos could get quite big over time?	11:34
grawity	possibly, but every now and then individual objects get packed	11:34
zZap-X	oh compressed?	11:34
grawity	yeah	11:34
zZap-X	oh thats good	11:34
grawity	with delta-compression, .git/objects usually ends up like 1% or 0.1% of its original size	11:35
zZap-X	wow nice	11:35
grawity	I don't remember which, I measured it a few months ago, but I forgot	11:35
zZap-X	i wonder what clever guy invented git	11:35
grawity	the same guy who invented linux	11:35
zZap-X	:D	11:35
osse	jesus?	11:35
zZap-X	god	11:35
grawity	linux.git is around 1.3 GB, at least my copy	11:36
	→ mizu_no_oto joined	11:36
zZap-X	so in the old days there was subversion but that only had 1 central repro	11:36
	but git is distributed	11:36
	so git is designed for scale	11:37
grawity	git isn't the first DVCS – it was inspired by bitkeeper; there was also monotone (which was seriously slow though); and mercurial got created at roughly the same time as git	11:37
zZap-X	ok	11:37
	→ lb joined	11:37
	← knighthawk left	11:37
	← lb left	11:37
	→ lb joined	11:37
grawity	ah yeah and bzr	11:37
	→ nnyk joined	11:37
grawity	not that anyone cares about bzr anymore	11:38
	← Sceorem left	11:38
zZap-X	when i was creating websites a few years ago, i had another directory for website testing, etc with different version of files named v1, v2, v3, a proper mess	11:38
	← LiohAu_ left	11:38
	gitinfo set mode: +v	11:38
zZap-X	now i can have a master and devel branch	11:38
	← doppo left	11:38
zZap-X	do some testing in devel branch, then once im happy merge the changes into master :D	11:39
	→ doppo joined	11:39
zZap-X	can git be used to make the repro have remote access without using github? so i could git clone my source code onto another box?	11:41
chris64	frogonwheels_: no one there atm	11:41
	→ josuebrunel joined	11:41
grawity	zZap-X: yeah, you can clone any repo directly	11:42
zZap-X	ace, so if you want private repos you dont need to use github and have a private account	11:42
grawity	well, for multi-user stuff you still want something like gitolite or gogs; makes configuration easier	11:42
zZap-X	oh yeah	11:42
grawity	but for personal ones, plain old SSH will do	11:42
zZap-X	ive heard of gogs, looks goo	11:42
	good	11:42
grawity	as in, `git clone myserver:path/to/repo`	11:43
zZap-X	looks identical to github	11:43
	ok, so i can use ssh to clone a repo	11:43
grawity	(there's also Gitlab, BitBucket, etc.)	11:43
	→ Shashikant86 joined	11:43
	→ encod3 joined	11:43
zZap-X	yep, i heard gitlab is dog slow	11:43
grawity	it actually is	11:43
arahael	gitosis or the like, too.	11:43
grawity	I thought gitosis was dead	11:44
zZap-X	gogs looks good if i wanted to ever get social lol	11:44
grawity	anyway, yeah, the "git@github.com:foo/bar" addresses are just SSH	11:44
	and cloning over HTTP is just git-http-backend	11:44
	→ dv_ joined	11:44
	→ sgambino joined	11:44
zZap-X	i think its nice to see a graphical view of all the commits and branches	11:44
dv_	hi	11:45
zZap-X	but not essential	11:45
	← Shashikant86 left	11:45
grawity	for that, local tools often do a better job	11:45
	like tig or gitk	11:45
zZap-X	oh ok	11:45
dv_	after rebasing my branch, I like to compare the rebased version with the upstream version of that branch to see that rebasing didnt break anything. however, other changes may have happened upstream.	11:45
	I know what commits contain these changes. and I compare the rebased version with the upstream one by using git diff scratch/<branch>..<branch>	11:46
	is it somehow possible to "reverse-apply" certain commits to the output of git diff scratch/<branch>..<branch> ?	11:46
	so that I do not see these changes?	11:46
	← mizu_no_oto left	11:47
	← timvisher left	11:48
	→ timvisher joined	11:49
	← jstimm left	11:49
	← t4nk531 left	11:51
	→ gechr joined	11:51
	→ ThomasLocke joined	11:52
	← doppo left	11:53
	← mdw_ left	11:53
	→ kristofferR joined	11:54
	→ luke_penn joined	11:55
	→ mdw joined	11:55
	→ Lomex joined	11:56
	← Macaveli left	11:57
	→ zarel joined	11:58
	→ Darcidride joined	11:58
	→ mikiones_ joined	11:58
	← josuebrunel left	11:59
	→ josuebrunel joined	11:59
	← ki0 left	11:59
	← mikiones_ left	11:59
	→ mikar joined	11:59
	← mikiones left	11:59
	→ _rht joined	12:00
	→ mikiones joined	12:00
	zZap-X wonders if Linus Torvalds has got angry with developers using Git the incorrect way	12:01
grawity	well not much	12:01
	→ ki0 joined	12:02
grawity	Git doesn't have much of "the correct way" in its design	12:02
zZap-X	aye ok	12:02
	← solars left	12:02
	→ italoacasas joined	12:02
grawity	well there are some things, but generally it was just written as a "data tracking" thing with VCS commands glued on top of it	12:02
osse	dv_: you want to undo your own work=	12:03
grawity	(see also 'cogito')	12:03
osse	?	12:03
	← josuebrunel left	12:03
	→ gechr_ joined	12:05
	→ Debyte joined	12:05
	→ threeminutemonta joined	12:05
strk	dv_: rewriting history ?	12:06
	dv_: or see git revert	12:06
	← gechr left	12:07
	gechr_ → gechr	12:07
	→ lindenle joined	12:08
	← otho left	12:08
	→ shymega joined	12:08
	→ st0opkid joined	12:09
	→ Sceorem joined	12:09
	← lindenle left	12:10
	→ sdothum joined	12:10
	→ mbrzuzy joined	12:10
	→ peroht joined	12:10
	→ doppo joined	12:11
	← Guest12711 left	12:11
	→ josuebrunel joined	12:11
	← CheckDavid left	12:12
	→ bronson joined	12:12
	→ synthroid joined	12:13
	← ksinkar left	12:15
	→ rwb joined	12:16
	← doppo left	12:16
	← bronson left	12:17
	→ doppo joined	12:17
	← timvisher left	12:17
	→ timvisher joined	12:18
	→ rafalcpp joined	12:18
	← sgambino left	12:19
	→ Wysi joined	12:19
	→ mkoskar joined	12:20
	→ elsevero joined	12:20
	← zarel left	12:21
	← Jellyg00se left	12:21
	→ rafalcpp_ joined	12:22
	← doppo left	12:22
	→ ht joined	12:22
	← a_thakur left	12:23
	→ doppo joined	12:23
	→ fuchstronaut joined	12:23
	← rafalcpp left	12:23
	← ewet left	12:23
k-man	how do i update my local branch so my local changes get moved to be after the latest commites on origin/master? (and what is this process called?)	12:26
	← trudko left	12:26
selckin	git rebase origin/master	12:26
	→ toogley joined	12:27
	← fuchstronaut left	12:28
k-man	ok that's what I was doing, but I think i have another problem, i changed the name of the branch but i need to somehow update that on the remote	12:28
	← ncd\|leeN left	12:28
selckin	push new branch, delete remote one	12:28
k-man	http://sprunge.us/JFSi	12:28
	← jimi_ left	12:28
	← ki0 left	12:29
	→ ewet joined	12:29
selckin	think you want the bottom one	12:29
ivan_on_trac	I want to see only the modified lines of each file in each commit. I do not want the author metadata.	12:29
	→ otho joined	12:30
selckin	git log --pretty:format:	12:31
	git log --pretty=format:	12:31
	→ Gamecubic joined	12:31
	→ ki0 joined	12:32
bremner	orly?	12:32
	→ a_thakur joined	12:32
selckin	k-man: read up on setting remote tracking branch	12:32
k-man	selckin, ok thanks	12:32
bremner	selckin: I get a whole lotta blank with that	12:33
selckin	bremner: add -p	12:33
bremner	selckin: right, good.	12:33
	← st0opkid left	12:33
	→ st0opkid joined	12:34
	→ nikolai_ joined	12:35
	→ josue joined	12:35
	← doppo left	12:35
nikolai_	"gitk --author=Foo" seems to also show the parent (but "git log --author=Foo" not) - is this a bug? https://paste.kde.org/pqmps02fe/e49omd/raw	12:36
	→ doppo joined	12:36
	← josuebrunel left	12:36
	josue → josuebrunel	12:36
sathya	hi. I did a rebase after making two fixup commits to the same previous commit. then I get this "It looks like you may be committing a cherry-pick. If this is not correct, please remove the file .git/CHERRY_PICK_HEAD and try again." message when running "git rebase --continue". what does it mean? am I about to throw one commit away?	12:36
ivan_on_trac	selckin: But I want to see the changed lines.	12:37
	← siaw left	12:37
sathya	is it not possible to make multiple fixups to the same commit prior to the same "rebase -i --autosquash"?	12:37
selckin	ivan_on_trac: add -p	12:37
	→ ariel_17 joined	12:40
	← st0opkid left	12:40
	→ st0opkid joined	12:40
	→ bitkiller joined	12:40
	→ mehola joined	12:41
	← doppo left	12:41
	← ayaz left	12:41
sathya	or it may be that I did two fixups to two different commits, but the second fixup addresses farther back to a sha that has changed after the rebase has reached it?	12:41
	I'm really guessing at random stuff here.	12:41
	→ doppo joined	12:42
	→ eletuchy joined	12:42
selckin	or you aborted a cherry-pick incorrectly last week	12:42
	→ MarkyC joined	12:44
sathya	I never did a cherry-pick.	12:44
	sathya aborted the rebase. it seems something's messy with my fixups.	12:44
	← raijin left	12:45
	← timvisher left	12:45
	→ timvisher joined	12:46
	→ axelitus joined	12:46
	sathya tries to fixup and rebase them one at a time and gain insight.	12:46
	← mehola left	12:46
	→ crose joined	12:47
	← eletuchy left	12:47
	← st0opkid left	12:48
	→ sto0pkid joined	12:48
	← radsy left	12:48
	→ livingstn joined	12:48
	← sto0pkid left	12:48
	→ fuchstronaut joined	12:49
	← ariel_17 left	12:50
	← livingstn left	12:50
	← doppo left	12:51
	→ algae joined	12:52
	→ doppo joined	12:52
	→ m8 joined	12:52
	→ jaguarmagenta joined	12:52
sathya	meh, works when I do them one at a time. so the lesson learned is that I should probably commit --fixup in the order that they address commits backwards in history.	12:54
	← bilb_ono left	12:55
	← subhojit777 left	12:55
	← jaguarmagenta left	12:56
	→ abyx joined	12:58
	← kristofferR left	12:59
	← abyx left	12:59
	← rscata left	13:00
	← doppo left	13:01
	→ bsanford joined	13:01
	→ cwong_on_irc joined	13:01
	→ doppo joined	13:02
	← algae left	13:03
	→ kam270 joined	13:03
	← kam270 left	13:03
	← bsanford left	13:04
	→ ariel_17 joined	13:04
	→ kam270 joined	13:04
	→ crameth joined	13:04
	← crameth left	13:04
	→ crameth joined	13:04
	→ newjersey joined	13:05
	→ CEnnis91 joined	13:05
	← kam270 left	13:05
	← WayToDoor left	13:05
	→ kam270 joined	13:06
	→ JagaJaga joined	13:06
	← peroht left	13:06
	→ madewokherd joined	13:06
	← timvisher left	13:07
	← doppo left	13:07
	← strk left	13:07
	→ timvisher joined	13:07
	→ doppo joined	13:08
	→ wviana joined	13:08
	→ stantonk joined	13:08
	→ nnyk_ joined	13:09
	→ confusedguy joined	13:09
	← wviana left	13:09
	→ wviana joined	13:09
	← mustmodify left	13:09
	gitinfo set mode: +v	13:10
confusedguy	hi everyone, does anyone know if there's a way to check if a merge was done fastforwardly or with --no-ff?	13:11
	← otho left	13:11
osse	confusedguy: if a merge was a fast-forward there won't be any trace of it.	13:11
	if there is a merge commit but one of the branches has no unique commits then it must have been --no-ff.	13:12
	otherwise, you cannot tell.	13:12
confusedguy	hmm	13:12
	← nnyk left	13:12
confusedguy	so if it was with fast-forward the branch log won't show any additional commit, right?	13:12
	the "target" branch, I mean	13:13
	→ TriXLegacy joined	13:13
tobiasvl	well it will show the commits that were merged in, but nothing else, yes	13:13
	← stantonk left	13:13
	← rnsanchez left	13:13
confusedguy	thank you guys	13:14
	← slappymcfry left	13:14
	← doppo left	13:14
	→ sgambino joined	13:15
	← TriXLegacy left	13:15
confusedguy	something weird happened here the other day, I merged my dev branch with no-ff into my master, but github and teamcity won't show the commits that were merged	13:15
	→ jimi_ joined	13:16
	→ diegoaguilar joined	13:16
	← mostlybadfly left	13:16
	→ rnsanchez joined	13:17
tobiasvl	you pushed your master?	13:17
confusedguy	yes	13:17
osse	!lol	13:18
gitinfo	A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	13:18
	← JagaJaga left	13:18
tobiasvl	and github/teamcity accepted the push? it didn't reject it because it was a non-ff?	13:18
	!repro if you still have the output (maybe not since it was "the other day")	13:19
gitinfo	[!transcript] Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see	13:19
confusedguy	it was yesterday, i'll try it out	13:19
	← al-damiri left	13:19
	← nnyk_ left	13:19
	→ jakwong joined	13:20
	← italoacasas left	13:20
	→ nnyk_ joined	13:20
tobiasvl	(when I say that the remote might have rejected because it was non-ff, I don't mean that your merge was no-ff, but that the push would lead to a no-ff merge on the remote…)	13:20
	anyway, hard for us to know, see if you can dig up the output or reproduce	13:20
	→ italoacasas joined	13:21
	← a_thakur left	13:21
	→ neonKow joined	13:21
	→ aspiers_ joined	13:21
	← elsevero left	13:22
	→ elsevero joined	13:22
	→ a_thakur joined	13:22
	→ Macaveli joined	13:22
	← neonKow left	13:23
	→ victortyau joined	13:24
confusedguy	couln't get the output, I'll try and reproduce	13:24
	→ zeroed joined	13:26
	→ a_thakur_ joined	13:26
	→ doppo joined	13:27
confusedguy	hey man, thanks again, gotta go	13:27
	bye	13:27
	← confusedguy left	13:28
	← timvisher left	13:29
	→ a_thaku__ joined	13:29
	← josuebrunel left	13:29
	→ timvisher joined	13:29
	→ a_thak___ joined	13:30
	← a_thakur left	13:30
tobiasvl	aight	13:31
	→ Xooi joined	13:31
	→ bremner joined	13:32
	← bremner left	13:32
	→ bremner joined	13:32
	→ sanketdg joined	13:33
	→ chitopunk joined	13:33
	← chitopunk left	13:33
	→ chitopunk joined	13:33
	← chitopunk left	13:33
	→ chitopunk1 joined	13:33
	← chitopunk1 left	13:33
	← a_thakur_ left	13:33
	→ chitopunk joined	13:33
	← Xooi left	13:33
	← a_thaku__ left	13:34
	← gechr left	13:35
	→ eletuchy joined	13:36
	← zeroed left	13:37
	→ otho joined	13:37
	← cwong_on_irc left	13:39
texasmynsted	anybody use git reset —soft very often?	13:39
selckin	never	13:39
	→ russo joined	13:39
i7c	sometimes	13:39
texasmynsted	It just pulls the last commits back as local changes, right?	13:39
i7c	It resets HEAD without changing index or working tree.	13:40
	Which renders the difference as "changes to be committed"	13:40
	→ augustold joined	13:40
	→ douglascorrea joined	13:40
texasmynsted	are the changes staged?	13:41
	← Macaveli left	13:41
i7c	yup	13:41
	← eletuchy left	13:41
	→ Dougie187 joined	13:41
	← russoneto left	13:42
	→ abyx joined	13:42
	russo → russoneto	13:42
	← threeminutemonta left	13:42
	→ Macaveli joined	13:42
	→ mehola joined	13:43
	← augustold left	13:43
	← Wysi left	13:44
	→ Wysi joined	13:44
	→ youser joined	13:47
	← mehola left	13:48
	← netcarver left	13:48
	← mischat left	13:48
	→ mischat joined	13:49
	← timvisher left	13:51
	→ timvisher joined	13:51
	← mdw left	13:52
	← Sonderblade left	13:53
	← Raging_Hog left	13:54
	→ dhollinger joined	13:54
	← rwb left	13:54
	→ rwb joined	13:55
	→ davisonio joined	13:58
	→ josuebrunel joined	13:58
lb	texasmynsted more on reset and the manipulation options with it can be viewed in this talk. https://www.youtube.com/watch?v=V7RIvj9tB64 slides are here: https://speakerdeck.com/schacon/a-tale-of-three-trees	13:58
	← bremner left	13:58
	→ bremner` joined	13:58
	→ fmcgeough joined	13:58
	← bremner` left	13:58
	→ bremner` joined	13:58
texasmynsted	:-) Thank you	13:59
	← mattfoo left	13:59
	← bremner` left	14:01
	→ bremner joined	14:01
	← bremner left	14:01
	→ bremner joined	14:01
	→ ash_workz joined	14:01
	→ IWishIKnew joined	14:01
	→ mizu_no_oto joined	14:02
	← JeroenT left	14:03
	← bremner left	14:03
	→ bremner joined	14:03
	← bremner left	14:03
	→ bremner joined	14:03
	← algun left	14:04
	→ mattfoo joined	14:05
	← ewet left	14:05
	← a_thak___ left	14:05
jokke	hi	14:05
	← testild left	14:06
	→ Sonderblade joined	14:06
jokke	i kind of messed up my history by trying to keep it linear using rebase on a branch. Is it somehow possible to merge only unique and missing commits from another branch	14:06
	← youser left	14:07
	→ JeroenT joined	14:07
	→ threeminutemonta joined	14:07
	← mizu_no_oto left	14:08
	← ash_workz left	14:09
	← clmsy left	14:10
groundnuty	hey, I'm having tround understaiding the -all flag in fetch	14:10
	I have a bare repo. I do it fetch --prune --tags --all	14:11
	and I would expect that all tangs/brances will be updated	14:11
	→ lindenle joined	14:11
groundnuty	what I get is just one line: * branch HEAD -> FETCH_HEAD	14:11
	→ Gonzo89_ joined	14:11
groundnuty	insted when I did git fetch origin +refs/heads/:refs/heads --tags --prune	14:12
	it worked	14:12
	I thought that --all will cover all refspecs	14:12
	→ mizu_no_oto joined	14:12
	← Gonzo89 left	14:12
	→ blue_lizzard joined	14:14
	→ bronson joined	14:14
	← troulouliou_div2 left	14:14
	← fbwnd left	14:14
	→ stantonk joined	14:15
	← timvisher left	14:15
	→ a_thakur joined	14:15
tobiasvl	all remotes	14:15
	← stantonk left	14:15
tobiasvl	--all: Fetch all remotes.	14:15
groundnuty	tobiasvl: yes I did read the manual :)	14:15
tobiasvl	hehe. all righty.	14:15
	→ timvisher joined	14:15
	← mizu_no_oto left	14:15
	← lindenle left	14:15
groundnuty	I'm just saying it's not working as expected :(	14:15
	or I miss something	14:16
	→ stantonk joined	14:16
	← italoacasas left	14:16
	→ nZac joined	14:16
	→ subhojit777 joined	14:16
groundnuty	git fetch origin ':' --tags --prune, should be the same as git fetch --all --tags --prune, yes?	14:17
	→ ncd\|leeN joined	14:17
nZac	I am trying to pull down all the tags for a specific repo on Github. I see the tag on the site but the tags is not appearing in my local list of tags. Any thoughts?	14:17
	→ italoacasas joined	14:18
	← bronson left	14:18
tobiasvl	groundnuty: hmmmmmm let's see if !fetch4 is relevant	14:20
gitinfo	groundnuty: [!fetchfour] [pre 1.8.4 only] We recommend against using 'git fetch/pull <remote> <refspec>' (i.e. with branch argument), because it doesn't update the <remote>/<branch> ref. The easy way to fetch things properly is to get everything: 'git fetch' or 'git pull' are sufficient if you have one remote; otherwise we recommend 'git fetch <remote>' (plus 'git merge <remote>/<branch>' if you wanted to pull/merge).	14:20
tobiasvl	maybe not	14:20
	but maybe for nZac	14:20
	nZac: what command did you run?	14:20
nZac	tobiasvl: git fetch <remote> --tags	14:20
groundnuty	no no no guys	14:21
	← stantonk left	14:21
groundnuty	I started with clone --bare	14:21
	got a bare repo	14:21
	i call git fetch --all --tags --prune	14:21
	and changes are not fetched	14:21
nZac	tobiasvl: when I run git fetch --all --tags I get the tags from a different remote, while in this case that works, I was trying to get them from the upstream not my fork.	14:22
	→ col joined	14:22
nZac	Are tags only connected to the "origin" remote. My understanding was the "origin" remote name had no special meaning.	14:22
	← kareeoleez left	14:23
	→ ferr joined	14:23
	→ guampa joined	14:23
	← inflames left	14:23
	→ espindola joined	14:24
i7c	jokke, git will notice if commits don't introduce changes and will ask you if you want to skip them or make them empty commits when doing rebase or cherry-pick.	14:24
	→ stantonk joined	14:24
i7c	jokke, however, if you apply them in different order it might get all screwed up. :)	14:25
	That is, some patches might not be applicable.	14:25
	jokke, how exactly did you mess up the history?	14:26
javaJake	Hey guys. Is there a way to ask git to apply the difference between two commits as a commit on my current branch?	14:26
jokke	meh i just merged with --squash	14:26
javaJake	git diff hash1..hash2 \| git apply #?	14:26
	→ j`ey joined	14:26
	→ anli_ joined	14:26
j`ey	is there an easy way to use the hashes from git reflog and look at the changes to a certain file?	14:27
anli_	git filter-branch --tree-filter 'git rm --cached .;git add .' -- HEAD gave me the error message fatal: bad revision 'rm', why?	14:27
i7c	j`ey, git show <hash>:file	14:27
	← fuchstronaut left	14:27
i7c	ah changes	14:27
j`ey	Ill just script the output of git reflog	14:27
i7c	j`ey, git show <hash> -- file	14:28
j`ey	nvm	14:28
i7c	what?	14:28
grawity	anli_: if you're running this from Windows cmd.exe/powershell, only " " will work	14:28
anli_	Ah, must run from bash	14:28
i7c	j`ey, git show $(git branch@{7}) -- file	14:28
	← nnyk_ left	14:28
grawity	bash accepts both kinds of quotes, cmd.exe only single quotes	14:28
i7c	derp	14:28
grawity	er, only double quotes	14:28
	j`ey: git reflog -p	14:28
i7c	without the $() ofc	14:29
	I'm being silly right now.	14:29
j`ey	grawity: cool thanks	14:29
	should have guessed -p	14:29
	→ troulouliou_div2 joined	14:29
	→ al-damiri joined	14:30
	← a_thakur left	14:30
anli_	Running git filter-branch --tree-filter 'git rm --cached -r .;git add .' -- HEAD from bash, did not get any error message but I did not get rid of an ignored file	14:30
	← mrkat left	14:30
anli_	Does git add need a recursive flag as well?	14:30
	→ eletuchy joined	14:31
selckin	tracked files are never ignroed	14:31
anli_	But they become untracked when I git rm --cached -r .	14:31
	→ jstimm joined	14:31
selckin	possibly	14:32
anli_	Why possibly?	14:32
selckin	globally ignored? .git/info/exclude?	14:32
anli_	...	14:32
	My problem is that a file that should be ignored by the .gitignore file is not	14:33
selckin	and when did you add it to gitignore, in the first commit?	14:33
	→ fstd joined	14:33
anli_	yes	14:33
	→ Kicer86 joined	14:34
	← timvisher left	14:34
	← eletuchy left	14:35
	→ timvisher joined	14:35
	← j`ey left	14:35
	← troulouliou_div2 left	14:36
	← stantonk left	14:36
	→ ash_workz joined	14:36
	← redasus2 left	14:38
	→ kpease joined	14:38
	← IWishIKnew left	14:39
	← redasus left	14:39
	→ a_thakur joined	14:40
	→ sangy joined	14:40
	← crameth left	14:41
	← elsevero left	14:42
anli_	git filter-branch -f --tree-filter 'git rm --cached -r .' seems to not alter the tree	14:42
	→ elsevero joined	14:42
selckin	this my remove-from-history script: git filter-branch --index-filter "git rm --cached --ignore-unmatch ${pattern}" --tag-name-filter cat -f -- --all	14:43
	← lss9 left	14:43
	→ stantonk joined	14:44
	→ solars joined	14:44
anli_	It seems like git filter-branch stages all unstaged files automatically for every commit	14:44
	→ staticshock joined	14:44
	← mbrzuzy left	14:45
solars	can anyone tell me why git mergetool -t kdiff3 returns without opening kdiff3 and I still have an incomplete merge left? what does that mean?	14:45
	← Macaveli left	14:45
selckin	no output?	14:45
solars	nope	14:46
	← dotpot left	14:46
solars	I have the merge files left (.BACKUP, .orig, etc)	14:46
	→ troulouliou_div2 joined	14:47
selckin	are you sure you still have a conflict, sometiems kdiff3 can automerge it where git can't, then it doesn't open the gui	14:47
solars	I thought the files disappear then?	14:47
	do I have to mark it?	14:47
	→ hobodave joined	14:47
puff	Hm,I have this nifty line in my .bash_profile some my shell prompt always shows me what branch I'm in. I'd like to add a bit that shows me how long it's been since I did a git pull on that branch.	14:47
	← deavid left	14:47
	→ bilb_ono joined	14:47
solars	selckin, ^	14:48
	→ shiriru joined	14:48
selckin	solars: no they stay	14:48
puff	Is there an existing shell script for that?	14:48
selckin	solars: git status will tell you	14:48
solars	selckin, git status shows the .orig etc files - how can I complete the merge now?	14:48
selckin	puff: there a million fancy git prompts on google, one might have something like that	14:48
	← staticshock left	14:49
puff	selckin: Thanks.	14:49
	→ nidr0x joined	14:49
	→ A8316-Guest joined	14:49
	→ deavid joined	14:49
	← Wysi left	14:49
selckin	solars: status will say if something is still in conflict state, if its just the .orig file untracked etc, you can ignroe that and just merge --continue (or commit)	14:49
puff	Anyone use IDEA's git support? I tried it out the other night, but there appears to be no IDEA equivalent of "git status" other than browsing through the file hiearchy pane (and expanding all of your hierachries).	14:49
	← anli_ left	14:49
	← nidr0x left	14:49
	→ mostlybadfly joined	14:49
	→ gsingh joined	14:49
solars	selckin, its BACKUP BASE REMOTE LOCAL orig	14:50
selckin	puff: alt-9 i think	14:50
	← a3Dman left	14:50
selckin	solars: if you can redo the merge and compare status before and after mergetool you will see (i think)	14:50
	← shiriru left	14:50
	← elsevero left	14:50
solars	selckin, hm okay	14:51
	→ justinqblake joined	14:53
	→ jaguarmagenta joined	14:53
	→ efco joined	14:53
	→ nnyk_ joined	14:54
	← justinqblake left	14:54
	← cyan__ left	14:54
	→ knighthawk joined	14:54
	→ a3Dman joined	14:54
	→ mbrzuzy joined	14:55
	← fragMent1 left	14:55
	→ kilo_bravo joined	14:55
	→ chrisshattuck joined	14:55
	← solars left	14:55
	← gsingh left	14:55
	← acolson left	14:55
	← timvisher left	14:55
	→ Thorn__ joined	14:55
	→ timvisher joined	14:56
	→ racket joined	14:56
	→ fragMental joined	14:56
	← kam270 left	14:57
	→ Noldorin joined	14:57
fragMental	I wanted to amend the second-last commit, so I did `git stash; git reset --hard HEAD^; git stash apply; git commit --amend; git stash drop` now I'm kind of stuck on how to apply the last commit again. I did `git log` before all this, so I have the sha of it, I just don't know which command to use.	14:57
	← AndroidVaan left	14:57
	← Thorn left	14:57
	← jaguarmagenta left	14:57
	← troulouliou_div2 left	14:57
	← A8316-Guest left	14:57
selckin	cherry-pick it	14:58
	← nnyk_ left	14:58
selckin	and next time, create a new commit with the changes you want to amend, and use rebase -i to combine it with the previous commit	14:59
puff	selckin: Thanks.	14:59
	→ nnyk_ joined	14:59
	← subhojit777 left	14:59
	→ bango2 joined	14:59
	← crose left	14:59
	← jceb left	15:00
	→ wrouesnel1 joined	15:01
	← lamppid left	15:03
	← synthroid left	15:04
	→ johnwhitton joined	15:04
	← chrisshattuck left	15:05
	← madewokherd left	15:07
	← MarkyC left	15:08
	← ThomasLocke left	15:09
	→ MarkyC joined	15:09
fragMental	selckin: Thank you!	15:09
	→ todd_dsm_w joined	15:10
	← todd_dsmw left	15:10
	← todd_dsm_w left	15:10
	→ todd_dsm_w joined	15:11
	→ todd_dsm joined	15:11
	→ ki0_ joined	15:11
	← Debyte left	15:11
	← todd_dsm_w left	15:11
	→ mdw joined	15:11
	← todd_dsm left	15:11
	→ Raging_Hog joined	15:11
	→ todd_dsm joined	15:12
	→ lindenle joined	15:12
	→ WayToDoor joined	15:12
	← kpease left	15:13
	← Sceorem left	15:14
	← ki0 left	15:14
	← Alienpruts left	15:14
	→ h12o joined	15:14
	← timvisher left	15:15
	← ki0_ left	15:15
	← JeroenT left	15:15
	→ mrkat joined	15:16
	→ thiago joined	15:16
	→ ki0 joined	15:16
	→ solars joined	15:17
	→ staticshock joined	15:17
	← lindenle left	15:17
	→ timvisher joined	15:17
	← threeminutemonta left	15:17
	← shymega left	15:18
	→ ki0_ joined	15:19
	← ki0_ left	15:19
	← ki0 left	15:19
	→ gsingh joined	15:20
	→ ki0 joined	15:20
	← _rht left	15:20
	→ Bruce____ joined	15:20
	← nnyk_ left	15:20
	→ redasus2 joined	15:21
	→ redasus joined	15:21
	← a_thakur left	15:24
	→ deadnull joined	15:24
	← davisonio left	15:24
	→ eletuchy joined	15:25
	← Bruce____ left	15:25
	→ infra-red joined	15:26
	→ nnyk_ joined	15:26
	→ MrWoohoo joined	15:26
	← ki0 left	15:27
i7c	selckin helps ALL the people? \o/	15:27
	→ fuchstronaut joined	15:28
	→ davisonio joined	15:29
	← eletuchy left	15:29
	← Eryn_1983_FL left	15:30
	← [Brain] left	15:30
	← kits left	15:30
	← MadHatter42 left	15:30
	→ Euus joined	15:31
	← Balliad left	15:32
	→ dreiss joined	15:32
	← fuchstronaut left	15:32
	← dan2k3k4 left	15:33
	→ akushner joined	15:33
	← diegoaguilar left	15:35
	← Euus left	15:36
	← Raging_Hog left	15:37
	← timvisher left	15:37
	→ timvisher joined	15:37
	→ Tylak joined	15:39
	← infra-red left	15:39
	→ kogol joined	15:39
	→ a_thakur joined	15:39
	→ Macaveli joined	15:39
	← solars left	15:40
	→ shymega joined	15:40
	← blue_lizzard left	15:40
	← Macaveli left	15:40
	→ solars joined	15:41
	← kogol left	15:42
	← deadnull left	15:42
	← ariel_17 left	15:43
	← redasus left	15:43
	← redasus2 left	15:43
	→ tyreld joined	15:44
	→ mehola joined	15:45
	→ synthroid joined	15:45
	→ IWishIKnew joined	15:47
	→ diegoaguilar joined	15:47
	→ lindenle joined	15:48
	← stantonk left	15:48
	→ ueberall joined	15:48
	← a_thakur left	15:49
	← mehola left	15:49
	→ Macaveli joined	15:50
	← gsingh left	15:50
	→ whomp joined	15:51
	→ cwong_on_irc joined	15:51
	← stasmakarov left	15:51
	→ raijin joined	15:52
	→ jceb joined	15:52
	→ gsingh joined	15:52
	← SporkWitch left	15:52
	← ahmed_elgabri left	15:52
	→ ochorocho__ joined	15:53
	← solars left	15:53
	← luke_penn left	15:53
	← Gonzo89_ left	15:55
	← mbrzuzy left	15:56
	← Darcidride left	15:57
	← victortyau left	15:57
	→ kpease joined	15:58
	← timvisher left	16:00
	→ timvisher joined	16:00
	→ soee_ joined	16:00
	← whomp left	16:01
	← s00pcan left	16:01
	← Macaveli left	16:01
	→ livingstn joined	16:01
	← armyriad left	16:01
	→ MarkyC_ joined	16:01
	→ armyriad joined	16:02
	Thorn__ → Thorn	16:02
	→ Walex joined	16:03
	→ madewokherd joined	16:03
	← MarkyC left	16:03
	→ SimonNa joined	16:03
	→ ToBeCloud joined	16:03
	gitinfo set mode: +v	16:03
	→ stantonk joined	16:05
	← IWishIKnew left	16:05
	→ elastix joined	16:05
	→ algun joined	16:06
	← bollullera left	16:07
	← jceb left	16:07
	← tlaxkit left	16:09
	→ _rht joined	16:09
	→ s00pcan joined	16:10
	→ specing joined	16:10
	← rdvdet left	16:11
	← sathya left	16:11
	→ Lewoco_ joined	16:11
	← staticshock left	16:11
	→ ciampix joined	16:11
	→ Bruce____ joined	16:12
	← stantonk left	16:13
	← Lewoco__ left	16:14
	← weox left	16:14
Virox	Is it just me or does it feel like a bug that `git clean -fd` would wipe out a folder that's marked in .gitignore ?	16:14
	→ crose joined	16:14
Virox	I could `git clean -i` but I feel like -fd should be fine	16:15
	← bilb_ono left	16:15
	→ imachuchu joined	16:16
	→ bronson joined	16:16
	← nnyk_ left	16:16
selckin	it doesn't wipe out gitignored files	16:16
_ikke_	git clean should honor .gitignore, unless -x is passed	16:16
	→ IWishIKnew joined	16:17
	→ chrisshattuck joined	16:17
	← raijin left	16:17
	← freimatz left	16:18
Virox	Interesting... So in my .gitignore I have "Carthage/Build" which is a directory that contains a bunch of .framework files Any ideas why it's still trashing those .framework files?	16:19
	→ staticshock joined	16:19
	← timvisher left	16:20
Virox	So I need to explicitly add .framework to .gitignore?	16:20
	→ timvisher joined	16:20
thiago	you need to explicitly add anythiing that you want ignored.	16:20
	→ mbrzuzy joined	16:20
	← nZac left	16:20
	← bronson left	16:21
Virox	I assumed adding the containing folder would be enough... I guess not	16:21
thiago	what do you mean by "trashing" ?	16:21
Virox	Its deleting them all	16:21
	← chrisshattuck left	16:21
thiago	pastebin the output of git status when those files/dirs are present	16:21
	→ hwrdprkns joined	16:22
	→ SporkWitch joined	16:22
	→ chrisshattuck joined	16:23
	← mdw left	16:23
	← PCatinean left	16:23
_ikke_	For me it works as it should	16:24
	← ncd\|leeN left	16:24
thiago	which means that there's something that Virox didn't tell us	16:25
Linkandzelda	just did my first fork merge... what an amazing tool	16:25
Virox	;D	16:25
	→ stantonk joined	16:25
Virox	Okay lemmie rebuild a few things, try again then paste the output	16:25
	← dsdeiz left	16:26
	→ blue_lizzard joined	16:26
_ikke_	mkdir foo && touch foo/bar && touch baz && echo -e "foo\n.gitignore" >.gitignore && git clean -fd -> removing bar	16:26
	sorry	16:26
	→ dsdeiz joined	16:26
_ikke_	removing baz	16:26
	so foo/bar is still there	16:26
	→ raijin joined	16:26
thiago	what happens if you create a file inside foo and track it?	16:26
	← _pix left	16:28
	← dsantiago left	16:29
	← mikar left	16:29
	← jimi_ left	16:30
	← ueberall left	16:30
	→ stantonk_ joined	16:31
	← ciampix left	16:32
	→ durham joined	16:32
	← durham left	16:32
	→ deadnull joined	16:32
	← encod3 left	16:32
	→ ueberall joined	16:33
	→ durham joined	16:33
	← stantonk left	16:34
	← deadnull left	16:34
	ueberall → uebera\|\|	16:35
	→ dsdeiz_ joined	16:35
	→ deadnull joined	16:35
	← gsingh left	16:35
	← dsdeiz left	16:36
	→ gsingh joined	16:37
	← muthu left	16:37
	→ subhojit777 joined	16:37
	← deadnull left	16:38
	← armyriad left	16:38
	→ armyriad joined	16:38
	→ whomp joined	16:39
	→ kadoban joined	16:39
	← dsdeiz_ left	16:39
	→ dsdeiz joined	16:40
	→ ariel_17 joined	16:40
	← dreiss left	16:40
	← wrouesnel1 left	16:41
	→ editshare-ericf joined	16:41
	← timvisher left	16:42
	→ bernardio joined	16:43
	→ timvisher joined	16:43
	← mikiones left	16:45
	← armyriad left	16:45
	→ aard_ joined	16:45
	→ nitin joined	16:45
	→ mehola joined	16:45
	→ armyriad joined	16:45
	← ManDay left	16:46
	← armyriad left	16:46
	← whomp left	16:46
	← Lomex left	16:47
	← acetakwas left	16:47
	→ armyriad joined	16:48
	← jstimm left	16:49
	← mehola left	16:50
Virox	So this is what I get https://gist.githubusercontent.com/JamieWhite/6f415eef859902c17bba5e93ac124b9c/raw/2cf6e724cb44236766c5ff60683c90c2a7a719f7/blah	16:50
	I'm guessing I need Carthage in the .gitignore	16:50
	→ t-mart_ joined	16:50
_ikke_	What do you have in your .gitignore	16:51
	→ jstimm joined	16:51
Virox	https://gist.githubusercontent.com/JamieWhite/d1949c691017bd2d3f323c2fb1b5023a/raw/ba116bf6be741fb1330ce04f0947cec174d3697e/test	16:51
	← nitin left	16:51
	→ bilb_ono joined	16:52
_ikke_	And what are the exact contents of Carthage	16:52
	?	16:52
Virox	The two folders Checkout and Build	16:52
_ikke_	And do they contain files	16:53
	?	16:53
	← ffio left	16:53
	→ solars joined	16:53
Virox	Build has folders Mac and iOS which both contain .framework files	16:53
	→ jaguarmagenta joined	16:53
	→ srcerer joined	16:54
	← irqq left	16:54
	← t-mart__ left	16:54
	→ glen joined	16:54
glen	hey. i'm abit confused about commit author encoding	16:54
	→ b1tchcakes joined	16:54
	← chll left	16:54
glen	this commit looks okay in github https://github.com/file/file/commit/8e9094a92c4eee790a9bd8910fceada2677f0c06.patch	16:54
	→ ffio joined	16:54
glen	and with git client (git show)	16:54
	→ SteffanW2 joined	16:55
glen	but if i look with fast export, i see latin1 string	16:55
	➔ git fast-export --all\|grep -a glen@pld\|less -r	16:55
	author Elan Ruusam<E4>e [email@hidden.address] 1461687883 +0000	16:55
	and so it broken on travis too https://travis-ci.org/file/file/builds/125883131	16:56
	← stantonk_ left	16:56
glen	i used git cvsimport to convert it when user file was latin1 encoded:	16:56
	git -c i18n.commitencoding=iso8859-1 cvsimport ...	16:57
	→ stantonk joined	16:57
	→ Lomex joined	16:57
	← thiago left	16:58
glen	now, should i worry, do it differently? complain to travis-ci?	16:58
	← jaguarmagenta left	16:58
	hwrdprkns → hwrd[away]	16:58
	← synthroid left	16:59
	← blue_lizzard left	16:59
glen	git-commit man page says i'm doing all correctly	16:59
	→ nitin joined	17:00
	← hwrd[away] left	17:00
	→ hwrdprkns joined	17:00
	→ peroht joined	17:01
	← chrisshattuck left	17:02
	→ jagob joined	17:02
	← Lomex left	17:02
	← Synthead left	17:02
	→ Synthead joined	17:03
	← gsingh left	17:04
	← otho left	17:04
Virox	_ikke_: Nailed it by adding `Carthage` to .gitignore	17:05
	Thanks for your help !	17:05
	← timvisher left	17:05
	→ zarel joined	17:05
	→ timvisher joined	17:05
	→ gsingh joined	17:06
	← TomyWork left	17:06
	← cyphase left	17:06
	← gsingh left	17:07
	← khelkun left	17:07
	→ gsingh joined	17:08
	→ cyphase joined	17:09
	cyphase → Guest39553	17:09
	← noteness left	17:11
	← sagerdearia left	17:11
	← CrypticGator left	17:12
	← nitin left	17:12
	← josuebrunel left	17:12
	← zarel left	17:12
	← subhojit777 left	17:14
	→ Eryn_1983_FL joined	17:16
	← toogley left	17:16
	← efco left	17:17
	← ZGD left	17:18
	→ noteness joined	17:18
	→ shmuli joined	17:18
	← bernardio left	17:20
	→ slayerjain joined	17:20
	→ dsantiago joined	17:20
	← aspiers_ left	17:22
	← Guest39553 left	17:22
	→ cyphase_ joined	17:23
	← shmuli left	17:23
	→ TSS_ joined	17:24
	→ mdw joined	17:24
	→ d4rklit3 joined	17:24
	← timvisher left	17:25
	← rominronin left	17:25
	→ timvisher joined	17:25
	→ zarel joined	17:25
	← IWishIKnew left	17:27
	→ PryMar56 joined	17:28
	cyphase_ → cyphase	17:28
	→ rominron_ joined	17:29
	← rkazak left	17:29
	→ Macaveli joined	17:29
	← WayToDoor left	17:29
	→ fuchstronaut joined	17:29
	→ Darcidride joined	17:30
	→ dreiss joined	17:32
	← marcogmonteiro left	17:32
	← imachuchu left	17:32
	← zarel left	17:33
	← peroht left	17:33
	→ oink joined	17:33
	→ imachuchu joined	17:34
	→ pantsman- joined	17:34
	← fuchstronaut left	17:34
	← gsingh left	17:36
	← elastix left	17:36
	→ DanZ3 joined	17:36
	→ cagmz joined	17:36
	← davisonio left	17:37
	rominron_ → rominronin_	17:37
	→ gsingh joined	17:37
	→ elastix joined	17:37
	→ synthroid joined	17:37
	rominronin_ → rominronin	17:38
	→ annoymouse joined	17:38
	→ elsevero joined	17:38
	gitinfo set mode: +v	17:38
	→ jimi_ joined	17:39
	← elastix left	17:39
	← ferr left	17:40
	← attila_ left	17:40
	→ Isla_de_Muerte joined	17:41
	→ whomp joined	17:41
	→ nnyk_ joined	17:41
	← ZeDestructor left	17:43
	← raijin left	17:43
	← xelxebar left	17:43
	hwrdprkns → hwrd[away]	17:43
	→ teresko joined	17:44
	→ realz joined	17:44
	→ thiago joined	17:44
	hwrd[away] → hwrdprkns	17:44
	← NwS left	17:44
	← jakwong left	17:44
	→ ZeDestructor joined	17:45
	← ZeDestructor left	17:45
	→ ZeDestructor joined	17:45
oink	does anyone know if there are any restrictions on which repos can be imported with git-fetch? the man pages make it sound like branches from any repo can be added to any project; but that doesn't make any sense to me; shouldn't there be some rules for making sure that only branches with a common ancestor to the current project can be downloaded?	17:46
	→ skunkz joined	17:46
tobiasvl	oink: that's correct, they need a common ancestor	17:46
	← timvisher left	17:47
skunkz	Hi everyone, I'm new to big project management, releases tracking and stuff.. Are there any "best practices" or general rules to follow ?	17:47
	→ Trieste joined	17:48
preaction	as little as possible, but no littler	17:48
Eugene	skunkz - !flow and !semver are good reads	17:48
gitinfo	skunkz: [!gitflow] The description of the gitflow branch workflow model is at http://nvie.com/posts/a-successful-git-branching-model/ while a tool to help implement this workflow is at https://github.com/petervanderdoes/gitflow See http://sethrobertson.github.com/GitBestPractices/#workflow for other workflow suggestions/references	17:48
	skunkz: The Semantic Versioning standard is widely used for version numbering. You may find it useful when creating git tags: http://semver.org/	17:48
tobiasvl	oink: that is, you can fetch (although you'll get a warning) from a remote branch with no common ancestor	17:48
	into a remote-tracking branch	17:48
	but it'll effectively be an orphan branch, and it can't be merged	17:49
	→ TomyLobo joined	17:49
	→ kdeal joined	17:49
	→ timvisher joined	17:49
Seveas	it can absolutely be merged	17:49
tobiasvl	oh wait	17:49
	yes it can	17:49
skunkz	thanks Eugene that's the kind of readings I needed	17:49
	← Bruce____ left	17:50
oink	I think I get it now; If I want to integrate a module stored in an unrelated remote repository with my current branch; I would fetch it, ignore the warning, and then merge it with my current branch?	17:51
	→ Bruce____ joined	17:51
tobiasvl	!xy	17:51
gitinfo	Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...	17:51
	→ Dyonisos joined	17:52
	← Macaveli left	17:53
	← jstimm left	17:53
oink	I don't intend to use it this way, I'm just reading through the documentation and I wanted to make sure I didn't misinterpret it	17:54
	← oink left	17:55
puff	Hm, I just made some changes and then realized that I should have done this on a feature branch. If I recall/understand correctly, I should: 1) git stash 2) git checkout -b newfeaturebranch, 3) git stash pop, 4) git add/commit my changes.	17:55
	Is the above correct?	17:55
	→ Sasazuka joined	17:56
	hwrdprkns → hwrd[away]	17:56
	→ xelxebar joined	17:56
	← hwrd[away] left	17:57
	← Sasazuka left	17:58
	→ nidr0x joined	17:59
	→ SwiftMatt joined	17:59
	→ subhojit777 joined	17:59
Eugene	puff - !float	18:00
gitinfo	puff: If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there. If the files you changed differ between branches, the checkout will fail. In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.	18:00
	→ hwrdprkns joined	18:00
Eugene	Assuming you start your feature branch from HEAD, no stash is needed.	18:01
	→ hust921 joined	18:01
	→ leonarth joined	18:02
	← kdeal left	18:04
	← elsevero left	18:04
	→ davisonio joined	18:04
	→ elsevero joined	18:04
	→ IWishIKnew joined	18:04
	→ russo joined	18:04
	→ tvw joined	18:05
	← nydel07 left	18:05
	→ stantonk_ joined	18:05
	← rominronin left	18:05
	← stantonk left	18:05
	→ clivejo joined	18:06
	← russoneto left	18:07
	russo → russoneto	18:07
clivejo	hi folks, Im trying to copy a collection of git archives to my local computer and then to a new host, anyone know of a fast easy way to do this?	18:08
	→ col_ joined	18:08
ojacobson	rsync	18:09
	← timvisher left	18:09
	→ timvisher joined	18:09
clivejo	ojacobson: can you point me in the direction of how to do that?	18:10
	← acton left	18:10
	→ ericvw joined	18:10
	→ col__ joined	18:10
	→ mwhooker joined	18:10
ojacobson	rsync -rza --progress path/to/sources/ user@host:path/to/destination/ # trailing slashes matter	18:10
	man rsync for an explanation of the details	18:10
	→ acton joined	18:10
	→ stantonk joined	18:11
	← stantonk_ left	18:11
	← col left	18:11
	→ voice_of_me joined	18:12
	← mdw left	18:12
ivan_on_trac	which the path of a server-side file ("bare").	18:12
	?	18:12
	→ irqq joined	18:12
	→ nofacade joined	18:13
_ikke_	ivan_on_trac: ?	18:13
	← col_ left	18:13
	← mbrzuzy left	18:14
	← stantonk left	18:15
	→ MattMaker joined	18:16
	← hwrdprkns left	18:16
	→ synthroi_ joined	18:17
	→ hwrdprkns joined	18:17
	← gsingh left	18:17
	→ jakwong joined	18:17
	← DanZ3 left	18:17
	→ mizu_no_oto joined	18:18
	→ bronson joined	18:18
	→ nydel07 joined	18:18
	→ mikiones joined	18:19
	← Scriptonaut left	18:19
	← digidog left	18:20
	← synthroid left	18:20
	→ stantonk joined	18:20
	← _rht left	18:20
	← chris64 left	18:20
	→ jost joined	18:21
	← hwrdprkns left	18:22
	← bronson left	18:22
	← moei left	18:23
	← przemoc left	18:23
	← sauvin left	18:23
	→ stantonk_ joined	18:24
	→ Sasazuka joined	18:24
	← stantonk left	18:24
	← jbitdrop left	18:25
	← irqq left	18:25
	→ _rht joined	18:26
	← xcesariox left	18:26
	← leonarth left	18:27
	← stantonk_ left	18:28
	→ mbrzuzy joined	18:28
	→ josuebrunel joined	18:28
	← IWishIKnew left	18:28
	← subhojit777 left	18:30
	→ toogley joined	18:31
	→ fuchstronaut joined	18:31
	← wviana left	18:32
	← timvisher left	18:32
	→ moei joined	18:32
	→ timvisher joined	18:33
	→ wviana joined	18:33
	→ stantonk joined	18:34
	← newjersey left	18:34
	→ newjersey joined	18:35
	← fuchstronaut left	18:36
	→ NeverDie_ joined	18:37
	← NeverDie left	18:38
	→ nwkj86 joined	18:38
	→ Zeranoe joined	18:39
	← diegoaguilar left	18:39
Zeranoe	Is there a git command that could show me the date of a specific commit?	18:39
Seveas	Zeranoe: git show commit-sha1	18:41
	→ NeverDie joined	18:41
	→ NeverDi__ joined	18:43
	→ stantonk_ joined	18:43
	← stantonk left	18:43
	← dsantiago left	18:43
	← NeverDie_ left	18:44
	→ dsantiago joined	18:44
	→ shinnya joined	18:44
	→ ahmed_elgabri joined	18:45
	← newjersey left	18:45
	→ leehambley joined	18:45
	← NeverDie left	18:46
	← dsdeiz left	18:46
	→ aspiers_ joined	18:47
	→ infra-red joined	18:47
	← stantonk_ left	18:47
	→ Joanna___ joined	18:47
	→ digidog joined	18:47
	→ NeverDie joined	18:47
	→ stantonk joined	18:47
	→ oregonduckman joined	18:48
leehambley	hi all - I wonder if someone can confirm something for me? "Refs don't have their own datetime" -- I'm trying to get the time a ref created with `upadte-ref ...` (e.g it's specifically not a tag) if I run something like `git log -1 --format=%ai refs/myrefs/foo` does that print the time of what "foo" points to (it must, as far as I understand) as the `.git/refs/myrefs/foo` contains nothing but a treeish sha1	18:49
	← infra-red left	18:49
ojacobson	leehambley: git log prints info from commits (normally) or the reflog (with the right option)	18:50
	← NeverDi__ left	18:50
Seveas	leehambley: if you have enabled the reflog for that ref or all refs, it will have that information	18:51
ojacobson	there is no meaningful record -at all- of the ref creation date -- loose refs have a ctime and mtime in the filesystem, but they're not guaranteed to have meaningful values, and they go away when the ref gets transported or packed	18:51
leehambley	alright, thanks for that confirmation. does that hold true for annotatied tags too ?	18:51
	← username17 left	18:51
	→ m0viefreak joined	18:51
	→ peepsalot joined	18:52
Seveas	leehambley: the reflog bit holds true for those, but annotated tags do store time of creation	18:52
leehambley	cool, so probably there's something I can do to make an "annotated ref"	18:52
	or is the annotation of tags a special case ?	18:52
	← noteness left	18:52
Seveas	they're a special case	18:53
	← stantonk left	18:53
Seveas	an annotated tag is a combination of a tag object (that's the bit that has the date) and a tag ref	18:53
ojacobson	!xy	18:53
gitinfo	Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...	18:53
leehambley	we have some automated options that may run one or more times against the same commit	18:54
	→ ferr joined	18:54
	→ jaguarmagenta joined	18:54
	← timvisher left	18:55
	← dhollinger left	18:55
leehambley	we'd like to record the results of that in refs in the repo (at least, we'd like to avoid tracking another file in the repo, subject to conflicts, etc), and since it's 1:1 mapped to which ref was "current" at the time, we need the "time of the tag/ref/etc" not the "time of the referenced commit"	18:55
	→ timvisher joined	18:55
leehambley	bah s/automated options/automated processes/g sorry	18:55
Seveas	That sounds backwards	18:56
leehambley	:) alright, nice to have a second opinion	18:56
ojacobson	what about notes?	18:56
Seveas	you're automation processes what the ref points to, not the ref itself	18:56
	so why not 'attach' the results to what the ref points to? As with notes like ojacobson says	18:57
	← SteffanW2 left	18:57
leehambley	I'd have to read into notes abit	18:57
	← abyx left	18:57
	← knighthawk left	18:57
	→ noteness joined	18:57
leehambley	`git notes append .... `seems like it might be decent for m	18:59
	my usecase*	18:59
	← jaguarmagenta left	18:59
	→ jparness joined	18:59
	→ knighthawk joined	19:00
	→ stantonk joined	19:00
	← nidr0x left	19:01
	→ dhollinger joined	19:01
	← knighthawk left	19:01
	← jparness left	19:03
	→ oregondu_ joined	19:03
ojacobson	You could also take the model notes use and alter it - git ultimately doesn't care what you do with the tools it gives you	19:04
	← oregonduckman left	19:04
leehambley	absolutely, I was just wondering what the plumbing behind notes looked like	19:04
	← oregondu_ left	19:04
leehambley	I'd assume that's also just `update-ref`	19:04
	→ oregonduckman joined	19:05
_ikke_	It's different things	19:05
	→ nidr0x joined	19:05
_ikke_	it involves creating trees and commit objects	19:06
	→ nilg joined	19:06
leehambley	alright, I thought so	19:06
	actually, otherwise where is the info :)	19:06
	← stantonk left	19:06
	→ stantonk joined	19:06
	← robbyoconnor left	19:06
	← Joanna___ left	19:07
	→ CrypticGator joined	19:08
	← ferr left	19:10
	← multi_io left	19:10
	→ ferr joined	19:10
	← racket left	19:10
	← SwiftMatt left	19:10
	→ multi_io joined	19:11
	← b1tchcakes left	19:11
	← nnyk_ left	19:12
	→ abyx joined	19:12
	→ b1tchcakes joined	19:12
	→ deadnull joined	19:12
	→ akiva joined	19:13
	← Zeranoe left	19:13
	← oregonduckman left	19:14
	← deadnull left	19:14
	→ oregonduckman joined	19:14
	→ deadnull joined	19:15
	← deadnull left	19:15
	→ dsdeiz joined	19:15
	← dsdeiz left	19:15
	→ dsdeiz joined	19:15
	← sdothum left	19:15
	→ knighthawk joined	19:15
	← oregonduckman left	19:16
	→ sdothum joined	19:16
	← timvisher left	19:18
	← cwillu_at_work left	19:18
	→ timvisher joined	19:18
	→ cwillu_at_work joined	19:19
	← knighthawk left	19:20
	← mikiones left	19:20
	→ DanZ3 joined	19:21
	→ mikiones joined	19:21
	← jimi_ left	19:22
	→ IWishIKnew joined	19:22
	→ przemoc joined	19:23
	← hust921 left	19:23
	← staticshock left	19:24
	→ Sound joined	19:25
	→ stantonk_ joined	19:29
	→ rahmen86 joined	19:30
	→ NwS joined	19:30
	← mwhooker left	19:32
	→ bronson joined	19:32
	← stantonk_ left	19:32
	← CrypticGator left	19:32
	← stantonk left	19:32
	→ stantonk joined	19:32
rahmen86	Hi! I've setup my git repo on my debian server. On my windows computer I now want to push my changes to that server. But instead of providing username and pass I want to work with ssh keys. Can I get some help here? Thanks!	19:33
	← Isla_de_Muerte left	19:33
	← mariuscc left	19:35
javaJake	puff: I use IDEA's git tool	19:36
	puff: use the 'Version Control' tool window	19:36
	puff: that's IDEA's equivalent of 'git status'	19:36
	→ Cassiopaya joined	19:37
	→ sagerdearia joined	19:38
	← stantonk left	19:40
	← timvisher left	19:41
	→ weox joined	19:41
	→ jeffreylevesque joined	19:41
	→ blue_lizzard joined	19:41
	→ timvisher joined	19:42
	→ IlNominePatre joined	19:42
	→ apotry joined	19:43
	← m8 left	19:43
	→ mwhooker joined	19:46
	→ barduck joined	19:46
	→ JBlazeCoder21 joined	19:48
	← toogley left	19:48
	→ d5sx43 joined	19:48
	← annoymouse left	19:49
	← bremner left	19:49
	→ soee joined	19:49
	→ bremner joined	19:49
	← bremner left	19:49
	→ bremner joined	19:49
	→ NeonSynth joined	19:50
	← nofacade left	19:51
	← isxek left	19:51
	→ knighthawk joined	19:51
	← barduck left	19:52
	← skelterjohn left	19:52
	→ gsingh joined	19:52
	→ AndroidSynth joined	19:53
	→ bernardio joined	19:53
	← bernardio left	19:53
	← soee_ left	19:54
	← livingstn left	19:54
	← netj left	19:54
	→ ajf- joined	19:54
	← moei left	19:55
	→ deadnull joined	19:55
	← deadnull left	19:55
	← blahdodo left	19:55
	← yarnfive8 left	19:56
	← blue_lizzard left	19:56
	→ stantonk joined	19:56
	→ akushner_ joined	19:56
	→ netj joined	19:57
	→ Shentino joined	19:57
	← tyreld left	19:58
	← akushner left	19:58
	← jon-mac left	19:58
	← AndroidSynth left	19:58
	← stantonk left	19:59
	← NeonSynth left	19:59
	→ blahdodo joined	20:01
	→ diegoviola joined	20:02
	← timvisher left	20:02
	→ timvisher joined	20:03
	→ bremner` joined	20:03
	← bremner` left	20:03
	→ bremner` joined	20:03
	← noteness left	20:04
	← bremner left	20:04
	← Bruce____ left	20:04
	→ newjersey joined	20:04
	← newjersey left	20:04
	bremner` → bremner	20:05
	→ stantonk joined	20:05
	← solars left	20:05
	← wviana left	20:05
	← d5sx43 left	20:05
	← voice_of_me left	20:05
	→ zacts joined	20:06
	← aard_ left	20:06
	← nidr0x left	20:06
	→ voice_of_me joined	20:07
	→ UrsoBranco joined	20:07
	→ nidr0x joined	20:07
	← Borkr left	20:07
	→ noteness joined	20:10
	→ basiclaser joined	20:10
	← jeffreylevesque left	20:10
puff	javaJake: Thanks.	20:11
	→ tyreld joined	20:11
puff	rahmen86: Did you get that sorted out?	20:11
	→ leprechau joined	20:11
puff	rahmen86: I wrote this thing about setting up ssh keys for using rsync, if you follow the steps it'll work for git too.	20:12
	← Sound left	20:12
puff	rahmen86: http://www.darksleep.com/notablog/articles/Using_ssh_agent	20:13
	← bronson left	20:13
	→ peroht joined	20:13
	→ staticshock joined	20:13
	→ CussBot_ joined	20:13
	CussBot → Guest75508	20:13
	← Guest75508 left	20:13
	CussBot_ → CussBot	20:13
	← davisonio left	20:13
	→ nfk joined	20:14
	← akiva left	20:14
	← voice_of_me left	20:14
	→ deadnull joined	20:15
puff	Eugene: Wait, so you're saying that until the first commit on a new branch, I can change branches without disturbing my working tree?	20:16
	Eugene: Is there any difference between doing it with float and doing it with stash?	20:16
Eugene	puff - checkout will do anything you ask, unless it interferes with uncommited changes(in which case it will tell you to stash).	20:17
	← mizu_no_oto left	20:17
Eugene	puff - in most cases this means that yes, you can make a new branch to commit your not-yet-commited changes onto.	20:17
	→ AndroidSynth joined	20:18
	← AndroidSynth left	20:18
	→ leonarth joined	20:18
	→ AndroidSynth joined	20:18
	← AndroidSynth left	20:18
	→ cdg joined	20:18
	→ AndroidSynth joined	20:19
	← AndroidSynth left	20:19
	← deadnull left	20:19
Eugene	stash actually creates a new commit(and a special ref to keep it for you), then `stash pop` re-applies the changes from that commit to your working tree. checkout(in this manner) just tries to switch branches. If the starting-point for the new branch is not the same thing as your current HEAD it will try to checkout whatever it is you've asked, but abort if that would lose anything uncommited	20:19
	Does that answer your question?	20:19
	→ SwiftMatt joined	20:19
	→ AndroidSynth joined	20:19
	→ wviana joined	20:20
	→ Komislav joined	20:20
	→ deadnull joined	20:20
	deadnull → _deadnull	20:21
	_deadnull → deadnull	20:21
	→ voice_of_me joined	20:22
	← deadnull left	20:22
	→ deadnull joined	20:22
	← UrsoBranco left	20:24
	← dsantiago left	20:24
	→ akiva joined	20:24
	← timvisher left	20:25
	→ dsantiago joined	20:25
puff	Eugene: Mostly, I have more questions but I need to get this thing done. I would like to follow up later.	20:25
	→ timvisher joined	20:25
	→ gajus joined	20:26
Eugene	We're here all day	20:26
	Not necessarily me, though	20:26
gajus	How do I get a commit hash of a specific line in code?	20:26
	i.e. I want to know the last commit that changed that line of code	20:27
	← specing left	20:27
	← rwb left	20:27
	← glen left	20:28
	→ Bruce____ joined	20:28
	→ CussBot_ joined	20:28
	← CussBot left	20:28
	CussBot_ → CussBot	20:28
	→ alex1a joined	20:28
	← johnmilton left	20:29
	→ st0opkid joined	20:30
	← ffio left	20:30
	← leprechau left	20:30
	← afuentes left	20:31
	→ mdw joined	20:31
	→ satifant joined	20:32
	← mofai left	20:32
_ikke_	gajus: git blame can do that	20:32
rahmen86	@puff thanks I will look at it	20:33
	→ sgrover joined	20:33
	← abyx left	20:33
	→ fuchstronaut joined	20:34
sgrover	Odd. I merge my develop branch into my feature branch to get the latest core files (not related to files I'm chaning in the branch). After cleaning up conflicts, and getting the merge commit in place, I'm noticing that my branch is 222 commits ahead of my origin/feature branch. Is this normal? Should I be doing a rebase instead?	20:34
	→ vF3hNGxc47h8 joined	20:34
	← Kicer86 left	20:35
	→ nbari joined	20:35
nbari	hi all, at work I did a git checkout --orphan test	20:35
gajus	`git blame -L 12,12 posts/using-mysql-in-node-js/index.md` that seem to do it	20:35
	→ leprechau joined	20:35
gajus	Is there a way to get a full, and just the hash?	20:35
nbari	I am in home and and wondering if I need to do also git checkout --orphan test o I can just do a git checkout test and will continue orphan ?	20:35
	→ nnyk_ joined	20:36
gajus	-l gives long hash	20:37
	→ voice_of_me_ joined	20:37
_ikke_	Not sure if you can get just the hash	20:37
gajus	and -p makes it ~easier to extract just the hahs.	20:37
	hash*	20:37
	← gsingh left	20:38
	← mar77i left	20:38
	← Bruce____ left	20:38
	← Komislav left	20:38
	← fuchstronaut left	20:39
	→ gsingh joined	20:39
	← _rht left	20:40
	← voice_of_me left	20:40
ajf-	So I've been working on a project and tracking it on git and now that project becomes part of another which is not tracked on git (yet). What is the standard way of "moving files into a subdirectory" and allowing git to englobe more things ?	20:40
	→ choki joined	20:41
	← gsingh left	20:41
	← phaleth left	20:41
osse	ajf-: i don't think there is a standard way. just moving them would be fine	20:42
ajf-	how about moving .git/ back to one parent instead?	20:42
	← synthroi_ left	20:42
osse	same thing	20:43
ajf-	cool	20:43
	thanks	20:43
	→ mar77i joined	20:43
zacts	hi gits	20:46
	I <3 this Ry's git tutorial thus far	20:46
	I'm going to check out Pro Git next	20:46
	← nbari left	20:46
zacts	are there any good online resources for collaborative workflows with git?	20:46
	like I feel I'm learning the commands	20:46
	but I want to have a more macro viewpoint on how to collaborate with others via various workflows	20:47
	→ gsingh joined	20:47
zacts	versus the micro command line way of viewing git	20:47
	← timvisher left	20:47
	→ timvisher joined	20:48
puff	clivejo: You also might find handy my rsync tutorial ("Enough rope...") at darksleep.com/notablog	20:48
clivejo	I dont think rsync will work	20:49
	→ barduck joined	20:49
	← gsingh left	20:49
clivejo	the 3rd party has many more repo's than I want	20:49
	← deadnull left	20:50
	→ gsingh joined	20:50
	← mbrzuzy left	20:50
puff	clivejo: Then don't rsync them.	20:51
	clivejo: a repo is a .git directory.	20:51
clivejo	ideally I need a way to get all branches and tag locally and them push them to another remote	20:51
	← gsingh left	20:51
puff	clivejo: Do you mean you only want a subset of the branches in their repo?	20:51
clivejo	yes	20:52
	kubuntu_*	20:52
	→ abyx joined	20:52
puff	clivejo: Ah, that's a whole different ball of wax.	20:52
	← JBlazeCoder21 left	20:52
	→ gsingh joined	20:53
puff	clivejo: A bit beyond my present knowledge of git, but for example if you'd cloned this repo at the start, and then the other guy added a zillion branches, you could list them with "git branch -r" and then pull them.	20:53
	→ tsherman joined	20:53
clivejo	I have them cloned localled	20:53
	← barduck left	20:53
	→ MagicTurtle joined	20:53
clivejo	and I can checkout and push a branch at a time	20:53
	→ Macaveli joined	20:54
puff	clivejo: Ah.	20:54
clivejo	but I need tags as well	20:54
	← stantonk left	20:54
clivejo	and Im just totally lost :(	20:54
puff	clivejo: Okay, again, that's a very different question.	20:54
	← ochorocho__ left	20:54
puff	clivejo: Sounds like you need more help than I have.	20:54
	→ elastix joined	20:54
	← gsingh left	20:54
	← MarkyC_ left	20:54
puff	clivejo: So to restate, your problem is that you cloned a remote repo to your local machine, and you want to push some of the branches up to a remote machine?	20:55
	→ jaguarmagenta joined	20:55
puff	clivejo: do you already have a repo on machine 3?	20:55
	← sagerdearia left	20:55
puff	clivejo: git tags are objects just like the commit object, I would assume they'd get copied across with a git push.	20:55
clivejo	I have few hundred repos on a machine and I want to copy them and put them on another remote	20:56
puff	You said you already had them cloned locally.	20:56
clivejo	I have them all in a folder called gitmove	20:56
	→ mizu_no_oto joined	20:56
clivejo	but I can only seem to do one branch at a time	20:56
puff	clivejo: So write a simple bash script that invokes the branches one at a time.	20:57
	clivejo: git branch -a > listofbranches.txt	20:57
clivejo	but the tags dont seem to be carried over	20:57
puff	clivejo: Yeah, that's beyond me right now, sorry.	20:57
	clivejo: I've gotta get back to work.	20:57
clivejo	I have 6-7 branches Im concerned about, the rest isnt needed	20:58
	← Macaveli left	20:59
	← akiva left	20:59
	← jaguarmagenta left	20:59
	← alex1a left	21:00
	→ stantonk joined	21:01
	→ voice_of_me joined	21:01
	← pantsman- left	21:02
	← stantonk left	21:02
	→ jeffreylevesque joined	21:03
	→ stantonk joined	21:03
ivan_on_trac	In bare repositories where it is stored the files?	21:03
	I have a hook and need to make a script "cat myfile".	21:04
	← voice_of_me_ left	21:04
sgrover	ivan_on_trac: in the .git directory inside your local repository folder.	21:04
moritz	ivan_on_trac: you can always 'git show HEAD:path/to/file'	21:04
	→ rojosh joined	21:05
	→ jchonig joined	21:05
	→ CussBot_ joined	21:05
	CussBot → Guest39474	21:05
	← Guest39474 left	21:05
	CussBot_ → CussBot	21:05
	← mostlybadfly left	21:06
	← teresko left	21:06
	← zacts left	21:07
	→ tomog999_ joined	21:08
	← timvisher left	21:09
	← fmcgeough left	21:09
	→ timvisher joined	21:09
	← mwhooker left	21:09
markmarkmark	!gitolite	21:09
gitinfo	Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/	21:09
	← jakwong left	21:10
	→ mwhooker joined	21:10
	← noteness left	21:10
	← tomog999 left	21:11
	← rnsanchez left	21:12
	← nnyk_ left	21:12
	→ moei joined	21:13
	→ cagedwisdom joined	21:13
	← nidr0x left	21:13
	→ bronson joined	21:14
	→ fuchstronaut joined	21:14
	← jmpp left	21:14
	→ jmpp joined	21:14
	→ nidr0x joined	21:14
	→ Bruce____ joined	21:16
	← dhollinger left	21:17
	→ mellernoia joined	21:17
	← choki left	21:18
	← bronson left	21:19
	→ Silenced joined	21:19
	← fuchstronaut left	21:19
ivan_on_trac	moritz: But I want to do the "cat" from a script. Without using direct commands git.	21:19
ojacobson	You'll need to use at least one git command, even if you use a non-bare repo for this	21:20
_ikke_	ivan_on_trac: A bare repository does not have a working tree	21:20
	→ noteness joined	21:20
_ikke_	So the files do not exist as just plain files	21:20
	they're stored in gits internal format	21:20
	← ahmed_elgabri left	21:21
	→ diegoaguilar joined	21:21
	← MagicTurtle left	21:21
	→ jeffmjack joined	21:22
	← peroht left	21:23
	← mwhooker left	21:23
	← vF3hNGxc47h8 left	21:24
	→ aidalgol joined	21:24
	← IWishIKnew left	21:25
	← nwkj86 left	21:26
foul_owl	How do I list all commit hashes between commit xyz and head? I want to include head but exclude xyz	21:26
	I know there is a some git log command that can specify a range but unsure how to use it	21:27
	Thanks!	21:27
	← noteness left	21:27
	← crose left	21:27
	← johnwhitton left	21:27
	→ frem_ joined	21:27
	→ nwkj86 joined	21:28
	← ash_workz left	21:28
	→ CrypticGator joined	21:28
	← SwiftMatt left	21:28
kadoban	foul_owl: Sounds like xyz..HEAD , which is from man gitrevisions	21:28
gitinfo	foul_owl: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html	21:28
foul_owl	THank you!	21:29
kadoban	(note that the dot notations work differently in 'git diff', which is … fun :-/	21:29
	)	21:29
	→ Isla_de_Muerte joined	21:29
foul_owl	Good to know!	21:30
	← aspiers_ left	21:30
	← mdw left	21:30
	← satifant left	21:30
	→ mwhooker joined	21:31
	→ courrier joined	21:31
	← timvisher left	21:32
	← NwS left	21:32
	← hobodave left	21:32
	→ timvisher joined	21:32
	→ JBlazeCoder21 joined	21:32
	→ mdw joined	21:33
courrier	Hey guys, does "git merge dev -s ours" in the branch master actually ignore all new commits made in master to replace it by branch dev?	21:34
	→ noteness joined	21:34
	← TomyLobo left	21:36
	← tsherman left	21:37
	← daynaskully left	21:37
	→ tsherman joined	21:38
	← apotry left	21:40
_ikke_	It does not ignore commits, it ignores changes in the commits	21:40
	← madewokherd left	21:40
	→ zacts joined	21:41
osse	courrier: and it ignores dev, not master	21:41
	← noteness left	21:41
kadoban	-s ours … there's little reason to ever use that, is there?	21:41
	← mdw left	21:41
	→ bollullera joined	21:42
	→ eletuchy joined	21:43
	→ daynaskully joined	21:43
_ikke_	I would not know of a proper reason	21:43
osse	to record a merge so that a ref cannot be accidentally be merged again	21:44
	and so that git describe works	21:44
	e.g. if you branch out to work on version 2 while version 1 is not completed then you might want to merge -s our v1.0 or something	21:45
	but even then it's likely you actually want a regular merge	21:45
	→ noteness joined	21:46
	← Dougie187 left	21:47
	← eletuchy left	21:48
	← Fijit left	21:48
	← bango2 left	21:49
	→ raijin joined	21:50
	← col__ left	21:51
	→ ochorocho__ joined	21:52
	→ mofai_ joined	21:52
	← mofai_ left	21:54
	← elastix left	21:54
	→ ahr3n joined	21:54
	→ yarnfive8 joined	21:56
	← mischat left	21:56
	← ochorocho__ left	21:56
	← timvisher left	21:56
	→ mischat joined	21:57
	→ timvisher joined	21:57
	← mase-tech left	21:57
	→ mofai_ joined	21:58
	← mofai_ left	21:59
	→ akiva joined	21:59
foul_owl	does git rev-list --all show in date order?	21:59
	← sangy left	22:00
osse	dunno, but it does if you do --date-order	22:00
	→ aspiers_ joined	22:00
	→ waveclaw_ joined	22:00
	← b1tchcakes left	22:01
	→ deadnull joined	22:01
	← mischat left	22:02
	← abyx left	22:05
soee	guys how can i push branch with all tags to remote ?	22:06
	frem_ → frem	22:06
	← espindola left	22:06
	→ abyx joined	22:08
	← emPi left	22:08
milki	push --tags	22:08
	→ radsy joined	22:09
	→ HenriettaSalt joined	22:09
	← sanketdg left	22:10
soee	milki: thanks	22:11
	→ madewokherd joined	22:11
	← deadnull left	22:12
	← waveclaw_ left	22:13
clivejo	is it possible to checkout all branches with a certain pattern?	22:13
	ie git checkout mybranch_*	22:14
	CussBot → Guest57671	22:14
	← Guest57671 left	22:14
preaction	at the same time?	22:14
	→ fuchstronaut joined	22:15
clivejo	to grab them all from the remote and have them locally	22:15
	→ CussBot joined	22:15
	← josuebrunel left	22:16
	← basiclaser left	22:17
	→ sagerdearia joined	22:19
	← IlNominePatre left	22:19
	← Cassiopaya left	22:19
	← sagerdearia left	22:19
	← pwnawannab[NE] left	22:20
	← nidr0x left	22:20
	← pwnawannab_ left	22:20
	← fuchstronaut left	22:20
osse	clivejo: No	22:20
	→ waveclaw joined	22:20
	→ johnwhitton joined	22:20
osse	You already have them all locally, in a way	22:20
	!remote_tr	22:21
gitinfo	[!remote_tracking_branch] Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the corresponding branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a new local branch based on a remote-tracking branch using e.g. 'git checkout -b <branch> <remote	22:21
	← timvisher left	22:21
	← sgrover left	22:21
	→ clevodearia joined	22:21
	← johnwhitton left	22:22
	→ devdearia joined	22:22
	→ timvisher joined	22:22
	→ johnwhitton joined	22:22
clivejo	osse: Im trying to copy certain branches from one remote to another	22:22
	based on a pattern in the branch name ( ie mybranch_* )	22:23
	→ nidr0x joined	22:23
osse	clivejo: You don't have to check them out to do that	22:25
	→ mofai_ joined	22:25
clivejo	Ive a folder with all the repo's I want	22:25
	I used git clone	22:25
	and have added my new remote	22:25
	but I cant seem to push over the branches I want/need	22:26
	→ raininja joined	22:26
	← raijin left	22:26
	→ mischat joined	22:27
	← Aerosonic left	22:27
	→ jstimm joined	22:28
	← mischat left	22:28
osse	git push remote2 remote1/mybranch:mybranch	22:28
	→ mischat joined	22:29
	← editshare-ericf left	22:29
	← DanZ3 left	22:29
	← mofai_ left	22:32
	→ liamonade joined	22:32
	→ bronson joined	22:33
	← abyx left	22:34
	← fscala left	22:34
	← akushner_ left	22:35
	→ fscala joined	22:35
	← soee left	22:35
	← jstimm left	22:36
	← mwhooker left	22:37
	← rxo left	22:37
	→ mofai_ joined	22:37
	← mizu_no_oto left	22:37
	→ mwhooker joined	22:38
	← stantonk left	22:38
	→ ril joined	22:39
	← zZap-X left	22:39
	← voice_of_me left	22:40
	→ rxo joined	22:42
clivejo	osse: error: unable to push to unqualified destination: master	22:42
courrier	osse _ikke_: my master is old and is my v1, my dev branch must become the new master and the old master must become a new old_v1 branch	22:42
	but I actually ignored dev, not master, and fucked up the repo :(	22:42
	I do have a copy though...	22:43
	I don't do a regular merge cause there are hge differences and that would be a hell to solve conflicts	22:43
	← Darcidride left	22:44
courrier	I just want to force dev to be the new master somehow	22:44
	→ zZap-X joined	22:44
	← timvisher left	22:45
	← digidog left	22:45
	→ timvisher joined	22:45
	→ sangy joined	22:46
	→ noser joined	22:46
	← mofai_ left	22:48
	→ mofai joined	22:50
	← leehambley left	22:51
	← sgambino left	22:51
	→ ash_workz joined	22:51
	← sentriz left	22:52
	← eggoez left	22:53
	← HenriettaSalt left	22:53
	← poz3idon left	22:55
	→ jaguarmagenta joined	22:56
	→ HenriettaSalt joined	22:56
	→ eggoez joined	22:58
	→ voice_of_me joined	22:58
	→ duderonomy joined	22:58
	← tsherman left	22:59
	← jaguarmagenta left	23:00
	→ eletuchy joined	23:00
	← leonarth left	23:00
	← HenriettaSalt left	23:02
	→ MarkyC joined	23:02
	→ ncd\|leeN joined	23:02
	→ _rht joined	23:07
	← ejnahc left	23:08
	→ ejnahc joined	23:08
	→ mizu_no_oto joined	23:08
	→ threeminutemonta joined	23:08
	← timvisher left	23:11
	← devdearia left	23:11
	→ devdearia joined	23:11
	← kpease left	23:11
	→ timvisher joined	23:11
	← clevodearia left	23:12
nevyn	courrier: do a force update if nobody has pulled it.	23:12
	git push remote dev:master	23:12
courrier	nevyn: with -f then?	23:14
	Fortunately I am the only one using that repo ^^	23:14
	← ffabi left	23:15
	← mwhooker left	23:15
	← CEnnis91 left	23:16
	→ tvon joined	23:17
courrier	Actually I would prefer fix my local repo first	23:18
	← ariel_17 left	23:18
courrier	In master I've tried "git merge -X theirs dev" to force dev to become the new master	23:18
	← bilb_ono left	23:18
	← a3Dman left	23:18
courrier	The merge went well but for some reason my tests fail while they were not in the dev branch	23:19
	→ mwhooker joined	23:19
courrier	it's odd	23:19
nevyn	oh man that's awful	23:19
	ok	23:19
	I'd fix the remote first as it's the biggest exposure	23:19
	← saidelike left	23:19
courrier	nevyn: but after the push, what should I do locally to fix my local stuff?	23:20
	→ ffabi joined	23:20
courrier	just pull?	23:20
	← mischat left	23:20
	← noser left	23:21
	← chitopunk left	23:21
	← axisys left	23:22
	→ axisys joined	23:23
	→ bob1 joined	23:23
	→ noser joined	23:24
	← bob1 left	23:24
	← aspiers_ left	23:25
	← CrypticGator left	23:26
	→ xcesariox joined	23:26
	← dsantiago left	23:26
	→ CussBot_ joined	23:26
	← CussBot left	23:26
	CussBot_ → CussBot	23:26
	← Dyonisos left	23:26
	→ dsantiago joined	23:27
	→ CrypticGator joined	23:28
	← CrypticGator left	23:29
	→ user083 joined	23:29
	→ CrypticGator joined	23:29
	← dsantiago left	23:30
	← CrypticGator left	23:30
	→ dsantiago joined	23:30
	→ saidelike joined	23:30
	→ a3Dman joined	23:31
	← user083 left	23:31
	← CussBot left	23:31
	→ CrypticGator joined	23:31
	← xaa left	23:31
	← timvisher left	23:33
	→ timvisher joined	23:34
	→ _wwwBukoLaycom joined	23:34
	→ CussBot_ joined	23:35
	CussBot_ → CussBot	23:35
	→ robbyoconnor joined	23:35
	← MarkyC left	23:35
	→ Kaisyu joined	23:37
	→ johnmilton joined	23:37
nevyn	no. reset --hard dev while on master.	23:38
	but I'd make a backup branch first	23:38
	so on master checkout -b backup-broken	23:38
	reset --hard dev	23:38
	ugh	23:38
	checkout master again first	23:38
	courrier: ^^	23:38
	← klep left	23:39
nevyn	so checkout master create a backup branch for justin.	23:39
	← robbyoconnor left	23:39
nevyn	the checkout master again and reset --hard to dev	23:39
	← bronson left	23:40
	→ bronson joined	23:41
	← Stummi left	23:41
	← nwkj86 left	23:41
	→ CEnnis91 joined	23:41
	← rahmen86 left	23:41
	→ noser_ joined	23:41
	← johnmilton left	23:42
	← ams_ left	23:43
	← mattfoo left	23:43
	← noser_ left	23:43
	← eletuchy left	23:44
	← dsantiago left	23:45
	→ eletuchy joined	23:46
	← fees left	23:46
	→ Stummi joined	23:47
	← cwong_on_irc left	23:48
	→ mattfoo joined	23:49
	→ realz__ joined	23:49
	← peepsalot left	23:49
	→ rkazak joined	23:49
	→ skapunker joined	23:50
	← cagedwisdom left	23:50
	← threeminutemonta left	23:50
	← diegoaguilar left	23:50
	→ threeminutemonta joined	23:51
	→ crime joined	23:51
crime	does .gitignore need to be in the root directory of the project, or of the machine?	23:51
	← BtbN left	23:51
	← languitar left	23:52
crime	where does it go	23:52
	← realz left	23:52
	→ BtbN joined	23:53
crime	nvm, it's in .git/info/exclude. that's obnoxious	23:53
	← ril left	23:53
	← crime left	23:53
	← mellernoia left	23:53
courrier	nevyn: thanks, that's fixed both remotely and locally	23:53
	→ ril joined	23:53
	← roflin left	23:53
	ril → ril[away]	23:53
	ril[away] → ril	23:53
	← asd5a left	23:54
	← i7c left	23:54
	← johnwhitton left	23:54
	→ ochorocho__ joined	23:54
	→ aspiers_ joined	23:54
	→ johnmilton joined	23:54
	← bollullera left	23:55
	← CrypticGator left	23:55
	→ mellernoia joined	23:55
	← timvisher left	23:55
	← mwhooker left	23:56
	← noser left	23:56
	→ johnwhitton joined	23:56
	→ timvisher joined	23:56
	← McNozes left	23:57
	→ languitar joined	23:57
	← krnex left	23:58
	← nfk left	23:58
	← johnwhitton left	23:58
	← stevenbenner left	23:58
	← mizu_no_oto left	23:58
	← fstd left	23:59
	← threeminutemonta left	23:59
	→ gitinfo joined	23:59
	ChanServ set mode: +o	23:59
	→ fstd joined	23:59
	→ threeminutemonta joined	23:59
	← ochorocho__ left	23:59
	→ wviana_ joined	23:59
	→ asd5a joined	23:59

Logs Search ←Prev date Next date→

Channels Documentation