IRCloggy #git 2015-09-21

Provider of IRC logs since 2005.

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

	2015-09-21
	← daito left	00:00
	→ kre10s_ joined	00:02
	← jmpp left	00:02
kre10s_	normally I clone a repo from somewhere, then push changes back... This time I created a new one, added a remote and pushed some changes. How can I get the familiar and helpful HEAD is ahead of origin my n commits message in status?	00:04
	← newman left	00:04
	→ newman joined	00:04
	← Ahmed90 left	00:05
phroa	kre10s_: git fetch	00:06
	→ cerulean__ joined	00:06
	→ daito joined	00:06
	→ mizu_no_oto joined	00:08
kre10s_	phroa, I just did this, but I do not get any hints in status. I should be 2 commits ahead. Is there anything I need to specify when I add the remote?	00:09
qsuscs	man git branch -u	00:09
gitinfo	the git-branch manpage is available at http://jk.gs/git-branch.html	00:09
phroa	ohh perhaps you didn't include -u. run git branch --set-upstream-to=	00:09
	yeah	00:09
	that	00:09
	→ jalnt joined	00:10
	← jalnt left	00:11
	→ jalnt joined	00:11
	← endiruna left	00:11
kre10s_	thanks!	00:12
	← daito left	00:12
	→ tbowman94 joined	00:12
kre10s_	just out of curiosity is it possible to have more than one upstream	00:13
rgb-one	kre10s_: upstream is an alias	00:13
	I think you can have multiple remotes	00:14
	→ sctskw joined	00:14
	← cerulean__ left	00:15
rgb-one	origin is usually the alias used to refer to the url for the main repository you push to.	00:15
	→ cerulean__ joined	00:15
	← choki left	00:16
	← jalnt left	00:16
	← leeN left	00:16
rgb-one	"upstream" is usually an alias for a repo you fork from and would like to keep your repository in sync with	00:18
	you could name it anything	00:18
	← cdown left	00:18
	→ otter768 joined	00:20
	← spriz left	00:20
	← skorgon left	00:20
	→ spriz joined	00:22
	→ r4zz91 joined	00:22
	← michael_mbp left	00:22
	→ mellernoia joined	00:23
	→ tbowmanag joined	00:23
	r4zz91 → r4zz	00:24
	← tbowmanag left	00:24
	← otter768 left	00:24
	→ jalnt joined	00:25
	← r4zz left	00:25
	→ r4zz joined	00:25
	← harish left	00:25
	→ shuaib joined	00:26
	← sctskw left	00:28
	→ sctskw joined	00:28
	→ michael_mbp joined	00:28
	← bitkiller left	00:30
	← spriz left	00:31
	→ tyoc213 joined	00:32
tyoc213	working with gitflow, should I delete remote features when done??? it affect the history in some way? or it only delete the ref?	00:32
	← sctskw left	00:32
shuaib	tyoc213, you mean remote feature branches?	00:34
tyoc213	yep	00:34
shuaib	You can delete them once merged	00:34
tyoc213	feature/mything	00:34
shuaib	Infact you should	00:34
tyoc213	OK, thx	00:34
shuaib	I hate having too many branches in repo that aren't worked on anymore	00:35
	→ harish joined	00:38
	← s8321414 left	00:41
Milos	sorry for the noob question but I don't want to get it wrong	00:42
	← SonikBoom left	00:42
Milos	I've tagged a commit in dev as v1.0.1, now I want to push it to my test remote, how do I do this?	00:42
	git push test +v1.0.1~0:master ?	00:43
	← diegoviola left	00:43
phroa	git push --tags	00:43
	← harish left	00:43
Milos	doesn't that just push tags?	00:43
	I want to push the actual stuff that the tag points to	00:43
	← nemix_ left	00:43
phroa	ah I didn't realize you were pushing both at once	00:43
Milos	that's ok	00:44
	→ nemix_ joined	00:44
phroa	er, I think it should push both	00:44
Milos	I was hoping there's a way to do it without a +, ~ or 0 in addition...	00:44
phroa	"All refs under refs/tags are pushed, in addition to refspecs explicitly listed on the command line. "	00:44
	from man git push	00:44
gitinfo	the git-push manpage is available at http://jk.gs/git-push.html	00:44
Milos	ooh	00:44
	← shuaib left	00:44
Milos	so can I specify a tag to push rather than --tags?	00:45
	I'll check the man page again	00:45
phroa	you can, yes.	00:46
	← mizu_no_oto left	00:46
	→ nemix__ joined	00:48
	→ fairuz joined	00:48
	← fairuz left	00:48
Milos	phroa, hmm I got "remote: fatal: No tags can describe <commit_id>", but it said [new tag] v1.0.1 -> v1.0.1 underneath	00:48
	when I re-run it says everything up-to-date	00:48
phroa	beats me	00:49
Milos	I'll have a play	00:49
	← tbowman94 left	00:50
	→ r3g3x joined	00:51
	← nemix_ left	00:51
	← cerulean__ left	00:52
	← toothrot left	00:52
	→ Guest48 joined	00:52
	← Noldorin left	00:54
	← Ingenia left	00:54
	← KsChoice left	00:55
	→ ril joined	00:58
	← SimonNa left	00:59
	← yohnnyjoe left	00:59
	→ jmpp joined	01:00
	→ yohnnyjoe joined	01:02
	← holodoc left	01:02
	← jmpp left	01:04
	← Guest53916 left	01:07
	→ _tgunr joined	01:07
	→ daito joined	01:09
	← tyoc213 left	01:09
	→ diego1 joined	01:10
	← diego1 left	01:10
	→ diego1 joined	01:10
	diego1 → diegoviola	01:10
	← sparetire_ left	01:10
	→ DolpheenDream joined	01:12
	→ devoldmx joined	01:12
	← daito left	01:13
	→ otter768 joined	01:14
	← otter768 left	01:14
	← devoldmx_ left	01:15
	→ otter768 joined	01:15
	← colona left	01:18
	→ colona joined	01:19
	← pks left	01:19
	← dreiss left	01:21
	→ pks joined	01:21
	→ blobbagus joined	01:21
	→ mizu_no_oto joined	01:23
	← oojacoboo left	01:24
	→ oojacoboo joined	01:25
	→ rchavik joined	01:26
	→ dreiss joined	01:27
	← nnyk_ left	01:29
	← newman left	01:31
	← blobbagus left	01:32
	→ spriz joined	01:32
	← dreiss left	01:33
	→ blobbagus joined	01:33
	← ril left	01:36
	→ Vampire0_ joined	01:38
	← thomasreggi left	01:39
	← msonntag left	01:39
	→ leprechau joined	01:41
	→ msonntag joined	01:41
	← Vampire0 left	01:41
	→ stee joined	01:43
	→ allcentury joined	01:44
	→ Phoenixz joined	01:47
	← Guest48 left	01:48
	→ AridBullet joined	01:48
	← pandeiro left	01:49
	← blobbagus left	01:52
	← CKyle left	01:55
	→ GoddeR joined	01:55
	← mellernoia left	01:56
	← Hink left	01:58
	→ harish joined	02:00
	← bb010g left	02:03
	← Atrumx left	02:04
	→ scarabx joined	02:06
	← triuba left	02:06
Milos	so I made a few modifications, no commits, but I want those modifications on a new branch rather than master	02:07
	do I just make a new branch and it will carry the changes over?	02:07
	← macabre left	02:07
	← Rodya_ left	02:07
	← mikiones left	02:09
	← MarkyC left	02:10
Eugene	Milos - !float	02:11
gitinfo	Milos: If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there. If the files you changed differ between branches, the checkout will fail. In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.	02:11
Milos	great!	02:11
	→ Rodya_ joined	02:14
	→ hasket joined	02:16
	→ ajpiano joined	02:17
	→ p1k joined	02:17
	→ penna__ joined	02:17
	← stee left	02:18
	← cyphase left	02:21
	← penna_ left	02:21
	← rchavik left	02:21
	→ cyphase joined	02:21
	← vF3hNGxc47h8 left	02:21
	cyphase → Guest41763	02:21
	← hasket left	02:23
	→ flavio_ joined	02:26
	← mezod left	02:26
	→ hasket joined	02:26
	← hasket left	02:27
	→ Hellacio joined	02:29
	→ jeffreylevesque joined	02:30
	→ jeffreylevesque_ joined	02:31
	← Guest41763 left	02:31
	→ cyphase_ joined	02:32
	← cyphase_ left	02:32
	→ cyphase_ joined	02:32
	→ stee joined	02:33
	→ alexwaters joined	02:33
	← jeffreylevesque left	02:34
	→ toothrot joined	02:35
	← Hellacio left	02:40
	← livingstn left	02:40
	← allcentury left	02:43
	← strayPuppy left	02:44
	← _tgunr left	02:44
	→ CKyle joined	02:45
	→ cerulean__ joined	02:47
	← mizu_no_oto left	02:48
	→ xcesariox joined	02:49
	→ philophil joined	02:50
	← cerulean__ left	02:52
	← tanath left	02:56
	→ tgunr joined	02:57
	← Nikhil_D left	02:59
	→ Padawan joined	03:00
	→ linuxmint2 joined	03:00
	→ Nikhil_D joined	03:00
	→ Guest48 joined	03:01
	← linuxboytoo left	03:01
	→ mizu_no_oto joined	03:02
	→ linuxboytoo joined	03:02
	→ irwiss` joined	03:02
	→ tanath joined	03:03
	← shinnya left	03:04
	← linuxboytoo left	03:06
	→ linuxboytoo joined	03:07
	→ cyphase__ joined	03:08
	← Guest48 left	03:08
	← cyphase_ left	03:08
	cyphase__ → Guest38034	03:08
	→ Motoko joined	03:09
	→ daito joined	03:10
	→ nettoweb joined	03:14
	← daito left	03:14
	→ _tgunr joined	03:15
	← nettoweb left	03:15
	→ nsuke joined	03:15
	← Padawan left	03:16
	← tgunr left	03:16
	→ dreiss joined	03:18
	← m0ltar left	03:18
	← diegoviola left	03:19
	← otter768 left	03:20
	→ dEPy joined	03:21
	← oojacoboo left	03:21
	→ diego1 joined	03:22
	← darkbasic left	03:22
	← diego1 left	03:22
	→ diego1 joined	03:22
	diego1 → diegoviola	03:23
	→ darkbasic joined	03:23
	← Guest38034 left	03:25
	→ cyphase joined	03:26
	← cyphase left	03:26
	→ cyphase joined	03:26
	← HeroYoojin left	03:27
	→ dsdeiz joined	03:29
	← weyanus left	03:30
	→ jmpp joined	03:31
	← dreiss left	03:33
	← CKyle left	03:33
	← mizu_no_oto left	03:34
	← bishopj left	03:36
	→ bishopj joined	03:36
	→ Sleepy63 joined	03:36
	→ rchavik joined	03:37
	← _tgunr left	03:37
	← kadoban left	03:38
	← jmpp left	03:39
	← michael_mbp left	03:39
	← lindenle left	03:41
	→ dreiss joined	03:41
	→ Atrumx joined	03:41
	→ Luming joined	03:41
	→ michael_mbp joined	03:42
	← chupacab1a left	03:42
	← r4zz left	03:43
	→ cagedwisdom joined	03:50
	→ hasket joined	03:52
	← hasket left	03:52
	← dreiss left	03:52
	← m0viefreak left	03:55
	→ boner joined	03:55
	→ diego1 joined	03:57
	← diego1 left	03:57
	→ diego1 joined	03:57
	← diegoviola left	03:57
	diego1 → diegoviola	03:57
	→ dimi1947 joined	03:57
	← GoddeR left	03:58
	→ GoddeR joined	03:58
	→ Meow-J joined	03:59
	← kristjansson left	04:00
	→ Dougie187 joined	04:06
	→ Milos_ joined	04:06
	→ mikiones joined	04:10
	← Milos left	04:10
	← dimi1947 left	04:11
	← Sly left	04:11
	→ Milos__ joined	04:12
	← GoddeR left	04:12
	← toothrot left	04:12
	← mikiones left	04:14
	← Milos_ left	04:16
	← Phoenixz left	04:17
	→ Phoenixz joined	04:18
	← xcesariox left	04:20
	← Es0teric left	04:22
	→ sinknode joined	04:24
	→ daito joined	04:25
	← jalnt left	04:29
	→ pungi-man joined	04:29
	→ Padawan joined	04:30
	← pungi-man left	04:30
	← daito left	04:30
	→ dreiss joined	04:30
Padawan	Why would a change/commit into a recently created branch would go into my master branch?	04:30
phroa	you created the branch with `git branch <name>` didn't you	04:30
	← bendangelo left	04:31
Padawan	phroa: git checkout -b name	04:31
phroa	ah :C	04:31
Padawan	phroa: is this wrong?	04:31
phroa	well, I can't tell you the cause, but you can use `git cherry-pick` to copy it over, then just reset --hard master down by one	04:31
	no that's right.	04:31
	← dEPy left	04:31
Padawan	phroa: the thing is, while i was at this new branch, i went bach in time to origin/master(and so my master branch). Now i gotta go ahead in time with my master branch to left things as they were	04:32
	What i mean is: i wanted to revert my new branch to origin, but then when i went to my master, this was also reverted to origin	04:33
	i guess i lost my work	04:34
phroa	you can find commits with the reflog, see man git reflog	04:34
gitinfo	the git-reflog manpage is available at http://jk.gs/git-reflog.html	04:34
	← Phoenixz left	04:35
	→ jceb joined	04:36
Padawan	I mean, the things i lost were the ones it wasnt commited yet. My most recent commit is in the orign	04:36
phroa	mm.	04:37
Padawan	I just wish i knew why the hell things i did in a branch went into master as well	04:37
	So that did not happen again	04:37
phroa	I don't think I'm qualified to help you.	04:37
Padawan	no problem, thanks for the help anyway	04:37
	→ HeroYoojin joined	04:39
	→ Hink joined	04:42
	← cagedwisdom left	04:44
	→ allcentury joined	04:44
	← jceb left	04:45
	← alexwaters left	04:45
	← zacts left	04:45
	← michael_mbp left	04:45
	← jeffreylevesque_ left	04:46
	→ jonmorehouse joined	04:47
	→ alexwaters joined	04:48
	→ zacts joined	04:48
	→ michael_mbp joined	04:48
	← IanWizard left	04:48
	← allcentury left	04:48
	← alexwaters left	04:50
	→ allcentury joined	04:51
	← allcentury left	04:56
	→ cagedwisdom joined	04:57
	← boner left	04:57
	→ kristjansson joined	05:00
	← kristjansson left	05:01
	→ pantsman- joined	05:01
	→ yeu joined	05:02
	→ kristjansson joined	05:02
	← yeu left	05:02
	→ Gvjia joined	05:04
	← Gvjia left	05:04
	← kristjansson left	05:06
	← sdothum left	05:06
	→ kristjansson joined	05:06
	→ zoso joined	05:07
	→ MechtiIde joined	05:08
	→ teran joined	05:08
	← kristjansson left	05:08
	→ kristjansson joined	05:09
	← Rodya_ left	05:09
	→ Raging_Hog joined	05:10
	→ boombatower joined	05:11
	→ ayaz joined	05:11
	← Wetmelon left	05:12
	→ jalnt joined	05:12
	← teran left	05:12
	← UmbraMalison left	05:12
	→ ckruczek joined	05:16
	→ smw joined	05:17
	→ allcentury joined	05:17
	← eme left	05:17
	→ PCatinean joined	05:18
	→ otter768 joined	05:21
	→ endiruna joined	05:21
	← allcentury left	05:21
	→ jmpp joined	05:22
	→ Manikandan joined	05:22
	← otter768 left	05:26
	← jmpp left	05:27
	← kristjansson left	05:28
	← jalnt left	05:28
	← endiruna left	05:29
	→ sinkensabe joined	05:32
	← sinkensabe left	05:32
	→ sinkensabe joined	05:32
	← joako left	05:33
	→ alexwaters joined	05:33
	← alexwaters left	05:34
	← joo-_ left	05:36
	→ alexwaters joined	05:36
	← dreiss left	05:37
	→ jceb joined	05:37
	← alexwaters left	05:37
	← pantsman- left	05:38
	← Milos__ left	05:38
	→ kre10s__ joined	05:38
	→ Milos joined	05:38
	← Milos left	05:38
	→ Milos joined	05:38
	→ xcesariox joined	05:39
	← kre10s_ left	05:41
	→ vikas027 joined	05:43
	← gambl0re left	05:45
	→ ThomasLocke joined	05:47
	← philophil left	05:48
	← NeverDie left	05:51
	← DolpheenDream left	05:51
	→ philophil joined	05:51
	→ madduck joined	05:53
	→ freimatz joined	05:56
	→ pcypher joined	05:57
	← Motoko left	05:58
osse	Padawan: if you didn't commit it when it never went into any branch	05:58
	Padawan: when you have uncomitted changes Git lets you switch branches as long as it doesn't have to touch any of the files you have changed	05:59
	→ V9O joined	06:00
Padawan	oh, so... if i have uncommited changes in false A and B, and create a branch, and then i start touching A and B, git add/commit in new branch. Then it overlaps it in main branch osse?	06:00
	← ayaz left	06:01
	← ahr3n left	06:01
osse	Padawan: define "overlap"	06:01
	→ jmpp joined	06:01
	← howdoi left	06:02
Padawan	I did o that. and from what i have seen i experienced that the main branch got the changes i did in new branch. It looked like as if whatever i did in new branch went directly into main branch	06:03
	→ dsdeiz_ joined	06:03
Padawan	i tried to reset new branch at one time and main branch got reseted to	06:03
	← joufflu left	06:03
osse	either you are mistaken or they never went into the new branch to begin with	06:03
	← dsdeiz left	06:04
Padawan	Lemme see if i can reproduce it	06:04
osse	Padawan: !lol with help	06:04
gitinfo	Padawan: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	06:04
	→ joako joined	06:07
	← gopar left	06:08
	→ jackeroo_marc joined	06:09
	← MechtiIde left	06:09
osse	!repro	06:09
gitinfo	[!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://gist.github.com/2415442 ) of your terminal session.	06:09
	→ rscata joined	06:09
	← curiousmansi left	06:09
Padawan	So osse, suppose i have file A and B in main branch and they are being modified, when i create a new branch git notifies me that. In this new branch i create another file called C and i git add it and then i try to git commit it. But git commit will commit the changed that came "pendent" from master.	06:10
	will it pass it through master after this new branch commit?	06:10
	→ mikiones joined	06:10
	→ dreiss joined	06:10
	← Hink left	06:11
Padawan	yeah it went to master as well	06:11
	→ fracting1 joined	06:11
	→ eGGsha joined	06:12
	→ nisseni joined	06:13
osse	Lies!	06:13
	← philophil left	06:14
Padawan	how can i prove?	06:14
osse	Padawan: !lol	06:14
gitinfo	Padawan: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	06:14
	← tpollard left	06:14
osse	!repro	06:14
gitinfo	[!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://gist.github.com/2415442 ) of your terminal session.	06:14
	← mikiones left	06:15
	→ go1111111 joined	06:16
	→ Amandil joined	06:16
	← Gamecubic left	06:18
Padawan	https://gist.github.com/202bc19b518aebf67682	06:18
	← Amandil left	06:19
	→ acolson joined	06:19
Padawan	It started at : 1a6fc73 Head	06:19
osse	is fix/one your "new branch" ?	06:19
	→ temmi_hoo joined	06:19
	→ roelmonnens joined	06:20
Padawan	yeah it showed me this when i crerated: https://i.imgur.com/27pVISL.png	06:20
osse	everyone looks normal	06:20
Padawan	then i did this: https://i.imgur.com/Kg3dT7P.png	06:20
osse	*everything	06:20
	160d443 is not part of master	06:20
	→ Amandil joined	06:20
Padawan	ok, but now, when i went back in master	06:21
	my vimrc	06:21
	my zshrc	06:21
	files i was modifying in master	06:21
osse	but you never committed them	06:21
Padawan	yeah exactly	06:21
	but in branch i had to commit	06:22
	lemme reddo	06:22
	it	06:22
	← jrahmy left	06:22
Padawan	and show the commit messages	06:22
osse	Padawan: commit them now, then rerun the log command	06:22
Padawan	i commited it in new branch	06:22
	lemme log the new branch	06:22
	→ daito joined	06:26
	← dsdeiz_ left	06:27
	→ philophil joined	06:28
	→ jrahmy joined	06:28
	→ dsdeiz joined	06:29
	← pcypher left	06:30
	→ Juzzika joined	06:30
	← daito left	06:31
Padawan	Okay, here is what i did: https://gist.github.com/anonymous/9061faed80d9e186da12	06:31
	Here is the commit message in newbranch after add a hello.txt file: https://gist.github.com/anonymous/1ab4e4ea585045049941	06:32
	when i go back to master and tail my vimrc, its not the same i was working before i create the new branch	06:32
	→ NordiQ_ joined	06:33
	→ skorgon joined	06:33
	← skorgon left	06:33
	→ skorgon joined	06:33
Padawan	i am just lost	06:34
NordiQ_	Hi. Let's say I went crazy tonight and restructured the directories of one of my repos locally as well as copied and deleted a bunch of files. What is the best way to reflect the new structure I have remotely?	06:34
	Do I have to delete all the files off the tracking tree and then readd everything by hand?	06:35
	← diegoviola left	06:37
grawity	git add --all	06:38
	← Amandil left	06:38
	→ diegoviola joined	06:38
	← diegoviola left	06:39
	→ diegoviola joined	06:39
	← CEnnis91 left	06:39
NordiQ_	How do I get the deleted files out of the remote tree though?	06:40
	Tried doing git reset HEAD	06:41
	crap	06:41
	I just understood what I did	06:41
	→ declanqian joined	06:43
osse	Padawan: on line 25 you commited vimrc and zshrc too, not just hello.txt	06:43
Padawan	i know, but it was in new branch	06:44
	→ Alienpruts joined	06:44
osse	Padawan: so when you checkout master then those files will be changed to reflect how they appear in mater	06:44
	← NordiQ_ left	06:46
	→ jost joined	06:46
	← jonmorehouse left	06:46
Padawan	Like, the files were modified-state right? When i went into new-branch and commited them, they were commited there to last commited state, not to master-modified state. And worse than that, when i checkout to master the files were not modified anymore, they were at my last commit state.	06:47
_ikke_	Padawan: Uncomitted changes don't belong to any branch	06:47
	→ skullcrasher joined	06:47
osse	Padawan: no, they were committed in their modified state	06:47
	and when you checkout master those changes won't show anymore	06:48
	→ howdoi joined	06:49
	→ Ingenia joined	06:49
	→ arup_r joined	06:50
	→ xintron joined	06:52
	→ Nizumzen joined	06:53
Padawan	osse, how do you explain this to me: https://i.imgur.com/7bNtXtW.png	06:53
	→ curiousmansi joined	06:54
	← ashnur left	06:54
	← scarabx left	06:54
	← jaafar left	06:54
Padawan	so ok, i commited the modified files in new branch, but when i got back to master... the modified files were lost?	06:54
grawity	they're in that other branch...	06:55
osse	the modifications now belong to the new branch	06:55
	when you checkout master the nyou see the files as they are in master	06:55
_ikke_	What do you expect when you switch branches?	06:55
Padawan	i see	06:55
grawity	yeah, that's kinda what branches are for	06:55
	so that each could hold different series of changes	06:55
	→ bmilesp joined	06:56
	→ xolubi joined	06:56
grawity	you want some change in both, you merge / cherry-pick / manually copy the commits	06:56
	← xolubi left	06:56
Padawan	I was using them when i could think before, this is great then. Ok	06:56
	Well, thanks for the patience osse	06:56
	And sorry for my stupidity.	06:57
	→ ahr3n joined	06:58
	→ mkoskar joined	06:58
	→ TomyWork joined	06:59
	← Goplat left	06:59
	← devoldmx left	07:01
	← aretecode left	07:02
	→ skynxnex joined	07:02
	→ ktosiek joined	07:02
	→ lb1a joined	07:03
	← durham left	07:03
	→ addshore joined	07:04
	← ahr3n left	07:05
	→ encod3 joined	07:05
	← encod3 left	07:05
	→ WAAO3ME joined	07:06
	→ ilmgb joined	07:07
	← bmilesp left	07:08
	→ encod3 joined	07:09
	← stee left	07:09
	← skorgon left	07:10
	→ wiky joined	07:10
	← jrahmy left	07:11
	← declanqian left	07:12
	← Neozonz\|Disc left	07:12
	← dreiss left	07:12
	→ User458764 joined	07:13
	→ pungi-man joined	07:16
	→ arup_r_ joined	07:17
	← User458764 left	07:18
	→ Efof joined	07:18
	← Efof left	07:18
	→ nerd_ joined	07:18
	← boombatower left	07:20
	← nerd_ left	07:20
	→ nerd joined	07:20
	← arup_r left	07:21
	→ otter768 joined	07:22
	→ pantsman- joined	07:23
	← pungi-man left	07:24
	→ Balliad joined	07:26
	← otter768 left	07:27
	← thiago left	07:29
	→ snonez joined	07:30
	← maxorator left	07:31
	→ maxorator joined	07:31
	← snonez left	07:33
	← ProT-0-TypE left	07:34
	← diegoviola left	07:34
	← ilmgb left	07:34
	→ ilmgb joined	07:35
	→ u26 joined	07:38
	→ tinajohnson joined	07:38
	→ allcentury joined	07:39
	← Padawan left	07:40
	→ jrahmy joined	07:40
	← nerd left	07:41
	→ u27 joined	07:41
	← ilmgb left	07:42
	← u26 left	07:42
	→ nerd joined	07:42
	→ Dragooon joined	07:42
	→ ilmgb joined	07:43
	← DuckMaestro left	07:44
	← allcentury left	07:44
	→ arjun_ joined	07:44
	← linuxmint2 left	07:45
	← jmpp left	07:45
	← u27 left	07:46
	← ilmgb left	07:46
	→ Hounddog joined	07:47
	→ ProT-0-TypE joined	07:47
	→ ilmgb joined	07:48
	→ nicechap joined	07:48
	→ tonyj joined	07:48
	← mac_ified left	07:49
	→ BSaboia joined	07:50
	← rasto left	07:51
	→ joo-_ joined	07:55
	→ rasto joined	07:55
	← Dragooon left	07:58
	→ Dynetrekk1 joined	07:59
Dynetrekk1	is it possible to get tmux in mintty/git-bash on windows?	07:59
	← arjun_ left	08:01
	→ codesing joined	08:01
	→ bongjovi joined	08:01
	← reim left	08:03
_ikke_	No clue	08:03
Dynetrekk1	_ikke_: too bad. if git-bash came with tmux I would be happy as can be	08:04
	→ arjun_ joined	08:04
Dynetrekk1	I wouldn't miss linux at all, except when I'm working	08:04
_ikke_	Just switch to linux :P	08:05
	j/k	08:05
	Linux has all the cool tools	08:06
	→ aswen joined	08:06
	→ allcentury joined	08:07
	→ endiruna joined	08:08
Dynetrekk1	_ikke_: I'm working on linux when I can. sometimes I can't	08:09
	that is, sometimes I have to windows	08:09
	just because other people haven't seen the light	08:09
_ikke_	I have to use use windows at work, but I have linux in a VM	08:09
Dynetrekk1	I do that too	08:09
	→ reim joined	08:10
	← allcentury left	08:11
Dynetrekk1	compiling for windows has to be done on windows though	08:12
_ikke_	.net?	08:13
	← harish left	08:13
Dynetrekk1	Fortran	08:13
_ikke_	ok	08:14
	← arup_r_ left	08:15
stealthii	I've two branches, `master` and `develop`, with the proviso that `master` cannot deviate from `develop` in commits, but is merely a less up-to-date version linearly. (Fast forwards to `develop` should always be possible.	08:18
	What would be the best practice to enforce this with commit hooks?	08:18
_ikke_	Just curious, what if you need to do hotfixes?	08:18
	← reim left	08:19
_ikke_	commit hooks are optional, ie, they can be easily skipped, and users need to explicitly add it to their hooks	08:19
	→ u26 joined	08:19
stealthii	That issue came up today. Hotfixes were pushed to `master`, and later a pull request was merged into `develop`. `master` can no longer be fast-forwarded to `develop` as a result of this	08:20
Dynetrekk1	you could put hooks if you've got a "blessed repo", e.g. stash, bitbucket, github, ...	08:20
_ikke_	And why is that a problem?	08:20
	stealthii: (just curious)	08:20
	Just trying to understand your workflow	08:21
stealthii	To make absolutely sure that the site container running on our test domain (deployed from develop), is exactly what we will deploy to the live site (from master)	08:22
	→ arup_r joined	08:22
_ikke_	But apparently you still want to do hotfixes?	08:22
stealthii	There has been issues in the past where poor developer merge commits have had the branches deviate whilst matching on commit content	08:22
	You raise a good point. I'd like to update those rules to allow for hotfixes, so master doesn't necessarily have to be fast-forwardable	08:24
	my requirement then would be that master doesn't contain any commits that aren't in develop as well	08:24
_ikke_	stealthii: Do you use some kind of release based workflow? ie, you have a stage where you prepare something to release?	08:25
	→ andyr joined	08:25
	→ King_Hual joined	08:26
	← King_Hual left	08:26
	→ King_Hual joined	08:26
	← u26 left	08:26
_ikke_	stealthii: perhaps you might want to look into !gitflow, which describes a workflow a bit more extensive as you currently have, but the formalization might be benneficial	08:28
gitinfo	stealthii: The description of the gitflow branch workflow model is at http://nvie.com/posts/a-successful-git-branching-model/ while a tool to help implement this workflow is at https://github.com/petervanderdoes/gitflow See http://sethrobertson.github.com/GitBestPractices/#workflow for other workflow suggestions/references	08:28
	→ Darcidride joined	08:28
	→ SimonNa joined	08:30
stealthii	Gitflow could work - this project isn't complex (static site, repo containing code and content) but I wanted to keep things a little simpler	08:30
_ikke_	ok	08:30
	Note that we use gitflow here for small projects too	08:30
	← jrahmy left	08:31
_ikke_	But it might be a bit overkill	08:31
stealthii	I'll have a think, I'd agree on Gitflow being ideal - enforcing with commit hooks may not be the best idea, which was what I was investigating	08:31
	→ reim joined	08:31
_ikke_	stealthii: Well, commit hooks is wrong place for enforcing things, they can at most be used for warning	08:32
	stealthii: The thing you want to protect is the 'blessed' repository	08:32
	What also can help in some cases is to devide roles	08:32
	← vikas027 left	08:33
	→ nnyk_ joined	08:33
_ikke_	ie, 1 or 2 people responsible for integrating into master	08:34
	→ Dragooon joined	08:35
_ikke_	stealthii: This is a social problem in the first place, not a technical problem	08:37
	→ jrahmy joined	08:37
	→ dimi1947 joined	08:37
osse	a problem perpetuated by the welfare state	08:37
	→ elsevero joined	08:37
	→ Amandil joined	08:38
	← SimonNa left	08:38
	→ liamkeily joined	08:38
_ikke_	hehehe	08:38
	→ noisebleed joined	08:40
	→ doener joined	08:40
	→ Ju287ju2917 joined	08:43
	← noisebleed left	08:43
	→ tvw joined	08:44
	→ noisebleed joined	08:45
	← liamkeily left	08:46
	→ jmpp joined	08:46
	← arup_r left	08:47
	→ cebor joined	08:47
	→ p4trix joined	08:48
	← wiky left	08:49
	← jmpp left	08:51
	← a3Dman left	08:53
	← howdoi left	08:53
	← Meow-J left	08:53
	→ aretecode joined	08:54
	← elementalest left	08:55
	← nsuke left	08:55
	→ elementalest joined	08:56
	← elementalest left	08:56
	→ elementalest joined	08:56
	← Juzzika left	08:56
	← Dragooon left	08:56
	→ srcerer joined	08:57
	→ a3Dman joined	08:57
	→ vikas027 joined	08:57
	→ howdoi joined	08:57
osse	_ikke_: why it am the funny?	08:57
	→ jackero__ joined	08:58
	→ King_Hual` joined	08:58
	← King_Hual` left	08:58
	→ [diecast] joined	08:59
	→ mariorz joined	08:59
	→ kapowaz joined	08:59
	← nnyk_ left	08:59
codesing	can anyone tell me what the benefits are of having a develop branch in gitflow over developing on master and tagging the releases?	08:59
	→ ELLIOTTCABLE joined	09:00
	← jackeroo_marc left	09:00
	→ yrashk joined	09:00
osse	codesing: someone probably can, but that would make them LIARS. It makes no sense	09:00
	← fracting1 left	09:00
codesing	i agree with you	09:01
	but i'm trying to find holes in the reasoning	09:01
	→ ahr3n joined	09:01
osse	!flow	09:01
gitinfo	[!gitflow] The description of the gitflow branch workflow model is at http://nvie.com/posts/a-successful-git-branching-model/ while a tool to help implement this workflow is at https://github.com/petervanderdoes/gitflow See http://sethrobertson.github.com/GitBestPractices/#workflow for other workflow suggestions/references	09:01
	→ SimonNa joined	09:01
tobiasvl	well I use master as bleeding edge, so it should always be stable (enough) even between releases. kind of a nightly	09:01
	→ Outsider__ joined	09:02
osse	hmm	09:02
	codesing: maybe it's because the flow thing expects you to merge hotfixes and features and such into multiple branches	09:02
codesing	i guess doing what tobiasvl does means that you never have to know what version is released..	09:02
osse	both master (=> a new release) and develop	09:02
	→ neersighted joined	09:03
	← endiruna left	09:03
codesing	well getting rid of develop would just mean you had less merging to do no?	09:03
	← noisebleed left	09:03
	→ sparetire_ joined	09:03
	→ endiruna joined	09:03
tobiasvl	sure	09:04
	"developing on master" is ambiguous though	09:04
	you'll still use topic branches?	09:04
	if so, knock yourself out	09:04
codesing	yeah you still have feature branches	09:04
	they just get merged into master	09:04
	→ arup_r joined	09:04
	→ noisebleed joined	09:05
	→ evanc joined	09:05
	→ m0viefreak joined	09:05
tobiasvl	sounds cool by me	09:05
codesing	too cool	09:05
	← ahr3n left	09:05
_ikke_	osse: You're funny because you made a joke?	09:05
osse	_ikke_: It was very serious!!!!11	09:06
_ikke_	osse: In the context it was still funny	09:06
	→ trig-ger joined	09:06
	→ quackgyver joined	09:06
	← MaceBewley left	09:06
	→ pcarrier joined	09:06
	← tirengarfio__ left	09:07
	→ akitada joined	09:08
	→ yena joined	09:08
	→ jiz joined	09:08
	→ jonha joined	09:09
	→ Thorax2015 joined	09:10
	← Ju287ju2917 left	09:10
	→ dsteplight___ joined	09:11
	→ noahsussman joined	09:11
	→ ethanol joined	09:11
	→ lacrosse joined	09:11
	ethanol → alcohol	09:11
	→ Zariel joined	09:12
	← bongjovi left	09:12
	← penna__ left	09:13
	← noisebleed left	09:13
	← xcesariox left	09:14
	→ noisebleed joined	09:15
	← reim left	09:15
	← endiruna left	09:16
	→ endiruna joined	09:16
	← joo-_ left	09:18
	→ preyalone joined	09:19
	→ ValicekB joined	09:19
	→ MLM joined	09:20
	→ jagob joined	09:20
	→ liamonade joined	09:21
	→ clone1018 joined	09:21
	→ tirengarfio__ joined	09:21
	→ faheem__ joined	09:21
	→ freestyl3r joined	09:22
	→ michele joined	09:23
	→ otter768 joined	09:23
	→ da5id joined	09:24
michele	hi! I have a 'develop' with 20+ commits. I want to create a new branch based on HEAD^1 commit on develop. I am thinking on a way to do it. First that comes to mind is: git checkout HEAD^1 && git checkout -b "new_branch" . what do you think about it?	09:24
	gitinfo set mode: +v	09:24
	← dsdeiz left	09:24
osse	michele: that's fine but you can also do git checkout -b new_branch HEAD^1 directly	09:24
jast	michele: or just git checkout -b new_branch HEAD~	09:24
michele	yay :) thanks	09:25
jast	all of these options will do the same thing	09:25
	→ dsdeiz joined	09:26
	→ mikiones joined	09:27
	← otter768 left	09:27
	→ ignas joined	09:31
	← SimonNa left	09:31
	→ tanuck joined	09:35
	→ alanwill joined	09:35
	← dimi1947 left	09:36
	→ nettoweb joined	09:36
	← darkbasic left	09:38
	→ darkbasic joined	09:38
	← freestyl3r left	09:39
	→ iamdevnul joined	09:40
	← aswen left	09:40
	→ Meow-J joined	09:40
	→ wiky joined	09:41
	→ rex_lee_ joined	09:42
	→ aard joined	09:42
	→ sublimate joined	09:42
	← Zariel left	09:43
	← cebor left	09:44
	→ codeitagile joined	09:45
	→ lindenle joined	09:45
	→ Zariel joined	09:45
	→ scarcry joined	09:45
	→ cebor joined	09:46
	← ryoshu left	09:46
	← Amandil left	09:46
	→ arup_r_ joined	09:49
	→ boxrick1 joined	09:49
	← lindenle left	09:50
	← maxorator left	09:50
	← michele left	09:51
	← noisebleed left	09:52
	← arup_r left	09:52
	→ maxorator joined	09:53
	← codesing left	09:55
	→ codesing joined	09:56
	→ noisebleed joined	09:57
	→ joo-_ joined	09:57
	→ stamina joined	09:58
	→ daito joined	09:58
	← zoso left	09:58
	→ zoso joined	09:59
	→ Neozonz\|Disc joined	10:00
	→ newbie123 joined	10:00
	→ allcentury joined	10:01
	→ devoldmx joined	10:02
	← daito left	10:03
	← Zariel left	10:04
	→ Amandil joined	10:05
	← Neozonz\|Disc left	10:05
	← devoldmx left	10:06
	← allcentury left	10:06
	← Amandil left	10:09
	← newbie123 left	10:10
	→ ms7 joined	10:10
	→ Zariel joined	10:12
	→ Salehi joined	10:13
	← noisebleed left	10:13
	→ zadock joined	10:14
	→ noisebleed joined	10:15
	→ Neozonz\|Disc joined	10:16
	→ bernardio joined	10:18
	→ s8321414 joined	10:18
	← zadock left	10:18
	← bernardio left	10:19
	← joo-_ left	10:20
	← Neozonz\|Disc left	10:21
	← Zariel left	10:21
	→ joo-_ joined	10:22
	← Thr3d_ left	10:22
	← noisebleed left	10:23
	→ SimonNa joined	10:24
	→ Zariel joined	10:24
	← Zariel left	10:24
	→ Zariel joined	10:24
	← Zariel left	10:24
	→ noisebleed joined	10:25
	→ Zariel joined	10:25
	→ jeffreylevesque joined	10:27
	← Zariel left	10:29
	→ freestyl3r joined	10:30
	→ Zariel joined	10:31
	← Zariel left	10:31
	→ Zariel joined	10:31
	→ Kallis joined	10:31
	← Kallis left	10:32
	→ Neozonz\|Disc joined	10:32
	← noisebleed left	10:34
	→ reim joined	10:35
	→ jmpp joined	10:36
	→ noisebleed joined	10:36
	→ allcentury joined	10:36
	← Neozonz\|Disc left	10:36
	→ Kallis joined	10:37
	← jmpp left	10:41
	← noisebleed left	10:43
	→ sdothum joined	10:44
	← BSaboia left	10:44
	→ agis- joined	10:44
	→ noisebleed joined	10:45
agis-	if the sole reference of a commit in a repo is in another (refenreced - not to be GCed) commit's message (by it's SHA1), is it still going to be collected by git-gc?	10:46
tobiasvl	I believe so	10:47
	not aware of any magic in commit message references	10:47
agis-	I would assume this answer is "no", but just want to verify this. In other words: does git looks at SHA1s inside commit messages to see if it should GC a commit?	10:47
tobiasvl	highly doubt it	10:48
	→ Neozonz\|Disc joined	10:48
	← Neozonz\|Disc left	10:48
	→ Neozonz\|Disc joined	10:48
	→ howlymowly joined	10:49
	← vikas027 left	10:50
_ikke_	agis-: git uses so called roots to start to find reachability	10:50
	← jrahmy left	10:50
_ikke_	refs, reflog	10:50
	If a commit is reachable via one of these roots, then it's not going to be collected	10:51
	← reim left	10:51
agis-	_ikke_: yep I know about this, so you are too implying that it does not reads at commit messages?	10:51
_ikke_	agis-: It has to of course	10:51
	because only one commit per ref would be reachable	10:52
	otherwise	10:52
	→ AnnaSweden joined	10:52
	← Neozonz\|Disc left	10:53
	← noisebleed left	10:53
	← Zariel left	10:53
agis-	_ikke_: not sure I understand here. So if I write a commit message like "this is a follow-up commit to <sha1-of-commit-unreferenced-commit>"	10:54
	→ darkbasic_ joined	10:54
agis-	git will understand and keep that commit?	10:54
	← AnnaSweden left	10:54
	→ Zariel joined	10:54
osse	no	10:54
	← darkbasic left	10:54
	← dsdeiz left	10:54
	→ t4nk703 joined	10:54
	← Zariel left	10:55
	← t4nk703 left	10:55
	→ noisebleed joined	10:55
	→ AnnaSweden joined	10:55
	→ mizu_no_oto joined	10:56
	→ linuxmint2 joined	10:57
	→ Mega joined	10:58
	→ CheckDavid joined	10:58
	← mizu_no_oto left	10:59
	← p1k left	10:59
	← AnnaSweden left	11:00
_ikke_	agis-: Ah that way, no	11:01
	agis-: Only parents will be followed	11:01
agis-	ok cool	11:01
	→ cdown joined	11:02
	← noisebleed left	11:03
	→ anna86swe joined	11:04
	← anna86swe left	11:04
	→ Neozonz\|Disc joined	11:04
	→ jalnt joined	11:04
	→ anna87sweden joined	11:04
	→ noisebleed joined	11:05
	← anna87sweden left	11:05
	→ anna87swe_ joined	11:06
	← anna87swe_ left	11:06
	→ BullHorn joined	11:06
BullHorn	im trying to do 'git config --global credential.helper wincred' to save my github login information but it tells me "git: 'credential-wincred' is not a git command."	11:07
	← rgb-one left	11:07
BullHorn	what am i doing wrong	11:07
	→ anna87swe_ joined	11:07
	→ anna87swe joined	11:07
anna87swe	Hello	11:07
gitinfo	anna87swe: 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.	11:07
	← Neozonz\|Disc left	11:08
anna87swe	I've been trying to figure out how to get updates from a remote repo but only fetch from a certain directory. Any ideas?	11:09
_ikke_	What do you mean, fetch from a certain directory?	11:10
	→ Thr3d_ joined	11:10
	→ cavallari joined	11:11
anna87swe_	Im not very good with the terminology.	11:12
	Let see if I can try describe what I want to do instead.	11:12
kre10s__	probably means fetch only the files bellow repo/path/foo ...	11:13
anna87swe_	yes something like that.	11:13
	← noisebleed left	11:13
anna87swe_	I'm not sure if that is best practice, I'm new to git.	11:13
	I want to try out the new bootstrap, but only use the files from a certain folder. https://github.com/twbs/bootstrap/tree/v4-dev/scss	11:15
	→ noisebleed joined	11:15
anna87swe_	First i initialized a new git repo, then i did this: git remote add --track v4-dev --no-tags baz [email@hidden.address]	11:16
	I also tried git clone [email@hidden.address] --branch v4-dev --single-branch scss/scss which gets the files I need.	11:17
	← Altreus left	11:20
	→ Neozonz\|Disc joined	11:20
	← jeffreylevesque left	11:20
	→ holodoc joined	11:21
anna87swe_	When someone updates the remote directory I want to be able to sync it with my local repo.	11:21
	← ilmgb left	11:21
	→ Guest30 joined	11:21
	→ ilmgb joined	11:22
	← ValicekB left	11:22
	← Guest30 left	11:22
	← jalnt left	11:22
	→ Guest48 joined	11:23
	← noisebleed left	11:23
	→ tgunr joined	11:24
	→ otter768 joined	11:24
	← Kallis left	11:24
	← Neozonz\|Disc left	11:24
	→ noisebleed joined	11:25
	← kre10s__ left	11:25
	← ilmgb left	11:26
	→ ManikM joined	11:26
	← otter768 left	11:28
	← arup_r_ left	11:29
	→ fracting1 joined	11:29
	← V9O left	11:31
	→ DolpheenDream joined	11:31
	→ rnsanchez joined	11:32
	← noisebleed left	11:33
	→ arup_r joined	11:34
	← paulweb515 left	11:34
	→ Neozonz\|Disc joined	11:36
	← fracting1 left	11:37
	← bishopj left	11:37
	→ aswen joined	11:37
	→ bishopj joined	11:37
	→ mezod joined	11:38
	→ Zifre_ joined	11:39
qsuscs	anna87swe_: what you describe is—in the way you describe it—impossible	11:40
	← Zifre left	11:40
	← Neozonz\|Disc left	11:40
	→ ilmgb joined	11:41
osse	qsuscs: would you go so far as to say it's "impossibru!!!" ?	11:42
qsuscs	osse: yes	11:44
	→ intellix joined	11:44
	→ sshine joined	11:45
	→ negaduck joined	11:46
	→ jeffreylevesque joined	11:46
sshine	I have a file that I'm trying to .gitignore, but it keeps showing in 'git status'	11:46
qsuscs	sshine: !ignore_tracked	11:46
gitinfo	sshine: Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.	11:46
	→ arup_r_ joined	11:47
sshine	qsuscs, aha! clearly. thank you.	11:47
	← cagedwisdom left	11:47
	→ devoldmx joined	11:48
	→ Kallis joined	11:50
	← arup_r left	11:50
	← Kallis left	11:50
	← BullHorn left	11:51
	→ Kallis joined	11:51
Mega	Hi guys! May I move a directory from my-repo to new my-repo.child?	11:51
	→ Neozonz\|Disc joined	11:52
	← devoldmx left	11:52
osse	Mega: what do you mean?	11:52
darnir	Mega: Do you want to split a repository into two?	11:53
qsuscs	anna87swe_: do NOT pm people without asking their consent first.	11:54
	← tarkus left	11:55
	→ jalnt joined	11:55
	← Neozonz\|Disc left	11:56
	→ bonswouar joined	11:56
	← ilmgb left	11:56
Mega	osse: darnir: I have a repository with a site, and there's a dir called helpers, I've got that dir in separate repository, and now I have no clue what should I do to add the new repo as a directory in old repo?	11:56
	→ reim joined	11:57
	→ veganista joined	11:57
	→ daito joined	11:59
	← fstd left	11:59
	← endiruna left	11:59
	→ CKyle joined	11:59
	→ fstd joined	11:59
	→ dionysus69 joined	12:00
	→ skullcrasher_ joined	12:00
	← wiky left	12:00
	→ AyushKesu joined	12:00
	→ _tgunr joined	12:01
	← skullcrasher left	12:01
	← dionysus69 left	12:01
	→ dsdeiz joined	12:01
	← daito left	12:03
	← tgunr left	12:03
	→ dionysus69 joined	12:03
	→ ValicekB joined	12:04
	→ Zariel_ joined	12:06
	← Zariel_ left	12:06
	→ Zariel_ joined	12:07
	→ Neozonz\|Disc joined	12:07
_ikke_	!subproject	12:08
gitinfo	[!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.	12:08
	← drbean left	12:08
	→ Walex joined	12:09
	→ drbean joined	12:10
	→ darkbasic joined	12:11
	← darkbasic_ left	12:12
	← SimonNa left	12:12
	← Neozonz\|Disc left	12:12
	→ retroj joined	12:12
	gitinfo set mode: +v	12:12
	← Darcidride left	12:13
retroj	what is the difference between 'git annex get' and 'git annex sync --content'?	12:13
lb1a	retroj, that's not a git core functionality. see the man page at https://git-annex.branchable.com/git-annex/	12:14
retroj	ok, thanks	12:14
	← DolpheenDream left	12:16
	→ ilmgb joined	12:16
	→ Smurfas joined	12:17
	← sarri left	12:17
	→ sgambino joined	12:18
	→ sarri joined	12:19
	← Manikandan left	12:20
	→ dimi1947 joined	12:20
	→ p1k joined	12:20
	← Zariel_ left	12:21
	← krawchyk left	12:21
	→ dgutierrez1287 joined	12:22
	→ victortyau joined	12:22
	← bronson left	12:23
	→ Neozonz\|Disc joined	12:23
	→ asfdfdfd joined	12:24
	← dwmw2_gone left	12:24
	→ bmilesp joined	12:24
deepy	I have accidentally done something terrible, my git repository has lost the git parts	12:24
	Can I recreate it and get it up to sync without ruining my working copy?	12:25
	→ krawchyk joined	12:25
qsuscs	deepy: option a: restore your backup	12:26
_ikke_	Do you have that repository somewhere else?	12:26
deepy	I have the repo in gitlab	12:26
_ikke_	clone it somewhere, and the copy your working tree over it	12:26
deepy	but the correct state of it is on the harddrive and severely out of sync	12:26
qsuscs	deepy: option b: create a backup, git init, git remote add, git fetch, git reset --soft $commit	12:26
	or --mixed? reset is a beast.	12:27
	→ rgb-one joined	12:27
	← HeroYoojin left	12:27
	← Neozonz\|Disc left	12:28
	→ dwmw2_gone joined	12:28
	→ CEnnis91 joined	12:29
	← Raging_Hog left	12:30
	→ Hanumaan joined	12:30
	→ noisebleed joined	12:30
	→ Raging_Hog joined	12:31
	→ cbonobo joined	12:31
	← Salehi left	12:31
	→ Darcidride joined	12:33
	→ harish joined	12:34
	← curiousmansi left	12:34
	← tinajohnson left	12:35
	← Thorax2015 left	12:36
	← dimi1947 left	12:37
	← negaduck left	12:38
	→ halas joined	12:38
	→ macabre joined	12:38
	← flavio_ left	12:39
	→ Neozonz\|Disc joined	12:39
	← nettoweb left	12:39
	→ mizu_no_oto joined	12:40
	→ bongjovi joined	12:40
	← Raging_Hog left	12:43
	→ paulweb515 joined	12:43
	→ eme joined	12:43
	← Neozonz\|Disc left	12:43
	→ dsilva joined	12:44
	mission712[AFK] → mission712	12:45
	← allcentury left	12:45
	← krawchyk left	12:45
sybariten	how does git handle folders, if i add "all" ... and they dont contain any whitelisted files?	12:46
	i.e. do they become empty folders in a repo	12:46
osse	then the folder won't be added	12:46
	no	12:46
sybariten	alrite	12:46
	← diget left	12:46
	→ Thorax2015 joined	12:48
	→ wrouesnel3 joined	12:48
	← noisebleed left	12:48
	← liamonade left	12:48
	→ negaduck joined	12:49
	← paulweb515 left	12:49
	→ MarkyC joined	12:50
	→ sanketdg joined	12:50
	→ noisebleed joined	12:50
	→ cvanball joined	12:50
	← yohnnyjoe left	12:50
	← cbonobo left	12:51
	→ LBV_User joined	12:51
	→ dougsland joined	12:52
j416	poll: name of release preparation branch for version 0.1 of project: release-0.1 or release-v0.1 ?	12:53
	→ mellernoia joined	12:53
	← retroj left	12:53
Impaloo	j416: master/develop?	12:53
_ikke_	j416: I don't care :P	12:54
osse	MASTER	12:54
	MASTER	12:54
j416	... this was very helpful guys.	12:54
Impaloo	WE MUST GO FASTER	12:54
j416	thanks..	12:54
	:P	12:54
	I know I should have never asked	12:54
Impaloo	j416: a new branch for a release doesn't make sense	12:54
osse	MASTER OF PUPPETS, I'M PULLING YOUR STRINGS	12:54
j416	Impaloo: why?	12:54
Impaloo	unless you're maintaining multiple major versions at the same time	12:55
	but then you'd have 1.x, 2.x, 3.x branches	12:55
	→ Neozonz\|Disc joined	12:55
Impaloo	since it's a 0.x release you should just keep everything in master/develop branch and tag releases as you go	12:55
_ikke_	Impaloo: Why not?	12:55
j416	point is that we do review _everything_, even release preparation stuff, so it makes sense in our workflow that master only has merges and all work is done in branches	12:56
_ikke_	Impaloo: Do you stop all integration before release?	12:56
	← agis- left	12:56
	→ allcentury joined	12:56
j416	branch reviewed -> gets merged to master	12:56
	← wrouesnel3 left	12:56
Impaloo	temporary branches are fine if you have some sort of freeze time for releases	12:57
	if you tag release as `v0.1` then I'd go for `release-v0.1`, `0.1` would be `release-0.1`	12:57
	← cdown left	12:57
_ikke_	Impaloo: If you are testing a release, you don't want new features to be merged into there	12:58
	but you want bugfixes	12:58
	Depending on the size of the project, you want integration to go on, while still working on the release	12:58
	← noisebleed left	12:58
	→ liamonade joined	12:59
	→ cdown joined	12:59
	← Neozonz\|Disc left	12:59
	→ noisebleed joined	13:00
	← CKyle left	13:00
	← bongjovi left	13:00
	→ settermjd joined	13:01
	← arjun_ left	13:01
Hanumaan	getting a validation error in git server when I do git gc what could be the problem? http://paste.ubuntu.com/12514126/?	13:01
	→ paulweb515 joined	13:02
	← tristanseifert left	13:03
	← jceb left	13:03
	→ tanuck_ joined	13:03
	→ bongjovi joined	13:04
	← holodoc left	13:04
	← reim left	13:05
	→ pratikmallya joined	13:06
	→ Noldorin joined	13:06
	← tanuck left	13:07
	→ s00pcan joined	13:08
	→ fracting joined	13:08
	→ pratikma_ joined	13:08
	→ livingstn joined	13:09
	← nerd left	13:09
	← livingstn left	13:09
	→ andyrs joined	13:10
	→ Neozonz\|Disc joined	13:11
	← settermjd left	13:11
	← pratikmallya left	13:12
	← aswen left	13:12
	→ Chill_Surf joined	13:13
	→ jceb joined	13:14
	← cvanball left	13:15
	→ settermjd joined	13:15
	← rchavik left	13:15
	← Neozonz\|Disc left	13:15
	→ krawchyk joined	13:16
	← cebor left	13:16
	→ black_silence joined	13:17
	→ bernardio joined	13:17
	← tanuck_ left	13:17
	→ leeN joined	13:18
	→ cebor joined	13:18
	← ManikM left	13:18
	→ Wetmelon joined	13:18
	→ charlesr joined	13:18
	← charlesr left	13:19
	→ ManikM joined	13:19
	← bernardio left	13:21
	→ newbie123 joined	13:22
	→ chitopunk joined	13:22
	→ bernardio joined	13:23
	← settermjd left	13:23
	→ SimonNa joined	13:23
	→ bronson joined	13:24
	← wxg left	13:24
	→ s00pcan_ joined	13:25
	→ otter768 joined	13:25
	→ jmpp joined	13:25
	→ reim joined	13:26
	→ charlesr joined	13:26
	← charlesr left	13:26
	← crose left	13:27
	→ Neozonz\|Disc joined	13:27
	← bernardio left	13:27
	→ crose joined	13:27
	→ Zariel joined	13:27
jeffreylevesque	when i try to `ssh -vT [email@hidden.address] i get "key_parse_private2: missing begin marker" - https://travis-ci.org/jeff1evesque/machine-learning/builds/81387012#L127, what does that mean, and how can i fix this?	13:27
	← p1k left	13:28
_ikke_	This is more of an ssh question than git..	13:28
	← bronson left	13:28
	← Impaloo left	13:28
	→ nettoweb joined	13:29
	← Zariel left	13:29
	→ Impaloo joined	13:29
	← linuxboytoo left	13:29
	← otter768 left	13:29
	← s00pcan_ left	13:29
	→ linuxboytoo joined	13:30
	← jmpp left	13:30
	→ tinajohnson joined	13:30
	→ NeverDie joined	13:31
	← cdown left	13:31
	← Neozonz\|Disc left	13:31
	← Wetmelon left	13:32
	→ mbrzuzy joined	13:32
	← jceb left	13:32
	→ Darcidride_ joined	13:34
	← linuxboytoo left	13:34
	→ diget joined	13:34
	← krawchyk left	13:35
	← noisebleed left	13:35
	← newbie123 left	13:35
	← Dougie187 left	13:35
	→ platzhirsch joined	13:35
platzhirsch	I did a git merge which I didn't want to execute, how can I abort it now where the text editor is open?	13:36
	Even wit quiting the editor it will savei t	13:36
	← reim left	13:36
osse	platzhirsch: empty the editor completely	13:36
canton7	platzhirsch, did the merge conflict, or did it complete successfully?	13:36
osse	then quit	13:36
_ikke_	:qc	13:36
	→ Gamecubic joined	13:36
_ikke_	:cq *	13:36
	That will quit with an eror	13:37
	:cq<enter>	13:37
platzhirsch	ah nice, now I only need to get rid of what I merged in	13:37
	→ cdown joined	13:37
osse	after that you can git merge --abort methinks	13:37
	← Darcidride left	13:37
	→ dickdaley joined	13:37
	← anna87swe_ left	13:37
canton7	only if you're in the middle of the merge - i.e. it conflicted	13:37
qsuscs	alternatively, just save and close and delete the merge afterwards	13:37
platzhirsch	well done, thanks for the help	13:38
	→ jaafar joined	13:39
	← halas left	13:39
	→ oojacoboo joined	13:40
	→ luksaur joined	13:40
	→ CKyle joined	13:41
	→ noisebleed joined	13:41
	← anna87swe left	13:41
	→ Neozonz\|Disc joined	13:43
	→ malavv joined	13:44
	→ krawchyk joined	13:44
	→ jceb joined	13:44
	← krawchyk left	13:45
	→ AaronMT joined	13:45
	→ krawchyk joined	13:45
	→ rchavik joined	13:45
	← darkbasic left	13:46
	→ maply joined	13:46
	← maply left	13:46
	→ noisebleed_ joined	13:47
	← noisebleed left	13:47
	← Neozonz\|Disc left	13:47
	→ reim joined	13:48
	← leeN left	13:48
	→ darkbasic joined	13:48
	→ devoldmx joined	13:48
	← SimonNa left	13:49
	← AridBullet left	13:49
	→ kristofferR joined	13:49
	← kristofferR left	13:50
	→ Ikc joined	13:50
	← Ikc left	13:50
	← Guest48 left	13:50
	→ Ahmed90 joined	13:50
	→ Dro__ joined	13:51
	→ amwa joined	13:51
	← Ahmed90 left	13:51
	← amwa left	13:51
	→ voodo joined	13:51
	→ Ahmed90 joined	13:51
	→ BigWillie joined	13:52
	→ marlinc_ joined	13:52
	← devoldmx left	13:53
	→ Vou joined	13:53
	← Vou left	13:53
	→ laszlof joined	13:55
	← ckruczek left	13:55
	← Luming left	13:55
	← krawchyk left	13:55
	marlinc_ → marlinc	13:55
	→ krawchyk joined	13:56
	← madduck left	13:56
	→ madduck joined	13:56
	← ms7 left	13:56
	→ Luming joined	13:56
	← moyam01 left	13:56
laszlof	is there a way to do a sparse-checkout with submodules and have it reproducable for anyone who clones said repository? Specifically, i want to clone certain files/directories from various projects into my own private repo	13:56
qsuscs	laszlof: no	13:57
	→ Uvpi joined	13:57
	← Uvpi left	13:57
	← platzhirsch left	13:58
laszlof	ok. so this isnt doable even with subtrees?	13:58
	→ lindenle joined	13:58
	→ Neozonz\|Disc joined	13:59
	← crose left	13:59
	← reim left	13:59
qsuscs	dunno	13:59
	→ daito joined	13:59
	→ darkbasic_ joined	14:00
qsuscs	submodules at least fit a very narrow usecase and attempts to use them otherwise will usually fail sooner or later	14:00
	← lindenle left	14:00
	← darkbasic left	14:00
laszlof	I was following this: https://github.com/git/git/commit/6cb5728c43f34a7348e128b44b80d00b9417cb19 and hoped it may let me do what I want.	14:00
	← mkoskar left	14:00
	← negaduck left	14:01
	→ cdown_ joined	14:01
	→ em2local joined	14:01
	← Smurfas left	14:01
	→ kevwil joined	14:02
qsuscs	hmm	14:02
	→ halas joined	14:02
laszlof	I want to link the various javascript vendor dependencies I have for a project, but I cant just pull down the whole project, as my autoloader will just grab all the .js files it can find.	14:02
qsuscs	use some package manager	14:02
laszlof	right, that was the other option	14:02
qsuscs	and the better one.	14:02
laszlof	I was hoping to solve it with git alone, so I didnt have to add another dependency manager	14:02
	← Neozonz\|Disc left	14:03
laszlof	meh, better is relative. I'm trying to simplify deployment and development, and adding another task (bower update, or whatever), is one more thing I have to pipeline into my developers work flow.	14:03
	→ darkbasic joined	14:04
	← daito left	14:04
	← oojacoboo left	14:04
	← darkbasic_ left	14:04
	→ oojacoboo joined	14:05
	→ fakingfantastic joined	14:07
fakingfantastic	Hey guys, how do you move all of your files in your repo root, into a subfolder, maintaining all the history	14:07
	← eGGsha left	14:07
_ikke_	git filter-branch	14:07
	← arup_r_ left	14:08
	→ ms7 joined	14:08
	← dsdeiz left	14:09
	→ m0ltar joined	14:12
	→ ayaz joined	14:12
	← voodo left	14:13
	→ Raging_Hog joined	14:13
	→ Neozonz\|Disc joined	14:14
	← fracting left	14:15
	← darkbasic left	14:15
	→ Es0teric joined	14:15
	← ManikM left	14:16
	→ Phoenixz joined	14:17
	→ darkbasic joined	14:18
	→ Dougie187 joined	14:19
	← Neozonz\|Disc left	14:19
	→ cbonobo joined	14:20
	← s8321414 left	14:20
	← Es0teric left	14:20
	→ RockLee joined	14:21
	→ d10n-work joined	14:21
	→ nsuke joined	14:22
	← AyushKesu left	14:23
RockLee	Hey guys I did a force push of some of my code because I wanted the changes in my code to take precedence over the same code a group member wrote. So in order to be able to submit my code without fast-forwarding was to force push. However, I lost all the old commits of my other team members. Is there any way to fix this or do they have to repush the code they have stored locally?	14:23
	← jceb left	14:24
_ikke_	RockLee: The latter	14:24
jast	I'm not sure you understood force push correctly	14:24
	when you push -f you're saying: make everything on the server that I don't have go away	14:25
	← darkbasic left	14:25
	← dionysus69 left	14:25
	← joo-_ left	14:25
	→ darkbasic joined	14:25
jast	in collaboration scenarios that's usually a fool's errand because another collaborator will push it back up there again, possibly without even noticing your force push	14:25
	→ Gsham joined	14:26
	→ mikecmpbll joined	14:26
boxrick1	Is there any reason a git add -A . would miss a change within a file?	14:26
	→ jmpp joined	14:26
_ikke_	no	14:26
jast	not that I know of	14:26
RockLee	First time using git this semester, so I'm sure I didn't understand it correctly. Hopefully those guys see my email and resubmit their code. In the future, how can I prevent this next time? Submitting my code, merging with some parts, but not accepting the fast-forward that overwrites my code?	14:27
qsuscs	assume-unchanged perhaps?	14:27
	→ rpage joined	14:27
qsuscs	RockLee: learning git.	14:27
	RockLee: a fast-forward does not overwrite code	14:27
jast	fast-forwards don't overwrite code	14:27
_ikke_	RockLee: Make sure everything is correct localy (including the commits others have pushed), and then push that (always use --force-with-lease instead of just -f)	14:27
	→ axl_ joined	14:27
jast	if you change a bit of code, and someone else changes it, too, at some point git will ask you to combine the two sets of changes, and how you do that is up to you	14:28
	→ Avuqo joined	14:28
	← Avuqo left	14:28
	→ Es0teric joined	14:28
	→ mkoskar joined	14:28
	← rscata left	14:28
jast	unless you force push, which allows you to skip over the combining and just discard the other person's stuff :)	14:28
	→ potatoes joined	14:28
	→ iota_pi joined	14:28
	← Phoenixz left	14:28
	→ bernardio joined	14:29
boxrick1	Would a tag cause me issues perhaps?	14:29
jast	with adding files? don't see how it possibly could	14:29
_ikke_	boxrick1: no, a tag has nothing to do with this	14:29
boxrick1	I got this	14:29
	1 file changed, 13 insertions(+)	14:29
	create mode 100644 manifests/base_utilities.pp	14:29
	Which indicates it finds my change	14:29
_ikke_	You added a new file	14:30
boxrick1	Then when I tried to commit	14:30
	Branch master set up to track remote branch master from origin.	14:30
	Everything up-to-date	14:30
	→ rscata joined	14:30
_ikke_	That is not the result of commit	14:30
	→ Neozonz\|Disc joined	14:30
	→ Uuis joined	14:30
	← Uuis left	14:31
	→ Zariel joined	14:31
	← jmpp left	14:31
boxrick1	Oddly further up it says "[detached HEAD 1bccd0e]"	14:32
jast	it seems like you've been doing rather weird things	14:33
	← elsevero left	14:33
jast	!repro	14:33
gitinfo	[!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://gist.github.com/2415442 ) of your terminal session.	14:33
	→ negaduck joined	14:33
	gitinfo set mode: +v	14:34
black_silence	maybe using alias co for checkout but you think it's for commit?	14:34
	→ skul joined	14:34
boxrick1	I have a script which literally does these 3 lines	14:34
	http://pastebin.com/AeVaYYxG	14:34
	→ FrostyX joined	14:35
	← Neozonz\|Disc left	14:35
boxrick1	Then pushes a tag	14:35
	http://pastebin.com/ATFN6w7R	14:35
	→ EricPoe joined	14:36
FrostyX	Please, how to delete commit (not pushed), which is not HEAD?	14:36
	← EricPoe left	14:36
	→ lxi joined	14:36
	← victortyau left	14:37
osse	FrostyX: git rebase -i commit^ ; delete it from the editor	14:37
	save and quit	14:37
	← rchavik left	14:37
boxrick1	http://pastebin.com/cSN2GWjM is the output I get	14:37
	← lxi left	14:38
	→ victortyau joined	14:38
_ikke_	You are working in a detached HEAD	14:39
	!detached	14:39
gitinfo	A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach	14:39
	→ theCole joined	14:39
	← sshine left	14:39
FrostyX	osse: thank you very much. But when I do git rebase -i <hash> , I don't see that mentioned commit here	14:40
_ikke_	FrostyX: You forgot the ^ or ~1	14:40
	You need to select the parent	14:40
FrostyX	ah	14:40
	okey	14:40
	osse: _ikke_: yeah, thank you very much. Solved	14:41
	← jalnt left	14:41
	→ darkbasic_ joined	14:42
boxrick1	How do I end up working on a detached head?	14:42
	← darkbasic left	14:42
boxrick1	If I am literally doing the same thing each time	14:42
_ikke_	Don't know what you have done	14:43
	← mbrzuzy left	14:43
_ikke_	checked out a tag perhaps	14:43
	← veganista left	14:43
qsuscs	reflog might tell	14:43
boxrick1	Checking out a tag sounds potential problem	14:43
	← victortyau left	14:43
boxrick1	I am using r10k which pulls based on a git tag	14:44
	→ Kicer86 joined	14:44
boxrick1	Then sometimes I am modifying it and pushing it back	14:44
_ikke_	right	14:44
	that's the problem	14:44
boxrick1	So, how should I be doing this?	14:44
_ikke_	You first have to checkout a branch before commiting	14:44
boxrick1	Or rather I just do a git clone, make my changes and push it back ?	14:45
_ikke_	No need for that	14:45
	→ GoddeR joined	14:45
_ikke_	But that's possible	14:45
	→ victortyau joined	14:45
_ikke_	work in local clones instead of the module directory directly	14:45
	← pratikma_ left	14:46
	← michael_mbp left	14:46
boxrick1	Its usually like this, I use r10k. It pulls all my git repos based on tag	14:46
	I notice a problem and jump into the puppet module change it and try and push it back using my script	14:46
	→ Neozonz\|Disc joined	14:46
	← victortyau left	14:46
black_silence	you can create a new branch based on that tag, work there and push it.	14:47
boxrick1	Is there a line I can add to basically fix it, and to check it out before pushing it back	14:47
	← rpage left	14:47
	→ islalobo joined	14:47
	→ michael_mbp joined	14:47
	→ Dumle29 joined	14:49
	← NeverDie left	14:49
	→ victortyau joined	14:51
	← Neozonz\|Disc left	14:51
	→ NeverDie joined	14:51
EdwardIII	hey	14:52
_ikke_	hello	14:52
EdwardIII	i've got like 4-5 commits on master that should really be on a separate branch (we tend to use master for our prod stream)	14:52
	← harish left	14:52
_ikke_	boxrick1: check out a branch before you make the changes	14:52
LBV_User	hi all, for server-side git, is there any hook I can use to create a bare repository if there is none on the pointed location?	14:52
	→ harish joined	14:52
EdwardIII	what's the best approach? i did git checkout <sha_before_changes>, then rebase -i master so i could pick the commits i wanted, but it just says "noop"?	14:53
	← jackero__ left	14:53
EdwardIII	should i just do the same but cherry-pick the commits i want that are in between the incorrect, new feature stuff?	14:54
_ikke_	Because master is ahead of the commit you checked out, so there is nothing to do	14:54
	→ bl4ckpajamas joined	14:54
_ikke_	Do you already have this branch, or do you want to create a new branch?	14:54
EdwardIII	hrm should i be doing the rebase the other way around as it's 'onto'? tbh i tend not to use rebase	14:54
	i just merge everywhere	14:54
	← rscata left	14:54
EdwardIII	i figured i'd create a new "prod" branch as that would be easier than meddling with master's history	14:54
	(quite a few people now have that branch)	14:54
	→ t4nk363 joined	14:54
	→ flashpoint9 joined	14:54
	← t4nk363 left	14:54
	← chamunks left	14:55
	→ NeverDie_ joined	14:55
_ikke_	Did you push these commits already?	14:55
	→ shachaf joined	14:55
EdwardIII	yes they're all pushed	14:55
black_silence	EdwardIII: you created the new branch from master with the commits you wanted there, so that branch is ready. But you want to remove them from master?	14:55
EdwardIII	black_silence: i want a few commits that are nestled in between	14:55
	→ reim joined	14:55
	→ zz_ag4ve joined	14:56
	→ mbrzuzy joined	14:56
	→ NeverDi__ joined	14:56
	→ gargola joined	14:56
	→ dimi1947 joined	14:56
	← NeverDie_ left	14:56
EdwardIII	so maybe i should cherry pick?	14:56
	→ darkbasic joined	14:56
	→ SleePy joined	14:56
	← darkbasic_ left	14:57
_ikke_	cherry-picking just copies these commits	14:57
	→ msm joined	14:57
	→ chamunks joined	14:57
black_silence	ok, then rebase -i still works to remove the commits you don't want from both branches. Though it's not perfect that you pushed already	14:57
EdwardIII	well if i do that in a separate branch	14:57
	should i be OK?	14:57
_ikke_	Sure, but it would be confusing if you merge that branch in again	14:57
EdwardIII	so checkout another branch of master, rebase from HEAD back to before the features, then pick the commits i want?	14:57
	hmm	14:58
	yeah we almost certainly will end up doing work on that branch	14:58
_ikke_	EdwardIII: You seem to use rebase, when you mean reset	14:58
	EdwardIII ponders	14:58
EdwardIII	but reset won't let me choose which commits i want?	14:58
	← NeverDie left	14:58
_ikke_	Correct	14:58
	You have to do it in multiple steps	14:58
EdwardIII	but that's what i need (i think)	14:59
_ikke_	The first step is that you reorder the commits	14:59
EdwardIII	hrm with rebase -i on master?	14:59
_ikke_	So that all the ones you want to move are on top	14:59
	← michael_mbp left	14:59
	← Zariel left	14:59
_ikke_	EdwardIII: rebase -i <parent-of-last-commit-you-want-to-have>	14:59
	NeverDi__ → NeverDie	15:00
	→ alexwaters joined	15:00
	→ lindenle joined	15:00
EdwardIII	hrm so i'm still rewriting history on master though?	15:00
	← nisseni left	15:01
	← bmilesp left	15:01
black_silence	if you pushed the commits you don't want to master, there's no other way	15:01
	→ michael_mbp joined	15:01
_ikke_	EdwardIII: yes	15:01
	→ fubi_ joined	15:01
EdwardIII	when happens when i push?	15:01
_ikke_	Though, you can use a temporary branch too	15:01
	so you leave master alone	15:02
	→ Zariel joined	15:02
_ikke_	!rewrite	15:02
gitinfo	Rewriting public history is not recommended. Everyone who has pulled the old history will 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 --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	15:02
EdwardIII	i guess a temp branch is the best move... as long as i don't have to change it (and then thus merge it back in)	15:02
	← Zariel left	15:02
black_silence	you can undo the changes with an anti-commit too	15:02
	→ Neozonz\|Disc joined	15:02
	→ davidkrauser joined	15:02
	← acolson left	15:02
	→ Zariel joined	15:02
EdwardIII	i guess i can just make changes to the master branch then er... do rebase/cherry pick onto this temp prod branch anyway if i really need it	15:03
	← lb1a left	15:03
EdwardIII	then once it's ok for those features to go in just delete prod and switch back to your normal model (master = prod)	15:03
	it's just for a week. basically someone implemented a change to comply with a BC breaking change on an upstream vendor, but their changes don't go into prod until monday	15:04
dimi1947	I am facing the following situation...I have added 2 rules in a css file...but I want one of them to be commited in a separate branch	15:04
	what should I deal it?	15:04
EdwardIII	and we need to do a prod release before then which is still on the old upstream api	15:04
	← dgutierrez1287 left	15:04
	← lindenle left	15:05
black_silence	dimi1947: commit one rule, stash the other and move to the other branch, unstash there	15:05
	← davidkrauser left	15:06
	← flashpoint9 left	15:06
	→ davidkrauser joined	15:06
	← Neozonz\|Disc left	15:06
	→ rpage joined	15:07
	← skynxnex left	15:07
	→ flashpoint9 joined	15:07
dimi1947	how am I going to commit one rule and leave the other out?...commits are made at per file basis	15:07
grawity	no they aren't: `git add -p`	15:07
dimi1947	grawity, what is git add??	15:08
	-p	15:08
jast	patch mode. you can choose individual patch hunks to stage for committing	15:08
grawity	how the hell have you been committing things without `git add`	15:08
	← bonswouar left	15:08
jast	presumably the "I don't want any flexibility" mode, git commit -a	15:09
	← rivarun left	15:09
grawity	yes but adding new files...	15:09
dimi1947	there was never a need to before to commot individual patch hunks	15:09
	→ rivarun joined	15:09
grawity	what about committing individual files	15:10
jast	alternatively, in git gui you can right-click on individual lines to stage them	15:10
black_silence	you can use a gui like git-cola if you like that better. there you have a graphical overview and can stage blocks or even lines if required	15:10
dimi1947	I use git gui	15:10
jast	what I said, then :)	15:10
	← marlinc left	15:11
dimi1947	git cola is a different gui and the question is which is better? sincde you brought the subject	15:11
	→ dionysus69 joined	15:11
	← reim left	15:11
jast	I've never looked at git-cola	15:12
black_silence	git gui uses tcl/tk, that doesn't look very nice in my gtk desktop ^^	15:12
dimi1947	so you suggest git cola	15:12
	?	15:12
	→ marlinc joined	15:13
	→ bmilesp joined	15:13
jast	git gui does the job. if you don't mind the somewhat dated visual aesthetic, there may be no need to switch	15:13
black_silence	for me, yes. I don't know your environment. Basic functionality seems to be the same	15:13
	← roelmonnens left	15:13
dimi1947	Ok...this another discussion I am going to focus on the subject at hand now...staging hunks	15:14
	→ aswen joined	15:14
	→ dionysus70 joined	15:14
	→ lindenle joined	15:14
dimi1947	one question..what is a hunk...how do you define it?	15:15
	← alexwaters left	15:15
	→ Hink joined	15:16
	← dionysus69 left	15:16
grawity	something like "a contiguous chunk of changed lines"	15:16
dimi1947	ok..got it	15:16
black_silence	A set of changes, may be multiple lines. A certain number of unchanged lines between changes splits them into hunks	15:16
	dionysus70 → dionysus69	15:16
	← potatoes left	15:16
grawity	the @@ ... @@ lines are hunk headers/separators	15:16
	if that helps	15:17
	→ pratikmallya joined	15:17
	← dionysus69 left	15:17
	← eme left	15:17
	→ dionysus69 joined	15:17
dimi1947	got it	15:17
	→ Neozonz\|Disc joined	15:18
	← chamunks left	15:18
	← Neozonz\|Disc left	15:18
	→ Neozonz\|Disc joined	15:18
	→ thiago joined	15:18
	← black_silence left	15:19
	← FrostyX left	15:19
	→ shinnya joined	15:20
	→ chamunks joined	15:20
	→ inspec joined	15:21
	→ strayPuppy joined	15:21
inspec	hi, i just installed git-2.5.3-64-bit for windows. i can't seem to find the ssh-keygen executable anywhere in it's program files dir, tho. has it been removed? it was in with the older version i had prior.	15:22
	→ Hink_ joined	15:22
	← Neozonz\|Disc left	15:23
	→ mchelen1 joined	15:24
	← Alienpruts left	15:24
mchelen1	is there any shorthand to push a new local branch to the default remote using the local branch name?	15:24
	← sinkensabe left	15:24
	→ alexwaters joined	15:24
mchelen1	basically want to do "git push -u remotename branchname" without having to specify remotename & branchname	15:24
	← Hink left	15:25
	← Hink_ left	15:25
	→ p1k joined	15:25
	→ otter768 joined	15:26
	→ eme joined	15:27
	← zoso left	15:27
_ikke_	There is no default remote	15:27
	← alexwaters left	15:27
mchelen1	ah ok, well i only have 1 remote configured	15:27
	← linuxmint2 left	15:28
_ikke_	I don't think there is a way for git to automatically assume that currently	15:28
	← howlymowly left	15:28
mchelen1	oh well thanks anyway, i'll live with the extra keystrokes :)	15:29
	→ Gama11 joined	15:29
	→ IWishIKnew joined	15:30
	→ pratikma_ joined	15:30
	← otter768 left	15:30
	← fakingfantastic left	15:30
	→ Amandil joined	15:31
	← intellix left	15:32
	← NeverDie left	15:32
dimi1947	is there a way I can rename a branch?	15:33
	← pratikmallya left	15:33
_ikke_	sure	15:33
	git branch -m <old> <new>	15:33
	→ open_defiance joined	15:34
	→ Neozonz\|Disc joined	15:34
	→ beaconwriter joined	15:34
open_defiance	is there some simple way of quantifying something like the hamming distance between commits?	15:34
	(or another bytestring metric)	15:34
	→ scoobertron joined	15:35
grawity	if you mean git built-in tools, then no, afaik there is only a basic addition/removal count	15:35
	(diff --stat or --numstat)	15:35
	← TomyWork left	15:36
open_defiance	yes, I've been using --numstat.	15:36
	for tracking productivty. but some of my files are binaries.	15:37
	→ deepend joined	15:37
open_defiance	thanks anyway	15:37
	← ilmgb left	15:37
	→ ilmgb joined	15:38
	→ sinkensabe joined	15:38
	← ayaz left	15:38
	→ scarabx joined	15:38
	← Neozonz\|Disc left	15:38
	← allcentury left	15:38
	← Balliad left	15:39
	← freimatz left	15:39
	→ tang^ joined	15:39
	→ linuxboytoo joined	15:39
	← linuxboytoo left	15:41
	→ dfaught joined	15:42
	← ilmgb left	15:42
	← Raging_Hog left	15:42
	← dionysus69 left	15:42
	← mbrzuzy left	15:42
	← Amandil left	15:43
	← Noldorin left	15:44
	← dfaught left	15:44
	← flashpoint9 left	15:44
_rgn	not sure if i would consider lines added and removed a good metric for productivity	15:45
bremner	lines removed - lines added ;)	15:45
open_defiance	it's funny that searching the web for "git commit hamming distance" gives me numerous unrelated github packages. and -site:github.com is probably a bad move instead.	15:45
Eugene	Mmmm ham	15:45
qsuscs	indeed	15:45
open_defiance	_rgn: this particular repos is all text. so there's no "reexpressing in a more concise way" in a first pass. in a second pass, in revision, that's messier.	15:46
	→ ayaz joined	15:46
qsuscs	Eugene: is it already time for a new topic?	15:46
open_defiance	also: "lines" = paragraphs. that's really noisy.	15:46
	← ThomasLocke left	15:46
Eugene	By jove, it is!	15:46
	← gfixler left	15:46
	ChanServ set mode: +o	15:46
qsuscs	good.	15:46
	→ petersr joined	15:46
	→ Noldorin joined	15:47
	qsuscs changed the topic to: Welcome to #git, the place for git help and ham \| Current stable version: 2.5.3 \| Start here: http://jk.gs/git \| Getting "cannot send to channel"? /msg gitinfo .voice \| Submit, or there will be fresh ham! https://madeitwor.se/git-jokes	15:47
	qsuscs set mode: -o	15:47
	← petersr left	15:47
	← ayaz left	15:47
	← Hounddog left	15:48
	← islalobo left	15:49
	→ Neozonz\|Disc joined	15:50
	→ nnyk_ joined	15:50
	← jagob left	15:50
	← RockLee left	15:51
	→ abacuspowers joined	15:51
	→ davispuh joined	15:53
	← Neozonz\|Disc left	15:54
	→ dreiss joined	15:55
	→ reim joined	15:57
	→ DuckMaestro joined	15:57
	→ The_Phoenix joined	15:57
	← skullcrasher_ left	15:58
	← jost left	15:58
	← ProT-0-TypE left	15:58
	→ T3ng` joined	15:59
	← Darcidride_ left	16:00
	→ sq-one joined	16:00
	→ Internet13 joined	16:01
	← aswen left	16:01
	← davispuh left	16:04
	→ dgutierrez1287 joined	16:04
	← eme left	16:04
	→ Caius joined	16:04
	← Caius left	16:04
	→ Caius joined	16:04
	→ ashnur joined	16:05
	← Noldorin left	16:05
	→ curiousmansi joined	16:05
	← reim left	16:05
	→ Noldorin joined	16:05
	→ Neozonz\|Disc joined	16:06
	→ flashpoint9 joined	16:07
	← m0ltar left	16:09
	→ ilmgb joined	16:09
	→ allcentury joined	16:09
	← p4trix left	16:09
	→ Guest48 joined	16:09
	→ kristjansson joined	16:10
	← Neozonz\|Disc left	16:10
	← nnyk_ left	16:10
	→ nfk joined	16:13
	→ bronson joined	16:13
	← Guest48 left	16:13
	← hyperair left	16:14
	← allcentury left	16:14
	← inspec left	16:14
	→ NeverDie joined	16:15
	→ jmpp joined	16:15
	→ jteneyck joined	16:16
	→ Phoenixz joined	16:16
	→ maletor joined	16:16
	→ snowcycle joined	16:18
	→ xiaotong joined	16:20
	← jmpp left	16:20
	← ilmgb left	16:20
	→ skynxnex joined	16:21
	← skynxnex left	16:21
	→ Neozonz\|Disc joined	16:21
	← Neozonz\|Disc left	16:21
	→ Neozonz\|Disc joined	16:21
	→ basiclaser joined	16:22
	← maletor left	16:22
	← bernardio left	16:23
	← p1k left	16:23
	→ reim joined	16:23
	← fubi_ left	16:24
	→ allcentury joined	16:24
	→ FrostyX joined	16:24
	→ darkbasic_ joined	16:25
	→ jteneyck_ joined	16:26
	← halas left	16:26
	← Neozonz\|Disc left	16:26
	← darkbasic left	16:26
	→ bernardio joined	16:26
	← sinkensabe left	16:26
	← jteneyck left	16:26
	← axl_ left	16:27
	→ jteneyck joined	16:27
	← jteneyck left	16:27
	→ jteneyck joined	16:27
	← bernardio left	16:27
	← dreiss left	16:28
	→ bernardio joined	16:28
	→ axl_ joined	16:29
	→ akiva joined	16:29
	→ nuck joined	16:29
	→ bilb_ono joined	16:30
	← xiaotong left	16:30
	← jteneyck_ left	16:31
	→ cvanball joined	16:31
	← NeverDie left	16:32
	→ nerd joined	16:32
	→ skapunker joined	16:33
	→ NeverDie joined	16:35
	→ Guest48 joined	16:35
	← ms7 left	16:35
	→ p1k joined	16:36
	← bernardio left	16:37
	→ Neozonz\|Disc joined	16:37
	← Neozonz\|Disc left	16:37
	→ Neozonz\|Disc joined	16:37
	→ MechtiIde joined	16:38
jeffreylevesque	why does travis successfully ssh into github, yet errors on that succsess - https://travis-ci.org/jeff1evesque/machine-learning/builds/81422050#L84?	16:38
	← freestyl3r left	16:38
	← nsuke left	16:38
	← dimi1947 left	16:39
	← liamonade left	16:39
	→ alfism joined	16:39
	← Guest48 left	16:39
	← Gsham left	16:39
	→ dimi1947 joined	16:40
qsuscs	jeffreylevesque: that’s still an SSH issue, not a git one	16:40
Seveas	jeffreylevesque: because ssh exits with code 1 as not being able to start a session is an error. Whether authentication succeeded or not.	16:41
	→ dionysus69 joined	16:41
	→ devoldmx joined	16:41
	← Neozonz\|Disc left	16:42
	→ it_tard joined	16:42
	← nfk left	16:42
	it_tard → nfk	16:42
	← Thorax2015 left	16:44
	→ tag joined	16:45
Nevik	!crosspost	16:45
gitinfo	Note: The above question was posted in both #git and #github	16:45
	→ Guest48 joined	16:46
	← devoldmx left	16:46
Nevik	(i have also answered it in #github)	16:46
	→ bernardio joined	16:46
	→ imachuchu joined	16:46
	← shad left	16:47
	→ durham joined	16:47
	→ rwb joined	16:48
	← githogori_ left	16:48
	← bernardio left	16:49
	← tvw left	16:51
	← abacuspowers left	16:51
	← mikiones left	16:52
	← Nizumzen left	16:53
	→ Neozonz\|Disc joined	16:53
	→ bernardio joined	16:54
	→ holodoc joined	16:55
	→ DuckMaestro_ joined	16:55
	→ foist_ joined	16:55
	→ abacuspowers joined	16:55
	→ blob joined	16:55
	blob → Guest87713	16:56
	← Hanumaan left	16:56
	→ joo-_ joined	16:56
	← thiago left	16:56
	→ prefixed joined	16:57
	→ tyreld joined	16:57
	→ hyperair joined	16:57
	← noisebleed_ left	16:57
	← Neozonz\|Disc left	16:58
	→ hahuang61 joined	16:58
	← foist_ left	16:59
	← bernardio left	16:59
	← bilb_ono left	17:00
	→ theCole_ joined	17:01
	→ bernardio joined	17:02
	← petersaints left	17:02
	← curiousmansi left	17:03
	← Zariel left	17:03
	← theCole left	17:03
	→ petersaints joined	17:04
	← aard left	17:04
	← codesing left	17:05
	← bernardio left	17:05
	← T3ng` left	17:06
	→ bernardio joined	17:06
	→ MinetestForFun joined	17:07
	→ bilb_ono joined	17:07
	→ farn joined	17:08
	→ ProT-0-TypE joined	17:08
	→ reim_ joined	17:09
	→ Neozonz\|Disc joined	17:09
	→ jbondhus_ joined	17:09
	← reim left	17:09
	← stamina left	17:12
	← rgb-one left	17:12
	← Neozonz\|Disc left	17:14
	← beaconwriter left	17:14
	→ meLon joined	17:15
Impaloo	How does one remove a worktree?	17:16
	oh, you have to do it manually	17:17
jedix	I recall someone once gave me a git repo in one file, but I don't recall the key word to find the command	17:17
Impaloo	jedix: you mean a tarball or something?	17:17
jedix	no, I could clone directly from the file	17:17
Nevik	jedix, man git-bundle	17:17
gitinfo	jedix: the git-bundle manpage is available at http://jk.gs/git-bundle.html	17:17
jedix	thanks	17:17
	← bilb_ono left	17:18
	← Olipro left	17:19
	← andyrs left	17:19
	← bernardio left	17:19
	→ Lyqyd joined	17:21
	→ mbrzuzy joined	17:21
	→ Gsham joined	17:22
	← CussBot left	17:22
	→ CussBot joined	17:22
	→ bernardio joined	17:23
	→ Jackneill joined	17:23
	← catsup left	17:24
	→ kl3 joined	17:25
	→ Neozonz\|Disc joined	17:25
	→ bilb_ono joined	17:26
	← negaduck left	17:26
	← The_Phoenix left	17:26
	→ otter768 joined	17:27
	← dionysus69 left	17:27
	→ Sasazuka joined	17:27
	→ thedodd joined	17:28
	→ voodo joined	17:28
	→ gopar joined	17:28
	← bernardio left	17:29
	→ eme joined	17:29
	→ youser joined	17:29
	← Neozonz\|Disc left	17:29
	→ mac_ified joined	17:29
	→ liamkeily joined	17:30
	→ beaconwriter joined	17:31
	← otter768 left	17:31
	← Guest48 left	17:32
	→ gfixler1 joined	17:32
	← cdown left	17:32
	← mjt left	17:32
	→ ilmgb joined	17:32
	← voodo left	17:32
	→ tvw joined	17:32
	→ cdown joined	17:33
	→ bernardio joined	17:33
	← eme left	17:34
	→ kpease joined	17:34
	→ andyrs joined	17:35
	← luksaur left	17:35
	← abacuspowers left	17:35
	← ilmgb left	17:36
	← dimi1947 left	17:37
	→ dreiss joined	17:39
	→ jmpp joined	17:42
	→ dionysus69 joined	17:42
	← mbrzuzy left	17:42
	← theCole_ left	17:43
	→ gamename joined	17:44
	← cvanball left	17:45
	← kpease left	17:45
	→ kpease joined	17:45
	→ adgtl joined	17:46
	→ catsup joined	17:47
	← Gsham left	17:47
	→ jstimm joined	17:47
	← shinnya left	17:48
	→ Gsham joined	17:49
	→ thiago joined	17:50
	→ luksaur joined	17:52
gamename	Hi guys. I'm trying to figure out a way to deploy code to a test machine before I do a git push to master (on github). That is to say, I have newly-written code on my local box, and I want to send it to a test box (on aws in this case) to verify all of it works. Then, when it has been tested, I will commit/push to github master. I'm told that there is a way to use my local box as a repo for the test machine on aws. Make sense?	17:53
	Possible?	17:53
	Or, even a good idea?	17:53
Hedgework	Testing before deploying is always good :)	17:53
gamename	Hedgework ...and I have the scars to prove it. :)	17:53
Hedgework	I don't have time to walk you through possible implementations, but check out !deploy and !workflow for starting points.	17:53
gitinfo	Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html	17:53
	Finding the right workflow for you is critical for the success of any SCM project. Git is very flexible with respect to workflow. See http://sethrobertson.github.com/GitBestPractices/#workflow for a list of references about choosing branching and distributed workflows.	17:53
gamename	Hedgework U da man. Thanks.	17:55
Hedgework	np	17:56
	← howdoi left	17:57
	← DuckMaestro_ left	17:57
	→ intellix joined	17:59
	→ mbrzuzy joined	18:01
	→ theCole joined	18:02
	← SJr left	18:03
	← bongjovi left	18:06
	← Gsham left	18:06
	→ T3ng` joined	18:07
	← Chill_Surf left	18:07
	→ bb010g joined	18:08
	gitinfo set mode: +v	18:08
	→ negaduck joined	18:08
	→ nour joined	18:08
	→ aard_ joined	18:09
	← bernardio left	18:10
	→ darkbasic joined	18:10
	← darkbasic_ left	18:11
	← T3ng` left	18:11
	← cdown left	18:12
	← gfixler1 left	18:12
	← andyrs left	18:13
	← bilb_ono left	18:13
	← Lunatrius left	18:15
	← aard_ left	18:15
	← theCole left	18:15
	← kl3 left	18:16
	→ lg188 joined	18:16
	← joki left	18:16
	→ abacuspowers joined	18:17
	→ andyrs joined	18:17
	→ jagob joined	18:17
	← darkbasic left	18:18
	← nour left	18:18
	→ darkbasic joined	18:18
	← encod3 left	18:19
	→ mihaicris joined	18:19
	→ tarkus joined	18:21
	→ joki joined	18:21
	← FrostyX left	18:22
	← hyperair left	18:23
	→ hyperair joined	18:24
	← youser left	18:26
	→ nisseni joined	18:27
	→ rockstar__ joined	18:28
	→ rockstar_ joined	18:28
	→ pandeiro joined	18:28
	← liamkeily left	18:28
	← gamename left	18:34
	← IWishIKnew left	18:36
	← dickdaley left	18:36
	→ blimpse joined	18:38
	← phantombeta left	18:38
	→ yqt joined	18:39
	→ sazed joined	18:39
	→ phantombeta joined	18:40
	→ SimonNa joined	18:40
	→ theCole joined	18:41
	→ oremanj joined	18:42
	→ devoldmx joined	18:42
	← andyrs left	18:42
	← jstimm left	18:43
	→ liamkeily joined	18:44
oremanj	Hi folks! I have two git repositories, and am trying to import the second as a subtree of the first. We're using a git<->svn mirroring system that doesn't deal well with multiple root commits, so I'm trying to do this using rebase.	18:44
_ikke_	You don't want to use rebase in combination with svn	18:44
	→ enzob joined	18:44
	→ jstimm joined	18:45
	→ Guest48 joined	18:45
oremanj	People with checkouts of the second repository are going to switch to using the first - that's not the issue.	18:45
	The svn thing is mostly not relevant to my problem except that it explains why I can't just use git merge -Xsubtree=foo to solve my problem.	18:46
	← kpease left	18:46
	← Ingenia left	18:46
	→ kpease joined	18:46
oremanj	git rebase -Xsubtree=foo is working well with linear history but producing conflicts when there's branching/merging, and git rebase -p -Xsubtree=foo stops with an error at the first merge commit ("fatal: Unknown option for merge-recursive: -X'subtree=foo'")	18:46
	→ gfixler1 joined	18:47
	← devoldmx left	18:47
oremanj	Is there something else I want to be using instead (filter-branch maybe?) or am I out of luck?	18:47
	← jstimm left	18:47
	← joo-_ left	18:47
	→ kahmalo joined	18:47
	← kpease left	18:48
	→ kpease joined	18:48
	→ joo-_ joined	18:49
_ikke_	I wonder how you would merge two repositories without getting multiple roots..	18:50
	← joo-_ left	18:50
	← kpease left	18:50
	gitinfo set mode: +v	18:50
oremanj	The repo-A equivalent of repo-B's root gets the prior tip of repo-A as its parent	18:50
	← adgtl left	18:50
	→ kpease joined	18:51
	← Guest48 left	18:51
oremanj	Basically I'm trying to take the entire history of repo-B, put it all in a subtree, and tack it onto the end of repo-A's development	18:51
	← bl4ckpajamas left	18:51
	← nettoweb left	18:51
	→ nnyk_ joined	18:51
_ikke_	sounds like grafts + filter-branch	18:51
kahmalo	In gitk, how can I make the date column show committer dates rather than author dates? (I don't care whether the names and email addresses are affected.)	18:51
oremanj	I'll look up grafts, thanks!	18:51
	→ shinnya joined	18:52
	→ bango2 joined	18:52
	← nerd left	18:53
	→ Guest48 joined	18:53
	→ thomasreggi joined	18:54
	→ jstimm joined	18:55
	← jstimm left	18:56
	→ mikiones joined	18:56
	→ nerd joined	18:57
	→ jrahmy joined	18:57
	→ darkbasic_ joined	18:57
	→ Balliad joined	18:57
	← darkbasic left	18:58
	← deepy left	18:58
	← kolobyte left	18:58
	→ dickdaley joined	18:59
	← Guest48 left	18:59
	→ deepy joined	19:00
	← mbrzuzy left	19:01
	← mchelen1 left	19:01
kahmalo	I guess that, if such a feature existed, it would be in proc drawcmittext. But it isn't.	19:01
	→ bunniez joined	19:01
	← sazed left	19:02
	← bunniez left	19:03
	← DuckMaestro left	19:04
	→ editshare-ericf joined	19:05
	→ noisebleed joined	19:06
	→ freestyl3r joined	19:06
	← lg188 left	19:07
	→ andyrs joined	19:07
	→ T3ng` joined	19:07
	← hahuang61 left	19:08
	→ NeckBeardPrince joined	19:08
	→ ilmgb joined	19:08
	← luksaur left	19:10
	← darkbasic_ left	19:10
	→ darkbasic joined	19:10
	← kpease left	19:10
	← andyrs left	19:10
	→ slash77 joined	19:10
	→ andyrs joined	19:10
	→ kpease joined	19:11
	← andyrs left	19:11
	→ thomasre_ joined	19:11
	← thomasreggi left	19:12
	→ andyrs joined	19:12
	← T3ng` left	19:12
	← kevwil left	19:12
	← andyrs left	19:13
	→ adgtl joined	19:13
	← ilmgb left	19:13
	← kpease left	19:15
	← darkbasic left	19:15
	← paulweb515 left	19:15
	→ kpease joined	19:15
	← adgtl left	19:15
	→ DXR_ joined	19:15
	→ darkbasic joined	19:16
	→ mbrzuzy joined	19:16
	← p1k left	19:18
	← dionysus69 left	19:19
	← strayPuppy left	19:20
	← enzob left	19:20
	← Dro__ left	19:20
	← rockstar__ left	19:20
	← kahmalo left	19:21
	→ rockstar__ joined	19:21
	→ tristanp joined	19:22
	← nisseni left	19:22
	← noisebleed left	19:24
	← dgutierrez1287 left	19:24
	→ shuaib joined	19:24
	→ sazed joined	19:26
	→ Maroloccio joined	19:27
	→ otter768 joined	19:28
	← winegoddess left	19:28
	→ darkbasic_ joined	19:29
	→ nisseni joined	19:29
	← darkbasic left	19:29
	→ jottr joined	19:29
	← Maroloccio left	19:29
	← kristjansson left	19:30
	→ boombatower joined	19:31
	→ settermjd joined	19:31
	← otter768 left	19:32
	← liamkeily left	19:33
	← darkbasic_ left	19:33
	→ liamkeily joined	19:33
	→ cagedwisdom joined	19:34
	→ darkbasic joined	19:35
	→ gamename joined	19:36
	← DXR_ left	19:36
gamename	hi guys. How can I get the toplevel directory (as in "git rev-parse --show-toplevel") when I'm somewhere outside the git-controlled dirs? Put another way I need to find out the toplevel dir for 'bar' is 'foo' (/foo/bar), but I'm calling the git rev-parse command from /baz (i.e. another place in the filesystem outside git's control). Make sense?	19:36
	← settermjd left	19:37
	→ settermjd joined	19:37
	→ DXR joined	19:37
qsuscs	gamename: git -C /foo/bar rev-parse --show-toplevel	19:37
	← rockstar__ left	19:38
gamename	qsuscs kewl! Thanks.	19:38
	← rockstar_ left	19:38
	→ winegoddess joined	19:38
	→ adgtl joined	19:38
gamename	qsuscs Hmmm... my git exec does not like the '-C'	19:39
	qsuscs I'm on git 1.8.3.1	19:39
	→ adgtl_ joined	19:39
	← sanketdg left	19:40
	→ sentriz joined	19:40
	→ thomasreggi joined	19:42
	← temmi_hoo left	19:43
	← thomasre_ left	19:43
	← adgtl left	19:43
	← sazed left	19:43
	← liamkeily left	19:44
	← adgtl_ left	19:45
	← alfism left	19:45
	→ tomog999_ joined	19:45
	→ donnib_ joined	19:45
	← darkbasic left	19:46
	← jrahmy left	19:46
	→ darkbasic joined	19:46
	→ paulweb515 joined	19:47
	← tomog999 left	19:48
	← _tgunr left	19:48
	→ temmi_hoo joined	19:48
	→ tgunr joined	19:49
	→ t4nk734 joined	19:49
	← tgunr left	19:49
	→ shad joined	19:50
	← MinetestForFun left	19:50
	gitinfo set mode: +v	19:50
t4nk734	Hi everyone, I recently submitted a PR by creating a branch off of my master, when acutally I was supposed to submit a PR by creating a branch off of another branch that is not master	19:50
	how can I fix my PR so that I put my new branch on top of the branch I was supposed to extend	19:51
	I hope that makes sense	19:51
iveqy	t4nk734: sounds strange, usually your PR should be based on master	19:51
t4nk734	I know we have a weird set up	19:51
iveqy	anyhow, the command is rebase, see man git rebase	19:51
gitinfo	the git-rebase manpage is available at http://jk.gs/git-rebase.html	19:51
iveqy	and then you've to do a forced push see man git push (look for -f)	19:51
gitinfo	the git-push manpage is available at http://jk.gs/git-push.html	19:51
	← flashpoint9 left	19:51
t4nk734	What if I just resubmit a new PR	19:52
	→ tgunr joined	19:52
iveqy	t4nk734: then you don't have to do a forced push, but you still need to rebase to get your branch based on "another branch" instead of on master	19:53
t4nk734	okay	19:53
	← PCatinean left	19:53
	← tgunr left	19:53
	→ tgunr joined	19:53
	← tgunr left	19:54
	→ tgunr joined	19:54
	→ dgutierrez1287 joined	19:55
	← tgunr left	19:55
	→ tgunr joined	19:56
	← tgunr left	19:57
	← settermjd left	19:57
	→ miosx joined	19:58
	← thomasreggi left	20:01
	← winegoddess left	20:01
	← pandeiro left	20:02
	→ Hink joined	20:03
	→ Guest48 joined	20:04
	→ SJr joined	20:04
	← dgutierrez1287 left	20:04
	← Guest48 left	20:05
	→ dgutierrez1287 joined	20:05
	→ tgunr joined	20:05
	→ liamonade joined	20:05
	← tinajohnson left	20:05
	← tgunr left	20:05
	→ ahr3n joined	20:05
	→ Lunatrius joined	20:06
	← liamonade left	20:06
	← Hink left	20:07
	← beaconwriter left	20:07
	← bishopj left	20:08
	→ bishopj joined	20:08
	→ adgtl joined	20:08
	→ T3ng` joined	20:08
	← mbrzuzy left	20:09
	← nisseni left	20:10
	← ahr3n left	20:10
fullstack	is there a better way to do 'git diff HEAD HEAD^' and then 'git diff HEAD^ HEAD^^' and then ^^ ^^^ and then ^^^ ^^^^?	20:10
	← tristanp left	20:10
	← theCole left	20:11
	→ eme joined	20:11
	→ MasterPiece joined	20:11
_ikke_	fullstack: git log -p	20:11
fullstack	_ikke_, thanks	20:12
	← gfixler1 left	20:12
	← T3ng` left	20:13
	→ devoldmx joined	20:13
	→ asfdfdfd_ joined	20:14
	← d10n-work left	20:14
	→ jrahmy joined	20:15
	← eme left	20:16
	→ joo-_ joined	20:16
	← nerd left	20:17
	← devoldmx left	20:17
	← asfdfdfd left	20:17
	→ liamonade joined	20:19
	← miosx left	20:19
	← basiclaser left	20:19
	← Phoenixz left	20:20
	← liamonade left	20:20
	→ Phoenixz joined	20:20
	→ ecraven joined	20:21
	← slash77 left	20:21
	← MasterPiece left	20:21
	→ Takumo joined	20:22
	← Takumo left	20:22
	→ Takumo joined	20:22
	→ Gianormagantrous joined	20:22
	← Gianormagantrous left	20:22
	→ Gianormagantrous joined	20:22
	→ mbrzuzy joined	20:22
	→ maletor joined	20:22
	→ grawity joined	20:23
	→ paul424 joined	20:24
	→ stamina joined	20:24
	→ biertie joined	20:24
	→ tristanp joined	20:25
	← dgutierrez1287 left	20:25
	→ nettoweb joined	20:25
	→ Guest59784 joined	20:26
	← jrahmy left	20:26
	→ z0idBerger joined	20:27
	← Guest59784 left	20:27
	→ EvilJStoker_ joined	20:27
	→ gufertum joined	20:28
	← mihaicris left	20:29
	→ noisebleed joined	20:30
Mega	_ikke_: Thank you man!	20:30
_ikke_	You're welcome	20:31
	← DXR left	20:31
paul424	How should I return to the top commit when the working direcotry is modified ?	20:33
	by reset --hard HEAD , right ?	20:33
	← shuaib left	20:33
_ikke_	right	20:35
	Note that you cannot undo it	20:35
	← t4nk734 left	20:35
	← nfk left	20:35
Gianormagantrous	You are at that commit paul424, if you want your working folder and files to represent that commit, yes, you do git reset --hard hence losing your not committed changes	20:36
	← dougsland left	20:36
	← jagob left	20:37
	← tristanp left	20:38
	→ tristanp joined	20:39
	→ tobyx joined	20:40
Gianormagantrous	On another topic: I do not mean to say that detached HEAD is wrong in anyway. I just want you guys opinion on how one should checkout a commit for, say, reviewing purposes. Currently, I do 'git checkout myCommitHash'. Then I do tests, edits, tests and what not and then going back to my current branch HEAD using 'git checkout myBranchPlease'.	20:41
	← biertie left	20:41
	← jteneyck left	20:41
	← darkbasic left	20:41
	← Takumo left	20:41
	→ strayPuppy joined	20:42
	← grawity left	20:42
	→ antispaceman joined	20:42
_ikke_	Nothing wrong with that	20:42
Gianormagantrous	How could I make my working directory reflect a given commit without changing the .git/HEAD file	20:42
	→ biertie joined	20:43
_ikke_	Why would that be a problem?	20:43
	HEAD reflects what you currently have checked out	20:43
	→ theCole joined	20:43
	→ sunny256 joined	20:43
_ikke_	That's its definition	20:43
	→ darkbasic joined	20:43
Gianormagantrous	Yes I you are right, let me explain:	20:44
	→ ahf joined	20:44
	→ bjornars joined	20:44
	→ myme1 joined	20:45
	→ canton7 joined	20:45
	← canton7 left	20:45
	→ canton7 joined	20:45
	→ weox joined	20:45
Gianormagantrous	If I checkout an old commit, I am in detached head. If I want to commit those changes to the tip of my branch (for some reason) I am not sure it is that right way to go	20:45
_ikke_	AS long a they don't conflict, there would be no problem	20:45
	→ Takumo joined	20:46
	← Takumo left	20:46
	→ Takumo joined	20:46
	→ synchronous joined	20:46
_ikke_	And otherwise you'd stash, checkout, apply, fix conflicts	20:46
	← donnib_ left	20:46
	→ grawity joined	20:46
	← NeverDie left	20:46
	→ winegoddess joined	20:46
Gianormagantrous	Ain't there a way to make a working directory reflect a given commit without checking that commit out?	20:47
	← rpage left	20:47
Gianormagantrous	^As if I had edited those file manually to reflect said commit?	20:47
	← sgambino left	20:47
	← BigWillie left	20:47
_ikke_	Gianormagantrous: git checkout <commit> .	20:47
	including the dot	20:48
	→ BigWillie joined	20:48
_ikke_	Note that it will overwrite any uncomitted changes	20:48
	So make sure your working tree is clean	20:48
	← rwb left	20:48
Gianormagantrous	wow thanks _ikke_	20:48
_ikke_	But note that in this case it becomes much harder to commit the changes you want to make	20:49
	→ cdown joined	20:49
	EvilJStoker_ → EvilJStoker	20:50
	← mizu_no_oto left	20:50
Gianormagantrous	Yes, I can see why, but obviously, it depends.	20:50
	→ g0th joined	20:52
Gianormagantrous	Do you know why this gets automatically added to the staging area?	20:52
	→ NeverDie joined	20:52
_ikke_	That's how checkout works	20:53
Gianormagantrous	hmm	20:53
	→ rockstar_ joined	20:53
	→ rockstar__ joined	20:53
Gianormagantrous	I am not sure why though.	20:54
	In the man it says "Updates files in the working tree to match the version in the index or the specified tree."	20:54
	← tvw left	20:55
	→ IWishIKnew joined	20:56
	← sq-one left	20:56
Gianormagantrous	So, lets say you want to revert to an old function you wrote 5 commits ago and commit that to your branch, how would you guys go about doing that?	20:56
	← sarri left	20:56
Gianormagantrous	I find it odd to have to checkout something and then having to unstage that stuff out.	20:57
	← tang^ left	20:57
	← cdown left	20:57
	← Balliad left	20:58
	→ Ornacia joined	20:58
	→ choki joined	20:59
	→ sarri joined	20:59
	← davidkrauser left	20:59
	← jeffreylevesque left	21:00
	← nemix__ left	21:00
	→ nemix_ joined	21:00
	→ nemix__ joined	21:01
Gianormagantrous	Maybe "revert" is what I am looking for.	21:01
	→ druidd joined	21:02
	Gianormagantrous is reading the man page for revert for the first time in years using git…	21:02
	← MarkyC left	21:02
	→ rodrigograca31 joined	21:03
	← cavallari left	21:04
	→ jrahmy joined	21:04
	← druidd left	21:04
	← nemix_ left	21:04
	→ gfixler1 joined	21:05
Gianormagantrous	Or maybe not : "If you want to extract specific files as they were in another commit, you should see git checkout, specifically the git checkout <commit> -- <filename> syntax."	21:05
	← mbrzuzy left	21:09
	← adgtl left	21:09
	→ T3ng` joined	21:09
	→ ilmgb joined	21:09
	→ ahr3n joined	21:09
	→ Dirkson joined	21:12
Dirkson	Hey all. I screwed up my working copy, and want to go back to my last commit. How do I do that?	21:12
	← Gamecubic left	21:12
	← jottr left	21:12
Gianormagantrous	git checkout HEAD	21:12
	git reset --hard	21:13
	← T3ng` left	21:14
	← ilmgb left	21:14
	← winegoddess left	21:14
	← BigWillie left	21:14
j416	Gianormagantrous: "git checkout HEAD" does nothing	21:15
	→ Balliad joined	21:15
Dirkson	Thanks	21:15
Gianormagantrous	yes, j416 I got confused	21:15
	→ tpollard joined	21:15
j416	Gianormagantrous: perhaps you mean "git checkout HEAD ."	21:15
	→ Gamecubic joined	21:16
	→ FrostyX joined	21:17
	→ jottr joined	21:18
	← pantsman- left	21:18
	→ winegoddess joined	21:19
	← rnsanchez left	21:20
	← allcentury left	21:20
	← bmilesp left	21:20
	→ mbrzuzy joined	21:21
	← abacuspowers left	21:21
	← jmpp left	21:21
	← jrahmy left	21:21
	→ BigWillie joined	21:21
	← chitopunk left	21:22
	← winegoddess left	21:23
	→ liamonade joined	21:23
	→ winegoddess joined	21:23
	← BigWillie left	21:24
	← shad left	21:24
	→ tristanseifert joined	21:24
	→ otter768 joined	21:28
	← BBBThunda left	21:30
	← CKyle left	21:30
	→ wEs joined	21:32
	← wEs left	21:32
	→ wEs joined	21:32
	← winegoddess left	21:32
	← mbrzuzy left	21:32
	← bb010g left	21:33
	← otter768 left	21:33
	← Balliad left	21:33
	← negaduck left	21:34
	→ adgtl joined	21:34
	← LBV_User left	21:35
	→ dsdeiz joined	21:35
	→ jmpp joined	21:35
	→ ok4n joined	21:36
	→ elux joined	21:36
	← bishopj left	21:37
	→ bishopj joined	21:38
	← gamename left	21:41
	← gopar left	21:41
	→ mchelen1 joined	21:41
mchelen1	when i do `git stash` does it go to the end (highest number) or beginning (lowest number)?	21:42
	← tag left	21:42
	← Jackneill left	21:43
	← theCole left	21:43
	→ bmilesp joined	21:44
spaceone	gr, i always end up in this error:	21:44
	Your branch and 'upstream/fix_ssl_handshake#114' have diverged,	21:44
	and have 37 and 36 different commits each, respectively.	21:44
	(use "git pull" to merge the remote branch into yours)	21:44
	I don't know how to fix this / what i am doing wrong	21:44
	→ duckmaestro joined	21:44
	← jottr left	21:45
spaceone	if i make a diff of the branches i only get my local changes.	21:45
	i also fixed the order of the commits with rebase -i	21:46
	still the same error	21:46
	→ FernandoBasso joined	21:47
	→ jrahmy joined	21:48
	→ SonikBoom joined	21:50
	→ axl__ joined	21:51
	→ negaduck joined	21:51
	← elux left	21:52
FernandoBasso	I have a repository foo on a local drive. I want to do git clone /path/to/foo /path/to/bar, to create copy of foo locally, change bar and push back to foo, always locally. Is that possible?	21:52
	← axl_ left	21:52
	axl__ → axl_	21:52
FernandoBasso	I read about bare repos, but I am still uncertain.	21:54
	→ T3ng` joined	21:55
	← gufertum left	21:55
	← z0idBerger left	21:55
	→ gufertum joined	21:55
bremner	FernandoBasso: is there some reason you don't just try it? what seems to be the actual difficulty?	21:55
	← gufertum left	21:55
FernandoBasso	bremner: I will later update the files of this "bare" repo to an ftp server, which is the deploy method for this particular project. But then, the bar repo has git directories scattered in that directory.	21:56
	→ toothrot joined	21:57
FernandoBasso	Perhaps this is not the right approach, that is why I ask.	21:57
	← jrahmy left	21:57
bremner	I see. well I guess you've read the standard deploy blurb, I don't have anything to add to that.	21:57
FernandoBasso	I want to test locally, in a "copy" of the main project, push back to that main project, and then upload through ftp.	21:57
	← Gama11 left	21:57
FernandoBasso	bremner: Okay. Thanks.	21:58
	← bango2 left	21:58
	→ m0ltar joined	21:58
	← sentriz left	21:58
	← malavv left	21:58
	← Dougie187 left	21:58
	→ daito_ joined	21:59
	← blimpse left	22:00
	← macabre left	22:00
	→ mizu_no_oto joined	22:00
	→ jeffreylevesque joined	22:01
	← jeffreylevesque left	22:01
	→ jeffreylevesque joined	22:01
	← victortyau left	22:02
	← Mega left	22:03
	→ nerium joined	22:03
nerium	How can I check if a branch/tag exists?	22:04
	← daito_ left	22:04
	→ tjm_jimmy joined	22:05
	→ nerd joined	22:06
	← mchelen1 left	22:08
	← Es0teric left	22:08
	→ CKyle joined	22:09
Gianormagantrous	nerium, you can check in .git/refs/tags and .git/branches	22:10
	→ jml32ljl2 joined	22:10
Gianormagantrous	also 'git tag -l' and 'git branches -al'	22:10
	→ vikas027 joined	22:10
Gianormagantrous	branch	22:11
	← intellix left	22:12
	← nettoweb left	22:14
	→ devoldmx joined	22:14
	← IWishIKnew left	22:15
preaction	there's also git show-ref	22:15
	→ aucecil joined	22:16
	→ sssilver joined	22:17
	← devoldmx left	22:18
	→ BigWillie joined	22:18
	← gargola left	22:18
	← adgtl left	22:20
	← NeckBeardPrince left	22:20
	→ anoob joined	22:20
	← editshare-ericf left	22:20
	← CKyle left	22:21
	← mizu_no_oto left	22:22
	← Kicer86 left	22:23
	→ tgunr joined	22:24
anoob	i've not added my files to index and removed then with git reset --hard ... is it possible to recover them? :(	22:24
	→ aeo1ackn joined	22:24
	← pratikma_ left	22:24
Eugene	Nope; they're gone. Sorry.	22:24
matthiaskrgr	you might be lucky with extundelete	22:25
	(if you run ext as a FS)	22:25
	← markelite left	22:26
	← aeo1ack left	22:26
	← stamina left	22:27
	→ whitby joined	22:28
	→ s8321414 joined	22:29
	← anoob left	22:30
	← wrouesnel2 left	22:32
	→ madewokherd joined	22:32
	← BigWillie left	22:32
	← NeverDie left	22:35
	← noisebleed left	22:36
	→ skirk joined	22:36
	← strayPuppy left	22:36
	← choki left	22:37
	→ nate_c joined	22:37
	→ markelite joined	22:37
	← thedodd left	22:37
nerium	Is there a way to specify a branch when using git ls-files?	22:37
	← jmpp left	22:39
	← StuartMI left	22:39
	→ WaReZ joined	22:40
	→ NeverDie joined	22:42
	← gfixler1 left	22:42
	← ignas left	22:43
	← axl_ left	22:43
	→ jottr joined	22:43
	→ aeo1acks joined	22:44
	→ adgtl joined	22:44
	→ endiruna joined	22:44
	→ hc123 joined	22:45
	← WaReZ left	22:45
	← aeo1ackn left	22:45
hc123	hi, i have a quick question, i have 2 branches (master and experiment), and master just got a bug fix that i want in experiment. is the best choice to do a rebase?	22:46
	← SonikBoom left	22:46
hc123	i still want to keep both branches	22:46
phroa	your options are to merge the branches or copy the commit with cherry-pick	22:47
	→ adgtl_ joined	22:47
phroa	I suggest merge unless you have features you don't want in both; cherry-pick is often confusing to look at later	22:48
hc123	ok thanks	22:49
	→ gfixler1 joined	22:50
phroa	merging hotfixes back to develop & master is how git-flow recommends you do it, if that matters.	22:51
	← adgtl left	22:51
	← jottr left	22:51
	→ nemix joined	22:53
	← nemix__ left	22:53
	← weox left	22:55
	→ btree joined	22:57
	→ pratikmallya joined	22:57
	→ ASOLAr joined	22:57
	→ jmpp joined	22:58
	← CEnnis91 left	22:59
	← D-Boy left	23:00
	← nnyk_ left	23:00
	← dsdeiz left	23:01
	← multi_io left	23:02
	→ multi_io joined	23:03
	← btree left	23:05
	→ diegoviola joined	23:06
	→ D-Boy joined	23:06
	→ druidd joined	23:07
	← ASOLAr left	23:08
	← adgtl_ left	23:08
	→ ilmgb joined	23:10
	→ allcentury joined	23:11
	← m0ltar left	23:11
	← cagedwisdom left	23:12
	← ilmgb left	23:14
	→ fracting joined	23:14
	← nerium left	23:15
	→ nerium joined	23:16
	→ Padawan joined	23:19
	← rockstar_ left	23:19
	← fracting left	23:19
	← rockstar__ left	23:20
	← prefixed left	23:20
	← yqt left	23:20
	← paul424 left	23:23
	→ Guest48 joined	23:24
	→ cagedwisdom joined	23:24
	← cbonobo left	23:26
	→ WaReZ joined	23:28
	← druidd left	23:28
	→ otter768 joined	23:29
	→ jasom joined	23:30
	← hexagoxel left	23:30
	→ cdown joined	23:30
jasom	I ran out of disk space during a repack; how do I clean up my .git directory?	23:30
phroa	man git fsck man git gc man git clean depending on definitions of "clean"	23:31
gitinfo	the git-fsck manpage is available at http://jk.gs/git-fsck.html	23:31
	the git-gc manpage is available at http://jk.gs/git-gc.html	23:31
	the git-clean manpage is available at http://jk.gs/git-clean.html	23:31
jasom	phroa: thanks	23:31
	→ hexagoxel joined	23:31
	→ fracting joined	23:33
	← otter768 left	23:34
	← Kallis left	23:36
jasom	phroa: hmm, that still seems to leave tmp_pack* files around, is it safe to delete those?	23:36
	← AaronMT left	23:37
phroa	I don't think I'm qualified to answer that	23:37
Eugene	I say go for it, but I'm a bit reckless	23:37
	← allcentury left	23:37
jasom	I have another clone of the repo elsewhere, so not a big deal if I lose it	23:37
Eugene	If you get missing objects, just fetch	23:37
	→ r4zz joined	23:37
	← tjm_jimmy left	23:38
Eugene	Yup. git doesn't care if half the repo is missing, it'll figure ito ut	23:38
	→ NeckBeardPrince joined	23:38
	→ tjm_jimmy joined	23:38
	← bishopj left	23:41
	← tachoknight left	23:41
	→ bishopj joined	23:42
	→ dsdeiz joined	23:42
	← dsdeiz left	23:42
	→ dsdeiz joined	23:42
	→ nettoweb joined	23:42
	← snowcycle left	23:42
	← WaReZ left	23:43
	→ rarepreppe joined	23:44
	← jml32ljl2 left	23:44
	← asfdfdfd_ left	23:44
	← kpease left	23:46
	← s00pcan left	23:50
	→ s00pcan joined	23:52
	← tjm_jimmy left	23:52
	← the_cybersphinx left	23:52
	← cdown left	23:53
	← GoddeR left	23:53
	← NeckBeardPrince left	23:54
	← pratikmallya left	23:55
	← r4zz left	23:56
	→ the_cybersphinx joined	23:56
	← oojacoboo left	23:56
	→ Star_ joined	23:58
	← fstd left	23:59
	→ fstd joined	23:59

Logs Search ←Prev date Next date→

Channels Documentation