IRCloggy #git 2014-07-07

Provider of IRC logs since 2005.

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

	2014-07-07
	← meLon left	00:00
	→ meLon joined	00:01
	→ otter768 joined	00:01
	→ str joined	00:03
	→ LucasTT joined	00:03
	← Reskp left	00:04
	→ noxd joined	00:04
	← hyperair left	00:05
	→ dccc joined	00:05
	← meLon left	00:06
	→ meLon joined	00:06
	← nordicdyno left	00:06
	→ Lyqyd joined	00:07
	→ kukks joined	00:09
	→ eaj joined	00:09
	→ the8thbit joined	00:10
	← blackmesa left	00:11
	← Segfault_ left	00:12
	→ Segfault_ joined	00:13
	← dccc left	00:13
	← eaj left	00:13
	→ stamina joined	00:13
	← ropav left	00:14
	← _ikke_ left	00:14
	← fatalhalt left	00:14
	→ _ikke_ joined	00:15
	→ fatalhalt joined	00:15
	→ ropav joined	00:17
	← linduxed left	00:19
	→ claudiop joined	00:19
	← imachuchu left	00:20
	← Nizumzen left	00:20
	← meLon left	00:20
	→ meLon joined	00:21
	← lolmaus left	00:21
claudiop	Hi. If i merge two branches, lets say "master" and "change", master creates a new commit merging both, but "change" keeps its pointer in the same place. To make it advance to the same as master i need to fast forward, correct? Whats the correct command for this situation?	00:22
imMute	claudiop: on change: git merge --ff-only master	00:24
	← stamina left	00:24
	→ martinklepsch joined	00:25
	← nfk left	00:25
	← meLon left	00:25
claudiop	imMute: Do i need to go back, or can i solve it after a successful merge without fast forward?	00:26
	→ meLon joined	00:26
imMute	no, just switch to change and run the command I gave you	00:26
	although, once you merge a branch into master, it's existence is kinda pointless. most people just delete it.	00:26
claudiop	if i append --amend will it overwrite the previous merge? Yes, but i will use that branch again later	00:27
	→ dccc joined	00:27
claudiop	Or deleting the branch and re-adding it again will have the same result?	00:28
imMute	I dont know what will happen if you try to --amend a merge commit. and yes, deleting then recreating a branch would do the same thing.	00:29
	(branches are just pointers)	00:29
	→ EminenceHC joined	00:29
	← martinklepsch left	00:29
	← Trudko left	00:29
	→ il_ joined	00:29
claudiop	imMute: Thanks for your answers ;)	00:30
	→ toothrot joined	00:30
	→ unreal joined	00:31
	→ SethM joined	00:32
	← appleby left	00:32
	← EminenceHC left	00:34
	← MattMaker left	00:34
	← meLon left	00:35
	→ meLon joined	00:36
	→ linduxed joined	00:36
	→ MattMaker joined	00:36
	→ Shelikhoo joined	00:36
	← Shelikhoo left	00:36
	← dccc left	00:38
	← linduxed left	00:42
	← claudiop left	00:44
	← Guest32342 left	00:45
	← meLon left	00:45
	→ meLon joined	00:46
	→ linduxed joined	00:46
	→ compact joined	00:47
	← netj left	00:48
	→ netj joined	00:48
	→ lolmaus joined	00:49
	← Hello71 left	00:49
	→ Hello71 joined	00:49
	← meLon left	00:50
	→ meLon joined	00:51
	← Lyqyd left	00:52
	→ bezet joined	00:53
	→ dccc joined	00:55
	→ nnyk_ joined	00:55
	← meLon left	00:56
	→ meLon joined	00:56
	← endiruna left	00:56
	← nnyk left	00:56
	← linduxed left	00:57
	← bezet left	00:58
	← snuffeluffegus left	00:58
	→ rkazak_ joined	00:58
	← bgerber left	00:58
	→ bgerber joined	00:59
	→ linduxed joined	00:59
	→ Skrypter_ joined	01:00
	→ Reskp joined	01:00
	← Skrypter left	01:00
	← meLon left	01:00
	→ meLon joined	01:01
	← noxd left	01:02
	→ User458764 joined	01:02
	User458764 → User458764_NotHe	01:02
	→ eaj joined	01:03
	→ Vampire0_ joined	01:03
	← linduxed left	01:04
	← Reskp left	01:05
	← meLon left	01:06
	→ meLon joined	01:06
	← dccc left	01:06
	← Vampire0 left	01:07
	← eaj left	01:07
	→ Ann21 joined	01:08
	← Ann21 left	01:08
	← duckydan left	01:09
	→ weiyang joined	01:09
	← meLon left	01:11
	→ meLon joined	01:11
	← kukks left	01:14
	→ duckydan joined	01:15
	← meLon left	01:15
	→ meLon joined	01:16
	← User458764_NotHe left	01:16
	← tummy left	01:16
	→ moritzschaefer joined	01:17
	→ harish_ joined	01:17
	← moritzs left	01:20
	← meLon left	01:20
	→ meLon joined	01:21
	→ dccc joined	01:22
	→ dsdeiz joined	01:23
	→ gsingh93_ joined	01:23
	← robustus left	01:25
	→ jeffreylevesque joined	01:26
	← oriba left	01:26
	← pheaver left	01:26
	← kevinb left	01:27
	← freeman42 left	01:27
	→ robustus joined	01:28
jeffreylevesque	can someone tell me why there is no reference (no link, solid black) next to my cloned repository 'grunt' - https://github.com/jeff1evesque/audio-analyzer/issues/279?	01:28
	← acharlieh left	01:28
	← dccc left	01:32
SamB	jeffreylevesque: maybe ##github ?	01:34
	I mean, unless they're somehow allowed to have an official channel despite being closed source, in which case #github	01:34
jeffreylevesque	thanks	01:35
	← meLon left	01:35
	→ meLon joined	01:36
	→ EminenceHC joined	01:36
	→ kevinb joined	01:36
	→ macrover joined	01:36
	→ hyperair joined	01:39
	← hyperair left	01:39
	→ hyperair joined	01:39
	← ejnahc left	01:39
	→ ejnahc joined	01:40
	← meLon left	01:41
	← kevinb left	01:41
	← darkbasic left	01:41
	→ meLon joined	01:41
	← EminenceHC left	01:41
	← fatalhalt left	01:41
	← Megaf left	01:41
	→ gargola_ joined	01:41
	→ darkbasic joined	01:41
	→ Fandekasp joined	01:42
	→ fatalhalt joined	01:42
	← harish_ left	01:44
	← n-st left	01:45
	← stiffi left	01:45
	← meLon left	01:46
	→ meLon joined	01:46
	→ kevinb joined	01:46
	→ dccc joined	01:49
	← str left	01:50
	← meLon left	01:51
	→ meLon joined	01:51
	← Arkaniad\|Laptop left	01:51
	→ martinklepsch joined	01:52
	← paulweb515 left	01:53
	← kevinb left	01:53
	← Corey84 left	01:55
	← dccc left	01:55
	← rkazak_ left	01:55
	← meLon left	01:56
zacts	I have a question	01:56
	→ neiled joined	01:56
	→ nickpresta joined	01:56
	→ meLon joined	01:56
	← neiled left	01:56
zacts	I want to fork http://git.minix3.org/minix-lionel.git	01:56
	→ paulweb515 joined	01:56
	← martinklepsch left	01:56
zacts	how can I do this, while keeping track of each branch 3.3.0u for example?	01:57
	→ eaj joined	01:57
	→ harish_ joined	01:57
imMute	zacts: "git clone git://git.minix3.org/minix-lionel.git"	01:58
	→ neiled joined	01:58
	← neiled left	01:58
zacts	imMute: that's all I have to do? I did this: mkdir minix-lionel ; cd minix-lionel ; git init ; git remote add upstream git://git.minix3.org/minix-lionel.git ; git fetch upstream; ...	01:59
	→ tokik joined	02:00
imMute	zacts: that would accomplish the same thing.	02:00
	→ daito joined	02:00
	← meLon left	02:00
	→ meLon joined	02:01
	→ Reskp joined	02:01
	→ neiled joined	02:01
	→ pheaver joined	02:01
zacts	ok, then how do I make sure there are no conflicts with my master branch and my upstream fetch?	02:01
	← eaj left	02:01
	→ silviof3 joined	02:01
zacts	s/fetch/merges/	02:02
imMute	zacts: well, with the previous, you would have master (your local one) being at a different point than upstream. so you'd have to reset/ff to get to the same as upstream/master	02:02
	← aviraldg left	02:03
	→ daito_ joined	02:03
	← daito left	02:03
	← Gamecubic left	02:04
	← silviof2 left	02:04
zacts	what I want is this [minix-lionel original repo] - - fetch / rebase - -> [zacts' repo with zacts' master branch fork of minix-lionel] - - zacts' various feature branches - - pushed to git hub - -> github	02:04
	and no conflicts	02:04
imMute	I didn't understand that. you've made changes to the repository?	02:05
zacts	imMute: yeah	02:05
	it's not a pure fork	02:05
	it's not a mirror	02:05
	but a fork	02:05
	← meLon left	02:05
	← Reskp left	02:06
	→ meLon joined	02:06
zacts	I want to make an experimental repo of minix-lionel that I can push to git-hub, while pulling from the original minix-lionel for updates	02:06
	then lionel will pull from my github repo and merge them back into the original minix-lionel repo	02:07
imMute	so make a repo that has two remotes, one for github and one for lionel's repo.	02:07
	← otter768 left	02:07
	← damccull left	02:07
imMute	and setup your config file to pull from the lionel remote and push to github.	02:07
	→ otter768 joined	02:07
	← daivyk left	02:07
	← cigarshark left	02:07
zacts	ok, and how do I make sure that my master doesn't conflict with the original minix-lionel master branch?	02:07
thiago	zacts: if you want to ensure there are no conflicts, stop making changes	02:08
	never make changes	02:08
	that's the only way to ensure no conflicts will ever happen	02:08
imMute	zacts: what do you mean "conflicts" ?	02:08
zacts	thiago: oh, no. I guess what would the best practice be. use my own master branch, or create a separate zacts branch?	02:08
	here, let me set it up really fast the way you said imMute then I'll link to my github page, so you can see what I mean.	02:09
thiago	zacts: there's no best way	02:09
	zacts: if there are conflicts, solve them	02:09
imMute	zacts: "master" is a name that only exists locally. in your repo, "lionel's master" would be called "lionel/master" (assuming you setup your remote to be called lionel)	02:09
	← darkxploit left	02:09
	→ kevinb joined	02:09
zacts	oh, I understand now. ok. that answers my question.	02:09
imMute	and there's another one that would be called github/master, whether that one matches lionel/master or not is up to you.	02:10
zacts	ok, sweet. thanks a bunch!	02:10
	→ rkazak_ joined	02:10
zacts	thiago: I see, ok. thanks.	02:10
	← meLon left	02:11
	→ meLon joined	02:11
	→ dccc joined	02:12
jeffreylevesque	what's the difference between getting a submodule of another repository, and cloning another repository?	02:12
thiago	jeffreylevesque: the difference is the fact that the submodule is linked from the supermodule	02:13
jeffreylevesque	my cloned "grunt" repo is not linked to it's repository - https://github.com/jeff1evesque/audio-analyzer/issues/279	02:14
thiago	not going to read a task tracker issue	02:14
imMute	jeffreylevesque: your .gitmodules file doesn't list a submodule for "grunt"	02:15
	so github has no wsay of knowing what repository it's supposed to be.	02:15
	← kevinb left	02:16
jeffreylevesque	imMute: instead of doing `git submodule add..`, i did `git clone ..`.	02:16
	→ daito joined	02:16
jeffreylevesque	should i manually create a reference in .gitmodules?	02:16
imMute	yes.	02:17
jeffreylevesque	thanks	02:17
imMute	thiago: missed out on an easy problem ;)	02:17
	← daito left	02:18
	→ daito joined	02:19
	← daito_ left	02:20
	← daito left	02:20
	← neiled left	02:20
	→ aviraldg joined	02:20
	→ daito joined	02:20
	← meLon left	02:21
	→ meLon joined	02:21
	→ kevinb joined	02:23
	← rkazak_ left	02:24
	← dccc left	02:25
	← bitkiller left	02:25
	→ kushal3 joined	02:26
	← kevinb left	02:27
	→ kingbeowolf joined	02:29
kingbeowolf	how do i re-git clone to get the latest stuff?	02:29
preaction	kingbeowolf: git pull	02:30
imMute	or, more safely, git fetch	02:30
kingbeowolf	preaction: oh sweet I thought i had to have permissions for that	02:30
	← meLon left	02:31
	→ meLon joined	02:31
imMute	.... you have to have read permissions, but if you can clone, you have them.	02:31
thiago	unless, of course, they changed since you cloned	02:32
	← CheckDavid left	02:32
	→ kevinb joined	02:33
kingbeowolf	oh ok	02:34
	so what is a pull request everyone is talking about?	02:34
	that is for private repos?	02:34
imMute	basically an email to the maintainer "hey, I made changes, you can find them at XXX and pull them into your repo"	02:34
	→ Remorse joined	02:35
kingbeowolf	oh	02:35
	← meLon left	02:36
	→ meLon joined	02:36
	← Davey left	02:37
	→ Davey joined	02:38
	→ HanClinto__ joined	02:38
	→ Remorse_ joined	02:39
	→ leb joined	02:39
	← Remorse left	02:39
	← kevinb left	02:40
	← meLon left	02:41
	→ meLon joined	02:41
	→ dccc joined	02:41
	→ rkazak joined	02:42
	← HanClinto_ left	02:42
	→ kevinb joined	02:45
	→ EminenceHC joined	02:45
	← meLon left	02:46
	→ meLon joined	02:46
	← Noldorin left	02:49
	← kevinb left	02:49
	← EminenceHC left	02:50
	→ eaj joined	02:51
	→ Lemony joined	02:51
	→ bezet joined	02:54
	← dccc left	02:55
	→ kevinb joined	02:55
	← meLon left	02:56
	→ meLon joined	02:56
	← eaj left	02:56
	← madewokherd left	02:56
	← zumba_addict left	02:57
	→ zumba_addict joined	02:57
	→ Arkaniad\|Laptop joined	02:57
	nevyn_ → nevyn	02:58
	← bezet left	02:58
	→ pr0ton_ joined	02:59
	← moritzschaefer left	02:59
	← leb left	02:59
	← kevinb left	03:00
	← meLon left	03:01
	→ meLon joined	03:01
	→ Reskp joined	03:01
	← polyzen left	03:02
	→ gargola__ joined	03:05
	← meLon left	03:06
	→ meLon joined	03:06
	← Reskp left	03:06
	→ kevinb joined	03:06
	→ zumba_ad_ joined	03:07
	← gargola_ left	03:08
	→ hkon_ joined	03:09
	← zumba_addict left	03:09
	← Fandekasp left	03:09
	→ jstimm joined	03:10
	← meLon left	03:11
	→ dccc joined	03:11
	← kingbeowolf left	03:11
	→ meLon joined	03:11
	← kevinb left	03:11
	← hkon_ left	03:14
	← MattMaker left	03:14
	→ jnz joined	03:14
	← jnz left	03:15
	→ jnz joined	03:15
jnz	How would you undo 2 unsynced commits ?	03:15
	← hyperair left	03:15
jnz	i tried to revert, but it made another commit	03:15
	→ diegoviola joined	03:15
	← meLon left	03:16
	← m0viefreak left	03:16
	→ meLon joined	03:16
	← zhangxaochen_ left	03:16
	→ kevinb joined	03:16
	→ zhangxaochen_ joined	03:17
	← jstimm left	03:17
	→ jftf joined	03:18
	→ a_le joined	03:18
	gitinfo set mode: +v	03:19
	skorgon_ → skorgon	03:19
skorgon	jnz: !fixup	03:19
gitinfo	jnz: So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!	03:19
	← graft left	03:19
	← toothrot left	03:20
	← dccc left	03:20
	→ MattMaker joined	03:20
	← LucasTT left	03:21
ISmithers	What are unsynced commits?	03:21
	→ delgiudices joined	03:21
delgiudices	how do i git rm to all files.pyc	03:22
jnz	uhmm nvm i just did git reset --soft HEAD~1	03:22
	and it removed the files :S	03:22
	how do i get the files back	03:22
preaction	ISmithers: commits that you have locally that are not in the local copy of the remote (git fetch)	03:22
ISmithers	jnz python .pyc files are just precompiled python files, if you wish them back but haven't got a commit with them in, then just re-run the python program that created them.	03:23
	← il_ left	03:23
	← kevinb left	03:23
ISmithers	Oh OK thanks preaction	03:23
skorgon	jnz: soft reset should not have touched your files	03:23
	jnz: but there is the !reflog	03:24
gitinfo	jnz: The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details. WARNING: reset --hard will trash any uncommitted changes! Visualize with: gitk --all --date-order `git log -g --pretty=%H`	03:24
jnz	http://i.imgur.com/qXh7F9Y.png	03:24
	→ echo-area joined	03:24
jnz	i did HEAD~2	03:24
	← shinnya left	03:24
jnz	why did it remove my files, i thought soft wasnt mean too :o	03:25
	meant*	03:25
ISmithers	Are you sure you didn't remove them another way?	03:25
jnz	nope i used that command	03:25
	git reset --soft HEAD~2	03:25
	and my files reverted to before the commits	03:26
	← meLon left	03:26
	→ meLon joined	03:26
skorgon	without --hard, reset should not even do that, if i'm not mistaken	03:26
	it just resets the index. the working tree remains as is, i thikn	03:27
ISmithers	Yes that's right.	03:27
nevyn	yes	03:27
	← jeffreylevesque left	03:28
	→ kevinb joined	03:29
jnz	idk what happened then ._.	03:29
	← kushal3 left	03:29
jnz	i managed to do a restore with the oldsha	03:29
	ok never using that command again :D	03:30
	got the files back	03:30
	← meLon left	03:31
ISmithers	You don't really need those pyc files anyway jnz.	03:31
	→ meLon joined	03:31
	← daito left	03:31
	← Ankhers left	03:31
	→ viscera joined	03:32
	← Remorse_ left	03:32
jnz	what are pyc files ?	03:32
	→ Remorse joined	03:32
jnz	that was another person lol	03:32
	nevyn waves hand in jedi like manner "these are not the files you are looking for"	03:32
	→ Ankhers joined	03:32
ISmithers	Oh sorry, that was indeed another person.	03:33
	I was meant to address that to delgiudices instead. Sorry jnz.	03:33
	← visceral left	03:34
	← aviraldg left	03:34
jnz	np :)	03:34
	→ daito joined	03:35
	← meLon left	03:36
	← kevinb left	03:36
	→ meLon joined	03:36
	→ visceral joined	03:36
	← daito left	03:36
	← surfdue left	03:36
	← HanClinto__ left	03:36
	→ dccc joined	03:36
	← shingshang left	03:36
	← Remorse left	03:36
	→ surfdue joined	03:38
	← khaije\|io left	03:39
	→ Consuela joined	03:39
	← viscera left	03:39
	→ ojacobson joined	03:40
	→ jstimm joined	03:40
	→ chrisshattuck joined	03:40
	← meLon left	03:41
	→ meLon joined	03:41
	→ kevinb joined	03:42
	→ daito joined	03:42
	→ leb joined	03:42
	→ polyzen joined	03:42
	→ hives joined	03:44
	→ eaj joined	03:45
	← meLon left	03:46
	→ Remorse joined	03:46
	→ meLon joined	03:46
	← dccc left	03:47
	← kevinb left	03:47
	→ EminenceHC joined	03:48
zacts	ok, I guess I'm a bit lost.	03:48
	← jftf left	03:48
offby1	you're in #git.	03:49
ISmithers	lol	03:49
offby1	A twisty maze of &c &c.	03:49
	→ Remorse_ joined	03:49
zacts	how can I set up a full mirror of http://git.minix3.org/minix-lionel.git (including all of the branches)?	03:49
	the git clone address is git://git.minix3.org/minix-lionel.git	03:49
	→ Corey84 joined	03:50
zacts	I only know how to: 1) git clone git://.../minix-lionel.git 2) git checkout origin/3.3.0u	03:50
	← Remorse left	03:50
	← eaj left	03:50
	← meLon left	03:51
zacts	I don't know how to mirror the entire repo and all of its branches. once I know how to do that my next question should evolve into a github question, as to how to sync this with github.	03:51
	→ meLon joined	03:51
offby1	zacts: I'd read about "git clone --mirror"	03:51
	in fact, let's see if this works: !mirror	03:51
zacts	ok, cool	03:52
	offby1: I'm reading it now. now that I know how to --mirror, can I still add my own branches to this repo?	03:52
	or is it going to be a static repo.	03:52
	zacts reads	03:52
	→ kevinb joined	03:53
	← EminenceHC left	03:53
	← otter768 left	03:53
	→ martinklepsch joined	03:53
	← kevinb left	03:55
zacts	offby1: what I want is a mirror of all of the minix-lionel branches, and my own zacts branch included	03:55
offby1	I actually don't know how it works :-\|	03:55
	I'd just play with it and see if it appears to do what you want	03:55
zacts	sure, ok.	03:56
	← meLon left	03:56
	→ meLon joined	03:56
	← delgiudices left	03:56
	← martinklepsch left	03:58
	← surfdue left	03:58
	← therealGent left	03:58
	→ hyperair joined	03:58
	→ quazimodo joined	03:59
	→ rchavik joined	04:00
	← ribasushi left	04:00
	← meLon left	04:01
	→ meLon joined	04:01
	← MissionCritical left	04:01
	→ Lyqyd joined	04:01
	← Remorse_ left	04:01
	← simesy left	04:01
	→ simesy joined	04:02
	← ropav left	04:02
	→ Reskp joined	04:02
	→ ropav joined	04:02
	→ dccc joined	04:03
	→ Motoko joined	04:04
	→ kevinb joined	04:04
	← Ankhers left	04:04
	← Dougie187 left	04:05
	← meLon left	04:06
	→ meLon joined	04:06
	← Reskp left	04:07
	← raven-au left	04:08
	→ raven-au joined	04:08
	← kevinb left	04:08
	→ mizu_no_oto joined	04:09
	→ Fandekasp joined	04:10
	→ ribasushi joined	04:10
	→ surfdue joined	04:10
	← meLon left	04:11
	→ meLon joined	04:11
	← ValF left	04:12
	← dccc left	04:12
	→ MissionCritical joined	04:14
	→ ValF joined	04:14
	→ kevinb joined	04:14
	← pr0ton_ left	04:15
	← meLon left	04:16
	← nnyk_ left	04:16
	→ meLon joined	04:16
	→ hobodave joined	04:16
	← daito left	04:17
	← hobodave left	04:17
	← punchagan left	04:17
	← kevinb left	04:19
	→ Guddu_ joined	04:19
Guddu_	What is the best Windows GIT Client one can use?	04:20
	← meLon left	04:21
	→ meLon joined	04:21
	← nodiscc left	04:21
	← rkazak left	04:21
nevyn	git for windows?	04:22
Guddu_	nevyn, GIT Client for Windows	04:23
nevyn	there's a build for windows of git	04:25
	→ kevinb joined	04:25
	← meLon left	04:26
	→ meLon joined	04:26
	← jonmorehouse left	04:26
	→ jonmorehouse joined	04:27
	→ luc_ joined	04:27
	→ Remorse joined	04:28
	→ dccc joined	04:28
	← kevinb left	04:29
	← Segfault_ left	04:30
	← Radivarig left	04:30
	← meLon left	04:31
	→ Segfault_ joined	04:31
	→ meLon joined	04:31
	← mizu_no_oto left	04:32
Motoko	MSYSGit.	04:33
	If you need a GUI, SourceTree.	04:33
	→ kevinb joined	04:34
	→ KamalKaur joined	04:35
	← meLon left	04:36
	→ meLon joined	04:36
	← KamalKaur left	04:37
	← Consuela left	04:38
	← dccc left	04:38
	← robbyoconnor left	04:39
	→ mennea joined	04:39
	→ robbyoconnor joined	04:39
	← robbyoconnor left	04:39
	→ robbyoconnor joined	04:39
	→ eaj joined	04:39
	→ irqq joined	04:40
	← Skrypter_ left	04:41
	← meLon left	04:41
	→ meLon joined	04:41
	← eaj left	04:44
	→ Skrypter joined	04:45
	← meLon left	04:46
	→ nnyk_ joined	04:46
	→ meLon joined	04:46
	← the_cybersphinx left	04:46
Guddu_	Thanks Motoko	04:48
	← basiclaser left	04:48
Motoko	SmartGit is also nice, but I like SourceTree much better.	04:49
	You're welcome.	04:49
	→ basiclaser joined	04:49
	← silviof3 left	04:49
	→ il_ joined	04:49
	← meLon left	04:51
	← fatalhalt left	04:51
	→ meLon joined	04:51
	→ Tommy[D]_ joined	04:51
	→ ajc_ joined	04:52
	→ quazimod1 joined	04:53
	← crankharder left	04:53
	← quazimod1 left	04:53
	← macrover left	04:53
	← Tommy[D] left	04:54
	→ bezet joined	04:54
	→ martinklepsch joined	04:54
	→ dccc joined	04:54
	→ EminenceHC joined	04:54
	← jonmorehouse left	04:55
	← meLon left	04:56
	→ jonmorehouse joined	04:56
	→ meLon joined	04:56
Guddu_	Motoko, Where do you host your GIT repository? I am planning to host on Amazon EC2	04:56
	Linux MIcroinstance	04:57
Motoko	I use BitBucket and GitHub depending.	04:57
Guddu_	Motoko, Paid service?	04:57
Motoko	Although I could use my personal dedi.	04:57
	Nah.	04:57
	BitBucket offers free private.	04:58
	Only up to five users can access.	04:58
	Above that, you have to pay.	04:58
Guddu_	Motoko, SOunds just right. I will have hardly 4 users	04:58
	← ojacobson left	04:58
Guddu_	Motoko, Else i can always install GIT for linux in my Amazon EC2 right?	04:59
	← martinklepsch left	04:59
	← bezet left	04:59
	← EminenceHC left	04:59
Motoko	If the code is open, I usually use GitHub due to the popularity.	04:59
	Sure. You can use any remote location.	04:59
	Even just plain ssh.	04:59
Guddu_	Motoko, Plain ssh?	04:59
Motoko	Yeah, you can push/fetch over ssh.	05:00
imMute	Guddu_: git clone ssh://immute@example.com/home/immute/repositories/foo.git	05:00
Motoko	You don't need anything fancy, really.	05:00
	But it is useful if you need to have more control.	05:00
imMute	Guddu_: requires no special software on the SSH server.	05:00
	← meLon left	05:01
thiago	besides git itself, of course	05:01
Guddu_	Motoko, I prefer GUI as it is more intuitive for me.	05:01
Motoko	Right.	05:01
	← dccc left	05:01
	← UmbraMalison_ left	05:01
thiago	that has nothing to do with it	05:01
	you can install a GUI	05:01
	→ meLon joined	05:01
Motoko	Guddu_, also learn the commands. Sometimes you'll need something that is either clunky in a GUI or not possible.	05:01
	← gargola__ left	05:01
Motoko	AFAIK, no GUI currently supports bisect.	05:01
Guddu_	Motoko, Makes sense. I will be the admin so I will neeed to learn the commmmand for sure. But for developer function I will use GUI always :-)	05:02
Motoko	And doing advanced repo management.	05:02
	Well, bisect is useful for dev.	05:02
	← jonmorehouse left	05:02
	→ UmbraMalison joined	05:02
	Guddu_ is looking at what biscet is	05:02
thiago	bisect is a local tool	05:03
	→ jonmorehouse joined	05:03
	← d1b left	05:03
thiago	I thought you were talking about managing a server via a web interface	05:03
	→ Reskp joined	05:03
Guddu_	thiago, No, Just code checkins and Checkout etc.	05:03
	I will do every administrative stuff using commands always	05:03
Motoko	You shouldn't really need any fancy admin stuff.	05:04
	Other than making sure you have backups.	05:04
Guddu_	Right	05:04
Motoko	That's a more general concern.	05:04
Guddu_	Thanks Motoko and thiago for your help today.	05:05
nevyn	is sourcetree proprietary?	05:05
Motoko	It's closed source, yes.	05:06
	← meLon left	05:06
	← jonmorehouse left	05:06
Motoko	But it's one of the best GUIs for Windows and OS X.	05:06
	IMO.	05:06
	→ meLon joined	05:06
	→ Guddu__ joined	05:06
SamB	Guddu_: I don't think most call that administrative	05:06
	→ jonmorehouse joined	05:06
	← Reskp left	05:08
	→ hkon_ joined	05:09
	← Guddu_ left	05:10
	← meLon left	05:11
	→ meLon joined	05:11
	→ idoit joined	05:12
	← nnyk_ left	05:12
	← hkon_ left	05:14
	→ kcj joined	05:14
	← meLon left	05:16
	→ meLon joined	05:16
	→ dccc joined	05:17
	→ User458764 joined	05:17
	→ daito joined	05:18
	→ punchagan joined	05:18
	→ glosoli joined	05:19
glosoli	Hey folks. I had some changes in repo, and the project was restructured in whole new repository. Is there some way to make a patch from a specific directory to the changes in that new repository, so I could apply my changes made in old repository to the new one ?	05:20
	← daito left	05:20
	→ daito joined	05:21
	← meLon left	05:21
thiago	yes	05:21
	→ FunkyAss joined	05:21
	→ meLon joined	05:21
thiago	git format-patch, edit the file paths, then git am	05:21
	← eliasr left	05:21
	→ dannixon joined	05:23
	← Tuna-Fish left	05:23
glosoli	thiago: I just found some article on Stackeroverflow saying I could just make a patch using "diff -ur b a > ba.diff" and then apply it. I am curious how git format-patch is better, what else does it do ?	05:25
	It also adds commits and other info to the patch ?	05:25
thiago	it keeps the commit message	05:25
	← dccc left	05:26
	← meLon left	05:26
	← gabeio left	05:26
	→ therealGent joined	05:26
glosoli	thiago: so if I had several commits on that dir, it will keep all of them when I apply the patch to new repo ?	05:26
	→ meLon joined	05:26
	← jonmorehouse left	05:27
	→ jonmorehouse joined	05:28
	← irqq left	05:28
	→ ifim joined	05:29
	← ValF left	05:29
thiago	yes	05:29
glosoli	thiago: I am wondering if I need to add the other repo as second remote, or I could just somehow use git format-patch specifying old_path_to_dir new_path_to_dir ?	05:31
	User458764 → User458764_NotHe	05:31
	← meLon left	05:31
	→ meLon joined	05:31
thiago	glosoli: you may be able to just cherry-pick	05:31
	→ User458764 joined	05:32
glosoli	thiago: cherry pick implies I am working on the same repo, the thing that these two repos are completely different ones, yet they share one common component	05:32
	the new one has old implementation, which wasn't merged from the old oen	05:32
	one"	05:32
	→ MrVagabond joined	05:33
thiago	glosoli: you said you were going to add as a remote	05:33
	glosoli: that implies same repo	05:33
	→ eaj joined	05:34
	→ pikaren joined	05:34
	→ Junior joined	05:34
glosoli	thiago: Ah sorry, I was asking if I must to do that in order to make use of git format-patch	05:34
	→ pantsman- joined	05:34
thiago	no	05:34
	← pikaren left	05:34
	→ Tuna-Fish joined	05:34
	→ pikaren joined	05:34
	→ Guddu_ joined	05:34
glosoli	thiago: emm sorry again, so how could I approach the problem and use git format-patch without adding the new repo as a remote ?	05:34
	← punchagan left	05:35
thiago	use git format-patch	05:35
	← User458764_NotHe left	05:35
glosoli	yeah but I don't get what do I need to specify for it (I did the reading for git format-patch --help)	05:35
	← meLon left	05:36
	← harish_ left	05:36
	→ meLon joined	05:36
thiago	the commits you want to create the patch for	05:36
	probably: git format-patch last-version-you-merged..HEAD -- subdir/	05:37
	← Lyqyd left	05:37
	→ FilipNortic joined	05:37
	← Guddu__ left	05:38
	← therealGent left	05:38
	← eaj left	05:38
	→ beautifulmind joined	05:39
	→ ThomasLocke joined	05:39
	← ThomasLocke left	05:39
	→ ThomasLocke joined	05:39
	← starkhalo left	05:39
	← meLon left	05:41
	→ meLon joined	05:41
	→ Novitsh__ joined	05:41
	User458764 → User458764_NotHe	05:42
	← Novitsh__ left	05:42
	← chrisshattuck left	05:42
	→ dccc joined	05:42
	→ Muchoz joined	05:42
glosoli	thiago: thanks, I seem to get it now, though how do I make single patch file from the commits ?	05:43
	→ Novitsh_ joined	05:43
thiago	--stdout and redirect to one file	05:43
	→ jftf joined	05:44
glosoli	thiago: seems to redirect only patch names	05:45
thiago	did you add the --stdout argument?	05:46
	← meLon left	05:46
glosoli	git format-patch 85e2253..HEAD -- transaction-categorisation-service/ --stdout > single.patch	05:46
	→ meLon joined	05:46
	← User458764_NotHe left	05:46
	← Muchoz left	05:47
glosoli	thiago: ah misplaces stdout argument	05:49
	sorry	05:49
	misplaces"	05:49
	misplaced" damn	05:49
	→ harish_ joined	05:49
	→ aldodelgado joined	05:50
	← Nikoli left	05:50
	← jftf left	05:50
	→ rath joined	05:50
	← meLon left	05:51
	→ meLon joined	05:51
	← dccc left	05:51
	← dannixon left	05:52
	→ gabeio joined	05:52
	← pantsman- left	05:52
	→ zumba_addict joined	05:54
	← jenia left	05:54
	← tpollard left	05:55
	← Lemony left	05:55
	→ gargola_ joined	05:55
	→ jluc joined	05:56
	← meLon left	05:56
	→ jargon joined	05:56
	→ meLon joined	05:56
	→ d1b joined	05:57
	→ kyb3r_ joined	05:57
	← zumba_ad_ left	05:57
	→ thevishy joined	05:58
	→ EminenceHC joined	05:58
	→ stellarhopper joined	05:59
glosoli	thiago: How does one resolve git am problems, since it does not seem to add any file to staging	05:59
	← ISmithers left	05:59
	← MattMaker left	06:00
	→ MattMaker joined	06:00
	→ Silmarilion joined	06:01
	← MrVagabond left	06:03
	← EminenceHC left	06:03
	→ Reskp joined	06:04
	← nkouevda left	06:04
	→ Muchoz joined	06:05
	→ hoschi joined	06:06
	→ papegaaij joined	06:06
	← glosoli left	06:06
	← tokik left	06:07
	← Motoko left	06:07
	→ dccc joined	06:08
	← Reskp left	06:09
	← pheaver left	06:10
	→ freimatz joined	06:10
	→ nordicdyno joined	06:10
	→ endiruna joined	06:10
	← Muchoz left	06:10
	→ KevinTS joined	06:10
	→ Reskp joined	06:11
	← Orbitrix left	06:11
	← meLon left	06:11
	← Junior left	06:11
	→ meLon joined	06:11
	→ Wiz_KeeD joined	06:12
	← jonmorehouse left	06:12
	→ jonmorehouse joined	06:13
	→ Junior joined	06:14
	← HelloShitty left	06:15
	→ acolson joined	06:15
	← Reskp left	06:15
	→ tokik joined	06:15
	← JanC left	06:16
	→ cbreak-work joined	06:16
	→ h0bbit joined	06:17
	→ bezet joined	06:17
	← weiyang left	06:17
	← dccc left	06:18
	← diegoviola left	06:18
	← quazimodo left	06:20
	← compact left	06:20
	→ nnyk_ joined	06:21
	→ mariuscc joined	06:21
	← bezet left	06:21
	→ LeMike joined	06:25
	← meLon left	06:26
	→ meLon joined	06:26
	→ solker joined	06:27
	→ Gizburdt joined	06:27
	→ eaj joined	06:28
	← jonmorehouse left	06:28
	→ jonmorehouse joined	06:29
	← solker_ left	06:29
	→ goTAN joined	06:29
	→ JanC joined	06:29
	← Gizburdt left	06:30
	→ Gizburdt joined	06:30
	← meLon left	06:31
	← dsdeiz left	06:31
	→ meLon joined	06:31
	← eaj left	06:32
	← Skrypter left	06:32
	→ nour_ joined	06:33
	← zumba_addict left	06:34
	← Gizburdt left	06:34
	→ Gizburdt joined	06:34
	← cobakobodob left	06:34
	→ dccc joined	06:34
	← relipse left	06:35
	→ fstd_ joined	06:35
	→ cobakobodob joined	06:35
	← meLon left	06:36
	← Asiajey left	06:36
	→ meLon joined	06:36
	→ saurabh joined	06:36
	saurabh → Guest86139	06:37
	→ Errorical joined	06:37
	→ please joined	06:37
	← please left	06:38
	→ Skrypter joined	06:38
	→ Asiajey joined	06:38
	← Asiajey left	06:38
	→ Asiajey joined	06:38
	← jonmorehouse left	06:39
	← thiago left	06:39
	→ bvi joined	06:39
	← fstd left	06:39
	fstd_ → fstd	06:39
	→ ehmatthes joined	06:39
	→ please joined	06:39
	please → Guest2366	06:40
	→ thiago joined	06:40
	← ferreum left	06:40
	← meLon left	06:41
	→ meLon joined	06:41
	→ jonmorehouse joined	06:42
	gitinfo set mode: +v	06:42
Guest2366	Hi guys. What's the most reliable way to keep up to date on Git development? Is there a recommendable newsletter or the like?	06:42
	→ CraigyDavi` joined	06:42
	→ HelperW joined	06:42
j416	Guest2366: mailing list	06:42
_ikke_	!mailing_list	06:43
gitinfo	[!official] Some official resources for git. Homepage: http://git-scm.com/ \| Source repo: https://www.kernel.org/pub/scm/git/git.git/ (Mirrrored: https://github.com/git/git/) \| IRC channel: You're in it. \| Mailing list: http://vger.kernel.org/vger-lists.html#git	06:43
j416	Guest2366: or the release changlog (see http://git-scm.com) if you want a birds-eye	06:43
_ikke_	There is regular birds-eye posts from the maintainer on the list too	06:43
	→ eaj joined	06:44
	← dccc left	06:44
	→ lite_ joined	06:44
	→ stodan joined	06:44
Guest2366	Thx. But subscribing to the mailing list means I will receive a lot of conversation which I am not interested in. I just want to get the most important news (new Git version and changes, tips and tricks maybe - something like that).	06:45
	← CraigyDavi left	06:45
	← lite_ left	06:46
	← meLon left	06:46
j416	Guest2366: did you read what I wrote?	06:46
	→ lite_ joined	06:46
	→ meLon joined	06:46
j416	nostalging on the mailing list, I came across this http://marc.info/?l=git&m=111350395823869&w=2	06:47
	→ weiyang joined	06:47
j416	is this possible to do?	06:47
	← Gizburdt left	06:47
	→ Gizburdt joined	06:48
	← Tuna-Fish left	06:48
_ikke_	THat's very easy to do	06:50
	git checkout --orphan	06:50
	or just merge two unrelated repositories	06:50
	← Goplat left	06:50
j416	--orphan would be the opposite, kind of	06:50
	how'd I merge two histories without a common merge-base but which, at some point, have an identical tree?	06:51
	← Gizburdt left	06:52
	→ xificurC joined	06:53
thiago	j416: git merge	06:54
	→ Gizburdt joined	06:54
	→ Tuna-Fish joined	06:54
	← Guddu_ left	06:55
	→ hebz0rl joined	06:55
	← meLon left	06:56
	→ martinklepsch joined	06:56
	→ meLon joined	06:56
	→ jerius joined	06:56
j416	thiago: it finds the common tree automagically?	06:56
	thanks. didn't know that.	06:57
	→ compact joined	06:57
thiago	maybe not	06:57
	if it fails to do that, check out one of the commits that is identical to the other, merge the other	06:58
	→ hkon_ joined	06:58
thiago	then merge that result into the two heads and them together	06:58
j416	because if the trees at the heads are identical merge won't even bother finding a merge-base?	06:59
	→ sea-gull_ joined	06:59
	→ dangerousdave joined	06:59
thiago	if that fails, use -s ours	06:59
	→ EminenceHC joined	06:59
j416	thanks	06:59
	← h0bbit left	06:59
j416	(I don't have this situation, it was just a question out of curiosity)	06:59
	→ cilly joined	07:00
	← hives left	07:00
	← a_le left	07:00
	→ dccc joined	07:00
	← martinklepsch left	07:00
	→ jnavila joined	07:01
	← meLon left	07:01
	← nordicdyno left	07:01
	← nickpresta left	07:01
	→ meLon joined	07:01
	← jonmorehouse left	07:01
	→ Zoddo joined	07:01
	← echo-area left	07:02
	← hkon_ left	07:02
	→ echo-area joined	07:02
	← veebers left	07:02
	→ gua_ould joined	07:02
	← the8thbit left	07:03
	→ fairuz joined	07:03
	→ jonmorehouse joined	07:04
	← EminenceHC left	07:04
	← thrownull left	07:04
	→ Orbitrix joined	07:04
	← Orbitrix left	07:04
	→ Orbitrix joined	07:05
	← meLon left	07:06
	← jrnieder left	07:06
	→ meLon joined	07:06
	→ Muchoz joined	07:06
	→ hkon_ joined	07:07
	← descala left	07:07
	→ okdamn joined	07:07
okdamn	hey sorry im trying using .gitmodules	07:08
	but when i do git submodule update —init	07:08
	→ Macaveli joined	07:08
okdamn	it doesn't fetchs repos i mean nothing happening	07:08
	i only modified the .gitmodules and .git/config files	07:09
	← endiruna left	07:09
	← dccc left	07:09
_ikke_	Did you create the .gitmodules manually?	07:09
	or was it already there	07:10
	Vampire0_ → Vampire0	07:10
okdamn	_ikke_: manually :P	07:10
_ikke_	Then that isn't going to work, because you still miss one component	07:10
	→ lb1a joined	07:10
okdamn	so i just have to delete that file?	07:10
	← Muchoz left	07:11
	← meLon left	07:11
	→ meLon joined	07:11
	→ blackmesa joined	07:11
	→ irqq joined	07:11
_ikke_	Just use git submodule add	07:11
	→ reim joined	07:11
okdamn	_ikke_: but .git/fongi is it ok if i put submodules urls right?	07:12
	← cilly left	07:12
okdamn	.git/config	07:12
	→ Silox\| joined	07:12
okdamn	_ikke_: http://pastebin.com/TfAMVyKX	07:12
	my config	07:12
	→ vurma joined	07:12
okdamn	now what to do? remove .gitmodules ?	07:13
_ikke_	It shouldn't be a problem iff it already existed	07:15
okdamn	_ikke_: ehm i deleted that file	07:15
	→ tgkokk joined	07:15
_ikke_	No problem	07:15
okdamn	its cache problem?	07:15
	→ jontmorehouse joined	07:15
okdamn	i now tryed git submodule add	07:15
_ikke_	No, those things are not cached	07:15
okdamn	great	07:16
	what after add ?	07:16
	update?	07:16
_ikke_	yes	07:16
	→ moritzschaefer joined	07:17
okdamn	but git submodule add open me the help command line	07:17
	with the list of submodule commands	07:17
	mmm	07:17
	← jonmorehouse left	07:17
_ikke_	Well, you still need to specify the submodule path and url	07:18
	see man git submodule	07:18
gitinfo	the git-submodule manpage is available at http://jk.gs/git-submodule.html	07:18
okdamn	yes but i did all of these :(	07:19
	→ phil80 joined	07:19
okdamn	it still not working i need to restart from zero	07:20
	← dangerousdave left	07:20
	← Zoddo left	07:20
	→ dangerousdave joined	07:20
	→ Trudko joined	07:20
	← Guest2366 left	07:21
	← reim left	07:21
_ikke_	What is not working?	07:21
	← jontmorehouse left	07:21
	→ reim joined	07:22
	← nour_ left	07:22
	← daurnimator left	07:22
	→ jontmorehouse joined	07:22
	→ JustMozzy joined	07:23
	← moritzschaefer left	07:24
	→ Gonzo89 joined	07:25
	→ jceb joined	07:25
	← il_ left	07:26
	← flaguy48 left	07:26
	← meLon left	07:26
	→ mlechner joined	07:26
Trudko	Guys what is advantage of using tags in small projects which will be release to just one client?	07:26
	→ dccc joined	07:26
	→ meLon joined	07:26
cbreak-work	oh god, google docks suck so much...	07:26
	Trudko: tags are labels.	07:26
	Trudko: do you care to know which versions were released?	07:26
	Trudko: do you care to label some commits as being version 3?	07:27
	← phil80 left	07:27
okdamn	oh guys big problem now, i used git submodule add repo /path	07:28
	now i deleted both .gitmodules and /path directory	07:28
	← jargon left	07:28
okdamn	and im unable to add new	07:28
Trudko	cbreak-work: should I care_	07:28
okdamn	submodules	07:29
	→ bezet joined	07:29
okdamn	what do when : No submodule mapping found in .gitmodules for path	07:29
	?	07:29
	→ jargon joined	07:29
	→ nekyian_ joined	07:29
cbreak-work	Trudko: don't know. I would.	07:29
	okdamn: you have a submodule that's not mapped	07:30
Trudko	and why would you care? What are the benefits?	07:30
cbreak-work	okdamn: remove it	07:30
	okdamn: git rm --cached path/to/submodule	07:30
	→ Royalb15 joined	07:30
cbreak-work	Trudko: knowledge is power	07:30
	← eaj left	07:30
cbreak-work	Trudko: knowing which version I gave out really helps with finding out why something is buggy, or not.	07:31
	← meLon left	07:31
cbreak-work	Trudko: it allows me building the exact same version to reproduce problems	07:31
	and so on	07:31
	→ meLon joined	07:31
okdamn	cbreak-work: hey it works thanks :D	07:31
	← daito left	07:32
	← bezet left	07:33
	→ numdig joined	07:33
	→ zhangxaochen joined	07:35
	→ atamanroman joined	07:37
	← zhangxaochen_ left	07:37
	← lite_ left	07:37
	← wrouesnel1 left	07:38
	← beautifulmind left	07:39
	→ lite_ joined	07:39
	← lite_ left	07:39
	← blackmesa left	07:39
okdamn	when adding submodules is it possible to specify a git dir instead of an enteire repo ?	07:39
	for example git://github.com/angular/angular.js.git this repo is up to 20mb	07:39
	too much	07:39
	→ Sceorem joined	07:39
okdamn	i would just like the /src dir	07:39
thiago	okdamn: no	07:39
okdamn	ok no problems sorry	07:40
	→ xequence joined	07:40
	→ pretty_function joined	07:40
	← meLon left	07:41
	→ meLon joined	07:41
	→ jagob joined	07:41
	→ phil80 joined	07:42
	← ehmatthes left	07:43
	→ ferreum joined	07:44
	→ Zoddo joined	07:45
	→ bezet joined	07:45
	← thiago left	07:46
	→ daito joined	07:46
	← compact left	07:48
cbreak-work	okdamn: git repositories are atomic, they can't easily be split	07:48
	and if you try to split them, bad things might happen.	07:48
okdamn	:)	07:49
	thanks for help guys	07:49
	i fixed all finally	07:49
	← leb left	07:49
	← meLon left	07:51
	→ meLon joined	07:51
	← jerius left	07:51
	→ m0nkmaster joined	07:52
	→ alorence joined	07:53
	→ psoo joined	07:54
	← thevishy left	07:55
	← psoo left	07:55
	→ psoo joined	07:55
	← meLon left	07:56
	→ meLon joined	07:56
	→ martinklepsch joined	07:56
	← dccc left	07:57
	→ ArSn joined	07:58
	→ dreiss joined	07:59
	← meLon left	08:01
	→ meLon joined	08:01
	← martinklepsch left	08:01
	→ doev joined	08:01
	→ dipendra joined	08:01
	→ arlekin joined	08:02
	← weiyang left	08:02
	→ zhangxaochen_ joined	08:02
	→ Streward joined	08:02
	→ mikecmpbll joined	08:03
arlekin	hi guys, i have some cleaning to do, and i have little question about git rebase -i: if i want to swithc order of commits, and i have mergecommit from not fast-forward merge, do i have to take some precautions, like remember to put him after specific commits or something like that ? or maybe i can even omit it completly ?	08:04
	→ EminenceHC joined	08:05
	→ lite_ joined	08:05
txdv	you can't change the order of two commits which depend on each other	08:05
	← jrdavid left	08:06
	← meLon left	08:06
	← zhangxaochen left	08:06
txdv	if they are unrelated you can do any kind of permutation	08:06
	→ meLon joined	08:06
	→ SpaghettiCat joined	08:06
arlekin	ain't every commit dependand of all its ancestors ?	08:06
	← bezet left	08:06
	→ Muchoz joined	08:07
	→ zhangxaochen joined	08:07
	→ sdrfnord1 joined	08:07
arlekin	and thats kinda problem, cause this merge has only automatically generated commit message and git show does not show anything except this message so i really do not now how to handle it :/	08:07
	*know	08:07
	→ jrdavid joined	08:07
jast	there are different flags for viewing merge commits	08:08
	← zhangxaochen_ left	08:08
jast	what might interest you is, if the merge commit is abc, git diff abc~ abc	08:08
	→ rjc joined	08:08
SpaghettiCat	Hello all, so some time ago I learnt to wield rebase and it blew me away with how useful it is! So I'm wondering what is the next "big" feature like that on the path to advanced usage?	08:08
arlekin	jast: abc ?	08:08
	→ Lemony joined	08:09
cbreak-work	arlekin: the name of your commit	08:09
	or its hash	08:09
	← EminenceHC left	08:10
arlekin	cbreak-work: oh yeah right!, thanks	08:10
	← m0nkmaster left	08:10
cbreak-work	also see man git show/git diff-tree	08:10
gitinfo	the git-show manpage is available at http://jk.gs/git-show.html	08:10
	← aldodelgado left	08:10
cbreak-work	-c and so on	08:10
arlekin	cbreak-work: right away, thanks :)	08:11
	← meLon left	08:11
	→ meLon joined	08:11
	← Muchoz left	08:11
	← jagob left	08:12
	← jontmorehouse left	08:13
	→ dccc joined	08:13
	→ jackneill joined	08:13
	→ cvanball joined	08:13
	→ linduxed joined	08:15
	→ jontmorehouse joined	08:15
	→ aviraldg joined	08:15
	→ weiyang joined	08:15
	← meLon left	08:16
	→ meLon joined	08:16
	→ gevatter joined	08:18
	← arlekin left	08:20
	→ martinklepsch joined	08:21
	← dipendra left	08:22
	← dccc left	08:24
	← lite_ left	08:24
	→ lite_ joined	08:26
	→ ghostlin_ joined	08:27
	← ifdm_ left	08:27
	← weiyang left	08:29
	← lite_ left	08:30
	→ ifdm_ joined	08:30
	→ lite_ joined	08:30
	← meLon left	08:31
	→ meLon joined	08:31
	→ tvw joined	08:31
	← Gizburdt left	08:32
	→ m0nkmaster joined	08:33
	← dreiss left	08:33
	← ifdm_ left	08:34
	← okdamn left	08:34
	← freimatz left	08:34
	→ dipendra joined	08:34
	→ Zariel_ joined	08:35
	← meLon left	08:36
	→ kriks joined	08:36
	→ meLon joined	08:36
	→ ifdm_ joined	08:37
	← m0nkmaster left	08:37
	→ Gizburdt joined	08:38
	← jstimm left	08:39
	→ dccc joined	08:40
	→ bezet joined	08:41
	→ weiyang joined	08:41
	← GodEater` left	08:42
	→ nordicdyno joined	08:42
murr4y	hi all! i want to share (push) my feature branch, and also keep it up to date with master, but avoid introducing merge commits... what's the best approach here?	08:43
	← irqq left	08:43
jast	choose any two	08:44
	or let everyone know you may break the branch at any time	08:44
murr4y	:(	08:45
	i see, thanks	08:45
	→ nfk joined	08:46
	→ GodEater joined	08:46
	← GodEater left	08:46
	→ GodEater joined	08:46
	← pretty_function left	08:46
	→ theForce joined	08:47
theForce	hi	08:47
lb1a	theForce, !hi	08:47
gitinfo	theForce: [!welcome] Welcome to #git, a place full of helpful gits. If you have a question, feel free to just go ahead and ask—somebody should answer shortly. For more info on this channel, see http://jk.gs/git/ Take backups (type !backup to learn how) before taking advice.	08:47
SpaghettiCat	!backup	08:48
gitinfo	Worried about your data while trying out stuff in your repo? To back up commit history on all branches/tags: `git clone --mirror`. To backup everything, including work tree and staging area: `tar cf repo-backup.tar repodir`. Or do your experiment in a throwaway clone instead. See also http://sethrobertson.github.com/GitBestPractices/#backups	08:48
	← atamanroman left	08:48
lb1a	btw, you can also /msg gitinfo in private with the triggers to avoid flooding :)	08:49
	← dccc left	08:49
SpaghettiCat	Wasn't planning on flooding, but thanks	08:49
lb1a	i know, just a regular reminder to all :D	08:49
	← nnyk_ left	08:51
	→ netcarver joined	08:51
	← solker left	08:51
	→ achadwick joined	08:51
	→ solker joined	08:51
	→ jdmf joined	08:53
	← ifdm_ left	08:54
	← meLon left	08:56
	→ meLon joined	08:56
	→ dotpot joined	08:56
	← echo-area left	08:58
	← gsingh93_ left	08:59
	→ CodeShark joined	09:00
	→ thevishy joined	09:01
	← meLon left	09:01
	→ meLon joined	09:01
	→ viscera joined	09:04
	→ sh[4]rm4 joined	09:05
	→ dccc joined	09:05
	← meLon left	09:06
	→ blackmesa joined	09:06
	→ meLon joined	09:06
	← jnavila left	09:06
	← visceral left	09:06
	→ EminenceHC joined	09:06
	→ Remorse_ joined	09:07
	→ Muchoz joined	09:07
	← Remorse left	09:08
groundnuty	hey, I'm looking for some technical doc on .git dir, its structure and details about basic operations such commit and add	09:08
	I'm heaving troube find anything here https://github.com/git/git/tree/master/Documentation/technical	09:08
	→ ifdm_ joined	09:08
	← mennea left	09:09
	← sh4rm4 left	09:09
groundnuty	do I look in a wrong place, or am I missing somethibg?	09:09
iamtakingiteasy	hello, i did a git add <files>, then realized that commited more that wanted to and tried to do git reset. the problem is that i did git reset --hard and now i am sort of screwed up. but i am aware that there is git fsck and i was able to access unreachable blobs with git show. the only remaining problem: i can't see a way to associate git blob with a file name. is it even possible?	09:10
	← meLon left	09:11
	→ W0rmDr1nk joined	09:11
	→ meLon joined	09:11
	← Gizburdt left	09:11
	← EminenceHC left	09:11
iamtakingiteasy	err	09:12
	s/commited/staged/	09:12
	← Muchoz left	09:12
	→ aard_ joined	09:13
	→ Gizburdt joined	09:13
moritz	iamtakingiteasy: iirc file names are stored in the tree objects	09:14
	but there my knowledge ends :(	09:14
	← blackmesa left	09:14
	← SpaghettiCat left	09:15
xender	iamtakingiteasy: Why not use reflog to go back to failed commit and then amend it?	09:15
	(or rebase)	09:15
	← dccc left	09:15
iamtakingiteasy	there was no commit	09:15
	i just did git add .; then git reset --hard	09:16
	(silly me)	09:16
xender	It's starting to get interesting...	09:16
	I'm positive that there is a way to get the blob back	09:17
	Not sure about the tree object	09:17
	← Fandekasp left	09:18
	← fairuz left	09:19
	← jontmorehouse left	09:20
	→ jontmorehouse joined	09:21
	← meLon left	09:21
	→ balor joined	09:21
	→ meLon joined	09:21
	← xequence left	09:21
	→ ghostbox joined	09:22
	→ francisfish joined	09:24
	← MattMaker left	09:25
	← meLon left	09:26
	→ meLon joined	09:26
	→ dangerou_ joined	09:26
xender	iamtakingiteasy: What about https://stackoverflow.com/questions/11094968/in-git-how-can-i-recover-a-staged-file-that-was-reverted-prior-to-committing ?	09:27
	It doesn't help with file name, but maybe you remember some fragment of that file so you could grep it?	09:27
	← dangerousdave left	09:27
	← bezet left	09:28
	→ [EddyF] joined	09:29
	[EddyF] → Guest59590	09:29
	← W0rmDr1nk left	09:30
	← GodEater left	09:30
	→ HelperW_ joined	09:32
	→ dccc joined	09:33
	← Gizburdt left	09:34
	→ freimatz joined	09:34
	→ GodEater joined	09:34
	← GodEater left	09:34
	→ GodEater joined	09:34
iamtakingiteasy	okay, yes, thank you. seems like there is no way to recover the tree object, but still i can remember most of what those 134 files were before this crazy unstage	09:34
	← HelperW left	09:35
	→ jnavila joined	09:35
	→ xequence joined	09:36
	← meLon left	09:36
	→ meLon joined	09:36
	→ h0bbit joined	09:37
xender	iamtakingiteasy: I don't really remember whether git add does build treeas or not. But there were 134 files changed? o_O	09:38
	That's a lot...	09:38
	← pbos left	09:38
iamtakingiteasy	yea	09:39
	← nordicdyno left	09:39
iamtakingiteasy	a few hours of seding, grepping and xargs'ing	09:39
	→ luc___ joined	09:39
iamtakingiteasy	to re-build the filesystem tree	09:39
	→ Gizburdt joined	09:40
	→ aptenex joined	09:41
	→ daedeloth joined	09:41
	← meLon left	09:41
	→ meLon joined	09:41
	← lolmaus left	09:41
	← aptenex left	09:41
	← weiyang left	09:42
	→ Layke joined	09:42
Layke	Hey. Why would git submodule foreach git pull origin master not pull my submodules? I'm using github.. and I am looking at my file tree and I see blanked out modules..	09:42
	← luc_ left	09:42
Layke	I would have thought they would pull when I run that?	09:42
	→ mewm joined	09:43
	→ lolmaus joined	09:43
	→ godgodgodgo joined	09:43
txdv	git submodule --init update or something	09:44
jast	Vampire0: fwiw you can add triggers yourself now (which includes adding aliases)	09:44
	→ arlekin joined	09:45
	← dccc left	09:45
	→ crxz0193 joined	09:46
arlekin	hi, how can i reverse search in git log --author	09:46
	← meLon left	09:46
arlekin	like author not X	09:46
	→ meLon joined	09:46
	→ stamina joined	09:46
	← lb1a left	09:47
	← Skrypter left	09:47
	← Zoddo left	09:47
xender	iamtakingiteasy: I think you can look for dangling trees	09:48
	← jontmorehouse left	09:49
	← meLon left	09:51
	→ meLon joined	09:51
Vampire0	jast, thanks	09:51
	→ bezet joined	09:53
	→ SLY1986 joined	09:54
	→ hs366 joined	09:54
	← hkon_ left	09:54
	→ hkon_ joined	09:55
	← SLY1986 left	09:55
	← Corey84 left	09:57
	← basiclaser left	09:58
	→ basiclaser joined	09:58
	→ lb1a joined	09:59
	→ beautifulmind joined	09:59
	sh[4]rm4 → sh4rm4	10:00
	← meLon left	10:01
	← Zariel_ left	10:01
	→ zumba_addict joined	10:01
	→ meLon joined	10:01
	→ dccc joined	10:01
	← beautifulmind left	10:04
	→ W0rmDr1nk joined	10:05
	→ beautifulmind joined	10:05
	→ dsdeiz joined	10:06
	← meLon left	10:06
	→ meLon joined	10:06
	← Gizburdt left	10:06
	→ King_Hual joined	10:07
	← Guest59590 left	10:07
	→ Hounddog joined	10:07
	← jnavila left	10:07
	→ freestyl3r joined	10:08
	→ mennea joined	10:08
	→ Muchoz joined	10:08
	← HelperW_ left	10:09
	← lapache left	10:09
	→ HelperW_ joined	10:10
	→ Muchoz_ joined	10:11
	→ jnavila joined	10:11
	← dccc left	10:11
	→ quizzi joined	10:11
	→ EminenceHC joined	10:12
	← KevinTS left	10:13
	← Muchoz left	10:13
	← daito left	10:13
	→ jontmorehouse joined	10:16
	← luc___ left	10:16
	← meLon left	10:16
	→ meLon joined	10:16
	← ifim left	10:16
	→ luc_ joined	10:16
	→ [EddyF] joined	10:16
	[EddyF] → Guest50342	10:17
	← EminenceHC left	10:17
	→ zeppo joined	10:17
	← kyb3r_ left	10:18
	→ m0viefreak joined	10:18
	← zeppo left	10:19
	← ferreum left	10:19
	→ descala joined	10:20
	← harish_ left	10:20
	← Muchoz_ left	10:20
	← jontmorehouse left	10:21
	→ jagob joined	10:24
drathir	mornin...	10:25
	← timclassic left	10:25
	← arlekin left	10:26
	← meLon left	10:26
	→ meLon joined	10:26
	← martinklepsch left	10:26
	→ Radivarig joined	10:26
	→ dccc joined	10:27
	→ Xethron joined	10:28
	← Xethron left	10:28
	→ Xethron joined	10:28
	→ noxd joined	10:29
	← quizzi left	10:30
	→ Corey84 joined	10:30
	← Radivarig left	10:30
	← meLon left	10:31
	→ meLon joined	10:31
	→ lb joined	10:31
	← ValicekB left	10:32
	→ ferreum joined	10:32
	→ KevinTS joined	10:33
	← simesy left	10:33
	← freestyl3r left	10:35
	← netcarver left	10:35
	← lb1a left	10:35
	→ freestyl3r joined	10:36
	→ Gizburdt joined	10:37
	← ifdm_ left	10:37
	← Gizburdt left	10:37
	→ compact joined	10:37
	→ Gizburdt joined	10:38
Vampire0	good UGT morning drathir	10:38
	→ ValicekB joined	10:38
	← dccc left	10:39
	← hoschi left	10:40
	← fr33domlover left	10:40
	→ fr33domlover joined	10:41
	← fr33domlover left	10:42
	→ Shelikhoo joined	10:42
	→ fr33domlover joined	10:42
	→ craigp joined	10:42
	→ magnus^p joined	10:43
	← ValicekB left	10:44
	lb → lb1a	10:44
magnus^p	Given I have a repository URL, how can I "export" a specific directory without first cloning it?	10:46
	← meLon left	10:46
	→ simesy joined	10:46
	→ meLon joined	10:46
Vampire0	magnus^p, I think man git archive is what you are after	10:48
gitinfo	magnus^p: the git-archive manpage is available at http://jk.gs/git-archive.html	10:48
	→ rob_w joined	10:48
	← FreezingCold left	10:49
	→ ifdm_ joined	10:50
	→ ValicekB joined	10:50
	→ moritzs joined	10:51
	← meLon left	10:51
	→ wrouesnel1 joined	10:51
	→ nnyk_ joined	10:51
	→ meLon joined	10:51
	→ dccc joined	10:55
	← meLon left	10:56
	→ Zariel_ joined	10:56
	→ meLon joined	10:56
	← Zariel_ left	10:56
	← kcj left	10:56
	← shruggar left	10:57
	← paulweb515 left	10:57
	← mtk left	10:57
	← hyperair left	11:00
	← meLon left	11:01
	→ meLon joined	11:01
	← TheMadMechanic left	11:01
	→ deuti joined	11:01
	→ Sendoushi joined	11:01
	→ zoso joined	11:01
	← Entomo left	11:02
	← bartman`` left	11:04
	→ FreezingCold joined	11:05
	→ fairuz joined	11:05
	← meLon left	11:06
	→ meLon joined	11:06
	← compact left	11:07
	← Multiply_ left	11:07
	→ mizu_no_oto joined	11:07
	← dccc left	11:08
	← tgkokk left	11:08
	← Silox\| left	11:08
	→ User458764 joined	11:09
	→ jontmorehouse joined	11:10
	← lolmaus left	11:11
	← meLon left	11:11
	→ HelloShitty joined	11:11
	→ meLon joined	11:11
HelloShitty	Morning	11:11
	→ shruggar joined	11:11
Vampire0	good UGT morning HelloShitty	11:11
HelloShitty	I need some help setting up a new rsa key to my gi account	11:11
	git	11:12
dr_lepper	what's a "git account"?	11:12
rom1504	HelloShitty: there is not git account	11:12
	→ quizzi joined	11:12
Vampire0	I guess you mean your GitHub account, not your git account?	11:12
HelloShitty	yes	11:12
	GitHub account	11:12
	sorry	11:13
	I have created the rsa key	11:13
	tried to add it to ssh-agent	11:13
	but I got an error	11:13
rom1504	cat ~/.ssh/id_rsa.pub	11:13
	then copy past it to github	11:13
j416	there is also #github	11:13
HelloShitty	and I can't issue the git push -u origin master command	11:13
rom1504	HelloShitty: what does ssh-agent have to do with this ?	11:13
Vampire0	!github_vs_git btw. :-)	11:14
gitinfo	github.com is not git; it's a hosting platform for git. There are alternative hosting offers (you can even host repositories yourself, or work on something on your own without any hosting whatsoever), and the range of features on the corresponding websites may differ. Git has little influence on what happens in github's web interface.	11:14
rom1504	HelloShitty: did you add your key in github ?	11:14
	→ EminenceHC joined	11:14
HelloShitty	yes I did rom1504	11:14
rom1504	then you can push	11:14
HelloShitty	in the github tutorial they say to add the key to ssh-agent with ssh-add command	11:14
	← jontmorehouse left	11:14
Vampire0	!www hells	11:15
gitinfo	What did you do (which commands?), what happened as a result (any messages?), and what was the result you expected instead?	11:15
rom1504	well if it's in .ssh/id_rsa, you don't need thaty	11:15
Vampire0	HelloShitty : !www	11:15
gitinfo	What did you do (which commands?), what happened as a result (any messages?), and what was the result you expected instead?	11:15
HelloShitty	rom1504:	11:15
	→ carandraug joined	11:15
HelloShitty	when I try to issue git push -u ....	11:16
	it says	11:16
	error: src refspec master does not match any.	11:16
	← meLon left	11:16
HelloShitty	error: failed to push some refs to 'git@github.com:xxxxxxxx/xxxxx	11:16
	→ meLon joined	11:16
HelloShitty	I enter my passpharse	11:16
	but it looks like it's not correct	11:16
	but it is	11:16
Vampire0	well HelloShitty, as the error clearly states, this is not an SSH key problem	11:17
	[13:16:10] <HelloShitty> error: src refspec master does not match any.	11:17
	→ compact joined	11:17
Vampire0	again, !www and !summarize	11:17
gitinfo	What did you do (which commands?), what happened as a result (any messages?), and what was the result you expected instead?	11:17
	[!dont_summarize] Please do not summarize what you did; !pastebin _exactly_ what commands you ran, what the output was, and why you think that this is wrong. Otherwise you may hide the real issue. See also !obfuscate and !repro	11:17
	← dv__ left	11:18
	→ maxer joined	11:18
HelloShitty	Vampire0: is not?	11:18
	← mizu_no_oto left	11:18
	→ Muchoz joined	11:18
HelloShitty	!www	11:18
gitinfo	What did you do (which commands?), what happened as a result (any messages?), and what was the result you expected instead?	11:18
HelloShitty	hum	11:18
	ok	11:18
	← luc_ left	11:19
HelloShitty	I have a folder in my home	11:19
	← EminenceHC left	11:19
HelloShitty	I did:	11:19
	git init	11:19
	then:	11:19
	git commit -m "first commit"	11:19
	then:	11:19
jast	the error you get has nothing to do with ssh keys	11:19
HelloShitty	git remote add origin [email@hidden.address]	11:19
	→ Balliad joined	11:20
HelloShitty	and last:	11:20
	git push -u origin master	11:20
	it's here the error comes up	11:20
Vampire0	Nothing between git init and git commit?	11:20
HelloShitty	nope	11:20
Vampire0	Then git commit should give you a dexcriptive error	11:20
jast	why? commit worked	11:20
Vampire0	Becasue you didn't add anythign to commit to the index	11:20
jast	oh, good point :)	11:21
	← meLon left	11:21
Vampire0	And without a commit there is no master ref	11:21
	← simesy left	11:21
Vampire0	And that is what the push error message tells you	11:21
HelloShitty	hum, ok	11:21
	→ meLon joined	11:21
Vampire0	Do the commit again and look at its output	11:21
HelloShitty	ok, i think i got it	11:21
Vampire0	Should say somthing like "nothign to commit"	11:21
	→ flaguy48 joined	11:21
	→ mizu_no_oto joined	11:21
HelloShitty	ok, got it	11:22
	done	11:22
	thanks a lot	11:22
Vampire0	yw	11:22
HelloShitty	I was forgeting the git add step	11:22
	← dsdeiz left	11:22
	← Muchoz left	11:23
	→ dccc joined	11:23
	→ Zariel_ joined	11:24
	← Zariel_ left	11:24
	→ DomeMaster joined	11:24
	→ Zariel_ joined	11:24
DomeMaster	Hi everyone	11:24
	I'm using describe, but I don't want any tags even annotated tags. I just want the commit hash. How do I do that?	11:25
	User458764 → User458764_NotHe	11:26
Vampire0	Well DomeMaster, describe is, to quote the man page, meant to "Show the most recent tag that is reachable from a commit"	11:26
	→ DrSlony joined	11:26
	→ deciph3r joined	11:26
	← deciph3r left	11:26
	→ deciph3r joined	11:26
DomeMaster	oh right, so there is no way round it?	11:26
Vampire0	Doesn't that somehow conflict with your question?	11:26
	what do you want to reach?	11:26
	← FabTG left	11:26
DomeMaster	I just want the latest commit	11:26
Vampire0	Then maybe someone can advice how to achieve it	11:26
DrSlony	Hi, I've been using mercurial for a long time but I'm a little lost with git. I would like to update my cloned repository to an older commit because the latest is broken, how do I do that?	11:26
Vampire0	The latest commit of what DomeMaster ?	11:27
DomeMaster	oh right Vampire0, I'm basically creating a beta "serial number" that allows me to find commit if something goes wrong for a client	11:27
Vampire0	DrSlony: !fixup	11:27
gitinfo	DrSlony: So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!	11:27
DomeMaster	so I just need like 7 or so character of the current branch highest value	11:27
	not value I mean commit	11:27
Vampire0	So you mean you want the SHA of the currently checked out commit?	11:28
DrSlony	Vampire0 i dont want to change the commit, i just want to compile an older version	11:29
DomeMaster	yup, and maybe add dirty if it has uncomitted files	11:29
	→ davividal joined	11:29
Vampire0	DomeMaster, "git rev-parse HEAD" or for the short version "git rev-parse --short HEAD"	11:29
DomeMaster	thanks very much mate	11:29
	will it have dirty?	11:30
Vampire0	But be aware that the short one could become ambigious in the future if you create more commits	11:30
DomeMaster	oh really?	11:30
	→ CheckDavid joined	11:30
DomeMaster	oh dear I don't want that	11:30
	← User458764_NotHe left	11:30
Vampire0	then don't use --short and you should be fine	11:30
DomeMaster	ok great	11:30
Vampire0	no DomeMaster, it is just is sha1 of the currently checked out commit, no info about cleanliness	11:30
DomeMaster	it doesn't have dirty though Vampire	11:31
	oh ok	11:31
	I guess that should do actually	11:31
	← meLon left	11:31
	→ meLon joined	11:31
DomeMaster	is there anyway to get a shorter message that isn't ambiguous it looks ridiculous at the moment ... I've got like 8 repos stringed together separated by ":"	11:31
Vampire0	If you want to get dirty state you can additionally get this of course, but not in one command together with the sha	11:31
	← dccc left	11:32
Vampire0	DomeMaster, create a tag with the same name on all the repos and just use that as reference	11:32
	A tag costs you 41 bytes of disk space	11:33
	DrSlony, man git checkout	11:33
gitinfo	DrSlony: the git-checkout manpage is available at http://jk.gs/git-checkout.html	11:33
	→ str joined	11:33
	→ intellix joined	11:34
moritz	actually, on most file systems, a file takes at least one block, which is usually between 0.5MB and 4MB	11:34
Vampire0	moritz, :-P	11:35
DrSlony	thanks	11:35
	← meLon left	11:36
DomeMaster	sorry was away Vampire0	11:36
	→ B1x1t0 joined	11:36
DomeMaster	I don't follow, so what create a tag everytime?	11:36
	→ meLon joined	11:36
	← compact left	11:36
Vampire0	why not? If you deliver your software, it should be worth a tag, shouldn't it?	11:37
DomeMaster	Erm ya I guess why not	11:37
	I need a way to generate tag names	11:37
	but that's not git releated I guess	11:37
	automate tag names even	11:37
Vampire0	Indeed :-)	11:37
DomeMaster	thanks for the help my dude	11:38
	→ User458764 joined	11:38
Vampire0	you're welcome	11:38
DomeMaster	thanks Vampire0	11:39
	nicoo → devient	11:40
	← freimatz left	11:40
	devient → nicoo	11:40
	← mizu_no_oto left	11:41
	← meLon left	11:41
	→ meLon joined	11:41
	← dipendra left	11:41
	← phil80 left	11:42
	← polyzen left	11:42
	← Gizburdt left	11:42
	→ lhvwb joined	11:43
	← lhvwb left	11:43
	→ mizu_no_oto joined	11:43
	→ hoschi joined	11:44
	← jnz left	11:45
	→ awekkih joined	11:45
	← awekkih left	11:45
	← meLon left	11:46
	→ meLon joined	11:46
	→ dccc joined	11:46
	← Guest86139 left	11:47
	→ str_ joined	11:50
	← meLon left	11:51
	→ meLon joined	11:51
	← str left	11:52
	→ toomanysecrets joined	11:53
	User458764 → User458764_NotHe	11:53
Trudko	Guys I have centra git repo and I would like check if each commit message of each developer match certain regex basicly I want to force that each commit message does have title and issue number. I only found how to check this on client but in that case with multiple dev env(OSX, Win, Linux) will developer has to setup up this by his own?	11:54
	→ tmcmahon joined	11:54
jast	on the server you can write a pre-receive/update hook that checks all added commits and rejects the update if they don't match	11:54
	man githooks for details on how these hooks work	11:55
gitinfo	the githooks manpage is available at http://jk.gs/githooks.html	11:55
jast	client-side checks will have to be installed manually by each developer, yes	11:55
cbreak-work	Trudko: man githooks	11:55
gitinfo	Trudko: the githooks manpage is available at http://jk.gs/githooks.html	11:55
	→ dipendra joined	11:55
	→ lsiv568 joined	11:55
	→ Gizburdt joined	11:55
cbreak-work	Trudko: at commit time you can test it locally	11:55
	but if you want to test it on the server, you can do so in post-receive or similar	11:55
	Trudko: do it in pre-receive if you want to be able to reject pushes	11:56
	← dccc left	11:56
	→ cannonball joined	11:56
	→ LBV_User joined	11:57
Trudko	cbreak-work: well I would like to do it on server so not to bother developers with setting it up. Btw is common to force message like that? I think it make sense to have title from issue tracker and its number plus maybe some details.	11:58
	← User458764_NotHe left	11:58
cbreak-work	I wish it was common...	11:58
	Trudko: I know that Qt forces unique numbers, but those are generated with a client script from the server, for gerrit	11:59
	here issue numbers are optional, most commits aren't made for issues though	11:59
	→ jerius joined	12:00
	← kevinb left	12:00
	→ mennea_ joined	12:00
Trudko	cbreak-work: I work at smaller company and we are doing our best to have issue for each requirement and we connect commit to issue	12:00
	→ CodePulsar joined	12:00
	← meLon left	12:01
	→ meLon joined	12:01
xender	Trudko: If you will be rejecting all commits with misformatted messages on server, then having developers to correct (rebase) all of them on failed push is even more bothering than additional hook setup on client	12:01
	← LBV_User left	12:01
cbreak-work	Trudko: well, what we have is a script that scans commit messages and posts them to jira if the message contains a token	12:01
	← jerius left	12:01
	← Layke left	12:02
	→ kevinb joined	12:02
cbreak-work	so the tokens in the messages are optional, but useful	12:02
	I think I am the only one that uses them though	12:02
	→ pppp2 joined	12:02
cbreak-work	I use the pre-receive hook for this	12:02
	← nnyk_ left	12:02
cbreak-work	posting to jira is done with some rest http call	12:02
xender	Trudko: Does your company use any particular branching model?	12:02
	← mennea left	12:03
	← tmcmahon left	12:03
xender	Like git-flow or github-flow (different things actually)	12:03
masak	is there any way to 'amend' a given commit a few steps back in history, without having to go thrwough 'rebase --interactive' and marking it up as 'edit'?	12:03
cbreak-work	getting the new commits is done with something like "git rev-list --reverse " + new_heads + " --not " + old_heads	12:03
	masak: nope	12:04
xender	masak: Not really, rebase is just that	12:04
cbreak-work	masak: rebase is what fixes all commits after the one you amend.	12:04
xender	masak: commits are immutable	12:04
	→ jontmorehouse joined	12:04
masak	oh, I know all that.	12:04
cbreak-work	masak: without that, all the new commits would still refer to the original	12:04
masak	and I'm not expecting subsequent SHA-1s to stay the same.	12:04
xender	amend creates one new commit. Rebase recreates all the commits after the change	12:04
masak	just wanted to do less work at the command line.	12:04
cbreak-work	masak: if you don't want to use rebase -i, you can use commit --amend and then rebase manually	12:04
masak	I still expect the rebase to happen.	12:04
	oh well, I guess I can create my own subcommand for this :)	12:05
	→ toothrot joined	12:05
	← h0bbit left	12:05
masak	oh, and I see I can get away with 'reword' in the interactive rebase, too.	12:05
xender	masak: You can also use alternative todolist editor	12:05
	← obiwahn left	12:05
	→ OnlyForF1 joined	12:05
	← pppp2 left	12:06
masak	sounds interesting.	12:06
xender	masak: You can supply your own script which will edit the todolist automagically	12:06
	→ pppp2 joined	12:06
	→ corehello joined	12:07
masak	yes, that sounds like what I was after.	12:07
	and then wrap it in a subcommand.	12:07
	→ polyzen joined	12:07
OnlyForF1	How do you guys deal with Word documents?	12:07
	← B1x1t0 left	12:07
xender	OnlyForF1: There is some option for diffing them	12:08
Vampire0	OnlyForF1, define "deal with"	12:08
xender	But IIRC that diff is only human-readable	12:08
	Not suitable for patching	12:08
	← mennea_ left	12:08
xender	So other thatn that - like with other binary files, and that means not so well	12:08
	→ mennea joined	12:09
	← ValicekB left	12:09
	← jontmorehouse left	12:09
OnlyForF1	Vampire0 merging and potentially conflict resolution.	12:09
	← DrSlony left	12:10
	→ roelmonnens joined	12:10
	→ DrSlony joined	12:10
DrSlony	thanks Vampire0 :]	12:10
	← jargon left	12:10
	← DrSlony left	12:10
masak	I could imagine a dedicated tool being able to merge and conflict-resolve Word files. but not Git itself.	12:10
Vampire0	OnlyForF1, well, I'd say "no real way" except take one of the two	12:10
lb1a	OnlyForF1, not possible for binary documents	12:11
xender	OnlyForF1: open all 4 versions in word and do it manually?	12:11
OnlyForF1	Could you use a custom difftool?	12:11
	← meLon left	12:11
xender	OnlyForF1: I mean - the common parent, remote ver., local ver. and destination file	12:11
	→ meLon joined	12:11
lb1a	OnlyForF1, if you know one that does understand doc format	12:11
xender	OnlyForF1: Aside from that, I heard that Word has its own changes history	12:11
Vampire0	OnlyForF1, man git difftool	12:12
gitinfo	OnlyForF1: the git-difftool manpage is available at http://jk.gs/git-difftool.html	12:12
Vampire0	xender, yes and no. You can switch on change tracking per document	12:12
	xender, and you can diff Word documents in Word	12:12
	← ntio left	12:12
	→ dccc joined	12:12
	← Guest50342 left	12:12
xender	OnlyForF1: You could also try to convert all 3 versions into some text representation (some XML or JSON or YAML or who-knows-waht thingy), resolve conflicts and convert back to binary	12:12
	*I mean plaintext	12:13
Vampire0	But unless you have a proper merge tool that can handle Word files I think even with those features it is not too nice to merge conflicted Word docs	12:13
	← beautifulmind left	12:13
OnlyForF1	I really wish my company didn't use Word for documentation :S	12:14
xender	masak: The environmental variable for git rebase -i is GIT_SEQUENCE_EDITOR	12:14
masak	ah, cool.	12:14
	→ ntio joined	12:14
masak	so I could just slide my own script in there, and be done.	12:14
OnlyForF1	Vampire0, I'm pretty sure word has a merge tool itself but can	12:15
	masak is thinking 'git-retcon'	12:15
xender	OnlyForF1: If they must use some WYSIWYG binary format, maybe ODT is an option?	12:15
Vampire0	OnlyForF1, make them use DocBook, much better for diffing, conflict resolution and efficient storaage in a VCS	12:15
OnlyForF1	... can't be accessed using the command line	12:15
	→ ValicekB joined	12:15
xender	OnlyForF1: I don't know if that really changes anything as for merge tools goes, but you have better chances for open format than for proprietary one	12:15
Vampire0	s/storaage/storage/	12:15
	→ dougsland joined	12:15
	← specing left	12:15
OnlyForF1	I think we're stuck with Word because of a bunch of third party software	12:16
	→ FabTG joined	12:16
	← meLon left	12:16
	→ meLon joined	12:16
OnlyForF1	As well as an overabundance of old people	12:16
bremner	but not old enough ;)	12:17
	← ValicekB left	12:17
	→ hyperair joined	12:17
OnlyForF1	The retirement age is growing faster then they are haha	12:17
Vampire0	OnlyForF1, afair you can generate Word documents out of DocBook as well	12:17
xender	OnlyForF1: What about ODT?	12:17
cbreak-work	OnlyForF1: binary files suck	12:18
	OnlyForF1: xml file formats work if they aren't compressed	12:18
	→ amcsi_work joined	12:18
cbreak-work	I heard OpenOffice can store uncompressed xml, maybe that pile of dung microsoft word can compete with open office on that front	12:18
OnlyForF1	I'll need to ask, atm we're using a third party library to convert our word documents to XML to be stored in a database	12:19
Vampire0	OnlyForF1, And for the old people, buy XMLMind XML Editor. It is a great WYSIWYG editor for DocBook files where you can write the files similar to Word, they don't have to write plain XML necessarily	12:19
cbreak-work	Vampire0: LaTeX FTW!	12:19
	→ Muchoz joined	12:19
OnlyForF1	And our word documents have all sorts of weird styles going on as well	12:19
	→ jargon joined	12:19
Vampire0	cbreak-work, yes, LaTeX is also nice, but mostly overkill and too complex to tell people to use it. ;-)	12:20
cbreak-work	intentionally or accidentally? :)	12:20
	Vampire0: ... :(	12:20
Vampire0	historically I guess :-D	12:20
cbreak-work	people just don't value the clarity of programming a text document	12:20
OnlyForF1	Very intentional unfortunately	12:20
	← meLon left	12:21
	→ LucasTT joined	12:21
Vampire0	cbreak-work, the people that write those documents are all too often no programmers or developers. And those you can teach to use XMLMind for WYSIWYG DocBook editing, but not LaTeX writing	12:21
OnlyForF1	I wish we could just use the intermediate XML format instead but then we can't keep our "pretty" PDF docs.	12:21
	→ meLon joined	12:21
amcsi_work	how do I find all dangling commits in the reflog?	12:21
cbreak-work	amcsi_work: commits that are in the reflog are by definition not dangling.	12:22
Vampire0	OnlyForF1, If you use DocBook, you already have XML for your database, and you can generate pretty PDF docs from it with any style you like	12:22
	→ tgkokk joined	12:22
OnlyForF1	Does DocBook support custom schema?	12:22
amcsi_work	cbreak-work, I see. Then I want to find all commits in the reflog that are not visible when doing git log --all	12:22
OnlyForF1	and weird stuff like cross document linking?	12:23
	← Lemony left	12:23
	← goTAN left	12:23
	← bezet left	12:23
cbreak-work	amcsi_work: you could try to play around with git log -g, maybe it works together with --contains or similar	12:23
Vampire0	OnlyForF1, I'm not sure, never did that with DocBook and what do you mean by "custom schema"?	12:23
	← balor left	12:23
	← Muchoz left	12:24
cbreak-work	amcsi_work: hmm... maybe git log -g --not --all	12:24
OnlyForF1	Worst case an XSLT translation from Docbook to our current format	12:24
	← albel727 left	12:24
	→ mtk joined	12:24
OnlyForF1	Although that could just be done afterwards	12:24
amcsi_work	cbreak, I'm getting "fatal: Cannot walk reflogs for refs/heads/attila"	12:24
cbreak-work	yeah, me too.	12:25
	looks like it doesn't work	12:25
	← dccc left	12:25
OnlyForF1	Oh DocBook is just an XML schema.	12:25
	Thanks for your help guys! I'll hack something up and try to convince my bosses to make the switch from SVN	12:26
Vampire0	OnlyForF1, DocBook just is the XML definition of the documentation. Then you can use any XSL Stylesheet you want to transform it to whatever you like, including your current XML format. There are some pre-made Stylesheets for transforming to PDF, Javahelp, manpages and so on	12:26
	OnlyForF1, how to handle Word documents does not really influence on whether SVN or Git is used. If you have a diff tool that can merge Word documents with SVN, you can most proabably also use this with Git	12:27
	← hoschi left	12:27
	← flaguy48 left	12:27
OnlyForF1	We were locking documents with SVN	12:27
	:p	12:27
	← i_ron left	12:27
Vampire0	cbreak-work, can't amcsi_work use man git reflog with a combination of --expire-unreachable and --dry-run to find the "dangling" refs?	12:28
	→ shauna_ joined	12:28
	→ shennyg__ joined	12:28
	→ albel727 joined	12:28
cbreak-work	Vampire0: hmm... that's an idea	12:28
	← TDJACR left	12:28
	← ws2k3 left	12:28
	← zling_ left	12:28
	← Norrin left	12:28
Vampire0	OnlyForF1, ah, ok good point	12:28
	← gitinfo left	12:28
	← Imdsm^ left	12:28
	← elijah left	12:28
	← ggherdov left	12:28
cbreak-work	OnlyForF1: easiest way would be to find out if that word thing can store without compression	12:29
	I heard the new format is somewhat resembling something like xml	12:29
	← ORiON-- left	12:29
	← electrogeek left	12:29
	← souther left	12:29
Vampire0	Hm, gitinfo sleeping?	12:29
	→ txomon\|home joined	12:29
	← ereslibre left	12:29
	← scalability-junk left	12:29
	→ ereslibre_laptop joined	12:29
	→ ws2k3 joined	12:29
Vampire0	amcsi_work, man git reflog	12:29
	← WakiMiko left	12:29
	← ToaNii left	12:29
	← ereslibre_laptop left	12:29
	→ ereslibre_laptop joined	12:29
	→ ValicekB joined	12:29
Vampire0	!beer	12:29
	→ adys joined	12:29
	→ TDJACR joined	12:29
	→ HanClinto joined	12:29
	← vespaper_ left	12:29
	→ JT-EC_ joined	12:29
	← Matrixiumn left	12:29
	← poimen left	12:29
	← tmz left	12:29
	← arcanis left	12:29
	← accela-dev left	12:29
	← kenyon left	12:29
	← rivarun left	12:29
	← adymitruk left	12:29
	← ohcibi left	12:30
	→ electrogeek joined	12:30
	→ kenyon joined	12:30
	→ QshelTier joined	12:30
	strictlyb → sb	12:30
	→ ohcibi joined	12:30
	→ vespaper joined	12:30
	→ ORiON-- joined	12:30
Vampire0	Hm, gitinfo is missing. jast?	12:30
	→ souther joined	12:30
_ikke_	The bot is gone	12:30
	→ pasky_ joined	12:30
	→ adymitruk joined	12:30
	→ njsg__ joined	12:30
	← RoryHughes left	12:30
	← canton7 left	12:30
	← xnox left	12:30
	← resetpacket left	12:30
	← Werring left	12:30
	→ rblackwe_ joined	12:30
	→ Favoretti joined	12:30
	→ NaiveFrost joined	12:30
	→ kilobyte joined	12:30
	→ Yahweh_ joined	12:30
	→ accela-dev joined	12:30
	→ uidzer0 joined	12:30
	← jleclanche left	12:30
	→ mitzip_ joined	12:30
	→ gws___ joined	12:30
	← SamB left	12:30
	← Bombe left	12:30
	← danmackay left	12:30
	← bauruine left	12:30
	→ tmz joined	12:30
	→ djh__ joined	12:30
	→ Punna joined	12:30
	→ dropdrive joined	12:30
	→ elijah joined	12:30
	→ pdtpatr11k joined	12:30
	← NaiveFrost_ left	12:30
	← kaendfinger left	12:30
	← shennyg_ left	12:30
	← asakura1 left	12:30
	← Pwnna left	12:30
	← llakey left	12:30
	← Cathy left	12:30
	← Neptu left	12:30
	← JT-EC left	12:30
	← stoned left	12:30
	← astaves left	12:30
	← Segfault_ left	12:30
	← St_Marx left	12:30
	← NanoArrow left	12:30
	← nuck left	12:30
	← Artpicre left	12:30
	← alexwhitman_ left	12:30
	← pasky left	12:30
	← RichardBronosky_ left	12:30
	← shauna left	12:30
	← fchmmr left	12:30
	← njsg left	12:30
	← eightyeight left	12:30
	← nicksloan left	12:30
	← ntio left	12:30
	← causasui left	12:30
	← skorgon left	12:30
	← djh left	12:30
	← pdtpatr1ck left	12:30
	← mitzip left	12:30
	← Yahweh left	12:30
	← meatmanek left	12:30
	← gws__ left	12:30
	← rblackwe left	12:30
	← Favorett1 left	12:30
	← alexbligh1 left	12:30
	← markmarkmark left	12:30
	← jiriki left	12:30
	← dcpc007 left	12:30
	← jojva` left	12:30
	← Corey left	12:30
	→ xnox joined	12:30
	← shennyg__ left	12:31
	→ shennyg__ joined	12:31
	→ Imdsm^ joined	12:31
	→ zling_ joined	12:31
	Punna → Pwnna	12:31
	→ kaendfinger joined	12:31
	QshelTier → Bombe	12:31
	← adymitruk left	12:31
	→ adymitruk joined	12:31
	← meLon left	12:31
	→ Corey joined	12:31
	djh__ → djh	12:31
	← elijah left	12:31
	→ elijah joined	12:31
	← zling_ left	12:31
	→ zling_ joined	12:31
	← Imdsm^ left	12:31
	→ Imdsm^ joined	12:31
	→ i_ron joined	12:31
	→ llakey joined	12:31
	→ WakiMiko joined	12:31
	→ Werring joined	12:31
	→ meLon joined	12:31
	→ SamB joined	12:31
	→ RoryHughes joined	12:31
	→ rivarun joined	12:31
Vampire0	Hm, lots of ping timeouts. Some server gone I guess	12:31
	→ arcanis joined	12:31
	→ Matrixiumn joined	12:31
	→ canton7 joined	12:31
	→ danmackay joined	12:31
	→ phil80 joined	12:31
	→ jakob joined	12:31
	→ red82 joined	12:32
	→ ToaNii joined	12:32
	→ Cathy joined	12:32
	← crxz0193 left	12:32
	→ nicksloan joined	12:32
	← nicksloan left	12:32
	→ nicksloan joined	12:32
	← cagedwisdom left	12:32
	→ alexbligh1 joined	12:32
	→ RichardBronosky joined	12:32
	→ fchmmr joined	12:32
	→ Artpicre joined	12:32
	← njsg__ left	12:32
	→ bosie joined	12:32
dropdrive	I'd like to share with my coworker my commits to mysupermod and mysubmod. My changes to mysubmod have not been pushed anywhere. When my coworker clones from my WC (is that bad?), he gets the upstream (?) url of mysubmod, and can't get my changes. Help?	12:32
	→ njsg joined	12:32
	→ gitinfo joined	12:32
	ChanServ set mode: +o	12:32
	→ eightyeight joined	12:33
Vampire0	ah, there it is again	12:33
	← ajc_ left	12:33
	→ dcpc007 joined	12:33
bosie	i made a mistake by committing a directory. though havent pushed. problem is its file size. is there a way to 'get rid of it'?	12:33
Vampire0	amcsi_work, man git reflog	12:33
	→ Neptu joined	12:33
	→ meatmanek joined	12:33
	→ markmarkmark joined	12:33
	→ nuck joined	12:33
_ikke_	WC?	12:33
	→ bauruine joined	12:33
	→ stoned joined	12:33
bosie	its 4 commits prior to the current status of the branch. came in through a merge	12:33
_ikke_	working copy?	12:33
Vampire0	bosie, !fixup	12:33
dropdrive	_ikke_: My working copy.	12:33
gitinfo	amcsi_work: the git-reflog manpage is available at http://jk.gs/git-reflog.html	12:34
	bosie: So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!	12:34
_ikke_	There is no problem for him clonging from you	12:34
	→ alexwhitman joined	12:34
	→ astaves joined	12:34
	→ jojva joined	12:34
Vampire0	dropdrive, what does "can't get my changes" mean? !www	12:35
gitinfo	dropdrive: What did you do (which commands?), what happened as a result (any messages?), and what was the result you expected instead?	12:35
amcsi_work	I don't know what I should look at in its man page	12:35
	→ jiriki joined	12:35
	← meLon left	12:36
dropdrive	Vampire0: When my coworker runs `git submodule update`, he gets: fatal: reference is not a tree: SHA	12:36
	→ meLon joined	12:36
Vampire0	amcsi_work try to use man git reflog with a combination of --expire-unreachable and --dry-run to find the "dangling" refs	12:37
gitinfo	the git-reflog manpage is available at http://jk.gs/git-reflog.html	12:37
	→ poimen joined	12:37
Vampire0	dropdrive, so you are using submodules?	12:37
amcsi_work	Vampire0, fatal: unrecognized argument: --expire-unreachable	12:37
	→ harish_ joined	12:38
	→ ggherdov joined	12:38
Vampire0	dropdrive, then I'm out sorry, not using those and preventing them where I can	12:38
jast	d'aww	12:38
dropdrive	Vampire0: Yep. I think the problem is that when my coworker clones from me, the "url" of mysubmod in .gitmodules is pointing upstream, not to me	12:38
jast	submodules are great :}	12:38
bosie	Vampire0: right but i couldn't find it	12:38
	Vampire0: because what i would need is to remove commited content, no?	12:38
	Vampire0: as in, remove it from the history, not a working dir	12:39
	← xequence left	12:39
	→ Norrin joined	12:39
	→ xequence joined	12:40
Vampire0	amcsi_work, what version of git do you use? I think that switch is there since 1.5.0	12:41
	→ dccc joined	12:41
	← ghostbox left	12:41
	→ Ace joined	12:41
	→ ghostbox joined	12:41
bosie	Use The BFG to remove unwanted data, like big files or passwords, from Git repository history. ?	12:42
	→ paulweb515 joined	12:42
Vampire0	bosie, you can do that and !fixup should help you. Just be aware that you will !rewrite public history if you pushed already	12:42
gitinfo	bosie: So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!	12:42
	bosie: Rewriting public history is not recommended. Everyone who has pulled the old history have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push -f <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	12:42
	→ ACE__ joined	12:42
	← pppp2 left	12:42
	← ACE__ left	12:42
amcsi_work	Vampire0, 1.8.4.1 Aren't you mixing this command up with git gc or something?	12:42
Vampire0	Nope amcsi_work	12:43
	amcsi_work, see: man git reflog	12:43
gitinfo	amcsi_work: the git-reflog manpage is available at http://jk.gs/git-reflog.html	12:43
	→ nordicdyno joined	12:43
	adys → jleclanche	12:43
	← tokik left	12:43
	→ pppp2 joined	12:43
Vampire0	amcsi_work, I guess you didn't specify a time	12:44
	← nordicdyno left	12:44
Vampire0	and don't forget --dry-run if you don't want to actually expire it really but just to find 'em	12:44
	→ knownasilya joined	12:44
	← CussBot left	12:45
	→ CussBot joined	12:45
	← CussBot left	12:45
	→ CussBot joined	12:45
amcsi_work	fatal: unrecognized argument: --dry-run (if I put the --dry-run argument to come first)	12:45
	← hs366 left	12:46
	← Ace left	12:46
	← meLon left	12:46
	→ jftf joined	12:46
	→ meLon joined	12:46
	→ beautifulmind joined	12:46
	← CussBot left	12:46
	→ CussBot joined	12:46
	→ hoschi joined	12:47
	→ bezet joined	12:47
Vampire0	well amcsi_work, then I guess you are still not reading the man page and omit the subcommand "expire", because then the subcommand "show" is used which does not know either of the two parameters	12:47
	← paulweb515 left	12:48
amcsi_work	Vampire0, oh	12:49
Vampire0	:-)	12:49
	← sb left	12:49
	→ strictlyb joined	12:50
amcsi_work	none of them are unreachable	12:50
	→ vtunka joined	12:50
	← str_ left	12:50
amcsi_work	this isn't working	12:50
	← meLon left	12:51
amcsi_work	it's not as important anymore btw, because I actually realized that it is a different project where the commit I was looking for is on	12:51
	→ meLon joined	12:51
	← dipendra left	12:51
	← dccc left	12:51
	→ dregad joined	12:52
HelloShitty	thanks Vampire0	12:53
	Vampire0: thanks	12:53
Vampire0	yw HelloShitty	12:54
	hm, ok amcsi_work, never used that, just looked in the man pages for you :-)	12:54
	← fairuz left	12:55
	→ ckyle joined	12:55
	→ luc_ joined	12:56
	← meLon left	12:56
HelloShitty	!karma	12:56
gitinfo	This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them. Try ".karma <nick>" or ".topkarma", but please do it via private message to avoid mass highlighting people.	12:56
	→ meLon joined	12:56
	← vtunka left	12:56
	← lsiv568 left	12:58
	→ lixxz_ joined	12:58
	→ jontmorehouse joined	12:58
	→ scalability-junk joined	12:58
	→ starkhalo joined	12:59
	← SethM left	13:00
	→ paulweb515 joined	13:00
	→ SethM joined	13:01
	← Textmode left	13:01
	← lixxz_ left	13:01
	→ bitkiller joined	13:01
	← mvdan left	13:02
	← jontmorehouse left	13:02
	→ dipendra joined	13:05
	← meLon left	13:06
	← txomon\|home left	13:06
	← mizu_no_oto left	13:06
	→ meLon joined	13:06
	→ zumba_ad_ joined	13:06
	← zumba_addict left	13:07
	← intellix left	13:07
	→ il_ joined	13:07
	→ MattMaker joined	13:08
	→ dccc joined	13:08
	← rchavik left	13:08
	← jargon left	13:09
	→ shinnya joined	13:09
	← toothrot left	13:10
	→ sgambino joined	13:10
	← juvenal left	13:10
	→ qwyeth joined	13:10
	→ hcc23 joined	13:10
	→ Muchoz joined	13:11
HelloShitty	what is the git command to see if any file has any changes since the last commit/push?	13:11
	← meLon left	13:11
	→ intellix joined	13:11
	→ meLon joined	13:11
ohcibi	git status	13:11
OnlyForF1	or git ls-files -m	13:12
groundnuty	hey, I'm looking for some technical doc on .git dir, its structure and details about basic operations such commit and add	13:13
	I'm heaving troube find anything here https://github.com/git/git/tree/master/Documentation/technical	13:13
	do I look in a wrong place, or am I missing somethibg?	13:13
	→ simesy joined	13:13
Hello71	!xy?	13:14
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...	13:14
Hello71	!xy ?	13:14
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...	13:14
	→ NinjaNoel joined	13:15
osse	groundnuty: man gitrepository-layout	13:15
gitinfo	groundnuty: the gitrepository-layout manpage is available at http://jk.gs/gitrepository-layout.html	13:15
groundnuty	I do know what I'm asking for :)	13:15
	← Muchoz left	13:15
OnlyForF1	Why do you need it groundnuty	13:15
	?	13:15
groundnuty	OnlyForF1: courious	13:15
	*curious	13:16
	← meLon left	13:16
OnlyForF1	Well in that case have you seen the Google Talk Linus did concerning git?	13:16
	← NinjaNoel left	13:16
	→ meLon joined	13:16
	→ amcsi_work_ joined	13:16
groundnuty	OnlyForF1: no, thank you I will watch it right away :)	13:16
	← Asiajey left	13:17
groundnuty	in general I read resources I had and looking more low level stuff	13:17
OnlyForF1	https://www.youtube.com/watch?v=4XpnKHJAok8&feature=kp	13:17
	← JustMozzy left	13:17
	→ EminenceHC joined	13:18
Vampire0	cbreak-work, can you tell me what I have to give --expire-unreachable as argument to denote "now"? I cannot get it to expire a ref I just made "dangling"	13:18
Hello71	0	13:18
osse	groundnuty: check out what I just gave you	13:19
	→ FortySix2 joined	13:19
	← FortySix2 left	13:19
	← craigp left	13:19
	← nfroidure left	13:19
Vampire0	Hello71, doesn't work. From a quick look into the source I guess 0 is interprete as 1.1.1970	13:19
groundnuty	osse: reading it, thank you too	13:19
	← dccc left	13:20
	← amcsi_work left	13:20
	← simesy left	13:22
Vampire0	ah, I have to give it the ref. D'oh	13:22
	→ juliohm joined	13:22
	→ jorj joined	13:22
Vampire0	this should probably throw some error	13:22
	← Gizburdt left	13:23
	→ kikimeter joined	13:23
	→ balor joined	13:23
	← EminenceHC left	13:23
	← jftf left	13:24
Vampire0	amcsi_work_, "git reflog expire --expire-unreachable=0 --dry-run --all" or "git reflog expire --expire-unreachable=0 --dry-run master" or "git reflog expire --expire-unreachable=0 --dry-run HEAD", according to what you are after. Without explicit ref and --all it seems to do just nothing	13:25
	→ vtunka joined	13:26
	← meLon left	13:26
	→ meLon joined	13:26
	→ craigp joined	13:26
	← jdmf left	13:28
	← zumba_ad_ left	13:29
	← jhermann left	13:29
HelloShitty	what is the git command to see if any file has any changes since the last commit/push?	13:31
	I can't find if anyone answered me!	13:31
	:\|	13:31
Vampire0	yes, someone did	13:32
	→ nfroidure joined	13:32
Vampire0	besides that it is essential whether you mean commit or push as those are pretty much different	13:32
HelloShitty	well, I have changed a source code file	13:32
	→ mmitchell joined	13:32
	→ [EddyF] joined	13:32
HelloShitty	but I can't remember if I have made any commit and push or if I haven't	13:33
	zz_veatch → veatch	13:33
HelloShitty	so I need to know if the version in github is the same or not from the file I have in my PC	13:33
	← pppp2 left	13:33
	→ pppp2 joined	13:34
	→ freimatz joined	13:34
	→ jerius joined	13:35
	← jerius left	13:35
	→ dccc joined	13:35
HelloShitty	Vampire0: I mean, I want to check if the content of the file in GitHub is still the same as the file in my PC	13:36
moritz	git diff @{u}	13:36
	← amcsi_work_ left	13:36
	← meLon left	13:36
	→ jerius joined	13:36
cbreak-work	Vampire0: no idea, sorry	13:36
	→ meLon joined	13:36
moritz	on tracked branches, 'git status' even tells if your state relative to the upstream	13:36
	→ brandonw joined	13:36
	→ amcsi_work joined	13:36
HelloShitty	jeezzzz, this channel has a lot of spamm with connecting messages	13:36
cbreak-work	Vampire0: I'd expect a time to work though	13:36
moritz	HelloShitty: configure your client to ignore them	13:37
cbreak-work	HelloShitty: so don't leave... :)	13:37
HelloShitty	configure git to ignore what?	13:37
moritz	HelloShitty: configure your IRC client to ignore joins/leaves	13:37
HelloShitty	the problem is that our conversations just disappear in a blink of an eye	13:37
	→ Gizburdt joined	13:37
_ikke_	HelloShitty: no problems here	13:38
HelloShitty	moritz: I'm at work using a web chat	13:38
_ikke_	HelloShitty: But that is the case with any sufficient large channel	13:38
moritz	HelloShitty: eeks	13:38
	HelloShitty: anyway, 'git diff @{u}' or 'git status' should tell you what you want to know, in different formats/detail levels	13:38
	→ livingstn joined	13:38
HelloShitty	git diff @{u} --> this was not what I was looking for	13:38
	there is a basic command that says that the version of the files are not the same	13:39
moritz	git diff --stat @{u}	13:39
osse	HelloShitty: it	13:39
	HelloShitty: git status?	13:40
HelloShitty	i guess that's it	13:40
	status	13:40
	yes, that's it	13:40
moritz	status doesn't tell you about remotes on a file base though	13:40
HelloShitty	but it was that one I was looking for	13:41
	thanks osse	13:41
	← meLon left	13:41
HelloShitty	thanks moritz for helping	13:41
	→ meLon joined	13:41
	← luc_ left	13:41
	→ jeffreylevesque joined	13:43
HelloShitty	one more question	13:43
ohcibi	HelloShitty: you have to say thanks to me as well as I named git status in the first place and it will push me to the last place in .topkarma	13:43
	← dccc left	13:43
	← pppp2 left	13:44
jast	oh, is that what the law says now? :}	13:44
HelloShitty	Is it possible to write the pass only one time and for the next ones, to make git to accept it automaticvally	13:44
	?	13:44
	cheers ohcibi I don't want you at the end of the list	13:45
	→ nnyk_ joined	13:45
cbreak-work	am I still on the list? :)	13:45
ohcibi	HelloShitty: im talking about .topkarma, i wasnt on that list before, so beeing on that list in the last place is more than not beeing in that list	13:45
jast	not on the 30 day list	13:45
	you're still not on the list, btw	13:46
	(@ohcibi)	13:46
	← meLon left	13:46
ohcibi	jast: i know, i guess because HelloShitty said "cheers" instead of "thanks"	13:46
jast	I suspect that's not what you expected mostly because you don't understand karma ;)	13:46
	→ meLon joined	13:46
jast	cheers is detected by the bot	13:46
cbreak-work	I should be more active I guess... :)	13:46
ohcibi	jast: i thought one cheers is 1karma-point... so its more than one?	13:46
cbreak-work	behold, for I shall answer all your questions, karma-donnors!	13:47
	ohcibi: that'd be too easy	13:47
jast	one cheers is a small fraction of a karma point	13:47
	← kermit left	13:47
ohcibi	ah ok...	13:47
jast	you thought gaining karma was easy? well it's not ;)	13:47
osse	!karma osse	13:47
gitinfo	This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them. Try ".karma <nick>" or ".topkarma", but please do it via private message to avoid mass highlighting people.	13:47
ohcibi	but i have a karma of 2 , so it cannot be much more to get into that list 8-)	13:47
osse	.karma osse	13:47
gitinfo	the Genuine Real Life Karma™ REST API results are back! osse: 89 (8 in past 30 days) (4 given out)	13:47
osse	osse: thanks	13:48
	.karma osse	13:48
gitinfo	the Genuine Real Life Karma™ REST API results are back! osse: 89 (8 in past 30 days) (4 given out)	13:48
osse	:(	13:48
jast	cheater	13:48
ohcibi	lol	13:48
	← hkon_ left	13:48
	→ kermit joined	13:48
jast	I'll have to take c7's suggestion to filter out self-thanks	13:48
ohcibi	.karma ohcibi	13:48
gitinfo	the Genuine Real Life Karma™ REST API results are back! ohcibi: 2 (0 in past 30 days) (1 given out)	13:48
	← Gonzo89 left	13:48
ohcibi	ok	13:48
jast	or maybe I'll just kickban all cheaters	13:48
ohcibi	i got that even more wrong	13:48
	i have 2 in total 8-))	13:48
osse	jast: looks like that filter already is in place	13:49
jast	not that I know of	13:49
	once again, a single thanks doesn't make a karma point	13:50
osse	ah	13:50
	osse: thanks	13:50
	.karma osse	13:50
gitinfo	the Genuine Real Life Karma™ REST API results are back! osse: 89 (8 in past 30 days) (5 given out)	13:50
jast	you still want that kickban? ;P	13:50
osse	If I'm not mistaken I can unban myself	13:50
cbreak-work	wasn't there a karma web interface?	13:51
jast	depends on how thoroughly you get banned	13:51
	← meLon left	13:51
jast	well, if there is one, it wasn't me who made it	13:51
	→ meLon joined	13:51
cbreak-work	hmm... or just a lines-said counter	13:51
	→ mizu_no_oto joined	13:51
	← bezet left	13:51
cbreak-work	http://itvends.com/irc/git-all.html	13:51
	indeed	13:52
	I rock	13:52
	→ yosito joined	13:52
	→ jontmorehouse joined	13:52
	→ hockey567 joined	13:53
bremner	hrm. Maybe I should link that from my CV ;)	13:53
HelloShitty	Is it possible to write the pass only one time and for the next ones, to make git to accept it automaticvally	13:53
	???	13:53
cbreak-work	pass?	13:54
	HelloShitty: use ssh keys :)	13:54
	→ AaronMT joined	13:54
cbreak-work	with those you can use ssh-add as key manager	13:54
HelloShitty	I already added an ssh key to github	13:54
cbreak-work	if you use https, you'll have to do something else	13:54
	← beautifulmind left	13:54
cbreak-work	(.netrc or so I think?)	13:54
	HelloShitty: git remote -vv will show you wether you use ssh or https	13:55
HelloShitty	i'm using ssh	13:55
cbreak-work	then use ssh-add	13:55
	add the key	13:55
	and git should use it to authenticate. Without additional password. Until the next reboot or relog or timeout	13:55
HelloShitty	it says:	13:55
	Could not open a connection to your authentication agent.	13:55
	→ Not-930a joined	13:55
HelloShitty	when I try to add the key	13:56
	→ zumba_addict joined	13:56
HelloShitty	with ssh-add	13:56
	← meLon left	13:56
jast	I'm assuming you have no experience with SSH agents?	13:56
	→ meLon joined	13:56
jast	(anti-self-thanks committed)	13:56
HelloShitty	nope jast	13:57
	← jontmorehouse left	13:57
	← kevinb left	13:57
jast	right. basically you start an instance of ssh-agent in your session somewhere, and make sure a bunch of environment variables get set to appropriate values in all shells you use	13:58
ohcibi	jast: do the thanks just sum up or is there a more complicated calculation with weighted thanks?	13:58
jast	once that is set up, you can cache key passwords by running 'ssh-add' and all ssh invocations will check back with the agent	13:58
	→ dccc joined	13:58
jast	the alternative is to use an unencrypted ssh key :}	13:58
ohcibi	or one of the various gui-tools that do the keychain-stuff for you	13:59
	→ kevinb joined	13:59
	→ mattstratton joined	13:59
HelloShitty	I have checked with ps aux \| grep -i ssh-agent	13:59
	→ glosoli joined	13:59
HelloShitty	and there is one ssh-agent running with pi 198358	13:59
	19838	14:00
jast	ohcibi: each individual thanks is weighted by a constant	14:00
ohcibi	you have to ssh-add your keys	14:00
HelloShitty	but when I try to add the key with	14:00
	→ lpax joined	14:00
jast	so presumably the agent got started somewhere but your shell(s) don't have the env var that tells ssh where the agent lives	14:00
	→ relisys- joined	14:00
	← FabTG left	14:00
HelloShitty	ssh-add ~/.ssh/id_rsa.pub	14:00
	it says Could not open a connection to your authentication agent.	14:00
	so how do I do that?	14:01
	← meLon left	14:01
jast	it depends on how the agent is getting started in the first place	14:01
	→ meLon joined	14:01
cbreak-work	on OS X it should be automatic	14:01
HelloShitty	i started it with eval 'ssh-agent -s'	14:01
cbreak-work	you shouldn't need to start it	14:02
jast	that way it'll only work in the same shell session	14:02
cbreak-work	there should be an env var set like SSH_AUTH_SOCK=/tmp/launch-msltN8/Listeners	14:02
	← glosoli left	14:02
	gitinfo set mode: +v	14:02
relisys-	I have some files in .gitignore. I have 2 local development machines, a live server and a dev server. For some reason, whenever I merge on the dev server, it deletes some of the files i have in .gitignore. This never happens on local machines or live server but keeps happening on dev server	14:03
HelloShitty	SSH_AUTH_SOCK=/tmp/ssh-kyOsL8bKS14r/agent.19837; export SSH_AUTH_SOCK;	14:03
relisys-	i feel like I'm not understanding something	14:03
cbreak-work	relisys-: gitignore is irrelevant	14:03
HelloShitty	SSH_AGENT_PID=19838; export SSH_AGENT_PID;	14:03
cbreak-work	relisys-: it doesn't apply to tracked files	14:03
HelloShitty	echo Agent pid 19838;	14:03
relisys-	these files are not tracked anymore	14:03
cbreak-work	then git won't delete them either	14:03
	git won't touch untracked files	14:04
relisys-	it's not touching them on 4/5 of the machines	14:04
cbreak-work	relisys-: maybe they are still tracked on that machine	14:04
	and you merged their deletion (their untracking)	14:04
relisys-	but i've merged their deletion like 5 times now	14:04
	i didn't notice this time if it said it deleted them	14:04
	some of the files have been in .gitignore for months	14:05
	and haven't gotten deleted	14:05
	during any merge	14:05
	then all of a sudden just now i merge and they got deleted	14:05
HelloShitty	jast: can you help me getting this to work?	14:05
	→ _iron joined	14:05
	← _iron left	14:05
jast	I don't really have that much time right now, sorry	14:05
cbreak-work	relisys-: you can look in history when they were deleted on that machine (with git log -- file)	14:05
	← meLon left	14:06
	→ meLon joined	14:06
	← corehello left	14:07
	← xequence left	14:08
	← dccc left	14:09
	→ toedwy joined	14:09
	→ squeakytoy joined	14:10
	→ IrishPrime joined	14:11
	← meLon left	14:11
	→ B1x1t0 joined	14:11
	→ meLon joined	14:11
	→ Muchoz joined	14:11
squeakytoy	Hey all. I am trying to figure out what command is best to get information about a single commit (based on a hash). Currently using git diff-tree with an own format. But it doesn't seem there is a format placeholder to get the "diff" between files	14:11
	← Trudko left	14:12
squeakytoy	if i use git show, I cannot use pretty for the diff	14:12
	← CodePulsar left	14:12
squeakytoy	I want the easier way to get information about a commit, so my third party application can parse the output into its system.	14:12
	← gargola_ left	14:14
	→ Diemuzi joined	14:14
	gitinfo set mode: +v	14:14
	→ chrisshattuck joined	14:15
lb1a	squeakytoy, script it yourself and use the pluming commands, to get what you want. maybe setup an alias for easier invocation	14:15
	plumbing*	14:15
	← Muchoz left	14:16
	← meLon left	14:16
	→ meLon joined	14:16
osse	squeakytoy: git log -1 perhaps	14:17
	-p gives you a diff also	14:17
squeakytoy	ok, thanks for all suggestions	14:18
	→ FabTG joined	14:18
	→ treehug88 joined	14:18
	→ Destos joined	14:18
lb1a	!ping	14:20
gitinfo	I only respond to !reply_time	14:20
	→ bezet joined	14:20
	→ simesy joined	14:20
	← Corey84 left	14:20
	← gua_ould left	14:20
	→ shingshang joined	14:21
	→ KamalKaur joined	14:21
	JT-EC_ → JT-EC	14:21
Vampire0	HelloShitty, sorry, got distracted by work. g I hope you have your answer already :-)	14:22
HelloShitty	nope	14:22
Vampire0	cbreak-work, yeah, found out already that "0" works. Just giving neither "--all" nor an explicit ref does nothing without some error message	14:22
	→ fairuz joined	14:23
	→ Guddu_ joined	14:23
HelloShitty	I just can't get my passphrase correct to add the ssh key to ssh-gaent so that I don't need to write the passphrase each time i issue a ush command	14:23
	→ Dougie187 joined	14:23
	← Errorical left	14:24
	→ EminenceHC joined	14:24
	← papegaaij left	14:24
	→ dccc joined	14:24
Vampire0	HelloShitty, ah, ok, I meant the diffing thing so see whether you commited and pushed changes to a specific file	14:25
HelloShitty	ah yes	14:25
	← rath left	14:25
HelloShitty	that one I got it	14:25
	git status	14:25
	→ ShooterMG joined	14:26
	← ShooterMG left	14:26
Vampire0	which woudl be "git status -- file.ext" for committed or not and "git diff @{u} -- file.ext" for pushed or not	14:26
	← meLon left	14:26
	→ meLon joined	14:26
Vampire0	About ssh agent, !www	14:26
gitinfo	What did you do (which commands?), what happened as a result (any messages?), and what was the result you expected instead?	14:26
relisys-	so git log --file says that the file hasn't been touched in May 21 yet it was definitely just deleted by git	14:26
	→ rypeck joined	14:26
	→ gua_ould joined	14:27
Vampire0	relisys-, are you missing a space between -- and file?	14:27
	← Zariel_ left	14:27
	← gua_ould left	14:27
relisys-	no, i have a space	14:28
	→ gua_ould joined	14:28
relisys-	otherwise it says invalid argument	14:28
	← EminenceHC left	14:28
relisys-	i'm getting the log back but it says "file" hasn't been touched since may 21 when it was removed from git	14:28
	but somehow it just got deleted when I merged	14:29
	it is untracked and in .gitignore	14:29
	supposedly untracked that is	14:29
	→ jmichaelward joined	14:30
	← KamalKaur left	14:30
	← ckyle left	14:30
Vampire0	relisys-, supposedly untracked?	14:30
relisys-	well how the hell else did git delete it?	14:30
	→ bambams_ joined	14:30
relisys-	i just made a change to it, git shows no changes to commit	14:30
	so it must not be tracked	14:30
	← craigp left	14:31
	→ teran joined	14:31
	← meLon left	14:31
relisys-	but i'd ask again, how/why did .git delete it then, and there is nothing in the logs...	14:31
Vampire0	being matched by .gitignore means "ignore it if it is untracked"	14:31
	← stodan left	14:31
relisys-	it's untracked	14:31
	that was kind of sarcasm	14:31
	→ meLon joined	14:31
	→ drswap joined	14:31
relisys-	because i don't see how git deleted it, if it's untracked and in .gitignore (which it is)	14:31
	← Hounddog left	14:31
relisys-	and this has happeneed repeatedly	14:31
	→ NanoArrow joined	14:32
relisys-	with another untracked file. These untracked files it deleted today have been untracked and ignored since May 21 and it deleted them during a merge today	14:32
Vampire0	It is an untracked file and in .gitignore and it gets deleted by git?	14:32
relisys-	yes	14:32
Vampire0	hm	14:32
relisys-	sounds impossible	14:32
cbreak-work	git doesn't touch untracked files at all, apart from git clean or git add	14:32
	(or as side effect)	14:33
	→ dfaught joined	14:33
relisys-	i know	14:33
	→ gua_ould_ joined	14:33
relisys-	i cant' explain it, obviously something is going on that i'm not understanding	14:33
	was hoping you guys might have a scenario where things could be or appear to be happening the way they are	14:34
	→ EminenceHC joined	14:34
relisys-	but it doesn't sound like you have any ideas either :P	14:34
	← gua_ould left	14:34
	gua_ould_ → gua_ould	14:34
relisys-	i must have something hosed up	14:34
Vampire0	I guess an important piece of information is missing to get the situation	14:34
relisys-	I guess	14:35
	something I'm overlooking	14:35
Vampire0	Maybe !www and !summarize helps	14:35
gitinfo	What did you do (which commands?), what happened as a result (any messages?), and what was the result you expected instead?	14:35
	[!dont_summarize] Please do not summarize what you did; !pastebin _exactly_ what commands you ran, what the output was, and why you think that this is wrong. Otherwise you may hide the real issue. See also !obfuscate and !repro	14:35
	→ zapotek6 joined	14:35
relisys-	do different branches have different .gitignore files?	14:35
	← zapotek6 left	14:35
	→ craigp joined	14:35
Vampire0	yes	14:35
relisys-	maybe a branch i merged doesn't have the right .gitignore?	14:35
	→ Munter_ joined	14:35
	← Junior left	14:35
Vampire0	But even then I guess the file should not be touched. Not without warning you about it	14:36
	s/guess/think/	14:36
	← kriks left	14:36
	← KevinTS left	14:37
	← dccc left	14:37
	→ Guest89885 joined	14:37
	→ aldodelgado joined	14:37
	→ zapb joined	14:38
	→ jontmorehouse joined	14:38
	← dotpot left	14:38
	→ thms joined	14:38
	→ ckyle joined	14:39
	← thms left	14:39
	→ thms joined	14:39
	gitinfo set mode: +v	14:39
	← Munter_ left	14:39
thms	Hi there, I have a github account, I connect to the master, can push commit and view changes on the web interface	14:39
Guest89885	hellp	14:39
	→ tang^ joined	14:39
thms	I done a git checkout -b "newbranch"	14:39
	problem is the branch doesn't show up after pushing it, it says no changes everything up to date	14:39
	→ fjfish joined	14:39
	→ Munter joined	14:39
Munter	Hi. I'm trying to revert a merge commit and ran into the thing about having to define what parent number is supposed to be the new parent. I was thinking it'd be some nice sugar to be able to define the commit hash-ish as a parent instead of having to look up a number you're not usually exposed to. Has this been discussed before?	14:39
thms	and git branch displays master and newbranch, but there are other branches created via the github.com account	14:39
	← przemkovv left	14:40
	← vtunka left	14:40
	→ gordian joined	14:40
	← francisfish left	14:40
	← jaimef left	14:40
	← meLon left	14:41
	→ meLon joined	14:41
	← squeakytoy left	14:41
	→ jaimef joined	14:41
Vampire0	thms, !www and !summarize	14:41
gitinfo	thms: What did you do (which commands?), what happened as a result (any messages?), and what was the result you expected instead?	14:41
	thms: [!dont_summarize] Please do not summarize what you did; !pastebin _exactly_ what commands you ran, what the output was, and why you think that this is wrong. Otherwise you may hide the real issue. See also !obfuscate and !repro	14:41
Vampire0	Guest22956, !hi	14:41
gitinfo	Guest22956: [!welcome] Welcome to #git, a place full of helpful gits. If you have a question, feel free to just go ahead and ask—somebody should answer shortly. For more info on this channel, see http://jk.gs/git/ Take backups (type !backup to learn how) before taking advice.	14:41
	→ Kaisyu joined	14:42
	← dfaught left	14:42
thms	Vampire0: I done "git checkout -b "newbranch" and "touch file.php" and "git add file.php", and git commit -am "new file" and finally git push	14:42
	if I do git checkout master there is no file.php	14:42
	if I do git checkout typo360 there is the file.php	14:42
	but the typo360 branch doesn't show up in the github webinterface	14:43
osse	thms: then you need to push it	14:43
thms	there is also a "production" branch, but git branch displays only the branches I created (so "newbranch", and ofc master)	14:43
Vampire0	tham, git push origin newbranch:newbranch	14:43
thms	Ho wait	14:43
	I actually had to type the branch name	14:43
Vampire0	and to see other branches, !where_are_my_branches	14:43
thms	in the github interface	14:43
	it wouldn't show up as choices but when I searched for it it worked. thanks a lot.	14:44
Vampire0	thms !wherearemybranches actually	14:44
gitinfo	Git clones all branches, but initially makes only the main branch (usually 'master') available as a normal local branch. To work on another branch, simply 'git checkout <branch>' (or, in versions older than 1.6.6, git checkout -b <branch> origin/<branch>). This works even if the branch doesn't show up in the normal list of branches. For technical details, see !rtb	14:44
	→ przemkovv joined	14:44
Vampire0	ah, ok great :-)	14:44
	← xificurC left	14:44
	← jontmorehouse left	14:44
Vampire0	Munter, are you asking how you say the xth parent of a commit symbolically?	14:45
	that would be <commit>^x	14:45
	→ nickpresta joined	14:46
	← meLon left	14:46
	→ n-st joined	14:46
	→ meLon joined	14:46
	← joki left	14:46
	← bgerber left	14:47
	→ jontmorehouse joined	14:48
osse	Vampire0: <commit>~x	14:48
	oh	14:48
	no, you're right.	14:48
	→ bgerber joined	14:48
osse	english is hard	14:48
jast	should we switch to navajo?	14:49
osse	si	14:49
Vampire0	:-)	14:50
	zz_jrhorn424 → jrhorn424	14:50
	← simesy left	14:50
Vampire0	There are myths that I don't always talk rubbish, seems they are true :-D	14:50
	→ kriks joined	14:50
	← meLon left	14:51
	→ meLon joined	14:51
	→ the_cybersphinx joined	14:51
	→ dccc joined	14:51
	→ joki joined	14:52
	→ zapotek6 joined	14:56
	← przemkovv left	14:56
	← zapotek6 left	14:56
	→ lsiv568 joined	14:56
	← meLon left	14:56
	→ przemkovv joined	14:56
	→ meLon joined	14:56
	→ ojacobson joined	14:56
	← _Vi left	14:56
	← balor left	14:57
	→ a_le joined	14:58
	→ exobit joined	14:59
	→ tranzfuse joined	15:00
cbreak-work	Vampire0: one sample does not make for anything close to statistical relevance	15:00
	← roelmonnens left	15:00
Vampire0	:-P	15:00
	← lsiv568 left	15:00
	→ tang^^ joined	15:00
	← acolson left	15:01
	← FilipNortic left	15:01
qsuscs	osse: which is you native language?	15:02
	← drswap left	15:02
	← tang^ left	15:03
	← dccc left	15:03
	← sdrfnord1 left	15:04
	← Silmarilion left	15:05
	← [EddyF] left	15:05
	→ xequence joined	15:05
	← meLon left	15:06
	→ meLon joined	15:06
	→ [EddyF] joined	15:06
	→ Corey84 joined	15:07
Munter	Vampire0: No. Rather, I'd like to be able to define the parent as a hash instead of an index. Since the index is not something most people are aware of, but everyone should be aware of hashes	15:07
	I'll probably implement a little local bash script that takes a hash, iterates over the parent indexes and picks the one that matches the hash. I was just thinking that I might not be the only one benefitting from it	15:08
ojacobson	"the one"	15:09
	if you cheat hard enough, you can create a commit object with the same parent more than once	15:09
	git itself never creates those, but they do work if you fudge it	15:09
	← basiclaser left	15:09
	← craigp left	15:09
	→ darkxploit joined	15:09
	← rob_w left	15:10
	→ basiclaser joined	15:10
	← meLon left	15:11
	cxreg2 → cxreg	15:11
	← tranzfuse left	15:11
osse	qsuscs: heh, I was just kidding... but it's right that english is not my mother's thong	15:11
	← Gizburdt left	15:11
	→ meLon joined	15:11
	→ hgl joined	15:11
	ChanServ set mode: +o	15:11
	→ the8thbit joined	15:12
	Eugene changed the topic to: Welcome to #git, the place for git help and unavoidable meetings \| Current stable version: 2.0.1 \| Start here: http://jk.gs/git \| Getting "cannot send to channel"? /msg gitinfo .voice \| git-svn: now you have two problems.	15:12
	Eugene set mode: -o	15:12
	→ Muchoz joined	15:12
Vampire0	Munter, sorry, don't get what you mean	15:13
	← cbreak-work left	15:13
	← hgl left	15:13
	→ hgl joined	15:13
	tang^^ → tang^	15:14
qsuscs	osse: did you really just say that your mother’s thong is not english?!	15:14
Eugene	It's Thai.	15:14
	← hgl left	15:14
	← MrDHat left	15:15
	→ hgl joined	15:15
	← FabTG left	15:15
	← hgl left	15:15
	→ hgl joined	15:15
	→ molqr joined	15:16
	← meLon left	15:16
	→ Zariel_ joined	15:16
	→ Gizburdt joined	15:16
	← Gizburdt left	15:16
	→ Gizburdt joined	15:16
	→ meLon joined	15:16
Vampire0	qsuscs, what is so strange about that? I guess many peoples mother tongue is not English in here. Mine is German	15:16
	← Gizburdt left	15:16
	← Muchoz left	15:17
	← ghostbox left	15:17
qsuscs	Vampire0: ja schon, ich auch. but he said thong, and not tongue. zunge vs. …schau lieber selbst.	15:17
jast	it might have been deliberate	15:18
Vampire0	ah, right	15:18
	lol	15:18
	← noxd left	15:18
	← mennea left	15:18
qsuscs	(Welcome to #git, the place for git help and foreign underwear)	15:19
	→ dfaught_ joined	15:19
	→ tranzfuse joined	15:19
Vampire0	you know this qsuscs: http://th08.deviantart.net/images/200H/i/2003/2/0/0/getStringFromObject.jpg ? :-)	15:19
	→ dccc joined	15:19
	→ jftf joined	15:19
	→ lolmaus joined	15:19
	→ thiago joined	15:20
	← Corey84 left	15:21
	→ thedodd joined	15:21
osse	qsuscs: i did	15:21
	→ Megaf joined	15:21
	← meLon left	15:21
	→ tyreld joined	15:21
osse	qsuscs: less boring than "mother tongue"	15:21
qsuscs	… native language, then.	15:21
	→ meLon joined	15:21
	→ sm0ke joined	15:21
jeffreylevesque	does the "longest streak" in github only span the last year, or is the streak indefinite since your account was created?	15:22
	← toomanysecrets left	15:22
jast	no idea, ask github (or #github, maybe)	15:22
sm0ke	hey guys on my git repo it shows a commit merged remote tracking blah blah...	15:22
	→ GT joined	15:22
sm0ke	but when i do git rebase -i HEAD~3 it doesnt show up	15:23
	→ jfran joined	15:23
	→ Mixologic joined	15:23
jast	rebase flattens merges	15:23
sm0ke	also the order of commits is also f**kd up	15:23
jast	use -p if you want to try and preserve them	15:23
hoylemd	Who does neale want to punch?	15:24
	ach. wrong channel. ignore me.	15:24
	→ doddstack joined	15:24
sm0ke	jast: so here is what i want i want to sqash last 3 commits into singl one	15:24
	← jftf left	15:24
sm0ke	but `git rebase -i HEAD~3` is really not what i am expecting	15:24
jast	is any of them a merge?	15:24
sm0ke	yes	15:24
	← Yahweh_ left	15:25
	→ dreiss joined	15:25
jast	right. rebase treats merges as if all the commits on both sides were made in parallel (roughly)	15:25
	→ dsdeiz joined	15:25
jast	in this case a different approach is probably simpler	15:25
	← thedodd left	15:26
jast	e.g. git reset --soft HEAD~2; git commit --amend	15:26
	← meLon left	15:26
	← bvi left	15:26
	→ meLon joined	15:26
sm0ke	what will that do?	15:26
	→ FabTG joined	15:27
sm0ke	so here is the thing i commited to my local repo then merged to remote and committed again	15:27
	→ atamanroman joined	15:27
	← jontmorehouse left	15:27
	← hgl left	15:28
	← mewm left	15:28
	→ jontmorehouse joined	15:28
	← hockey567 left	15:28
	→ JDHawke joined	15:28
JDHawke	is there a simple way of being able to replace a tag in a file with the commit id that it's part of...any kind of place holder or such?	15:29
	→ leb joined	15:29
	← GT left	15:29
sm0ke	so actually its like MY_COMMIT-> (2 COMMITS AND MERGES BY SOMEONE) -> MY_AGAIN	15:30
	← nfk left	15:30
sm0ke	ON GITHUB It SHOW LIKE (MINE-> MY_MERGE -> MINE_AGAIN)	15:30
	→ HelperW__ joined	15:30
sm0ke	ugh..excuse me.. but rebase is not like that	15:30
	→ EmmEight joined	15:31
jast	sm0ke: maybe you want to rebase against upstream first, and then figure out what to do next	15:31
	← paulweb515 left	15:31
	← GodEater left	15:31
sm0ke	i doubt if github sorts commits by time	15:31
jast	that will put your commits on top of other people's commits	15:31
sm0ke	jast: how do i do that?	15:31
jast	(by that I mean NON-interactive rebase)	15:31
	← aldodelgado left	15:32
jast	git rebase <wherever you merged from, e.g. origin/master>	15:32
	→ jimi_ joined	15:32
jast	JDHawke: after the fact, sure, as part of your build scripts	15:32
	it's mathematically infeasible, of course, to do it as part of the commit	15:32
	← dccc left	15:32
JDHawke	jast	15:32
sm0ke	i merged from remote/dev	15:33
jast	that's my IRC nick, yes	15:33
j416	JDHawke: clean/smudge may be of help http://git-scm.com/book/en/Customizing-Git-Git-Attributes	15:33
sm0ke	let me try	15:33
JDHawke	jast: thanks, I was looking at that path, but was wondering if there was anything else	15:33
sm0ke	i am really not sure	15:33
jimi_	I have a question that I'm a bit conflicted on. My boss asked me to put our user uploaded content / images, etc into git, so that we can migrate servers, etc in the future easier. My thought was... we really dont want to do that, because those files do not really change, or have anything history related to track. Wouldnt it be better to backup those sepearelty, or store them in some other manner, unrelated to git?	15:33
	→ Thra11 joined	15:33
	→ acharlieh joined	15:33
jast	jimi_: yes.	15:33
JDHawke	lol, yeah, tab completion in my IDE isnt the same as in my IRC....	15:33
jast	you're much better off using rsync for stuff like that	15:33
	← EmmEight left	15:34
jimi_	yep	15:34
	← HelperW_ left	15:34
qsuscs	additionally, !baloon	15:34
jimi_	Ok, just making sure im not completely crazy.	15:34
qsuscs	!balloon	15:34
gitinfo	[!binary] Storing binary files in git causes repo balloon, because they do not compress/diff well. In other words, each time you change a file the repo will grow by the size of the file. See !annex for some solutions	15:34
	→ Zoddo joined	15:34
sm0ke	jast: it seemed to put my commits on top	15:34
jast	qsuscs: not an issue if the files never change :)	15:34
sm0ke	jast: but i dont see the merge commits at all now	15:34
jimi_	!annex	15:34
gitinfo	git-annex and git-media are two solutions to the !binary problem. They work by keeping the blobs outside of the repo, storing a reference to the blob in the repo instead. See http://git-annex.branchable.com/ and https://github.com/schacon/git-media	15:34
qsuscs	it’s still very big.	15:34
	← jceb left	15:34
qsuscs	:<	15:34
	← HelperW__ left	15:35
JDHawke	j416 : that looks perfect for what I need	15:35
jast	sm0ke: that's because they are no longer needed now. the commits have been re-ordered so the merge is not required anymore.	15:35
	→ cjwilburn joined	15:35
sm0ke	do i just push -f now?	15:35
jast	oh, you already pushed your merge thingy?	15:35
JDHawke	I just want to be able to look at the file and know which version was checked out, I think that will work perfectly!	15:35
j416	JDHawke: I'd avoid using it too much though, it can become confusing when the file contents do not correspond to what's in the repo	15:35
sm0ke	yes	15:35
jast	you might want to mention that kind of thing a little earlier :)	15:35
	→ Noldorin joined	15:35
sm0ke	what!	15:35
jast	because !rewrite	15:36
gitinfo	Rewriting public history is not recommended. Everyone who has pulled the old history have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push -f <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	15:36
sm0ke	i kill you jast :D	15:36
jast	don't worry, we can undo the rebase	15:36
	→ nfk joined	15:36
	← meLon left	15:36
	← lb1a left	15:36
	→ meLon joined	15:36
JDHawke	j416 I can see that, but I only plan on using it on one file, and it's a repository thats going to be typically read only for most users...	15:36
jast	sm0ke: though it's fine if you're reasonably certain nobody else has your old copy of the history that contains the merge	15:36
	→ Trudko joined	15:37
sm0ke	yes its my fork	15:37
	no one else can do anything	15:37
	→ akim__ joined	15:37
	← gua_ould left	15:37
jast	well, it's not what they can do, is what they've already merged from you	15:37
	akim__ → akim	15:37
jast	it's fairly likely they haven't even cloned your repo, so a force push should be okay	15:38
	→ martinklepsch joined	15:38
sm0ke	hmm should i squash now or after committing	15:38
	pushing*	15:38
j416	JDHawke: be aware that it won't just magically work for anyone who is cloning your repo	15:38
	→ felipe joined	15:38
	→ punchagan joined	15:38
sm0ke	let me just push wth	15:38
jast	might as well do it now while you're at it	15:38
j416	JDHawke: you have to configure it properly first	15:38
jast	otherwise you'll have to force push again	15:38
	no big deal, I suppose	15:39
sm0ke	yea	15:39
	→ epifanio joined	15:39
sm0ke	ok squash went fine	15:39
	i am not very sure about the status though	15:40
	Your branch and 'origin/master' have diverged, and have 1 and 3 different commits each, respectively.	15:40
JDHawke	j416 thanks for the tip, I'll play around and see if I can make it work...if not...back to the build scripts ;)	15:40
	→ solker_ joined	15:40
j416	yw	15:40
jast	sm0ke: think of it like this: 3 are the old, not rewritten history, and 1 is your new squashed commit	15:41
	← meLon left	15:41
	→ meLon joined	15:41
jast	this piece of logic doesn't know you used to have these 3 commits... after all you just made git think they never existed ;)	15:41
sm0ke	but how do we know we did not f**k up conflicts in what we just did	15:42
	argh git hard	15:42
	git is*	15:42
jimi_	!hard	15:42
	lol	15:42
	← chrisshattuck left	15:42
j416	sm0ke: !book	15:42
gitinfo	sm0ke: 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	15:42
luto	!bottomup <3	15:42
gitinfo	'Git from the bottom up' starts with explaining the building blocks of git and proceeds to tell you how they fit together. http://ftp.newartisans.com/pub/git.from.bottom.up.pdf (http://ikke.info/git.from.bottom.up.pdf)	15:42
jast	well git didn't complain about any conflicts	15:43
sm0ke	:`(	15:43
	jast: let me trust you on this one	15:43
	← solker left	15:43
jast	in practice that's really all that matters	15:43
[sr]	_ikke_: have more problems in another repo :(	15:43
	← ghostlin_ left	15:43
j416	sm0ke: I knew nothing, then I spent 2 days reading, now I know quite a lot without having asked many questions at all. So.. read the book.	15:43
jast	if you don't trust that, you can't ever trust any merge/rebase that does any automatic merging of file contents	15:43
	→ PrimalHunter joined	15:43
sm0ke	good point	15:44
	let me see what i led me too on github now	15:44
	it*	15:44
jast	github says: your repository? uh... it's got to be around here somewhere... maybe...?	15:44
	→ brownbathrobe joined	15:45
	← jftf_ left	15:45
Eugene	Omnomnom tasty repo	15:45
qsuscs	!botsnack	15:45
gitinfo	Om nom nom	15:45
	← mattstratton left	15:45
	← meLon left	15:46
PrimalHunter	I got a non technical quesiton about git. Would this be a place to bring it up or should i go else where? It's a question about my usage pattern and the way git is intended to use.	15:46
	← freimatz left	15:46
	→ meLon joined	15:46
moritz	PrimalHunter: it's fine to ask here	15:47
sm0ke	jast: looks about right	15:47
	← Balliad left	15:47
ojacobson	Fallacy #1: "git has an intended use"	15:47
sm0ke	thanks	15:47
	→ RusAlex joined	15:47
moritz	we get workflow questions regularly	15:47
ojacobson	git's more like a bag of tools for building source control systems than it is like a source control system	15:47
sm0ke	that rebase against remote was useful thing	15:47
	← sea-gull_ left	15:47
sm0ke	what exactly does rebase do there?	15:47
	→ invalid_packet_ joined	15:47
sm0ke	reorders commits?	15:47
moritz	sm0ke: yes, it puts your own commits on top of the branch you rebase against	15:48
	→ dccc joined	15:48
sm0ke	hurm didnt knew about that	15:48
	→ hkon_ joined	15:49
sm0ke	actually i know nothing tbh	15:49
	gitinfo set mode: +v	15:49
invalid_packet_	Hello everyone	15:49
gitinfo	invalid_packet_: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	15:49
qsuscs	ojacobson: git is a fancy file system (except for the permissions)	15:49
invalid_packet_	Does anyone know where to find official documentation aboutn git custom commands?	15:50
	← psoo left	15:50
PrimalHunter	Hehe OK. Thanks! :) I'm currently thinking about forking a project on github and my commit mentallity on a local level is "commit often". This means I also commit broken code in my local repo. But i'd love to get a orderly looking github repo. So I'd have to somehow "condense" my "in development" commits so they don't show up on github. Is this a problem of my usage pattern or is there a way to	15:50
	do this?	15:50
qsuscs	PrimalHunter: use !feature_branch	15:50
	!feature_branches	15:50
	← dfaught_ left	15:51
ojacobson	PrimalHunter: !sausage !githubflow	15:51
gitinfo	PrimalHunter: [!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	15:51
	PrimalHunter: [!github_flow] This is the workflow followed by github: http://scottchacon.com/2011/08/31/github-flow.html	15:51
	← meLon left	15:51
	← il_ left	15:51
	→ chrisshattuck joined	15:51
qsuscs	oh, there is no such trigger like i intended	15:51
	→ meLon joined	15:51
	← mizu_no_oto left	15:51
	← HelloShitty left	15:51
	→ _Vi joined	15:52
qsuscs	invalid_packet_: do you mean implementing like "git foobar"?	15:52
	← zoso left	15:52
	→ dfaught joined	15:52
	← brownbathrobe left	15:52
RusAlex	q: recently github added blocking access for often queries. And now I have a problem, when I want to do 'git submodule foreach git pull', some of repos throws "connection timeout". How can I avoid this ?	15:52
jast	PrimalHunter: look into interactive rebase. if memory serves correctly, here: !interactive_rebase	15:52
gitinfo	PrimalHunter: Interactive rebase sounds similar to rebase but has completely different abilities. It can do this to commits: change the order, squash some of them together, remove some, add random existing commits from other branches, split them, and more... it's very powerful. Documentation is in the section "Interactive Rebase" in 'man git-rebase'.	15:52
	← dfaught left	15:53
	→ il_ joined	15:53
jast	man git-rebase	15:53
gitinfo	the git-rebase manpage is available at http://jk.gs/git-rebase.html	15:53
PrimalHunter	Thanks a lot for all that help! :) I'm gonna red up on it. I guess I haven't really thought about branching in the process, sorry. :) Thanks for being uber-helpful! :D	15:53
	← hkon_ left	15:53
	→ dfaught joined	15:53
invalid_packet_	qsuscs: Yes. I found many articles around the web, all about putting executables files in your $PATH like git-foo, but found nothing in git documentation	15:53
qsuscs	invalid_packet_: i don’t know if this is mentioned somewhere, but that’s it. place git-foobar in your path and run git foobar	15:54
	Matrixiumn → CaveJohnson	15:54
qsuscs	invalid_packet_: there are APIs in many common scripting languages, and as git is written in C, writing own commands in C is as easy as any C program (i.e. hard)	15:54
Munter	Vampire0: I mean something like `git revert <hash-to-revert> --parent <hash-of-parent>`, where <hash-of-parent> matches the parent-id to base the history upon	15:55
ojacobson	or in GIT_EXEC_PATH, if you prefer to only access git-foo through git(1)	15:55
	← meLon left	15:56
	→ akushner joined	15:56
	→ meLon joined	15:56
sm0ke	bye all and thanks much	15:56
	← sm0ke left	15:56
	← solker_ left	15:56
Eugene	.trigger_edit custom_subcommands You can create custom git subcommands(eg, `git foo`) in two ways: man git-config and see alias.*, or place a script/binary in your PATH(~/bin/ is a good candidate) named "git-foo". The `git` wrapper will find these and execute as-needed.	15:56
gitinfo	Eugene: Okay.	15:56
invalid_packet_	qsusc: alright then, thaks	15:57
	→ solker joined	15:57
	→ lsiv568 joined	15:57
	← nekyian_ left	15:57
	← LeMike left	15:58
Munter	Vampire0: My thinking is that the specific hash I want to be the parent is easier for most users to figure out from the logs, while the id of the parent of the merge commit is somewhat more elaborate to figure out	15:58
	→ Rastus_Vernon joined	15:58
	← dccc left	15:58
	← dreiss left	15:59
	→ ofdm joined	16:00
[sr]	_ikke_: i think the problem may be, commiting with a 1.x version and the server is a 2.x version, could it be the reason?	16:00
	← dsdeiz left	16:00
	← thms left	16:01
	← invalid_packet_ left	16:01
	← meLon left	16:01
	→ imachuchu joined	16:01
	→ meLon joined	16:01
	← a_le left	16:01
Eugene	No, the repository format has not changed.	16:02
	← tvw left	16:02
	← mlechner left	16:03
	← nnyk_ left	16:03
	→ Musok joined	16:03
	→ a_le joined	16:03
	← lindenle left	16:04
	← Guddu_ left	16:04
	→ lindenle joined	16:04
	→ Royalb15_1 joined	16:04
	→ Guddu_ joined	16:05
Vampire0	Munter, ah, now I get you. With git revert you can only give -m 1 and not a <commit>-ish as parent and you would like to give it a <commit>-ish	16:06
	← Sendoushi left	16:06
	← meLon left	16:06
Vampire0	yeah, makes sense for me, suggest it on the mailing list, or contribute a patch :-)	16:06
	← Royalb15 left	16:06
	→ meLon joined	16:06
	← samir left	16:07
	→ Nizumzen joined	16:07
Vampire0	I was not aware that you have to give the parent number to revert	16:07
	← lsiv568 left	16:07
	→ samir joined	16:08
	← intellix left	16:08
	← lite_ left	16:10
	← ckyle left	16:10
	← alorence left	16:11
	→ eliasr joined	16:13
	→ hockey567 joined	16:13
	→ ehmatthes joined	16:13
	← jnavila left	16:14
[sr]	Eugene: believe so, but in 2 days had the same problem in two != repos	16:14
	thats odd, the server is a VM and the HOST OS has no problem with the disks	16:14
	→ Quevin joined	16:14
	→ dccc joined	16:15
	→ asakura1 joined	16:15
	← doddstack left	16:16
	← meLon left	16:16
	→ meLon joined	16:16
	→ Ankhers joined	16:16
	← xequence left	16:16
	← Logan- left	16:17
	→ Muchoz joined	16:17
	→ jftf joined	16:17
	→ mjsmith2 joined	16:18
	← dipendra left	16:19
	← bezet left	16:19
	→ paulweb515 joined	16:19
	← gordian left	16:20
	→ dreiss joined	16:20
	← ropav left	16:20
	← the8thbit left	16:20
	→ mattstratton joined	16:21
	← Sceorem left	16:22
	← CheckDavid left	16:22
	← Zariel_ left	16:23
	→ goTAN joined	16:23
	← epifanio left	16:23
	← mtk left	16:24
	→ craigp joined	16:24
	← dccc left	16:26
	← meLon left	16:26
	→ meLon joined	16:26
	→ ntio joined	16:26
	← shruggar left	16:28
	← shinnya left	16:29
	← Ankhers left	16:29
	khisanth_ → Khisanth	16:29
	→ skorgon joined	16:30
	callumacrae → nub	16:31
	← meLon left	16:31
	→ meLon joined	16:31
	← zhangxaochen left	16:31
	→ zhangxaochen joined	16:32
	→ bezet joined	16:32
	→ jstimm joined	16:33
	← B1x1t0 left	16:33
	→ thedodd joined	16:34
fr33domlover	Hello. I'm considering whether to use 'highlight' or GNU source-highlight in a project. Why did gitweb choose the first over the second?	16:34
	← ultrapro left	16:34
	← mikecmpbll left	16:35
	← W0rmDr1nk left	16:35
moritz	fr33domlover: try asking in #github	16:35
	erm sorry, I ready "github"	16:35
	no idea then	16:35
	← meLon left	16:36
	← Musok left	16:36
	→ meLon joined	16:36
	→ LzrdKing joined	16:37
	→ User458764 joined	16:37
	← tranzfuse left	16:37
	← Novitsh_ left	16:38
	→ scampbell joined	16:38
LzrdKing	if i download a clean php frontend for an app, and have git manage it, then create some branches with patches, then push the branches back to the trunk, and then a new version of the frontend comes out, how could the patches being on branches simplify repatching the new version?	16:38
	← achadwick left	16:39
	← craigp left	16:40
	→ FortySix2 joined	16:40
	← dreiss left	16:40
	← ferreum left	16:40
	→ mikecmpbll joined	16:41
	← meLon left	16:41
	→ meLon joined	16:41
	→ dccc joined	16:41
	→ mennea joined	16:43
	← ntio left	16:43
	→ ntio joined	16:44
	← moritzs left	16:44
	← punchagan left	16:44
	→ adkins1 joined	16:44
	← Wiz_KeeD left	16:44
	→ Haikarainen joined	16:45
fr33domlover	moritz, thanks anyway	16:45
	→ carlo joined	16:45
	carlo → Guest27310	16:45
	→ dangerousdave joined	16:45
	← pikaren left	16:46
	← meLon left	16:46
	→ meLon joined	16:46
	← phil80 left	16:46
Haikarainen	Hello, I'm still rather new to git (and vcs's), and I'm looking for some good reading material on version management and branches/merges. Currently I just have the main branch and am doing commits that I push to github (where I host it), this doesn't feel to safe and it prevents me from having good versioning. I'm thinking about branching off 1 branch that is development and only merge it to main/master (or what its called) on version mileston	16:47
	← FortySix2 left	16:47
	→ craigp joined	16:48
Haikarainen	the project in question is https://github.com/haikarainen/light	16:48
	pekster_ → pekster	16:48
	→ lucha joined	16:48
	→ ropav joined	16:48
	← dangerou_ left	16:48
	→ FortySix2 joined	16:49
muep	Haikarainen: I do not think lack of branches necessarily prevents good versioning or is unsafe, especially in one-person projects	16:49
	← bosie left	16:49
	← dccc left	16:49
	← jaimef left	16:50
	→ Ankhers joined	16:50
muep	Haikarainen: also in my experience, typically the public master branch would have all the the features whose development if fairly complete, regardless of when a new stable version is released	16:50
Haikarainen	muep: I'm thinking primarily if I do a bad commit some time, if I'm on a development branch I have time to catch it before mergin to main. Also how would one manage versioning in a one branch repo?	16:51
	→ punchagan joined	16:51
	→ jaimef joined	16:51
muep	Haikarainen: you should check what commits are getting pushed before you push them to the public repository	16:51
	→ bosie joined	16:51
	← bosie left	16:51
	→ bosie joined	16:51
Haikarainen	muep: I am, it just feels safer to still have that "buffer" heh..	16:52
muep	Haikarainen: if you catch mistakes at that point or before that, you can safely edit all commits that you have not yet pushed	16:52
	→ WaReZ joined	16:52
Haikarainen	muep: That is true.. currently I've only really pushed after each commit.	16:53
	← martinklepsch left	16:53
muep	editing already published commits is usually a bad idea, even if they are in a separate development branch	16:53
	← jmichaelward left	16:53
	→ lsiv568 joined	16:53
muep	so having a separate development branch does not help that much to cope with commits that are bad due to some silly mistake	16:54
	← p4denis left	16:54
	← FortySix2 left	16:54
	→ p4denis joined	16:54
muep	Haikarainen: for marking some commits as a "version", usually they are just tagged with the git tag feature	16:55
	→ martinklepsch joined	16:55
muep	this can be done regardless of how many branches you have	16:55
	← meLon left	16:56
	→ meLon joined	16:56
Haikarainen	muep: What do you think about branching off for each separate bugfix / feature ? I've read that is a common approach especially in corporations.. Would that be a good practice to implement? I want to learn how to use git in a professional environment as well..	16:56
	← lsiv568 left	16:57
Haikarainen	muep: Ah yes, I've noticed that.. Tried to find some functionality directly on github for it but didnt find how to tag old commits for versioning.	16:57
muep	you might want to learn git a bit better before relying too much on the convenience functions that github provides	16:58
	Haikarainen: basically, the master branch of your local repo is already a branch that is separate from the master branch of the public repo	16:58
	← ropav left	16:58
	→ noxd joined	16:58
	→ marthinal joined	16:58
	→ Nikoli joined	16:58
	← Remorse_ left	16:58
	← p4denis left	16:59
muep	Haikarainen: so if you start from a situation where your master and the public master are identical, you can first write commits that fix a bug or add a feature, and then push when you think you are finished	16:59
	→ acharlie_ joined	16:59
	← [EddyF] left	16:59
muep	Haikarainen: from this, it is pretty small step into first creating a new local branch and then writing the feature there and then merging it to local master and then pushing your master	17:00
	← Guddu_ left	17:00
	← hahuang65 left	17:00
LzrdKing	or you can just push the branch to the remote master and merge it on github	17:00
	or rather, open a pr on github	17:01
	← meLon left	17:01
	→ meLon joined	17:01
	→ bvi joined	17:01
muep	I'd still recommend working with the plain git tools until you know them reasonably well	17:01
	← bvi left	17:02
	← acharlieh left	17:02
Haikarainen	muep: Yeah got it, thanks a ton! :)	17:02
	muep: Yep, I'm trying to work directly with the cli, git is a huge system to take in though hehe	17:02
LzrdKing	muep: do you know how pathces on branches can be used to siplify re-patching when there is a new master to base commits from?	17:02
	i might be using the terminology wrong	17:02
	← fold left	17:02
LzrdKing	patches*	17:03
	← lucha left	17:03
	→ User4587_ joined	17:03
	→ lucha joined	17:04
	← alexbligh1 left	17:04
	← treehug88 left	17:04
	→ HelperW__ joined	17:04
muep	Haikarainen: often when I start working on some issue, I just work on master. later it may turn out that I must work on some other issue before getting the first one into a state that I feel like pushing to a shared repo. in that case, I can just turn my master into a feature branch and revert the local master to be identical to the public master before working on the other issue	17:04
	→ alexbligh1 joined	17:04
	← HelperW__ left	17:04
Vampire0	Munter, git config --global alias.revert-merge '!revert_merge() { [ $# -ne 2 ] && echo '\''error: revert-merge needs exactly two arguments, the <commit>-ish to revert and the <commit>-ish of the mainline parent'\'' >&2 && exit 1; git revert "$1" -m "$(echo -n "$(git rev-list --parents -n 1 "$1" \| sed -e "s/ $(git rev-parse "$2").*//" -e '\''s/[^ ]\+ \?/X/g'\'')" \| wc -c)"; }; revert_merge'	17:04
	→ dccc joined	17:04
	← QuantumTonto left	17:04
alexbligh1	Let's say from origin commit O have branch P with commits A1 A2 .. An, B1 B2 .. Bn, and branch Q with commits B1 B2 ... Bn. I want to rebase P onto Q but don't care if commits A1 .. An end up as a single commit A. git rebase is hard because everything conflicts. I can do 'git diff P Q' to get a single diff between the branches then simply apply this to Q as a commit, but this won't work for binary files. Is there a neat	17:05
	way to do this?	17:05
	(apols if a dupe - I got "cannot send to channel")	17:05
	→ flaguy48 joined	17:05
Vampire0	Munter, this will allow you to specify the commit to revert and the mainline parent as <commit>-ish	17:05
	Munter, it does not support any other arguments to revert like -n or -e, but this could surely be added easily	17:05
	→ jack joined	17:06
	← User458764 left	17:06
	← kevinb left	17:06
	jack → Guest17610	17:06
	→ leeN joined	17:07
muep	LzrdKing: I may know something about that, but I did not understand the question well enough to know if I can help you	17:07
	→ HelloShitty joined	17:07
	→ kevinb joined	17:08
Vampire0	Munter, not tooo thoroughly tested though. At least not the un-happy path	17:08
	→ ropav joined	17:08
	← punchagan left	17:08
	→ pheaver joined	17:08
	← martinklepsch left	17:09
	← ropav left	17:09
	→ nnyk_ joined	17:09
	← cvanball left	17:10
	← vurma left	17:10
LzrdKing	muep: zabbix has a php frontend that is missing features that i have patches for and i'm tired of having to keep reapplying all the ones i use every time they release a new frontend, so i was wondering if git coul dmake it easier	17:10
	← thiago left	17:10
LzrdKing	since they devs never add user-submitted patches	17:10
	→ pantsman- joined	17:11
Haikarainen	Hm.. is it possible to have automated tags of sorts? So that I have annotated tags for each major and minor version (like 1.3.0, and 4.3.0) that is set manually, and then lightweight tags are automatically added so that 2 commits after 1.3.0 is 1.3.2, and 43 commits after 4.2.0 is 4.2.43 ?	17:11
	← meLon left	17:11
	→ meLon joined	17:11
Eugene	You're looking for man git-describe	17:11
gitinfo	the git-describe manpage is available at http://jk.gs/git-describe.html	17:11
muep	LzrdKing: is the project hosted in a public git repository?	17:12
Haikarainen	Eugene: Oh wow. Thanks a ton :D git is so awesome yet so huge.	17:12
	← craigp left	17:13
Vampire0	Munter, a little bit more rebust about typos: git config --global alias.revert-merge '!revert_merge() { [ $# -ne 2 ] && echo '\''error: revert-merge needs exactly two arguments, the <commit>-ish to revert and the <commit>-ish of the mainline parent'\'' >&2 && exit 1; git rev-parse "$2" >/dev/null && git revert "$1" -m "$(echo -n "$(git rev-list --parents -n 1 "$1" \| sed -e "s/ $(git rev	17:13
	-parse "$2").*//" -e '\''s/[^ ]\+ \?/X/g'\'')" \| wc -c)"; }; revert_merge'	17:13
drathir	is disabled adding changes after make pull request?	17:13
	→ drjeats joined	17:13
	← dccc left	17:15
	← yosito left	17:15
Bombe	drathir, yes, you can never work on your machine again after making a pull request. You have to buy a new one.	17:15
LzrdKing	muep: i think so	17:15
	but if not, i can host it on bitbucket	17:15
	i might host it on bitbucket anyway	17:15
Vampire0	Munter, git config --global alias.revert-merge '!revert_merge() { [ $# -ne 2 ] && echo '\''error: revert-merge needs exactly two arguments, the <commit>-ish to revert and the <commit>-ish of the mainline parent'\'' >&2 && exit 1; git rev-parse "$2" >/dev/null && git revert "$1" -m "$(echo -n "$(git rev-list --parents -n 1 "$1" \| sed -e "s/ $(git rev-parse "$2").*//" -e '\''s/[^ ]\+ \?/X/g'\'')" \| wc -c)";	17:15
	}; revert_merge'	17:15
osse	Vampire0: jesus... write a script :p	17:15
muep	LzrdKing: so you could writer your patches as a git branch, and then rebase those when a new version of the upstream project is releasedx	17:15
Vampire0	hm, too long for IRC :-/	17:15
	osse, why? :-D	17:15
drathir	because i make changes and orginal repository cant be merged because its error in one file added after make the pull request...	17:16
	→ oojacoboo joined	17:16
	← meLon left	17:16
osse	Vampire0: becauae this looks insane :o	17:16
ojacobson	Vampire0: because penmanship counts	17:16
	→ fold joined	17:16
Vampire0	Well, perfect fit then :-D	17:16
	→ meLon joined	17:16
	← dougsland left	17:16
	← doev left	17:17
drathir	any ideas how i could fix that?	17:17
Vampire0	ojacobson, what is penmanship?	17:17
ojacobson	the aesthetics and clarity of your writing, as opposed to the aesthetics and clarity of your ideas	17:18
	← hoschi left	17:18
ojacobson	for example, one long massive line of bash is more or less unreadable	17:18
	← leeN left	17:18
ojacobson	but the same program could be written readably, _in bash_, had you stuck it in a file named 'git-revert-merge' in GIT_EXEC_PATH	17:18
Vampire0	sure	17:19
	→ craigp joined	17:19
Vampire0	but one line is better to paste in IRC :-D	17:19
HelloShitty	hi again	17:19
ojacobson	Only if you expect people not to read your code	17:19
HelloShitty	What is that command to download a project from github to PC?	17:19
Vampire0	HelloShitty, man git clone	17:19
gitinfo	HelloShitty: the git-clone manpage is available at http://jk.gs/git-clone.html	17:19
Vampire0	HelloShitty, or do you mean man git archive?	17:20
gitinfo	HelloShitty: the git-archive manpage is available at http://jk.gs/git-archive.html	17:20
	← akim left	17:20
	← craigp left	17:20
LzrdKing	muep: i've never had to rebase before; if a patch can no longer be applied, i will get conflicts?	17:20
Vampire0	ojacobson, who says I want him to read my code, he could fine the worm then :-D	17:20
	→ dreiss joined	17:21
Vampire0	LzrdKing, yes	17:21
	← meLon left	17:21
	← Nizumzen left	17:21
Vampire0	LzrdKing, basically you will get the same conflicts as with a merge, just the history will look different if you rebase	17:21
	→ meLon joined	17:21
Vampire0	LzrdKing, http://sprunge.us/LPfR :-)	17:21
	→ xequence joined	17:22
	← Destos left	17:22
	→ akim joined	17:23
	→ lite_ joined	17:23
LzrdKing	Vampire0: should all my patches should be on the same branch off of master?	17:23
Vampire0	sorry?	17:24
osse	Vampire0: http://sprunge.us/OFQJ?console	17:25
	→ tjj joined	17:25
osse	feels good, man	17:26
	← jluc left	17:26
	← meLon left	17:26
Vampire0	but doesn't work osse ;-)	17:26
	→ meLon joined	17:26
osse	why not?	17:26
Vampire0	Because you broke it	17:26
osse	how so	17:26
Vampire0	f*** up escapings, or rather missed unescaping	17:27
	← rogerraymond left	17:27
osse	ahh	17:27
Vampire0	'\'' should be '	17:27
osse	yup	17:28
LzrdKing	Vampire0: if all my patches are on separate branches, won't that mean a rebase for each branch?	17:28
	← polyzen left	17:28
Vampire0	and I guess a "\" is missing after the "&&"	17:28
	← thedodd left	17:28
	→ roger_raymond joined	17:28
Vampire0	LzrdKing, well I guess so, depends on what you want to achieve	17:28
osse	Vampire0: no, that's allowed	17:29
	same with \| and \|\|	17:29
LzrdKing	Vampire0: reapply all my own patches to a new release	17:29
Vampire0	ah, yes, you are right osse	17:29
	→ max joined	17:29
	→ looper joined	17:29
	→ mtk joined	17:29
	← marthinal left	17:29
	→ tranzfuse joined	17:29
	max → Guest85733	17:29
	→ tranzfuse1 joined	17:29
osse	Vampire0: hmm, so all that rev-list stuff is to figure out whether the commit is the first or the second parent?	17:29
	← mtk left	17:29
Vampire0	LzrdKing, if you have several branches and want to preserve that branches, you have to rebase each branch separately, yes	17:30
	→ marthinal joined	17:30
	→ duderonomy joined	17:30
	→ freeman42 joined	17:30
	→ p4denis joined	17:30
Vampire0	basically yes osse, is there a plumbing for this already?	17:30
	→ dccc joined	17:31
	← Xethron left	17:31
LzrdKing	thats just as much work as simply reapplying patches, just a bit more organized; all patches in a single branch is less work, but less organized too, especially if say, one patch is no longer needed	17:31
	← Diemuzi left	17:31
	← Quevin left	17:31
osse	Vampire0: I'd check if git rev-parse "$1"^1 or rev-parse "$1"^2 was equal to rev-parse "$2"	17:31
	← mz` left	17:31
osse	of course that won't work for 3 or 4	17:32
Vampire0	osse, well that works with a simple merge, but my "thing" works with an octopus merge too	17:32
	User4587_ → User458764_NotHe	17:32
	→ mz` joined	17:32
	← mz` left	17:32
	→ mz` joined	17:32
	→ Corey84 joined	17:32
Vampire0	if you make it a full fledged script, you can of course get the number of parents and then iterate and stuff and make it nice	17:32
	→ Quevin joined	17:32
Vampire0	I just wanted to make it short :-)	17:32
	← zapb left	17:32
	← tgkokk left	17:33
Vampire0	I can both, nice code and short code g	17:33
	← ojacobson left	17:33
Vampire0	usually I also prefer nice code though	17:33
	→ ferreum joined	17:33
	→ ojacobson joined	17:33
	→ lasserix joined	17:33
	← teran left	17:33
	← tranzfuse left	17:34
osse	http://sprunge.us/PaPJ	17:34
	→ User458764 joined	17:34
osse	wait, that's not right	17:34
	never mind	17:34
	→ punchagan joined	17:35
	← User458764_NotHe left	17:37
	→ hahuang65 joined	17:37
	← bezet left	17:37
	← kermit left	17:37
	→ cvanball joined	17:37
	← ArSn left	17:38
	→ ropav joined	17:38
	jrhorn424 → zz_jrhorn424	17:39
	→ balor joined	17:40
	→ yosito joined	17:40
	← blorbx``` left	17:41
	← dccc left	17:42
	→ macrover joined	17:42
	→ israelpattison joined	17:43
Vampire0	:-)	17:43
	← n4irc left	17:43
	← n4irc2 left	17:43
	→ blorbx joined	17:43
	← OnlyForF1 left	17:44
	← tjj left	17:44
	→ tgkokk joined	17:45
	← mattstratton left	17:45
	→ thiago joined	17:45
	→ zapb joined	17:45
	← gargola left	17:45
	← meLon left	17:46
	→ meLon joined	17:46
LzrdKing	Vampire0: i am confused, i would want to only rebase once, but keep all the patches separated in case one is the cause of all conflicts so i could drop that one	17:46
	→ gargola joined	17:47
	← ThomasLocke left	17:47
	→ ayaka joined	17:47
	→ n4irc joined	17:47
	→ n4irc2 joined	17:48
	→ lyzidiamond joined	17:48
	→ akiva joined	17:48
ayaka	I use git rebase to squash many patches, could I split them this time?	17:48
osse	yes	17:48
	ayaka: mark a commit for editing when using git rebase -i, then git reset 'HEAD^' and make several commits before you git rebase --continue	17:48
	→ AKK9 joined	17:49
	→ kermit joined	17:49
	→ msm` joined	17:49
	← jontmorehouse left	17:49
LzrdKing	i think what i want to do might not be as simple as i thought	17:49
	← User458764 left	17:49
	← thevishy left	17:49
	← Corey84 left	17:49
	→ bitfury joined	17:50
	→ jhulten joined	17:50
	← mitzip_ left	17:50
	← xequence left	17:51
	→ shinnya joined	17:51
	← meLon left	17:51
	← bitfury left	17:51
	→ moritzs joined	17:51
ayaka	osse, I would try thank you	17:51
	→ mitzip joined	17:51
	→ meLon joined	17:51
	← msm left	17:51
ayaka	osse, but there is no commit show in git rebase -i, just "noop"	17:52
osse	ayaka: then you need to give git rebase some better arguments	17:52
	like HEAD~5 or however many commits it is you want to operate on	17:53
thiago	ayaka: if you want to create a commit before a given patch, edit the one before it. You can checkout -p from the later commit.	17:53
	the most common case is to edit the commit you want, reset -p HEAD~ the parts you don't want, commit, then commit the rest	17:54
ayaka	osse, I see	17:54
	→ Corey84 joined	17:54
	→ bitfury joined	17:55
bitfury	Hi, might not be the right channel to ask this but anyone know where I can find the GitBlit Plugins directory in CentOS?	17:55
	$BaseDir/Plugins does not exists	17:55
thiago	bitfury: not the right channel, sorry	17:55
bitfury	hmm ok :\	17:55
	→ Shusshu joined	17:56
	← Shusshu left	17:56
	← mariuscc left	17:56
	← meLon left	17:56
	← ropav left	17:56
	→ meLon joined	17:56
	→ teran joined	17:57
	→ mariuscc joined	17:57
	→ ferreum158 joined	17:57
	→ lsiv568 joined	17:57
	→ xequence joined	17:57
	→ Sceorem joined	17:57
	← akushner left	17:58
	← tgkokk left	17:58
	← cjwilburn left	17:58
	→ Skrypter joined	17:59
	← teran left	17:59
	← zapb left	17:59
	→ akushner joined	17:59
	→ sdrfnord1 joined	17:59
	→ cjwilburn joined	18:00
	← ferreum left	18:00
	← Skrypter left	18:00
	→ dccc joined	18:00
	→ Skrypter joined	18:01
	← meLon left	18:01
	← cjwilburn left	18:01
	→ meLon joined	18:01
	→ cjwilburn joined	18:01
	← lsiv568 left	18:01
	→ tgkokk joined	18:02
	→ mattstratton joined	18:03
	→ cagedwisdom joined	18:03
	← Skrypter left	18:03
	→ Skrypter joined	18:04
	← Skrypter left	18:04
	→ Skrypter joined	18:04
	← Skrypter left	18:04
	→ Skrypter joined	18:05
	← meLon left	18:06
	→ Manny joined	18:06
	→ meLon joined	18:06
	→ Nizumzen joined	18:08
	← atamanroman left	18:09
	→ _iron joined	18:09
	← lite_ left	18:09
	← stamina left	18:09
	← Guest85733 left	18:09
	← dccc left	18:10
	← lucha left	18:10
	← _iron left	18:11
	← meLon left	18:11
	← Trudko left	18:11
	→ _iron joined	18:11
	→ meLon joined	18:11
	→ jmichaelward joined	18:11
	→ homework1 joined	18:12
	→ zapb joined	18:12
	→ teran joined	18:12
	← _iron left	18:12
	← Skrypter left	18:13
	→ Skrypter_ joined	18:13
	← cvanball left	18:13
	→ thedodd joined	18:14
	→ EmmEight joined	18:14
	← EmmEight left	18:14
	← Skrypter_ left	18:14
	→ Skrypter joined	18:15
	→ dotpot joined	18:15
	← Skrypter left	18:15
	→ Skrypter joined	18:16
	← meLon left	18:16
	→ meLon joined	18:16
	← balor left	18:17
	← Skrypter left	18:17
	→ fresham joined	18:17
	→ Skrypter joined	18:17
	← hyperair left	18:18
	← zapb left	18:18
	← netj left	18:18
	→ Skrypter_ joined	18:18
	← Skrypter_ left	18:19
	→ netj joined	18:19
	→ Raging_Hog joined	18:19
	→ Skrypter_ joined	18:19
	← Skrypter left	18:20
	← adkins1 left	18:20
	→ jenia joined	18:20
	← Skrypter_ left	18:20
	→ zapb joined	18:20
	→ Skrypter joined	18:21
	→ elliotd123 joined	18:21
	← PaulCapestany left	18:21
	← kikimeter left	18:21
	← Skrypter left	18:21
	→ Skrypter joined	18:22
	→ PaulCapestany joined	18:22
jenia	hello. i want to release my software a GPL but i dont want to show the entire repo as it is very messy. do you think its a good idea to start a new repository a copy the entire project there from a new.	18:22
	start from a blank slate	18:22
	← davividal left	18:22
	← leb left	18:22
	→ ropav joined	18:23
	→ davividal joined	18:23
	→ alvaro_o joined	18:23
	← ereslibre_laptop left	18:23
	→ polyzen joined	18:24
	→ dccc joined	18:24
	← tgkokk left	18:24
	→ pbrobst joined	18:24
bremner	jenia: you can rewrite history how you like, then push to the new repo	18:24
	→ ereslibre joined	18:25
	← ereslibre left	18:25
	→ ereslibre joined	18:25
	→ lsiv568 joined	18:25
	← Skrypter left	18:25
jenia	okay thanks	18:25
	nice	18:25
	→ Skrypter joined	18:25
	← meLon left	18:26
	→ meLon joined	18:26
	← Raging_Hog left	18:26
jenia	one more quick question. do you think my project has a better chance of developping a following on github or bitbucket?	18:26
	i mean, everything else equal...	18:27
	→ Skrypter_ joined	18:27
	← Skrypter left	18:27
	← ropav left	18:27
jenia	"following" means a community	18:27
	← lsiv568 left	18:27
	→ jrnieder joined	18:28
LzrdKing	whichever one has more users	18:28
	→ DolphinDream joined	18:28
	← Sleepy63 left	18:29
	← Zoddo left	18:29
	→ CKyle joined	18:29
	→ dougsland joined	18:29
	→ m8 joined	18:30
	← jerius left	18:30
jenia	yes. that's true. which is github. so this beggs the next question: do you know if switching from bitbucket to github, will have no repercussions? like is this something that happens from time to time or will bitbucket ask me to pay them once the code leavs or something?	18:31
	← zapb left	18:31
jenia	im new to this. dont judge me too harshly	18:31
	← meLon left	18:31
	→ meLon joined	18:31
	→ ropav joined	18:32
xender	jenia: Now, why would they?	18:32
	→ jerius joined	18:32
ttkw	not seeing the circular reasoning there	18:32
xender	If you have paid account, you may want to cancel the subscription, that's all	18:32
	← acharlie_ left	18:33
cbreak	jenia: you don't have to leave bitbucket.	18:33
xender	ttkw: I've seen at least one project moved from BB to GH, or other way around	18:33
cbreak	jenia: git's not centralized.	18:33
	← ropav left	18:33
cbreak	you can have as many remotes as you can remember	18:33
xender	And yes, you can have accounts on both	18:34
jenia	okay that;s what confusing me a little. they say that after 5 members i need to pay	18:34
xender	(In fact you can even log in to Bitbucket using a Github account)	18:34
cbreak	xender: :O	18:34
jenia	but if I;ll have a remote where there are 25 members... does that count towards the 5 or something?	18:34
	← Macaveli left	18:34
xender	jenia: 5 members or 5 private repos?	18:34
	There are no "members" in git repo	18:34
	→ Destos joined	18:34
xender	It may be about access control	18:35
	That you may have 5 persons authorised to write to repo hosted on Bitbucket	18:35
	It doesn't limit the number of commiters (commits authors)	18:35
jenia	yea. that's what i hoped it is. thanks very very much	18:35
	→ fairuz_ joined	18:35
	← kermit left	18:35
	← dccc left	18:35
	← Mixologic left	18:35
cbreak	xender: yeah, how would they enforce that anyway...	18:36
	not like committers are authenticated	18:36
	→ ropav joined	18:36
xender	They could in theory, but that would be pointless both for them and for contributors	18:36
	It would be like shooting your own foot	18:37
	→ Balliad joined	18:37
	← Balliad left	18:37
cbreak	xender: hey. PHP has survived years on the foot-shooting model	18:37
	I bet there are still people using it today!	18:37
	→ Balliad joined	18:37
xender	:D	18:38
	← Balliad left	18:38
xender	cbreak: Don't you like fractals?	18:38
cbreak	not if they are out to kill me with bad design	18:38
	← fairuz left	18:38
	→ Balliad joined	18:38
	→ jontmorehouse joined	18:39
	→ acharlieh joined	18:39
	← eletuchy left	18:39
	→ paul424 joined	18:40
	→ tgkokk joined	18:40
	← tgkokk left	18:40
	← meLon left	18:41
	← nnyk_ left	18:41
	→ meLon joined	18:41
	→ tgkokk joined	18:41
	→ Sleepy63 joined	18:41
	← tgkokk left	18:41
	→ tgkokk joined	18:42
	← tgkokk left	18:42
	→ tgkokk joined	18:43
	→ zapb joined	18:44
	→ mishok13 joined	18:45
	← meLon left	18:46
	→ meLon joined	18:46
	← Guest27310 left	18:47
	→ lucasff joined	18:47
	→ Trudko joined	18:48
	gitinfo set mode: +v	18:48
lucasff	hi! anyone expected this issue: $ git stash Cannot save the current worktree state rm: /Users/lucas/Sites/reweb/az-de-espadas/.git/index.stash.13131: No such file or directory	18:48
	→ sea-gull_ joined	18:48
	← jmichaelward left	18:49
	→ dccc joined	18:50
	→ justinsd joined	18:50
	gitinfo set mode: +v	18:50
justinsd	Hey guys, do you happen to know how to reset your local branch to be the same as remote when commits have been made locally?	18:51
	← Skrypter_ left	18:51
	← _Vi left	18:51
	← meLon left	18:51
	→ Techy84 joined	18:51
	→ Skrypter joined	18:51
	→ meLon joined	18:51
	→ Mixologic joined	18:52
	→ Diemuzi joined	18:52
	gitinfo set mode: +v	18:52
	→ Gizburdt joined	18:52
cbreak	justinsd: it's git reset --hard @{u}	18:52
justinsd	That doesn't work.	18:52
cbreak	justinsd: if you do not have an upstream configured, you can use origin/master directly	18:52
justinsd	If you have made local commits.	18:52
cbreak	justinsd: so?	18:52
	local commits are irrelevant	18:52
justinsd	Because it still thinks the local branch is ahead. It doesn't revert the local commits. It only makes the state of the files and index the same.	18:52
cbreak	this will nuke away everything	18:52
	→ zhodge joined	18:53
cbreak	justinsd: no	18:53
	justinsd: it takes the state of @{u}	18:53
	← lucasff left	18:53
	← wrouesnel1 left	18:53
justinsd	After I do a git reset --hard origin/master it is telling me I am x number of commits ahead of remote master.	18:53
	← teran left	18:53
cbreak	nope. because origin/master is the remote master	18:53
	(unless you have an other remote?)	18:53
justinsd	I would like to reset to the state of origin/master	18:54
cbreak	justinsd: pastebin !lol	18:54
gitinfo	justinsd: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	18:54
	→ treehug88 joined	18:54
	→ lolmaus_ joined	18:54
	← Corey84 left	18:54
cbreak	justinsd: that's what the command I gave you does.	18:54
	Techy84 → Corey84	18:54
justinsd	So I want to revert to head on remote master, but when I run the command it thinks that I have a bunch of commits that need to be pushed.	18:54
cbreak	justinsd: so, do what I told you.	18:54
	[20:54:02] <cbreak> justinsd: pastebin !lol	18:55
gitinfo	A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	18:55
	→ jfran_ joined	18:55
justinsd	What happens is that when I run the command it thinks that the branches have diverged afterwards.	18:55
	← goTAN left	18:55
ayaka	osse, thank you I finally done it	18:55
	← Mixologic left	18:55
justinsd	I don't understand why it doesn't just reset to the satte of the remote master.	18:55
	→ Mixologi_ joined	18:56
	← jfran_ left	18:56
zhodge	even with “.css” in my .gitignore I’m getting “modified: public/css/home.css” in my git status…my “.swp” line works just fine for example but git is still tracking my css files	18:56
	→ Vivekananda joined	18:56
cbreak	justinsd: it will reset to the state origin/master had the last time you fetched	18:56
	justinsd: maybe you didn't fetch?	18:56
justinsd	It's not working. After I run the command and do a git status it tells me the branches have diverged.	18:56
cbreak	justinsd: of course it works...	18:56
	[20:54:02] <cbreak> justinsd: pastebin !lol	18:56
gitinfo	A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	18:56
	← lolmaus left	18:57
	→ kermit joined	18:57
justinsd	There was a merge and a whole bunch of commits in the local branch. The command git reset --hard origin/master at least is not working.	18:57
cbreak	zhodge: if you want git to stop tracking things, remove them	18:57
justinsd	Perhaps I need to use another command.	18:57
cbreak	zhodge: git rm --cached filename	18:57
	→ gsingh93_ joined	18:57
cbreak	justinsd: nah	18:57
	justinsd: that command is fine	18:57
justinsd	How come it is telling me that the branches have diverged?	18:57
cbreak	justinsd: who knows? You're too lazy to answer a simple question...	18:57
justinsd	Dude, this obviously isn't the simple example you are talking about and something else is going on.	18:58
	This is an edge case.	18:58
cbreak	justinsd: nope.	18:58
	there are no edge cases for reset. It resets. That's it.	18:58
justinsd	Yes, everything is up to date and fetched.	18:58
cbreak	it can set any branch to any commit	18:58
	and that's what it does.	18:58
	(it sets the current branch obviously...)	18:59
	justinsd: so answer my question:	18:59
	← jfran left	18:59
justinsd	Well it thinks the branches are diverged after I run the command on origin/master.	18:59
cbreak	[20:54:02] <cbreak> justinsd: pastebin !lol	18:59
gitinfo	A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	18:59
cbreak	hopefully the first 40 or so lines are enough	19:00
	← freeman42 left	19:00
	→ bartman`` joined	19:00
	→ Mixologic joined	19:01
	← oojacoboo left	19:01
	← meLon left	19:01
	← dosequis left	19:01
	→ meLon joined	19:01
	→ AllowSpectators joined	19:02
	← Sceorem left	19:02
	→ joelm joined	19:02
	← Mixologi_ left	19:03
	← MattMaker left	19:03
	← treehug88 left	19:03
	→ oojacoboo joined	19:04
	→ sheperson joined	19:04
zhodge	thanks cbreak	19:04
	→ MattMaker joined	19:04
	→ eletuchy joined	19:04
	← ropav left	19:04
	→ Xethron joined	19:04
	← dccc left	19:05
	→ hyperair joined	19:05
	→ ropav joined	19:05
	→ dannixon joined	19:06
	← meLon left	19:06
	→ meLon joined	19:06
	→ Mixologi_ joined	19:06
	← ayaka left	19:08
	→ Sceorem joined	19:08
	← Mixologic left	19:08
	→ Carina21 joined	19:08
	→ lucasff joined	19:08
	← Carina21 left	19:08
	← CKyle left	19:09
	gitinfo set mode: +v	19:09
	← oojacoboo left	19:09
lucasff	Hi! Anyone had a similar issue? $ git stash Cannot save the current worktree state rm: /Users/lucas/Sites/reweb/az-de-espadas/.git/index.stash.974: No such file or directory	19:09
	← rjc left	19:09
LucasTT	why is that highliting me	19:09
	oh, right .	19:09
	→ Skrypter_ joined	19:09
	← Skrypter_ left	19:10
	← ropav left	19:10
	→ Skrypter_ joined	19:10
	→ rjc joined	19:11
	→ Sijdesign joined	19:11
	← meLon left	19:11
	← Mixologi_ left	19:11
cbreak	never heard of index.stash	19:11
	→ fstd_ joined	19:11
	→ meLon joined	19:11
lucasff	my bad. I think the culprit is https://github.com/kaelzhang/shell-safe-rm	19:12
	→ kballou joined	19:12
	← Trudko left	19:13
	← marthinal left	19:13
	← Skrypter left	19:13
	→ leb joined	19:13
cbreak	that looks pointless.	19:14
	lucasff: there's already a safe rm, it's called srm :D	19:14
	(read man page before using!)	19:14
ojacobson	unsurprisingly, stuff breaks if the 'rm' on $PATH is not rm(1)	19:14
	← kballou left	19:14
	← sea-gull_ left	19:14
ojacobson	arguably git should be using unlink(1) instead, if only because people are less likely to do stupid replacement tricks :)	19:15
	(the parts that are shell scripts, anyways)	19:15
	← fstd left	19:15
	fstd_ → fstd	19:15
	← EminenceHC left	19:15
	→ cdleonard joined	19:16
	→ girl26 joined	19:16
	← meLon left	19:16
	← Rastus_Vernon left	19:16
lucasff	srm?	19:16
cdleonard	is there a way to automatically generate nice commit messages for git submodule upgrades?	19:16
	← dannixon left	19:16
cbreak	lucasff: srm - securely remove files or directories	19:17
	lucasff: securely means "no one can ever read the file again, not even the NSA"	19:17
	← xequence left	19:17
cbreak	(it doesn't erase backups though :D)	19:17
qsuscs	yes, and this is not sure on SSDs	19:17
cbreak	yep. That's why full disk encryption on those is even more important than on spinning drives	19:18
	(and even those do relocation occasionally)	19:18
	→ aldodelgado joined	19:18
	← kermit left	19:18
	→ ropav joined	19:18
	← zapb left	19:19
lucasff	i currently don't care about encryption. i did the replacement trick because i used safe-rm in ubuntu.	19:19
	buuut i just read this article http://apple.stackexchange.com/questions/17622/how-can-i-make-rm-move-files-to-the-trash-can and get your point.	19:20
	rmtrash ftw	19:20
	→ cmoneylulz joined	19:20
ojacobson	lucasff: the problem is that 'rm' isn't just used by you, interactively	19:20
	→ thevishy joined	19:20
	→ kballou joined	19:20
	→ dccc joined	19:20
ojacobson	it's also used by a mountain of shell scripts, which mostly find it using $PATH instead of hard-coding /bin/rm (though posix does guarantee the location of rm, nobody does it that way)	19:21
	→ str joined	19:21
lucasff	actually the rm was in my $PATH	19:21
ojacobson	replacing rm affects all of those, too, unless you are _supremely_ careful	19:21
	← girl26 left	19:21
lucasff	I use an alias	19:21
	alias rm='rm -i'	19:21
	to avoid stupid things	19:22
	← Sijdesign left	19:22
	→ nour_ joined	19:22
	→ meLon joined	19:22
	→ girl26 joined	19:23
	← Royalb15_1 left	19:23
	→ CKyle joined	19:23
	→ nir joined	19:24
	→ kermit joined	19:24
	← girl26 left	19:24
Eugene	RM_BIN=$(which --skip-alias rm)	19:25
	Eugene ducks	19:25
	→ hkon_ joined	19:25
	← meLon left	19:26
	→ therealGent joined	19:26
	→ oojacoboo joined	19:26
	← FunkyAss left	19:27
	← jstimm left	19:27
	← zhodge left	19:27
cbreak	mv () { srm $@; }	19:27
	← lyzidiamond left	19:27
	→ meLon joined	19:27
	→ jstimm joined	19:28
	→ Reskp joined	19:28
	← jstimm left	19:28
	← nir left	19:28
lucasff	$ $(which --skip-alias rm) which: illegal option -- - usage: which [-as] program ...	19:28
	Mac OS X compatible?	19:28
	→ lsiv568 joined	19:28
cbreak	in case you wonder: no, don't do what I just wrote...!	19:29
qsuscs	BSD (where osx stole its userland) is often a bit different.	19:29
	← hkon_ left	19:30
	→ Sijdesign joined	19:30
cbreak	OS X is more real posix and less added convenience	19:30
lucasff	dont blame osx	19:31
	its very good	19:31
	← meLon left	19:31
	→ Mixologic joined	19:31
	→ zapb joined	19:32
	→ meLon joined	19:32
	← lucasff left	19:32
	← lsiv568 left	19:33
	→ lucasff joined	19:33
	gitinfo set mode: +v	19:33
	← sheperson left	19:33
	← dccc left	19:34
	→ xequence joined	19:34
	← NanoArrow left	19:34
	← jerius left	19:34
	→ sheperson joined	19:34
	← mattstratton left	19:35
	← sheperson left	19:35
	← Mixologic left	19:36
	← zapb left	19:36
	→ bezet joined	19:37
	← Diemuzi left	19:37
	← Gizburdt left	19:38
	→ jerius joined	19:38
	→ EminenceHC joined	19:39
	← dangerousdave left	19:39
	→ dangerousdave joined	19:40
	← meLon left	19:41
	→ meLon joined	19:41
	← bezet left	19:42
	← FabTG left	19:42
	→ EmmEight joined	19:42
	← yosito left	19:42
osse	Vampire0: git cat-file -p "$1" \| awk -v p=$2 '$0 ~ p {print NR-2}'	19:42
	← ropav left	19:42
osse	BOOM	19:42
	← EmmEight left	19:43
	→ FabTG joined	19:43
	← EminenceHC left	19:44
	→ ropav joined	19:44
	→ rnaveiras joined	19:45
	← rnaveiras left	19:45
	← cmoneylulz left	19:46
	← meLon left	19:46
	→ meLon joined	19:46
	→ Zoddo joined	19:46
	← salamanderrake left	19:46
	← ropav left	19:46
	← CKyle left	19:48
	← Sijdesign left	19:48
	← Manny left	19:49
	→ dccc joined	19:50
	→ mattstratton joined	19:50
	← aldodelgado left	19:50
	→ maestrojed joined	19:51
	→ salamanderrake joined	19:51
	→ CKyle joined	19:51
osse	-1, bleh	19:52
	← Reskp left	19:52
	→ Gizburdt joined	19:53
	→ Aleric joined	19:53
	→ Reskp joined	19:54
Aleric	Hi... I just did a rebase and it went totally wrong :/. I'd like to find back the SHA1 of the old branch. How can see the history of what branch names pointed to please?	19:54
	← Reskp left	19:54
subleq	Aleric: git reflog	19:54
	→ Nae joined	19:54
Aleric	thanks :)	19:55
	→ ropav joined	19:55
	← Sceorem left	19:55
	← Skrypter_ left	19:56
	→ zapb joined	19:56
	→ Skrypter joined	19:56
	← meLon left	19:56
	← Skrypter left	19:56
	→ meLon joined	19:56
	→ Sijdesign joined	19:56
	→ Skrypter joined	19:56
	← Skrypter left	19:57
	← dccc left	19:57
	→ Skrypter joined	19:57
	← kermit left	19:58
	→ Reskp joined	19:58
	→ _Vi joined	19:58
	← Skrypter left	19:59
	→ Skrypter joined	19:59
	← Skrypter left	20:00
	← zapb left	20:00
	← jontmorehouse left	20:00
	← jimi_ left	20:00
	← SethM left	20:00
	→ Skrypter joined	20:00
	← thevishy left	20:00
	→ Sceorem joined	20:00
	→ jmichaelward joined	20:00
	→ thevishy joined	20:00
	← meLon left	20:01
	→ meLon joined	20:01
	← Aleric left	20:02
	← tgkokk left	20:02
	← mariuscc left	20:02
	← fresham left	20:03
	← lucasff left	20:03
	← Gizburdt left	20:03
	→ lsiv568 joined	20:04
	→ Gizburdt joined	20:04
	← Gizburdt left	20:04
	← Dougie187 left	20:04
	→ akushner_ joined	20:04
	→ Gizburdt joined	20:04
	← akushner left	20:05
	← maxer left	20:05
	← chrisshattuck left	20:05
	→ chrisshattuck joined	20:06
	← Skrypter left	20:06
	→ EminenceHC joined	20:06
	→ toothrot joined	20:07
	→ Skrypter joined	20:07
	← noxd left	20:08
	→ cbonitz joined	20:08
	→ jluc joined	20:08
	→ Rastus_Vernon joined	20:08
	→ jontmorehouse joined	20:09
	← Gizburdt left	20:09
	→ Blaster joined	20:10
	→ Gizburdt joined	20:10
	→ yosito joined	20:10
Blaster	how do you cherry pick a commit from a remote branch?	20:10
	Do you have to pull that branch down first?	20:10
	→ idoit` joined	20:11
tang^	fetch the repo first	20:11
	← meLon left	20:11
	→ DaisyTheCow joined	20:11
bremner	!remote	20:11
gitinfo	[!remote_commands] The only git porcelain commands which might interact with remote repos are: fetch, pull, push, remote, ls-remote, archive, submodule (plus plumbing, remote helpers, etc)	20:11
tang^	then it's no longer remote	20:11
	→ Gizburdt_ joined	20:11
	→ meLon joined	20:11
	← xequence left	20:11
bremner	Blaster: do you mean remote as in on a different server, or the technical git sense of "remote branch"	20:12
Blaster	I mean a branch on origin, which is on Github.	20:12
	There's a commit from one of the branches which I would like to cherry pick onto my local master branch.	20:12
	→ dccc joined	20:13
	← jackneill left	20:13
	← Gizburdt_ left	20:13
	← cbonitz left	20:14
	→ tgkokk joined	20:14
	← Gizburdt left	20:14
	← yosito left	20:14
	← pheaver left	20:14
	← idoit left	20:15
	← tgkokk left	20:15
bremner	so "git fetch origin", then cherry-pick either by hash or by tag or by origin/branchname	20:15
	← DaisyTheCow left	20:15
	→ endiruna joined	20:15
	→ tgkokk joined	20:16
	← tgkokk left	20:16
	← meLon left	20:16
	→ meLon joined	20:16
	→ tgkokk joined	20:17
	← Skrypter left	20:18
	← jontmorehouse left	20:19
	→ Gizburdt joined	20:20
davividal	my coworker did a git rebase --skip and the git rebase was done. Did he lost his skipped commit for good?	20:21
	→ Skrypter joined	20:21
	← Skrypter left	20:21
cbreak	davividal: nope	20:21
	davividal: man git-reflog	20:22
gitinfo	davividal: the git-reflog manpage is available at http://jk.gs/git-reflog.html	20:22
davividal	cbreak: thanks	20:22
cbreak	davividal: if you git reset --hard to the commit he was on before the rebase started, he'll be back	20:22
	davividal: don't do that if you've already pushed though	20:22
	← Gizburdt left	20:22
	→ B1x1t0 joined	20:23
	← macrover left	20:24
	← mattstratton left	20:24
	→ lyzidiamond joined	20:25
	→ Willow joined	20:25
	← Sijdesign left	20:25
	← dotpot left	20:26
	← dccc left	20:26
	→ pheaver joined	20:26
	→ veebers joined	20:27
	→ Dougie187 joined	20:27
	→ boxatom joined	20:27
	→ beastd joined	20:28
	→ yellowfish joined	20:28
yellowfish	so I lookedi n git log	20:28
	how do I revert 5 steps back?	20:28
	→ CheckDavid joined	20:29
boxatom	:D i want to know how to do what yellowfish said in sourcetree	20:29
osse	!revert	20:29
gitinfo	That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?	20:29
osse	yellowfish: do you want to pretend the 5 (or 4) newest commits simply didn't exist?	20:29
	→ jacobt joined	20:29
yellowfish	Ok I have 5 commits	20:30
	I want to undo 4 of them	20:30
	→ hs366 joined	20:30
yellowfish	So go back to the 5th one	20:30
	I meant the first one	20:30
	but 5th one down	20:30
osse	yellowfish: do you want to pretend the 4 newest commits simply didn't exist?	20:30
	→ kermit joined	20:30
	→ Diemuzi joined	20:30
yellowfish	yes, that’s correct	20:30
	gitinfo set mode: +v	20:30
osse	git reset --hard HEAD~4	20:30
yellowfish	that’ll remove the heads?	20:31
	→ Mixologic joined	20:31
	→ pwnz0r joined	20:31
	→ compact joined	20:31
qsuscs	!zombies	20:31
gitinfo	[!zombie] Brainzz! More brainzzzz! For information about detached heads, see !detached	20:31
osse	yellowfish: the question doesn't make sense in Git terms	20:32
	← fjfish left	20:32
	→ jontmorehouse joined	20:32
	← oojacoboo left	20:33
	→ hypnosb joined	20:33
hypnosb	Hi	20:33
gitinfo	hypnosb: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	20:33
	← juliohm left	20:33
hypnosb	cool	20:33
	Is git clone the same as 'fork' ?	20:34
cbreak	hypnosb: git doesn't have forking	20:34
	but each clone is an independent repository	20:34
	so I guess you can think of it as a fork	20:34
	← moritzs left	20:34
	← lyzidiamond left	20:36
	PrimalHunter → Primal0xFF	20:36
	← IrishPrime left	20:36
	← pbrobst left	20:36
	← ropav left	20:37
	← toothrot left	20:37
	← lsiv568 left	20:38
	→ noxd joined	20:38
	→ mewm joined	20:40
	→ cbonitz joined	20:40
	← mishok13 left	20:40
Joost`	I'm seeing this weird behaviour on github one of you might be able to explain; someone did a rebase of an old commit to fix a misleading commit message, and all commits after that from other authors got a little quip along the bottom saying he actually made that commit rather than the original author	20:40
	← Ankhers left	20:41
	→ maxer joined	20:41
	← meLon left	20:41
	→ causasui joined	20:41
	→ jfran joined	20:41
	→ meLon joined	20:41
	→ Radivarig_ joined	20:41
	← scampbell left	20:42
	→ ianmcorvidae joined	20:43
	→ dccc joined	20:43
	← endiruna left	20:44
	→ Setchi joined	20:44
ojacobson	Joost`: git tracks two separate facts about each commit: author and committer	20:45
	if you rebase a commit, you become the committer, but the author will be left unchanged	20:45
	→ mishok13 joined	20:45
ojacobson	rebase, cherry-pick, or otherwise manipulate a commit	20:45
	→ Gizburdt joined	20:45
	← n-st left	20:45
	→ endiruna joined	20:45
	← Setchi left	20:46
Joost`	ah, that makes sense	20:46
	we added --committer-date-is-author-date to fix the date issue that was caused by a similar problem	20:46
	is there a way to make sure the author remains the committer?	20:46
ojacobson	rebasing an old commit was fundamentally an unwise choice	20:46
	jacobt → oojacoboo	20:46
ojacobson	modifying a commit changes its identity, _and_ the identity of all following commits	20:46
	← DolphinDream left	20:47
ojacobson	which means that any branches downstream of the modified commit require manual cleanup	20:47
Joost`	I realise that; this was a small project that we developed in private but decided we wanted to opensource, and it started out a bit messy	20:47
ojacobson	you're stuck with it now, probably, but you may want to read man git-rebase "RECOVERING FROM UPSTREAM REBASE" and !rewrite to understand why this went wrong for you :)	20:47
gitinfo	Rewriting public history is not recommended. Everyone who has pulled the old history have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push -f <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	20:47
	the git-rebase manpage is available at http://jk.gs/git-rebase.html	20:47
ojacobson	mm	20:47
	← tgkokk left	20:47
	← paul424 left	20:47
	→ GrupoCITEC joined	20:47
ojacobson	I don't think git-rebase has the mode you want	20:48
	→ zumba_ad_ joined	20:48
Joost`	Is there a 'cleaner' way to fix messy old commit messages other than interactive rewriting?	20:48
ojacobson	you can do something with git-filter-branch to rewrite all the affected commits, but it'll be complicated	20:48
	"leave it"	20:48
	we're all human :)	20:48
Joost`	fair enough :P	20:48
ojacobson	if you really want to fix it, either provide the fixed commit message as a note, or create a replacement object per man git-replace	20:48
gitinfo	the git-replace manpage is available at http://jk.gs/git-replace.html	20:48
ojacobson	both require conscious work for others to integrate, but they're at least identity-preserving	20:49
Joost`	ah, that's worth looking into	20:49
ojacobson	(notes and replacements are not cloned or fetched by default, but it's not hard to set up)	20:49
	→ Skrypter joined	20:49
Joost`	note that this has become a 'means over goal'-sort of thing where I'd like to learn how to fix it rather than actually fix it :P	20:49
	← jovy88 left	20:50
	← dccc left	20:50
ojacobson	the other fun way to publish a previously-private project is with git checkout --orphan <branchname> <commit> to start a new branch with zero history at some known state	20:50
	that has all the problems that rebase does, but more so, because it rewrites the whole of history away	20:50
	→ HanClinto_ joined	20:50
Joost`	that's like taking the source and dumping it into a fresh repository, then?	20:51
	← meLon left	20:51
	← zumba_addict left	20:51
ojacobson	p much.	20:51
	→ meLon joined	20:51
Joost`	it seems like a waste to lose history like that though	20:51
ojacobson	welcome to git, here's a ton of alternatives and zero guidance on which might be appropriate	20:52
Joost`	hehe	20:52
	→ mattstratton joined	20:53
hypnosb	cbreak, well I'm just clarifying some terminology someone else is having to be honest... I think fork came from github which is a clone	20:53
	← HanClinto left	20:53
	veatch → zz_veatch	20:54
	← Skrypter left	20:54
	→ Zariel_ joined	20:54
cbreak	hypnosb: fork on github is a bit more	20:54
	it clones the repository as part of forking, but it also sets up a new project on github, with dependencies and so on	20:55
ojacobson	hypnosb: github borrowed the term "fork" from prior usage	20:55
	→ jfran_ joined	20:55
ojacobson	see for example the XFree86/XOrg split, which was described as a "fork" at the time	20:55
qsuscs	or, more recent, libreoffice from openoffice	20:56
	→ freeman42 joined	20:56
qsuscs	or even more recent openssl and libressl	20:56
	← doge_wow left	20:56
	← endiruna left	20:57
	← jfran left	20:57
	← Thra11 left	20:57
ojacobson	but, yes, a github fork is a git clone, plus some github-specific metadata stored inside github that tracks how those clones relate to one another	20:57
cbreak	I predict: Before the end of this year, OpenSSL will have more forks than the linux kernel tree has merges.	20:58
	→ tgkokk joined	20:58
ttkw	the NSA will love that.	20:59
	→ ropav_ joined	20:59
	← akushner_ left	21:00
	→ akushner joined	21:00
	← freeman42 left	21:00
	← toedwy left	21:01
	← nicetry left	21:01
	→ nicetry joined	21:01
	hobana.freenode.net set mode: +v	21:01
	← ropav_ left	21:01
	→ freeman42 joined	21:01
	← meLon left	21:01
	← freeman42 left	21:01
	→ meLon joined	21:01
	← tgkokk left	21:02
	→ tpollard joined	21:02
	→ ropav joined	21:02
	→ endiruna joined	21:03
	→ hamiltont joined	21:03
	← Zariel_ left	21:04
	← mishok13 left	21:04
	→ blackmesa joined	21:05
	→ dccc joined	21:06
	← Zoddo left	21:06
	← meLon left	21:06
	← B1x1t0 left	21:06
	← davividal left	21:08
	← happytux left	21:08
	→ meLon_ joined	21:08
	→ happytux joined	21:08
	← cannonball left	21:08
hypnosb	the nsa is just misunderstood, they want friends	21:08
	→ blackbeard joined	21:08
hamiltont	I'm having trouble using ls-files properly. I'm in a directory that has a lib folder with some big files in it. My gitignore lists lib/*, but when I run ls-files --others --ignored --exclude-standard, none of the files in lib are listed	21:08
	← str left	21:09
	← AKK9 left	21:09
	← endiruna left	21:10
	→ nnyk_ joined	21:10
	← mjsmith2 left	21:13
	→ hkon_ joined	21:14
	← dougsland left	21:15
	← dccc left	21:16
	← meLon_ left	21:16
	→ meLon joined	21:16
	→ treehug88 joined	21:17
	← sdrfnord1 left	21:17
cbreak	hamiltont: maybe they aren't untracked	21:17
	← cjwilburn left	21:18
	← hkon_ left	21:18
	→ endiruna joined	21:18
hamiltont	I can delete them at will and nothing shows up in git status	21:19
	(I think that proves they are untracked, right?)	21:19
cbreak	not really. There are ways to fuck around with git's index	21:19
	(those are rather exceptional)	21:19
hamiltont	I mean, this is a simple project	21:19
	nothing crazy happening (intentionally!)	21:19
	← hcc23 left	21:20
	→ preyalone joined	21:20
	← ojacobson left	21:20
	← endiruna left	21:20
preyalone	How can I fast-forward my merge after I accidentally git pull?	21:20
	← Nae left	21:20
cbreak	preyalone: it should be fast forward already	21:21
	← mennea left	21:21
	← meLon left	21:21
mewm	preyalone: revert/reset the merge commit, and then merge again?	21:21
	→ endiruna joined	21:21
	→ meLon joined	21:21
cbreak	preyalone: if it's not fast forwardable, then git pull will make a merge commit	21:22
	but then you can't fast forward anyway	21:22
preyalone	I can reset to the same time as my branch, and fast-forward merge that way	21:22
	But when I try to push my local "cal" branch to origin, it says "Updates were rejected because the tip of your current branch is behind"	21:23
	How can I 'git pull' while keeping my last commit on top?	21:23
mewm	preyalone: revert, stash, pull, pop stash	21:24
	← m8 left	21:24
preyalone	Does revert undo pull?	21:24
mewm	preyalone: it kinda depends how long or why your remote branch is in front	21:24
	no	21:24
cbreak	preyalone: as I said above	21:24
	it's not fast forwardable	21:24
	preyalone: you can rebase your commits and it will look as if it was fast forward	21:25
	(git pull --rebase)	21:25
	← pheaver left	21:25
cbreak	but this is history rewriting.	21:25
mewm	bwaah	21:25
	preyalone: why don't you want your merge commits?	21:25
	→ tgkokk joined	21:25
preyalone	my dev shop doesn't like them	21:26
cbreak	preyalone: git pull --rebase will remove the merges if there were any, in theory :)	21:27
hamiltont	cbreak: Umm, this works as expected with git version 1.8.5.2 (Apple Git-48)	21:27
	seems like a big	21:27
	bug*	21:27
preyalone	i'm kinda lost now.	21:27
cbreak	hamiltont: weird. It doesn't work with what?	21:27
	preyalone: !cs	21:28
gitinfo	preyalone: "Git for Computer Scientists" is a quick introduction to git internals for people who are not scared by phrases like Directed Acyclic Graph. http://eagain.net/articles/git-for-computer-scientists/ See also !concepts !bottomup	21:28
hamiltont	1.7.9.5	21:28
	← tgkokk left	21:28
preyalone	i have successfully fast-forward merged a bugfix into my local cal branch. i just want to push that fix to origin on top of the latest commits	21:28
hamiltont	(the default on 12.04)	21:28
cbreak	hamiltont: eeeew, prehistoric	21:28
	2 is current	21:28
	← happytux left	21:28
	← jfran_ left	21:28
hamiltont	huh, ok then. I'll try to force an update	21:28
mewm	preyalone: sounds like you have try out cbreak suggestion, or, reset last commit softly, stash that, pull the remote branch and pop your stash on it.	21:28
	→ jstimm joined	21:28
	→ jovy88 joined	21:29
	← ropav left	21:29
preyalone	I tried to pull, then fast-forward yesterday, and ran into the same problem.	21:29
	Do I really have to use a queue when I have the bugfix in its own branch?	21:29
	→ ropav joined	21:30
	← Quevin left	21:31
hamiltont	darn, this verison of git-core is the latest in the 12.04 repos	21:31
	annoying	21:31
	← jagob left	21:31
	← meLon left	21:31
	→ meLon joined	21:31
	→ dccc joined	21:31
	→ moritzs joined	21:32
cbreak	preyalone: pull MERGES	21:33
	← Guest17610 left	21:33
cbreak	you can NOT fast forward merge unless the commits you want to merge are direct descendants of your current commit	21:33
	if you can't fast forward merge, you will get a merge commit, no way around it	21:34
	unless you rewrite history. Which is what rebase does.	21:34
	→ Quevin joined	21:34
	← pantsman- left	21:34
SamB	fast forward really isn't a good way to merge	21:34
	← Gizburdt left	21:35
SamB	and merge really isn't a good thing for pull to do	21:35
	← livingstn left	21:35
	← jontmorehouse left	21:36
	← meLon left	21:36
	→ meLon joined	21:36
	→ pheaver joined	21:36
	← exobit left	21:37
	← fr33domlover left	21:38
	← cbonitz left	21:38
	→ bezet joined	21:38
	← Balliad left	21:39
preyalone	git is not printing any messages about not being able to fast-forward. it's just not doing it.	21:39
	→ hebz0rl_ joined	21:40
	← duderonomy left	21:41
	← meLon left	21:41
	→ meLon joined	21:41
	← dccc left	21:41
	← bezet left	21:42
	→ NanoArrow joined	21:43
	← ropav left	21:43
	→ toedwy joined	21:44
	→ ropav joined	21:45
	← nour_ left	21:46
	← homework1 left	21:46
	← eightyeight left	21:47
	← AllowSpectators left	21:47
	→ Skrypter joined	21:48
	← Reskp left	21:48
	→ eightyeight joined	21:48
	← ropav left	21:48
	→ ropav joined	21:49
	← kermit left	21:49
	← kriks left	21:49
	→ rasto joined	21:50
	← Diemuzi left	21:50
	→ kermit joined	21:50
	→ AKK9 joined	21:51
	→ Guddu_ joined	21:51
	← meLon left	21:51
	→ meLon joined	21:51
	← Sceorem left	21:52
	→ fr33domlover joined	21:53
	← ropav left	21:53
	→ ropav joined	21:53
	← meLon left	21:56
	→ meLon joined	21:56
	→ source47 joined	21:56
	gitinfo set mode: +v	21:57
source47	hi guys. i am having a strange problem with my github. i am using ssh auth but for some reason github thinks i am someone else	21:58
	so doesnt let me do 'git push origin master'	21:58
	any ideas?	21:58
	← scalability-junk left	21:58
	→ dccc joined	21:58
	→ cmoneylulz joined	21:59
	← noxd left	21:59
mmattice	git remote show origin	21:59
	← CKyle left	21:59
source47	i did mmattice	22:00
	the origin is setup fine	22:00
	← a_le left	22:00
mmattice	what's it say for the user?	22:01
	→ a_le joined	22:01
source47	origin git@github.com:developerinlondon/docker-workstation.git (fetch) origin git@github.com:developerinlondon/docker-workstation.git (push)	22:01
	← meLon left	22:01
	← Corey84 left	22:01
	→ meLon joined	22:01
mmattice	huh, weird. probably a #github problem	22:02
	→ neiled joined	22:02
	→ CKyle joined	22:02
source47	unlikely. it works fine from my laptop	22:03
	← beastd left	22:04
	→ kriks joined	22:04
	← HanClinto_ left	22:05
	← meLon left	22:06
	→ meLon joined	22:06
mmattice	then you probably don't have your local key listed with github, or, you have too many keys and it's bombing out after trying the first few	22:06
source47	i have a few keys in github	22:07
	→ dik_dak joined	22:07
	← thevishy left	22:07
source47	but didnt know theres a limit	22:07
Dougie187	I think he means too many keys on your local machine	22:07
mmattice	on your end. your client presents them serially, not all at once. if you fail authentication too many times, it'll stop trying more keys	22:07
Dougie187	Who does github think you are?	22:08
	try `ssh -vT [email@hidden.address] and pastebin the output	22:08
mmattice	something like IdentityFile may be useful	22:08
	← robbyoconnor left	22:08
	→ malahal joined	22:08
	← neiled left	22:08
	→ robbyoconnor joined	22:08
	← sgambino left	22:09
	→ Reskp joined	22:09
	← dccc left	22:09
xender	Why doesn't interactive rebase have "just pause here" command?	22:09
bremner	xender: edit	22:09
xender	Well, selecting previous commit do edit and actually not editing it does the thing	22:09
source47	ok it worked when i regenerated	22:09
	old key wasnt set with same email i guess	22:10
	← Willow left	22:10
	→ fstd_ joined	22:10
	→ Willow joined	22:10
	← Willow left	22:11
malahal	I have some commits (78 in total authored by various people) whose 'committer's name' is incorrect. It is in a private branch so I change change history. What is the easiest way to change committer to be same as author for such commits?	22:11
	← meLon left	22:11
	← bitfury left	22:11
	→ meLon joined	22:11
Joost`	hmm, ojacobson is no longer here, but for whoever was reading alone with my issue a few hours ago, https://stackoverflow.com/questions/5520425/how-can-i-rebase-a-commit-made-by-another-author-without-adding-myself-as-the-co actually fixed it exactly like I needed it to and he described. Kudos go to both him and stackoverflow	22:13
bremner	what does incorrect mean? the person who committed didn't configure an email address?	22:13
Joost`	malahal: wow, that is oddly relevant	22:13
	where 'that' is both your question and my follow-up of a similar problem, above	22:13
	← WaReZ left	22:14
	← fstd left	22:14
	fstd_ → fstd	22:14
Joost`	the filter-branch thing I just linked to does exactly that; replace the committer name by the author name for all selected commits	22:14
	← cmoneylulz left	22:14
osse	malahal: note that if you have rebased these commits then Git intetionally changes the committer names. I'm not saying they're necessarily correct; just saying that it's not necessarily an accident that they're different	22:14
	← nickpresta left	22:15
bremner	right, that's kindof what I wanted to say.	22:15
	or git am'ed them, or cherry-picked, or...	22:15
	→ DolphinDream joined	22:16
	← Reskp left	22:16
	← meLon left	22:16
	← looper left	22:16
	→ meLon joined	22:16
osse	If I could go back in time I would remove the first occurence of "necessarily" in my previous message	22:17
	→ scalability-junk joined	22:17
Seveas	osse: also change intetionally to intentionally while you're at it :)	22:17
osse	I might as well	22:17
Seveas	git time-machine --back 4 minutes	22:18
	→ toothrot joined	22:18
	← shinnya left	22:19
malahal	osse, Joost`: thank you for the link. In our case, we all had to rebase a set of patches. We all did that on a single system with shared screen. Everyone actually rebased their own patches, but this committer's was set to one of our address. No big deal, but wanted to correct if possible.	22:19
osse	it is possible to correct. not sure it's worth it though	22:20
	in any case you want filter-branch with an --env-filter I think	22:20
malahal	If git allowed us to pass "rebase -i" intermediate work, then we would have handled it differently!	22:20
	→ jottr joined	22:20
	← meLon left	22:21
	→ meLon joined	22:21
	→ aldodelgado joined	22:22
	→ dccc joined	22:24
	← hs366 left	22:24
	← treehug88 left	22:25
	← jmichaelward left	22:25
	→ shinnya joined	22:25
	← endiruna left	22:25
	← Skrypter left	22:25
	→ lsiv568 joined	22:27
	→ jon_r joined	22:28
	← AKK9 left	22:28
	← DolphinDream left	22:29
	→ DolphinDream joined	22:30
	← maxer left	22:31
	← meLon left	22:31
	→ meLon joined	22:31
	← punchagan left	22:32
	← CKyle left	22:33
	← FreezingCold left	22:34
	← Mixologic left	22:34
	← meLon left	22:36
	→ meLon joined	22:36
	← elliotd123 left	22:36
	← ropav left	22:37
	→ elliotd123 joined	22:38
	← gws___ left	22:38
	← thedodd left	22:38
	← jerius left	22:38
	→ ropav joined	22:38
	← elliotd123 left	22:38
	← yellowfish left	22:39
	← mewm left	22:39
	→ kingbeowolf joined	22:39
	→ gws_ joined	22:39
	← Nizumzen left	22:39
	→ elliotd123 joined	22:39
	← kriks left	22:41
	← DolphinDream left	22:41
	← meLon left	22:41
	→ meLon joined	22:41
	← lsiv568 left	22:41
	→ jfran_ joined	22:41
	→ Corey84 joined	22:42
	← elliotd123 left	22:42
	→ elliotd123 joined	22:42
	← joelm left	22:44
	← Vivekananda left	22:45
	← dccc left	22:45
	← meLon left	22:46
	← jfran_ left	22:46
	→ meLon joined	22:46
	→ DolphinDream joined	22:46
	← ehmatthes left	22:47
	→ [EddyF] joined	22:48
	→ endiruna joined	22:48
	← Dougie187 left	22:49
	→ FreezingCold joined	22:49
	← meLon left	22:51
	→ meLon joined	22:51
	→ ISmithers joined	22:52
	→ jontmorehouse joined	22:54
	← rasto left	22:54
	→ lolmaus joined	22:56
	← tranzfuse1 left	22:57
	← lolmaus_ left	22:58
	→ dmarkham joined	22:58
	→ Mixologic joined	22:58
	→ TheOneRing joined	22:58
	→ tranzfuse joined	22:58
TheOneRing	hi this is my .gitatributes file http://paste.kde.org/p3sz8o7td I want to have all text files in eol=lf	22:59
	no git still tries to convert all my .txt files to crlf on the next commit	22:59
	← doggfrank left	23:00
	← deuti left	23:00
TheOneRing	how can I realy force it to make it lf, with my ast try with * it even converted png and exe files to lf	23:00
	→ frankdogg joined	23:01
TheOneRing	which wasn't that cool ...	23:01
	← blackbeard left	23:01
TheOneRing	git version 1.9.0.msysgit.0	23:01
	→ dsdeiz joined	23:01
	← meLon left	23:01
	→ meLon joined	23:01
	← FreezingCold left	23:01
	→ dccc joined	23:02
	← Sonderblade left	23:02
	← dangerousdave left	23:02
	← tranzfuse left	23:05
	← DolphinDream left	23:05
	→ DolphinDream joined	23:06
	← King_Hual left	23:06
	← meLon left	23:06
	→ meLon joined	23:06
jrnieder	TheOneRing: you can tell git which files are text files using the 'text' attribute: e.g., "*.txt text"	23:07
	TheOneRing: if you want it to autodetect, you can do "*.txt auto"	23:07
	TheOneRing: generally speaking the eol setting shouldn't go in .gitattributes. Instead, you can globally tell git that you want LF endings in the worktree with "git config --global core.eol lf"	23:08
	→ Eric21 joined	23:08
jrnieder	TheOneRing: or if you want that setting in a specific repository, use --local instead of --global	23:08
	← Eric21 left	23:08
	→ Alayde joined	23:08
	→ a_le_ joined	23:08
	← a_le left	23:08
TheOneRing	hm k thx	23:09
	← Guest89885 left	23:09
jrnieder	TheOneRing: once you've told git what files are text files (and hence should be stored with LF endings in the repository) and what the line-endings should be when you check out, it still doesn't change the content of files in the worktree or in previous commits	23:09
TheOneRing	the eol issue was making me crazy	23:09
jrnieder	TheOneRing: https://help.github.com/articles/dealing-with-line-endings#refreshing-a-repository-after-changing-line-endings explains how to get the line endings right in the worktree once your settings are just right	23:10
	← Alayde left	23:10
	→ B1x1t0 joined	23:10
TheOneRing	hm yes I tried that but my txt files where still marked as modified	23:11
jrnieder	your files probably have mixed line endings	23:11
	← meLon left	23:11
jrnieder	s/probably/maybe/ :)	23:11
	→ meLon joined	23:11
	← tang^ left	23:11
	← DolphinDream left	23:11
	→ mizu_no_oto joined	23:12
jrnieder	anyway, if you have specific messages you'd like people here to help debug then copying into a pastebin as described in !repro may help	23:12
gitinfo	Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will raise the odds of getting your problem fixed from about 30% to about 90%.	23:12
	← bosie left	23:12
	→ edc joined	23:14
	← aard_ left	23:15
	→ simesy joined	23:16
	← drjeats left	23:16
	← simesy left	23:16
	→ simesy joined	23:16
	→ Willow joined	23:16
	→ FreezingCold joined	23:17
	← jontmorehouse left	23:18
	→ jontmorehouse joined	23:19
	← bgerber left	23:20
jrnieder	TheOneRing: when I say ".txt auto" I mean ".txt text=auto" above. sorry for the confusion	23:20
	← hebz0rl_ left	23:20
osse	/2	23:20
	← blackmesa left	23:20
osse	oops	23:20
	→ noxd joined	23:20
	gitinfo set mode: +v	23:21
	gitinfo set mode: +v	23:21
	← meLon left	23:21
edc	hello	23:21
gitinfo	edc: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	23:21
	→ meLon joined	23:21
	← ropav left	23:21
	→ epifanio joined	23:21
	→ jftf_ joined	23:21
	← Muchoz left	23:23
edc	views?	23:25
	← mmitchell left	23:25
	← Rastus_Vernon left	23:26
	← meLon left	23:26
	→ meLon joined	23:26
	→ lowkeyliesmyth joined	23:26
	← [sr] left	23:27
	← jontmorehouse left	23:27
	→ [sr] joined	23:27
	← pwnz0r left	23:28
	← edc left	23:29
	→ jontmorehouse joined	23:29
	→ DolphinDream joined	23:30
	← DolphinDream left	23:30
	← aldodelgado left	23:30
	← meLon left	23:31
	→ happytux joined	23:31
	→ meLon joined	23:31
	← mizu_no_oto left	23:31
	→ woollyams joined	23:32
	← imMute left	23:33
	relisys- → relisys	23:33
	← mikecmpbll left	23:34
	← relisys left	23:34
	→ imMute joined	23:34
jenia	if i push to a new repository, will that also push all the history there too?	23:34
	← Quevin left	23:35
	→ maxer joined	23:35
	→ DolphinDream joined	23:36
	← B1x1t0 left	23:36
	← akiva left	23:37
	→ Quevin joined	23:37
	← Destos left	23:37
	← jontmorehouse left	23:37
	→ kukks joined	23:38
	→ bosie joined	23:39
	← bosie left	23:39
	→ bosie joined	23:39
	→ ropav joined	23:39
	← freestyl3r left	23:39
	← dik_dak left	23:39
	← rypeck left	23:40
	→ joelm joined	23:40
	← shingshang left	23:40
	→ bgerber joined	23:40
	← ropav left	23:41
	→ jontmorehouse joined	23:41
	← moritzs left	23:42
	← jluc left	23:43
	← bosie left	23:43
	← joelm left	23:44
	← dregad left	23:44
	← AaronMT left	23:46
	← meLon left	23:46
	→ meLon joined	23:46
	← carandraug left	23:47
	→ netto_ joined	23:48
	→ shingshang joined	23:48
	← lowkeyliesmyth left	23:49
	→ lowkeyliesmyth joined	23:49
	→ gargola_ joined	23:51
	← meLon left	23:51
	→ meLon joined	23:51
	← v0n left	23:53
	→ a_le joined	23:53
	← a_le_ left	23:53
	→ ropav joined	23:54
	← lolmaus left	23:54
	→ mmitchell joined	23:55
	→ akiress joined	23:56
	← daedeloth left	23:56
	← meLon left	23:56
	→ meLon joined	23:56
jenia	hello everyone	23:57
	if i create a new branch a push it to a new repository, will that new repository show the branch;s part history?	23:57
	← dfaught left	23:58
	← godgodgodgo left	23:58
	→ dik_dak joined	23:59

Logs Search ←Prev date Next date→

Channels Documentation