IRCloggy #git 2016-01-27

Provider of IRC logs since 2005.

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

	2016-01-27
JTeatime	https://git-scm.com/docs/git-filter-branch	00:00
	← d4rklit3 left	00:00
	→ tildes joined	00:00
Emperor_Earth	thanks, i'll bookmark that for when i need the nucllear option	00:00
JTeatime	just be super careful never to commit, and especially never to push, anything sensitive; because you're right, it's a huge PITA to "fix" (however, this difficulty is actually a symptom of a feature of git, and not a bug.)	00:01
	→ funfunctor joined	00:01
funfunctor	Hi	00:01
	→ macefr joined	00:02
	→ citizen-stig joined	00:02
	→ junw joined	00:02
Emperor_Earth	^^ fortunately, i only dev on machines with keys i don't care about. but it still looks bad in the commit history	00:02
	hey funfunctor	00:02
JTeatime	yeah; the clean commit graph is easy to fix since you haven't pushed :)	00:02
	you can rewrite history all you want before you push	00:02
	and never after; that's the golden rule.	00:02
	← faux___ left	00:02
funfunctor	I am trying to figure out how to effectually deal with rebasing some 800 odd kernel patches. I know of course how to do basic rebases and typically only deal with 50 patches max. How does one deal with such large sets in good O-time? :)	00:03
Emperor_Earth	if i reset --hard, it'll remove all traces, even references, correct?	00:03
	there's probably a function to compare the changes, so i can just manually copy/paste	00:03
JTeatime	no	00:03
	the reference I was referring to will still be in .git	00:03
Emperor_Earth	ah snap	00:03
JTeatime	however, --hard will also reset your working tree	00:03
	→ jam_ joined	00:03
	→ bronson joined	00:03
	→ Wetmelon joined	00:04
funfunctor	Emperor_Earth: git reflog still contains stuff, git does its best no to loss stuff	00:04
	← junw left	00:04
JTeatime	Emperor_Earth: this might help explain why: http://eagain.net/articles/git-for-computer-scientists/	00:05
	when you do git-reset you're just moving the yellow sticky note, the pointer-to-some-data.	00:05
	and the rest of git will begin ignoring the data-that-nothing-points-to	00:06
	but the data itself still exists	00:06
Emperor_Earth	yeah, i think i'll just have to live with that for now	00:06
	← citizen-stig left	00:06
Emperor_Earth	i enterred "git reset HEAD^" and get a message "More?" back	00:06
	← t0by left	00:06
JTeatime	git gc --prune=all	00:07
	might remove it	00:07
funfunctor	Emperor_Earth: thats why git talks about garbage collection, it cleans up unref heads	00:07
Emperor_Earth	do i type "no"?	00:07
	→ flashpoint9 joined	00:07
	← flashpoint9 left	00:07
JTeatime	uh, I dunno why it would say 'More?'	00:07
Emperor_Earth	no idea	00:07
funfunctor	So any idea how I can deal with my huge rebase issue?	00:07
	← nettoweb left	00:08
Emperor_Earth	sorry funfunctor . i'd help but you're clearly more well-versed	00:08
	← jam_ left	00:08
funfunctor	Emperor_Earth: understood thx	00:08
	→ eka joined	00:08
JTeatime	funfunctor: is your problem that git will take a long time to do it, or that you have to do lots of manual merging ?	00:08
	← espindola left	00:08
JTeatime	(and yes you know more than me so I'm not going to be able to help either :)	00:09
	← bronson left	00:09
	← mattfoo left	00:09
Emperor_Earth	The "More?" message-- http://i.imgur.com/u7rcatj.png	00:09
funfunctor	JTeatime: well for a start I am not sure how much manual merging is going to be required. Is there a way to get a list of files that will conflict?	00:09
	← King_Hual left	00:09
JTeatime	yeah, attempt the operation :)	00:09
funfunctor	JTeatime: I know that it takes a while to calculate all those SHA1 sums	00:10
	← damascene left	00:10
funfunctor	JTeatime: well no, because git afaik will only tell me what conflicts per commit. I am asking how to know up front for a set of commits	00:10
JTeatime	it doesn't sound to me like a problem, 'cause git is super-fast and so are modern CPUs	00:10
	oh	00:10
funfunctor	don't worry about the speed issue, not talking about that here.	00:11
	My question is more to do with workflow	00:11
	how do others deal with large kernel rebases usually	00:11
JTeatime	linus yells at them, and the pressure makes them think more clearly.	00:12
	(I got nothing.)	00:13
	I don't suppose git-rerere would help you any?	00:14
funfunctor	whats that?	00:15
	→ xameada joined	00:15
JTeatime	well, I'm not sure, I've been trying to figure it out	00:15
funfunctor	lol@re linus - probably correct.	00:15
	→ aem34i` joined	00:15
JTeatime	but it seems to be a device to remember when you de-conflict merges, and if the same conflict comes around again somehow, you don't have to do it manually again	00:16
	→ mattfoo joined	00:16
	← Spacew00_ left	00:16
funfunctor	thanks for the pointer, reading https://git-scm.com/blog/2010/03/08/rerere.html now	00:17
JTeatime	was a random guess; good luck.	00:17
	← aem34i left	00:17
funfunctor	thx, i'll hang around and see if anyone else pings me with other solutions too	00:17
	← dopesong_ left	00:17
JTeatime	heh my stupid alias is still broken	00:18
	← ferr left	00:18
JTeatime	why is it always trivial details that end up taking the hours.	00:18
	hrm, I guess it's the && that it doesn't like... no error if I replace that with ;	00:19
	← fscala left	00:19
	← Brando753 left	00:20
	← hexagoxel left	00:20
	→ Brando753 joined	00:21
	→ fscala joined	00:21
	← kpease left	00:22
	→ hexagoxel joined	00:23
	← diegoviola left	00:25
	← ncd\|leeN left	00:25
	← rook2pawn left	00:26
	→ kpease joined	00:27
	→ MarkyC joined	00:28
	← User458764 left	00:28
	← krawchyk left	00:28
	→ the_cybersphinx joined	00:28
kadoban	JTeatime: That's … curious. I wonder if I don't understand how ! really works in aliases.	00:29
	→ krawchyk joined	00:29
JTeatime	googling is suggesting to me that my problem is in handling parameters	00:29
	← cybersphinx left	00:29
	← krawchyk left	00:29
JTeatime	which I mean, I didn't think there were any parameters	00:30
	← kpease left	00:30
	→ krawchyk joined	00:30
JTeatime	I actually remember havign had this issue before, long ago... maybe twice.	00:31
	I shouldn't give up again, I should figure it out this time ;)	00:31
	→ HenriettaSalt joined	00:32
	← m0viefreak left	00:32
kadoban	JTeatime: You should, and share your results :)	00:32
	← krawchyk left	00:35
	← tang^ left	00:35
	← dreiss left	00:36
	→ lucasmali joined	00:40
	← lucasmali left	00:44
	← cdg left	00:45
	← Vgr left	00:45
	← rikonor left	00:46
	← mischat left	00:47
	← paddyez left	00:49
	← alanwill left	00:50
	→ ensyde joined	00:50
	→ Lyqyd joined	00:50
	→ crayon joined	00:51
	→ maneco joined	00:51
	← chitopunk left	00:52
	→ fahadash joined	00:52
	→ faux___ joined	00:52
	← maneco left	00:53
	← Fissure left	00:53
	→ sebastian joined	00:53
	→ maneco joined	00:53
	← Sonderblade left	00:54
	→ bannakaffalatta joined	00:55
	← sebastia- left	00:56
	← faux___ left	00:56
	→ faux___ joined	00:57
	Guest34283 → wanderer	00:57
	wanderer → Guest57677	00:58
	→ huQeQwdpu47q joined	00:58
	← triuba left	00:58
	← fstd left	00:59
	← huQeQwdpu47q left	00:59
	→ davidosomething joined	00:59
	→ jargan joined	01:00
	← imachuchu left	01:00
	→ huQeQwdpu47q joined	01:00
	→ daito joined	01:00
	→ fstd joined	01:00
	← jast left	01:00
	→ jottr_ joined	01:01
	← mkopriva left	01:01
	← irc-5225225 left	01:01
	← jottr left	01:01
	← HenriettaSalt left	01:02
	jottr_ → jottr	01:03
	← BennyPlayboy_ left	01:03
	← xameada left	01:03
	← clemf left	01:03
	→ BennyPlayboy joined	01:04
	← daito left	01:04
	→ abc123 joined	01:05
	← Guest57677 left	01:05
	→ Guest57677 joined	01:05
	Guest57677 → giraffe	01:05
	→ Fissure joined	01:05
	→ nnyk_ joined	01:05
	← abc123_ left	01:05
	abc123 → abc123_	01:05
	← hyperair left	01:06
	← AAoK left	01:06
	← sibach left	01:06
JTeatime	ok, well, I give up again	01:07
	this shit is insance	01:07
	→ vkngpmhc joined	01:07
JTeatime	*insane. I replaced it with this ~/bin/git-start script:	01:07
	#!/bin/bash	01:07
	git init	01:07
	git commit --allow-empty -m "[empty] Initial commit."	01:07
	→ cbonobo joined	01:08
	→ abc123 joined	01:10
	→ cbonobo_ joined	01:10
	← abc123_ left	01:10
	abc123 → abc123_	01:10
	→ scottschecter joined	01:11
	← scottschecter left	01:11
	← cbonobo left	01:13
	→ jteneyck joined	01:14
	← giraffe left	01:15
	→ wanderer_ joined	01:15
	← wanderer_ left	01:15
	→ wanderer_ joined	01:15
	wanderer_ → giraffe	01:16
	← raijin left	01:16
	← xaa left	01:16
	← mwhooker left	01:16
	← Soni left	01:17
	← Jusle left	01:19
	← tildes left	01:20
	→ irc-5225225 joined	01:21
	→ bb010g joined	01:21
	gitinfo set mode: +v	01:21
	→ tildes joined	01:21
	→ ahr3n_ joined	01:21
	← ahr3n left	01:21
	→ asya_counsyl joined	01:22
	← ensyde left	01:22
	← abc123_ left	01:24
	→ abc123 joined	01:24
	→ ascarter joined	01:24
qsx	kadoban: either it spawns the process directly or it is passed to sh -c	01:25
	→ ascarter_ joined	01:25
	← nonconvergent left	01:25
	→ n00bdev joined	01:26
	→ Gsham joined	01:26
	← bitkiller left	01:28
	→ ome joined	01:29
	→ terminal_echo joined	01:30
	← vkngpmhc left	01:33
	→ mizu_no_oto joined	01:33
	→ harish joined	01:34
	← tvw left	01:35
	→ espindola joined	01:35
	← msonntag left	01:35
	← Guest75614 left	01:37
	→ AtnevRed joined	01:38
	→ daito joined	01:39
	→ rchavik joined	01:40
	→ alanwill joined	01:40
	← ascarter left	01:41
	← ascarter_ left	01:41
	← diogenese left	01:42
	← AtnevRed left	01:42
	→ mkopriva joined	01:43
	→ Soni joined	01:43
	→ diogenese joined	01:44
	← espindola left	01:46
	← nnyk_ left	01:47
	← mkopriva left	01:47
	→ clemf joined	01:50
	→ \|node joined	01:50
	← bollullera left	01:50
	→ ignas joined	01:55
	→ BadCoderFinger joined	01:56
	← boombatower left	01:58
	frogonwheels_ → frogonwheels	01:59
	→ boombatower joined	01:59
	← tlaxkit left	01:59
	← terminal_echo left	02:00
	→ mattp_ joined	02:01
	← radsy left	02:01
	← pks left	02:01
	← weox left	02:02
	→ citizen-stig joined	02:03
	→ pks joined	02:03
	← MarkyC left	02:04
	→ bronson joined	02:04
	→ jam_ joined	02:04
	← mizu_no_oto left	02:05
	→ SimonNa joined	02:06
	← mezod left	02:06
	← strayPuppy left	02:06
	→ rclanan joined	02:07
	← citizen-stig left	02:08
	← jam_ left	02:09
	← bronson left	02:09
	← liamonade left	02:09
	→ donmichelangelo joined	02:09
	← Sasazuka left	02:10
	→ dstarh joined	02:11
	← michelangelo left	02:12
	← peoliye__ left	02:12
	→ beaconwriter joined	02:12
	← algae left	02:13
	← diogenese left	02:13
	← rclanan left	02:13
	← Gamecubic left	02:15
	→ Gamecubic joined	02:15
	→ vkngpmhc joined	02:15
	→ diogenese joined	02:16
	← thiago left	02:18
	→ strayPuppy joined	02:19
	← davidosomething left	02:19
	← therealGent left	02:20
	← localuser left	02:22
	← aeontech left	02:24
	→ livingstn joined	02:24
	→ tyll joined	02:25
	← skcin7 left	02:25
	← strozyka left	02:25
	← blahdodo left	02:25
	→ guampa joined	02:26
	← vkngpmhc left	02:26
	← tyll_ left	02:27
	← freedg left	02:27
	← harish left	02:28
	→ SimonNaa joined	02:28
	→ xameada joined	02:28
	→ harish joined	02:28
	← ril left	02:29
	← victortyau left	02:31
	← SimonNa left	02:32
	→ nilsi joined	02:32
	← diogenese left	02:32
	← glebihan_ left	02:33
	← tildes left	02:35
	→ vkngpmhc joined	02:35
	← kermit left	02:35
	→ Vampire0 joined	02:36
	→ blahdodo joined	02:36
	→ mkopriva joined	02:37
	→ CheckDavid joined	02:37
	← clemf left	02:38
	→ wanderer joined	02:38
	wanderer → Guest21840	02:39
	← Guest21840 left	02:39
	← shinnya left	02:39
	← Vampire0_ left	02:39
	← Ldip left	02:40
	← CrazyBonz left	02:40
	→ clemf joined	02:40
	← alanwill left	02:41
	→ CrazyBonz joined	02:42
	→ nonconvergent joined	02:42
	← n00bdev left	02:42
	← ahr3n_ left	02:43
	→ mischat joined	02:44
	→ durham_ joined	02:44
	← nonconvergent left	02:44
	→ [Saint_] joined	02:45
	← hyphenated left	02:46
	← [Saint] left	02:46
	→ mablae_ joined	02:46
	→ Vgr joined	02:47
	← durham left	02:48
	← mellernoia-work left	02:48
	← faux___ left	02:48
	→ ahr3n joined	02:49
	→ reim joined	02:49
	← mablae__ left	02:49
	→ diogenese joined	02:49
	← mischat left	02:50
	Soni → cat5e	02:51
	← JTeatime left	02:51
	← Powersource left	02:52
	← frem left	02:52
	← codedmart left	02:57
	← trumee left	02:58
	← yqt left	02:58
	← Gsham left	02:58
	← daito left	02:59
	→ Poppa joined	02:59
	← Poppabear left	02:59
	← govg left	03:01
	← pks left	03:01
	→ System42 joined	03:01
	→ aeontech joined	03:02
System42	Anyone familiar with using ssh for git? I'm having a weird problem. One of my repos refuses to authenticate, but another one is fine. I've worked through most of the checks found here https://help.github.com/articles/error-permission-denied-publickey/#platform-linux but nothing.	03:02
	← durham_ left	03:03
	→ pks joined	03:03
	→ n00bdev joined	03:03
	← jaguarmagenta left	03:04
	→ skcin7 joined	03:04
	→ kpease joined	03:04
	← kpease left	03:06
	← githogori left	03:07
	← yongyung left	03:08
	→ govg joined	03:08
	→ jaguarmagenta joined	03:08
	→ yongyung joined	03:09
	→ rclanan joined	03:10
	← harish left	03:11
	→ thiago joined	03:12
	← presto left	03:12
	← mkopriva left	03:13
	→ alanwill joined	03:14
	← cat5e left	03:15
	→ watabou joined	03:15
	→ githogori joined	03:15
	← rclanan left	03:15
	→ Soni joined	03:16
	Soni → cat5e	03:16
	→ ssinfod joined	03:18
	← n00bdev left	03:18
	→ peoliye joined	03:20
	gitinfo set mode: +v	03:20
	← nyuszika7h left	03:21
ssinfod	hello, i have a question about setting up a git server in ubuntu 14.04.	03:21
	← Samual left	03:21
	← boombatower left	03:21
ssinfod	I followed the instructions from here: https://www.linux.com/learn/tutorials/824358-how-to-run-your-own-git-server	03:22
	my server is working OK but I must be logged in.	03:22
	if I log out, then I cannot "push"	03:22
	→ boombatower joined	03:23
ssinfod	Is this normal ?	03:23
	So, if I want to push from another computer (client), I must first log on on the server computer with the user.	03:24
	→ raghu_ joined	03:25
phroa	that's a little weird. do you have a moment to talk about our lord and saviour !gitolite, though?	03:28
gitinfo	Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/	03:28
phroa	perhaps the git server daemon is only running when your git account is logged in?	03:28
ssinfod	how do I install the git server daemon so it is always running ?	03:31
	(wihout a user logged in)	03:31
	→ gfixler joined	03:31
	→ jaguarmagenta2 joined	03:32
	← diogenese left	03:32
	← aem34i` left	03:33
	← vkngpmhc left	03:33
phroa	sorry, just giving ideas. I don't actually know the proper path to take on ubuntu.	03:33
	→ xameada_ joined	03:34
	← jaguarmagenta left	03:34
	← maneco left	03:34
ssinfod	ideas are good for me ! just looking for some reason and what to look for..	03:34
	← chachasmooth left	03:35
	→ chachasmooth joined	03:36
	→ nyuszika7h joined	03:37
phroa	here's a link to the git book's section, if it's useful. https://git-scm.com/book/en/v2/Git-on-the-Server-Git-Daemon	03:37
	← ome left	03:37
	← xameada left	03:37
	→ Sazhen86 joined	03:38
ojacobson	It looks like that's a tutorial for setting up gitlab	03:38
	have you talked to the gitlab folks?	03:38
	→ Gsham joined	03:38
sitaram	ssinfod: phroa may be on the right track; I believe ubuntu uses a kind of "home directory encryption" that only decrypts the home folder when the user is logged in. Maybe far-fetched, but worth looking at... easy to test; just do an "ls -al" and see what you see in both cases I suppose	03:38
	→ AtnevRed joined	03:39
	→ rkazak joined	03:40
ssinfod	ok, I will read about git daemon and check about home folder encryption.. thanks	03:41
	→ nbdy joined	03:42
	← aeontech left	03:42
	← AtnevRed left	03:43
	← nbdy left	03:43
	← jottr left	03:43
	← crayon left	03:45
	← ssinfod left	03:46
	→ mischat joined	03:46
	→ msonntag joined	03:47
	← robbyoconnor left	03:48
	← nilsi left	03:48
	→ robbyoconnor joined	03:48
	← robbyoconnor left	03:49
	→ robbyoconnor joined	03:49
	← samw left	03:49
	← mischat left	03:50
	← raghu_ left	03:52
	← BadCoderFinger left	03:53
	→ felixn_ joined	03:57
	← beaconwriter left	03:58
	← watabou left	03:59
	→ daito joined	04:00
	← felixn left	04:00
	→ mkopriva joined	04:02
	→ watabou joined	04:02
	← clemf left	04:03
	← amdi_ left	04:03
	← yongyung left	04:03
	← daito left	04:04
	→ citizen-stig joined	04:04
	→ yongyung joined	04:04
	→ jam_ joined	04:05
	← aidalgol left	04:06
	→ bronson joined	04:06
	→ dances-with-cats joined	04:07
	← citizen-stig left	04:09
	→ raghu_ joined	04:09
	← jam_ left	04:09
	← Vgr left	04:09
	→ treaki_ joined	04:10
	← elementalest left	04:11
	→ rclanan joined	04:11
	→ Vgr joined	04:11
	← System42 left	04:11
	← bronson left	04:11
	← asya_counsyl left	04:14
	← githogori left	04:14
	→ wgrant joined	04:14
	← treaki left	04:14
	← rclanan left	04:15
	← dances-with-cats left	04:16
	← alanwill left	04:18
	→ dances-with-cats joined	04:20
	sublimate → magic	04:21
	→ crayon joined	04:22
	→ samw joined	04:22
	→ diogenese joined	04:23
	→ mohabaks joined	04:23
	→ yrter joined	04:24
	← s00pcan left	04:25
	← GT left	04:25
	← Sazhen86 left	04:25
	→ s00pcan joined	04:27
	← samw left	04:27
	← ahr3n left	04:28
	← dstarh left	04:28
	← sparetire left	04:29
	← jteneyck left	04:30
	← watabou left	04:30
	→ jam_ joined	04:30
	← fscala left	04:31
	→ pungi-man joined	04:32
	← s00pcan left	04:32
	→ s00pcan joined	04:33
	→ fscala joined	04:34
	← bbbthunda_ left	04:35
	← mkopriva left	04:35
	→ sctskw joined	04:37
	→ zacts joined	04:37
	→ jteneyck joined	04:38
	→ jottr joined	04:39
	← livingstn left	04:40
	→ Goplat joined	04:40
	← Sucks left	04:42
	← rkazak left	04:43
	← dsdeiz left	04:43
	→ dsdeiz joined	04:43
	→ elementalest joined	04:44
	← elementalest left	04:44
	→ elementalest joined	04:44
	← jottr left	04:45
	← mohabaks left	04:45
	← italoacasas left	04:46
	← ignas left	04:46
	← nivag left	04:47
	→ mischat joined	04:47
	→ daito joined	04:47
	→ Limes_ joined	04:48
	→ User458764 joined	04:49
	→ nivag joined	04:49
	← mischat left	04:52
	→ nilsi joined	04:52
	← sdothum left	04:53
	← Limes_ left	04:53
	→ leeN joined	04:54
	→ espindola joined	04:56
	→ tildes joined	04:56
	← espindola left	04:56
	← joki left	04:58
	← d10n-work left	04:58
	→ Dreamer3_ joined	04:59
	← raghu_ left	04:59
	→ faux___ joined	05:00
	→ joki joined	05:03
	← diegoaguilar left	05:03
	← faux___ left	05:04
	→ alanwill joined	05:07
	← Gsham left	05:08
	← jjttjj left	05:12
	← User458764 left	05:12
	→ rclanan joined	05:12
	→ mohabaks joined	05:13
	← arooni left	05:15
	→ arooni joined	05:15
	→ Manikandan joined	05:16
	← rclanan left	05:17
	← avgn5 left	05:18
	← peoliye left	05:20
	← mohabaks left	05:21
	← xameada_ left	05:25
	→ mkopriva joined	05:25
	← sctskw left	05:29
	← jteneyck left	05:29
	→ sctskw joined	05:29
	← felixn_ left	05:29
	← knownasilya left	05:30
	→ blackwind_123 joined	05:31
	← sctskw left	05:34
	← govg left	05:35
	→ peoliye joined	05:35
	→ weox joined	05:35
	→ mohabaks joined	05:35
	→ govg joined	05:36
mohabaks	how can i gitignore a directory	05:38
Bombe	The same way you gitignore anything else.	05:38
	→ flavi0 joined	05:38
	→ AtnevRed joined	05:40
	→ felixn joined	05:40
	→ a3Dman joined	05:41
	← Chill_Surf left	05:41
	→ jottr joined	05:41
	→ tristanp_ joined	05:42
	← tristanp left	05:44
	← AtnevRed left	05:44
	← Cabanossi left	05:44
mohabaks	i tried .ropeproject/* in .gitignore	05:45
	but still git track it	05:45
ojacobson	You can't ignore tracked files	05:45
mohabaks	ooh	05:46
	→ Cabanossi joined	05:47
	← jottr left	05:47
	→ mischat joined	05:48
	← dances-with-cats left	05:48
	→ rkazak joined	05:48
	→ xameada_ joined	05:52
	← mischat left	05:52
	← apiarian left	05:54
	→ apiarian joined	05:54
	← mattp_ left	05:55
	← mohabaks left	05:55
	← [Saint_] left	05:56
	← Wetmelon left	05:56
	→ glebihan joined	05:56
	→ freimatz joined	05:57
	← mkopriva left	05:59
	→ edude03 joined	05:59
	→ mohabaks joined	06:00
	← blackwind_123 left	06:00
	← arooni left	06:00
	→ dtrott joined	06:01
	→ daito_ joined	06:01
	← dr_lepper left	06:02
	→ blackwind_123 joined	06:02
	← asd6a left	06:02
	← Gamecubic left	06:02
	→ Gamecubic joined	06:03
	← hwoarang left	06:03
	← xvx left	06:04
	← daito left	06:04
	→ citizen-stig joined	06:05
	→ rclanan joined	06:05
	← rkazak left	06:06
	← tpollard left	06:07
	→ bronson joined	06:08
	← citizen-stig left	06:09
	→ ril joined	06:10
	← rclanan left	06:10
	← jam_ left	06:11
	← bronson left	06:13
	→ nilg joined	06:14
	← xameada_ left	06:14
	← cbonobo_ left	06:15
	→ rscata joined	06:15
	→ hwoarang joined	06:17
	→ asd6a joined	06:17
	← eggoez left	06:19
	→ dr_lepper joined	06:19
	→ noyb joined	06:20
	← ohcibi left	06:20
	→ githogori joined	06:21
	→ mattp_ joined	06:22
	← mohabaks left	06:24
	← edude03 left	06:25
	← blckbit10 left	06:27
	→ blckbit10 joined	06:28
	→ apotry joined	06:28
	← cebor left	06:29
	→ mohabaks joined	06:29
	→ [Saint] joined	06:30
	→ cebor joined	06:36
	→ cbonobo joined	06:39
	→ Macaveli joined	06:39
	← Macaveli left	06:39
	← st0opkid left	06:40
	← nilg left	06:41
	← leeN left	06:41
	→ rkazak joined	06:41
	→ jottr joined	06:42
	→ radsy joined	06:42
	→ Po joined	06:43
	→ zeroed joined	06:44
	← zeroed left	06:44
	→ zeroed joined	06:44
	→ ThomasLocke joined	06:44
	→ leeN joined	06:44
	→ nilg joined	06:45
	→ hyphenated joined	06:45
	← jottr left	06:47
	→ mischat joined	06:49
	→ eggoez joined	06:49
	← CheckDavid left	06:49
	← freimatz left	06:50
	→ mkopriva joined	06:50
	→ h43k3r joined	06:50
	← rkazak left	06:50
	→ nick\|here joined	06:51
	← mischat left	06:53
	→ deepy- joined	06:54
	→ mariuscc joined	06:56
	gitinfo set mode: +v	06:56
	→ jordanm joined	06:57
	→ ohcibi joined	06:57
	← Po left	06:57
jordanm	is it possible to determine a revision for a given tag without cloning a repository?	06:57
deepy-	Is there some string or something I can put in a file that'll turn into the revision that's checked out?	06:57
	← HelloAtMega left	06:58
Fissure	jordanm: git ls-remote will show the sha1 for all refs in the repository	06:59
	← h43k3r left	06:59
	→ h43k3r joined	06:59
	← deepy- left	07:00
	→ n00bdev joined	07:00
	→ dreiss joined	07:01
	→ TomyLobo joined	07:01
	→ daito joined	07:02
	→ johnsno joined	07:02
	→ italoacasas joined	07:02
jordanm	Fissure: that's perfect, thanks	07:02
	← drodger_ left	07:03
	← n00bdev left	07:03
	← Manikandan left	07:03
	← daito left	07:03
	← boombatower left	07:03
	→ daito joined	07:04
	← mohabaks left	07:04
	→ drodger joined	07:04
	→ Po joined	07:05
	← daito_ left	07:05
	→ rclanan joined	07:06
	← italoacasas left	07:07
	← Lyqyd left	07:10
	← rclanan left	07:10
	→ roelmonnens joined	07:13
	→ aeontech joined	07:13
	→ freimatz joined	07:15
	← ShapeShifter499 left	07:16
	→ Sazhen86 joined	07:16
	→ Manikandan joined	07:17
	← hyphenated left	07:17
	← grassass left	07:17
	→ rkazak joined	07:18
	← pungi-man left	07:18
	→ ShapeShifter499 joined	07:18
	→ colona_ joined	07:19
	→ huQeQwdpu47q_ joined	07:20
	← scarcry left	07:20
	→ eijk joined	07:20
	← huQeQwdpu47q left	07:21
	← lindenle left	07:21
	← colona left	07:21
	← asd6a left	07:21
	← weox left	07:21
	← iera left	07:21
	← joki left	07:21
	← strayPuppy left	07:21
	← ril left	07:21
	← a3Dman left	07:21
	← dsdeiz left	07:21
	→ iera joined	07:21
	← [Saint] left	07:21
	→ dsdeiz joined	07:21
	→ joki joined	07:21
	← flavi0 left	07:21
	→ jceb joined	07:22
	→ weox joined	07:22
	→ flavi0 joined	07:22
	→ strayPuppy joined	07:22
	→ asd6a joined	07:22
	← mkopriva left	07:23
	→ lamppid joined	07:23
	→ [Saint] joined	07:23
	→ acolson joined	07:23
	← daito left	07:24
	→ corehello joined	07:25
	← corehello left	07:25
	→ JeroenT joined	07:26
	→ a3Dman joined	07:26
ojacobson	deepy: man gitattributes	07:27
gitinfo	deepy: the gitattributes manpage is available at http://jk.gs/gitattributes.html	07:27
ojacobson	I seem to recall that there's an attribute filter that'll expand at least $Id$	07:27
	ah, yes, ident	07:28
Fissure	iirc it expands to the blob id, not the commit id	07:28
	← Manikandan left	07:28
Fissure	keeping with the whole "don't update mtime on files that haven't changed" thing	07:28
	← noyb left	07:31
	→ clemf joined	07:31
	gitinfo set mode: +v	07:31
	→ scarcry joined	07:32
	← Fissure left	07:33
	→ Fissure joined	07:33
	← TomyLobo left	07:34
	→ lucido joined	07:34
	→ Sceorem joined	07:37
	← happy-dude left	07:39
	← clemf left	07:39
	→ Manikandan joined	07:40
	→ AtnevRed joined	07:40
	→ imack joined	07:41
	→ clemf joined	07:41
	→ mischat joined	07:41
	← Sazhen86 left	07:42
	→ jottr joined	07:43
	← AtnevRed left	07:45
	← peoliye left	07:45
	← mischat left	07:46
	→ tvw joined	07:47
	→ User458764 joined	07:47
	← jottr left	07:47
	← apiarian left	07:49
	← tildes left	07:50
	→ apiarian joined	07:50
	← alanwill left	07:50
	→ hyphenated joined	07:51
	← \|node left	07:51
	→ alanwill joined	07:52
	← Gamecubic left	07:52
	→ troulouliou_div2 joined	07:52
	← strayPuppy left	07:54
	→ pantsman- joined	07:55
	→ xelxebar joined	07:55
	→ Imek joined	07:56
	→ PCatinean joined	07:57
	→ fees joined	07:57
	→ dan2k3k4 joined	07:58
	← Imek left	08:00
	→ faux___ joined	08:00
	→ aleksandar2810 joined	08:01
	← govg left	08:01
	→ Sazhen86 joined	08:02
	→ aidalgol joined	08:03
	→ italoacasas joined	08:03
	→ howdoi joined	08:04
	← Sazhen86 left	08:04
	→ Asenar joined	08:04
	← faux___ left	08:04
	→ peoliye joined	08:05
	← stevenm left	08:05
	→ sbasso joined	08:06
	→ citizen-stig joined	08:06
	→ ciampix joined	08:07
	← alanwill left	08:07
	→ rclanan joined	08:07
	→ Anticom joined	08:07
	← italoacasas left	08:07
	→ alanwill joined	08:08
	→ thierryp joined	08:08
	← dtrott left	08:08
	← sbasso left	08:09
	← ShapeShifter499 left	08:09
	→ stevenm joined	08:09
	→ TomyWork joined	08:10
	→ bronson joined	08:10
	← citizen-stig left	08:11
	← rclanan left	08:11
	→ citizen-stig joined	08:14
	→ mkopriva joined	08:14
	← tvw left	08:15
	← bronson left	08:15
	← clemf left	08:16
	→ lindenle joined	08:17
	← mkopriva left	08:17
	→ mkopriva joined	08:17
	← apiarian left	08:17
	→ apiarian joined	08:18
	← citizen-stig left	08:18
	← lindenle left	08:21
	→ ShapeShifter499 joined	08:22
	← peoliye left	08:22
	→ bonswouar joined	08:22
	← alanwill left	08:23
	← meejah left	08:23
	← dreiss left	08:23
	← nilg left	08:23
	→ colegatron_origi joined	08:23
	→ aerocarbine joined	08:24
	→ ferr joined	08:24
	← imack left	08:24
colegatron_origi	Good morning. I'm turning crazy since yesterday noon. I have added two identities with ssh-add because I have to checkout two different repositories. identity1 has perm to read repo1 and identity2 perm to read repo2.	08:25
	but a git clone always offers the same identity to bitbucket, making one of the clones to fail.	08:26
	there is anyway to specify which key to use in a clone?	08:26
grawity	set up two Host entries in your ~/.ssh/config, aliased to bitbucket	08:26
	e.g. http://superuser.com/a/366656/1686	08:27
	→ josuebrunel joined	08:27
colegatron_origi	grawity, there is no way without writting a config file? this script is going to be run on multiple servers, where maybe a config file already exists or have different contents. I prefer to avoid it if possible	08:28
	← aerocarbine left	08:29
	→ Balliad joined	08:29
colegatron_origi	maybe it is possible to write it to a different config-filename and make git read that one?. that way I would avoid the clash with the existing one.	08:29
grawity	if it's a script, you could try customizing $GIT_SSH before each clone/fetch/push run.	08:30
	I'm not sure if it can contain parameters though	08:30
	← aeontech left	08:30
colegatron_origi	googling GIT_SSH	08:30
osse	in recent gits you can use GIT_SSH_COMMAND	08:31
	which is taken as a shell command	08:31
	GIT_SSH_COMMAND='ssh -i whatever.rsa -o MyOption' git push etc.	08:31
	→ nnyk_ joined	08:31
grawity	recent gits being 2.6.0+ or 2.7.0+ I think?	08:32
	I vaguely remember that being very recent	08:32
	→ blur3d joined	08:32
colegatron_origi	osse, tnx. I'm going to check which version I have there	08:33
osse	i think it's 2.6.0	08:33
colegatron_origi	mmm all servers are going to have 1.9.1 :-(	08:33
	← Po left	08:33
osse	oh, 2.3.0 actually	08:33
	→ bittin- joined	08:34
	gitinfo set mode: +v	08:34
	← kadoban left	08:36
	← cbonobo left	08:36
	← aleksandar2810 left	08:36
	→ aleksandar2810 joined	08:37
	→ harveyphan joined	08:40
	← reim left	08:42
	→ mischat joined	08:42
	→ chx joined	08:43
chx	fatal: Pathspec 'contrib/ctools/config' is in submodule 'html/modules/contrib/ctools' . How can i force this. i know it's in a submodule, and i do not care. i just want the add to happen, nonetheless. this used to work.	08:43
	→ jottr joined	08:44
grawity	I can't imagine how it could possibly work	08:44
	given that it'd need two tree entries with the same name	08:44
	one for the submodule and one for the subdirectory	08:44
	though	08:44
	it might have worked before because the submodule wasn't tracked by the main repo	08:44
osse	the only reason I see it could have worked is if you cd contrib/ctools first so that you add it to the submodule instead	08:45
grawity	if the sub-repo isn't tracked as a submodule, sure, you can add its contents directly	08:45
	← josuebrunel left	08:45
	← eijk left	08:45
grawity	but doing both at once would be equivalent to trying to have two files with the same name – not valid in Git	08:45
	→ eijk joined	08:46
chx	what i mean, this used to work with other repos	08:46
	← fscala left	08:46
chx	i didnt set it up as a submodule	08:46
	there is a .git directory in ctools yes	08:46
grawity	possibly you did `git add contrib/ctools` earlier?	08:46
	← mischat left	08:46
	→ fscala joined	08:47
grawity	if you try to add contrib/ctools/, it adds just the contents	08:47
	if you try to add contrib/ctools, it adds a special 'submodule' entry instead	08:47
	(almost like `git submodule add` but without the .gitmodules part, so only useful in rare occassions)	08:47
	do you have another repo where it "used to work"?	08:48
	← jottr left	08:48
	← eijk left	08:48
chx	AH	08:49
	→ peoliye joined	08:49
	→ samw joined	08:49
chx	grawity: super helpful thanks	08:50
	→ nettoweb joined	08:50
chx	grawity: git rm --cached html/modules/contrib/ctools ; git add html/modules/contrib/ctools/*	08:50
	grawity: that worked.	08:50
grawity	the asterisk isn't required, trailing / already means "contents" (similar to how you `ls` a symlink vs symlink/)	08:51
	→ pungi-man joined	08:51
grawity	use `git ls-tree HEAD:/html/modules/contrib` to see the differences	08:51
colegatron_origi	grawity, GIT_SSH did not worked for me, but adding a key, cloning and then removing it from the ssh-agent do works. it is a bit annoying, but... at least works	08:52
	ssh-add key.pem && git clone && ssh-add -d key	08:52
	← Goplat left	08:53
	← pks left	08:54
	← nnyk_ left	08:54
	→ powered joined	08:54
	← samw left	08:54
	→ pks joined	08:55
	← dsop left	08:55
	→ kurkale6ka joined	08:58
	→ sbasso joined	08:58
	→ DWestCoast joined	08:58
	← sbasso left	08:59
	→ sbasso_ joined	08:59
	← FireArrow133 left	08:59
	→ josuebrunel joined	09:00
	→ encod3 joined	09:01
	← lucido left	09:02
	← pks left	09:02
	← aleksandar2810 left	09:03
	→ pks joined	09:04
	→ italoacasas joined	09:04
	← led_belly left	09:04
	← JeroenT left	09:04
	→ eijk joined	09:05
	→ noyb joined	09:05
	→ petersr joined	09:05
	→ dopesong joined	09:05
	← jceb left	09:05
	→ JeroenT joined	09:05
	← petersr left	09:07
	→ Po joined	09:07
	→ rclanan joined	09:08
	← italoacasas left	09:09
	← noyb left	09:09
	→ {AS} joined	09:11
	→ t0by joined	09:11
	← pks left	09:11
	← peoliye left	09:12
	← rclanan left	09:12
	→ pks joined	09:12
	→ p3a joined	09:14
	← johnsno left	09:15
	→ marcogmonteiro joined	09:15
	→ peoliye__ joined	09:15
	→ lindenle joined	09:19
	← thierryp left	09:20
	→ jceb joined	09:20
	← apiarian left	09:21
	→ apiarian joined	09:21
	→ roxlu joined	09:21
	→ Jellyg00se joined	09:22
	← josuebrunel left	09:22
	← lindenle left	09:24
	← harveyphan left	09:24
	← User458764 left	09:25
	→ Alienpruts joined	09:28
	→ MutantMahesh joined	09:30
	→ mase-tech joined	09:30
	← leeN left	09:31
	→ citizen-stig joined	09:32
	← pks left	09:33
	→ zarubin joined	09:33
	→ permalac joined	09:33
	→ pks joined	09:34
	→ Tsux joined	09:34
	← Tsux left	09:34
	→ reim joined	09:35
	→ govg joined	09:37
	← pantsman- left	09:37
	← pks left	09:37
	← jceb left	09:38
	→ AAoK joined	09:38
	→ doener joined	09:38
	→ tinajohnson__ joined	09:39
	→ Ykiki joined	09:41
	← Ykiki left	09:41
	→ AtnevRed joined	09:41
	→ pks joined	09:42
	→ vruo joined	09:44
	← vruo left	09:44
	← pks left	09:44
	→ jottr joined	09:44
	→ Qxpdw joined	09:45
	→ pks joined	09:45
	← Qxpdw left	09:46
	← blckbit10 left	09:46
	← AtnevRed left	09:46
	→ blckbit10 joined	09:46
	← pks left	09:47
	→ Gonzo89 joined	09:47
	→ ahmedelgabri joined	09:47
	→ pks joined	09:48
	← pks left	09:49
	← jottr left	09:49
	← thiago left	09:50
	→ pks joined	09:50
	← rkazak left	09:51
	→ rixx joined	09:51
rixx	the git-bisect manpage doesn't mention the "git bisect next" command, even though it works and is mentioned in "git bisect help"	09:52
	← pks left	09:52
rixx	the source gode mentions that "git bisect next" should maybe be deprecated: https://github.com/git/git/blob/master/git-bisect.sh#L680	09:52
	would it still be a good idea to submit a patch with git-bisect next documentation for the man page?	09:53
grawity	if it wasn't removed from the manpage for the same reason already	09:53
	← dopesong left	09:53
	→ pks joined	09:53
	→ etdi joined	09:54
	← etdi left	09:55
	→ nnyk_ joined	09:55
	← dieck_ left	09:55
	→ jceb joined	09:55
	→ dwj joined	09:56
	← dwj left	09:56
	← mkopriva left	09:56
rixx	as far as I can see, it never was part of the man page	09:56
	→ ruveb joined	09:57
	← ruveb left	09:57
	→ rnsanchez joined	09:57
	← Po left	09:57
	→ Gloomy joined	09:58
	→ josuebrunel joined	09:58
	→ ygf joined	09:58
	← ygf left	09:58
	← roxlu left	09:59
	→ bronson joined	10:01
	← pks left	10:01
	→ kirt joined	10:01
	← kirt left	10:02
	← felixn left	10:02
	→ chll joined	10:02
	→ pks joined	10:02
	→ paul98 joined	10:03
rixx	nope, never been there	10:05
	→ italoacasas joined	10:05
paul98	hi within gitlab, when you look at a project you get the http / ssh which gives you the url to the .git, how do you change this, atm it's showinw as gitlab.example.com - i can't seem to find the option to change it to my own domain	10:05
	→ mischat joined	10:05
	← chx left	10:05
	← pks left	10:06
	← bronson left	10:06
	→ pks joined	10:07
	← govg left	10:07
	← peoliye__ left	10:08
	→ interrobangd joined	10:08
	← italoacasas left	10:09
	← pks left	10:10
	→ PHPanos joined	10:10
	→ pks joined	10:11
	→ thierryp joined	10:11
rixx	you might want to try asking at #gitlab	10:11
paul98	ta :)	10:13
	← nilsi left	10:13
	← abc123 left	10:13
	→ abc123_ joined	10:13
	← pks left	10:13
	→ pks joined	10:15
	← pks left	10:16
rixx	grawity, the comment about git-bisect has actually been in the source code since the inital commit of git bisect by Linux in 2005 :D	10:16
	← radsy left	10:16
	→ stamina joined	10:16
	→ moei joined	10:17
	→ pks joined	10:17
	← dsdeiz left	10:18
	← pks left	10:20
	→ codeman joined	10:21
	→ pks joined	10:21
	→ User458764 joined	10:22
	→ clmsy joined	10:24
	→ filisko joined	10:24
	→ Po joined	10:24
	← Po left	10:25
	← abc123_ left	10:26
	← pks left	10:26
	→ abc123 joined	10:26
	→ notebox joined	10:27
	→ faux___ joined	10:27
	→ pks joined	10:27
	→ nilg joined	10:27
	→ ramsub07 joined	10:28
ramsub07	hello, i'm having a merge conflict. How do i rebase a particular branch with master ? Is it, $git rebase master <branch_name> or $git rebase <branch_name> master ?	10:29
moritz	ramsub07: when you're on the branch, 'git rebase master'	10:30
	→ kephasp joined	10:30
	← fahadash left	10:31
	← faux___ left	10:31
	→ Jusle joined	10:33
	→ Ice_Strike joined	10:34
	jargan → jast	10:35
	→ govg joined	10:35
	← _W_ left	10:35
	→ LucaTM joined	10:35
	→ harish_ joined	10:36
	← filisko left	10:37
	→ King_Hual joined	10:38
	← King_Hual left	10:38
	→ King_Hual joined	10:38
	← tango_ left	10:38
	← ShapeShifter499 left	10:38
	→ mkopriva joined	10:38
	→ dopesong joined	10:39
	→ reim_ joined	10:39
	→ tango_ joined	10:40
	→ aleksandar2810 joined	10:40
	← reim left	10:42
	→ jottr joined	10:45
	→ Radivarig joined	10:47
	→ Meow-J joined	10:48
	← ramsub07 left	10:50
	← jottr left	10:50
	→ ShapeShifter499 joined	10:51
	← cagedwisdom left	10:51
	→ aleksandar2810_ joined	10:53
	← aleksandar2810 left	10:54
	← hyphenated left	10:55
	→ tvw joined	10:57
	← p3a left	11:01
	→ hyphenated joined	11:03
	← kfpratt left	11:04
	→ mischat_ joined	11:04
	→ faux___ joined	11:05
	← thierryp left	11:07
	← skcin7 left	11:08
	← mischat left	11:08
	← govg left	11:09
	→ rclanan joined	11:09
	← ferr left	11:09
	← faux___ left	11:10
	→ darkbit joined	11:12
	← mase-tech left	11:13
	← mkopriva left	11:13
	→ italoacasas joined	11:14
	← rclanan left	11:14
	→ Anderson69s_Pi joined	11:14
	→ jost joined	11:15
	← citizen-stig left	11:16
	← aleksandar2810_ left	11:16
	← Anderson69s_Deb left	11:16
	→ _joes_ joined	11:17
	← nick\|here left	11:18
	→ jottr joined	11:18
	← italoacasas left	11:19
	→ aleksandar2810 joined	11:19
	← dopesong left	11:21
	→ HobGoblin joined	11:21
	← KennosiS left	11:23
	→ thierryp joined	11:23
	← abc123 left	11:24
	→ xvx joined	11:24
	← dan2k3k4 left	11:24
	→ abc123_ joined	11:24
	← Sceorem left	11:24
	← Meteorhead left	11:25
	→ Sceorem joined	11:26
	→ thierryp_ joined	11:26
	← freimatz left	11:27
	→ yn5 joined	11:27
	← thierryp left	11:28
	← colegatron_origi left	11:28
	→ Wolf480pl joined	11:28
	→ Virox joined	11:28
	→ hyperdrive joined	11:28
	← thierryp_ left	11:28
	→ tabakhase joined	11:28
	→ eXeC64 joined	11:28
	← cyan__ left	11:28
	→ loren joined	11:29
	→ slentzen joined	11:29
	→ xaa joined	11:30
	→ govg joined	11:31
	→ freimatz joined	11:32
	← hyphenated left	11:34
	→ mezod joined	11:34
	→ thierryp joined	11:34
	→ imack joined	11:35
	→ dan2k3k4 joined	11:35
	→ dopesong joined	11:36
	→ italoacasas joined	11:37
	← dopesong left	11:39
	← Gloomy left	11:41
	← Radivarig left	11:41
	→ Radivarig joined	11:41
	→ AtnevRed joined	11:42
	→ colegatron_origi joined	11:43
	→ dopesong joined	11:43
	→ Gloomy joined	11:43
	→ mkopriva joined	11:44
	← zeroed left	11:44
	← italoacasas left	11:45
	← mischat_ left	11:45
	→ dsdeiz joined	11:45
	→ mischat joined	11:45
	→ st0opkid joined	11:45
	→ herr_barium joined	11:46
	← a3Dman left	11:47
	← AtnevRed left	11:47
	→ a3Dman joined	11:48
	→ ExeciN joined	11:49
	→ italoacasas joined	11:49
	← herr_barium left	11:50
	← italoacasas left	11:50
	→ italoacasas joined	11:51
nedbat	git diff uses regexes from .gitattributes to find the function header for diffs. Is there a way to set those regexes from the command line for ad-hoc diff'ing?	11:52
	← italoacasas left	11:54
	→ codedmart joined	11:54
_ikke_	I don't think so. There is no command line switch to set attributes, only config values	11:54
nedbat	or, is there some other command-line tool that would let me do that?	11:54
	← slentzen left	11:55
	← rixx left	11:55
	→ subhojit777 joined	11:56
osse	git -c core.attributesFile=<(echo '*.foo diff=foo') -c diff.foo.xfuncname='regex here' diff	11:57
	osse crosses fingers	11:57
	→ zeroed joined	11:58
	← zeroed left	11:58
	→ zeroed joined	11:58
	→ acetakwas joined	11:58
	→ mellernoia joined	11:59
	→ Manikandan_ joined	12:01
	→ bronson joined	12:03
nedbat	osse: wow :)	12:03
	← Manikandan left	12:04
	→ fission6 joined	12:04
	← subhojit777 left	12:06
	← bronson left	12:08
osse	nedbat: maybe setting core.attributesFile in your ~/.gitconfig can help. then you can stuff your weird regexes in there as needed	12:08
	→ led_belly joined	12:08
osse	hmm, but the regexes go in the config :/	12:10
	bleh	12:10
	← acetakwas left	12:10
	→ rclanan joined	12:10
	← stamina left	12:12
	← treaki_ left	12:14
	← dopesong left	12:14
	← User458764 left	12:15
	← rclanan left	12:15
	← Gloomy left	12:15
	→ ckruczek joined	12:15
	→ dopesong joined	12:16
	→ sdothum joined	12:16
	← steve left	12:16
	→ citizen-stig joined	12:17
	← dopesong left	12:17
	→ italoacasas joined	12:17
	→ steve joined	12:18
	← encod3 left	12:20
	→ mizu_no_oto joined	12:20
	→ lindenle joined	12:21
	← tvw left	12:21
	→ filcab joined	12:22
	→ fbwnd joined	12:24
	← italoacasas left	12:25
	→ acetakwas joined	12:25
	→ samw joined	12:26
	← lindenle left	12:26
	← ciampix left	12:26
	← acetakwas left	12:26
	→ ifra201 joined	12:27
	← abc123_ left	12:27
	→ abc123 joined	12:27
	← tinajohnson__ left	12:29
	→ treaki_ joined	12:30
	→ sanketdg joined	12:31
	← samw left	12:31
	← ahmedelgabri left	12:32
	← blckbit10 left	12:34
	← JeroenT left	12:36
	→ Sceorem_ joined	12:37
	→ leonarth joined	12:38
	← leonarth left	12:39
	← Sceorem left	12:39
	→ encod3 joined	12:40
	→ acetakwas joined	12:40
	→ tinajohnson__ joined	12:40
	→ leonarth joined	12:40
	→ bitkiller joined	12:41
	← a3Dman left	12:41
	→ roygbiv joined	12:42
	← acetakwas left	12:45
	→ ac3takwas joined	12:45
	→ a3Dman joined	12:45
	← pks left	12:46
	← ac3takwas left	12:46
	→ blckbit10 joined	12:47
	→ ahmedelgabri joined	12:48
	→ dopesong joined	12:48
	← jeffreylevesque_ left	12:48
	← tinajohnson__ left	12:48
	→ pks joined	12:49
	→ Gloomy joined	12:49
	→ nilsi joined	12:51
	→ kadoban joined	12:51
	← Anticom left	12:52
	→ acetakwas joined	12:55
	→ yarnfive8 joined	12:55
	← fstd left	12:59
	→ fstd joined	12:59
	← fission6 left	13:00
	→ marscher joined	13:00
	→ fbwnnd joined	13:01
	← Manikandan_ left	13:03
	→ s8321414 joined	13:04
	→ synthroid joined	13:06
	← mizu_no_oto left	13:08
	← loren left	13:08
	→ EduardoMartins joined	13:09
	← acetakwas left	13:09
	→ acetakwas joined	13:09
	← dsdeiz left	13:09
	← acetakwas left	13:10
	→ brrt joined	13:10
	→ rclanan joined	13:11
brrt	hi #git, i'm having trouble cloning a local repository to an ssh server	13:11
	→ acetakwas joined	13:11
brrt	i do: git clone <local-directory> ssh://user@server:/directory-path ; and what happens is that <local-directory> is cloned to a directory 'ssh:'/user@server/path.git	13:12
	← fbwnnd left	13:12
brrt	i.e. git clone never touches my ssh server at all	13:12
	any way you know how i can make it dwim	13:13
	→ JeroenT joined	13:13
	← fbwnd left	13:13
	→ rwb joined	13:13
	gitinfo set mode: +v	13:15
freimatz	Hi, can i access a commit that was amended	13:15
	← rclanan left	13:16
moritz	you mean the original?	13:16
	→ Manikandan_ joined	13:16
	→ nitesh`` joined	13:16
holdsworth	OT: do you know of a messaging service that I could use that would delete my messages after X amount of time after the user had opened the message I sent him?	13:17
brrt	freimatz: you can always use git reflog to get the commit hash of the original, so you could then git checkout it	13:18
freimatz	moritz, yes	13:18
brrt	\o moritz	13:18
freimatz	brrt thx	13:18
brrt	(alright, git docs speak of scp. then so it is)	13:18
moritz	freimatz: as brrt said: once you have the hash, you can view it with 'git show $hash'	13:19
	and finding the hash via git reflog, git log -g, or if it's not in the reflog anymore, with git-fsck	13:19
	← nitesh` left	13:19
freimatz	okok, i use Tortoise	13:20
moritz	then switch to the command line for this	13:20
	→ xameada_ joined	13:20
freimatz	why? it works fine	13:20
	← kephasp left	13:21
	← eijk left	13:21
	→ iLembus joined	13:21
freimatz	ah, yes, i used command line for git reflog - but for using the hash i can use tortoise	13:21
	→ failshell joined	13:21
	→ herr_barium joined	13:22
failshell	hello. we use a pre-commit hook. its copied into new projects, but it's not used by existing projects unless we manually copy it. is there a way to configure git to copy them from ~.git_templates automagically?	13:22
	← Segfault_ left	13:23
	← EduardoMartins left	13:23
	→ EduardoMartins joined	13:23
	← EduardoMartins left	13:25
moritz	freimatz: no; that would be a huge security risk	13:26
	sorry, meant failshell	13:26
	→ ss1891 joined	13:26
moritz	failshell: you can however tell people to create a symlink to that file, so they don't have to copy it each time it changes	13:26
freimatz	hehe	13:26
	← failshell left	13:27
	→ mahendra_ joined	13:28
	← Jellyg00se left	13:30
	→ algae joined	13:30
	→ junw joined	13:30
	→ _W_ joined	13:30
	← diogenese left	13:30
	← JeroenT left	13:31
	→ JeroenT joined	13:31
	→ faux___ joined	13:32
	← powered left	13:33
	→ jost_ joined	13:34
	← aleksandar2810 left	13:35
	→ CheckDavid joined	13:36
	← faux___ left	13:36
	→ aleksandar2810 joined	13:36
	→ tvw joined	13:37
	→ mischat_ joined	13:37
	→ Segfault_ joined	13:37
	← jost left	13:38
	← Gloomy left	13:38
	← mischat left	13:39
	→ Jellyg00se joined	13:42
	← xameada_ left	13:43
	← tobias left	13:43
	→ AtnevRed joined	13:44
	← zarubin left	13:44
	→ fission6 joined	13:44
	→ reim- joined	13:44
	→ failshell joined	13:45
failshell	moritz: thanks.	13:45
	→ zarubin joined	13:45
	→ aranea joined	13:45
	← dopesong left	13:46
	→ presto joined	13:46
	← reim_ left	13:46
	← presto left	13:46
	→ presto joined	13:46
	→ italoacasas joined	13:48
failshell	moritz: is it possible to configure git to symlink the hooks instead of copying them during a init/clone?	13:48
	← blur3d left	13:48
	← AtnevRed left	13:49
	→ mohabaks joined	13:49
	← nnyk_ left	13:49
	← acetakwas left	13:50
moritz	failshell: I'm pretty sure a clone neither copies nor symlinks; same security issue	13:50
	→ TheZeroNine joined	13:51
	← italoacasas left	13:51
	→ harveyphan joined	13:52
	→ dopesong joined	13:52
	← mohabaks left	13:54
	→ \|node joined	13:54
	← jceb left	13:54
	← MutantMahesh left	13:55
	→ italoacasas joined	13:56
	→ Eclipse joined	13:57
	← ss1891 left	13:58
	→ mbrzuzy joined	13:58
	→ dstarh joined	13:59
	→ diogenese joined	13:59
	→ fbwnd joined	13:59
	→ User458764 joined	13:59
	→ DeltaHeavy joined	13:59
	← s8321414 left	14:00
	→ MarkyC joined	14:00
	→ rclanan joined	14:01
	→ sgambino joined	14:03
	← failshell left	14:05
	← zarubin left	14:05
	← fission6 left	14:05
	→ fission6_ joined	14:05
	→ bronson joined	14:05
	← cushwalk left	14:07
	→ fission6 joined	14:07
	→ diegoaguilar joined	14:07
	← fission6_ left	14:08
	→ viljaste joined	14:08
	← sgambino left	14:09
	→ sgambino joined	14:09
	← fbwnd left	14:09
	← diegoaguilar left	14:10
	← bronson left	14:10
	→ jceb joined	14:11
	→ diegoaguilar joined	14:12
	← leonarth left	14:13
	← bannakaffalatta left	14:14
	→ King_Hual` joined	14:14
	← Manikandan_ left	14:15
	→ cdg joined	14:15
	→ strozyka joined	14:15
	← sgambino left	14:17
	→ robh71 joined	14:17
	→ sgambino joined	14:17
	← King_Hual left	14:17
	→ modocache joined	14:17
	← notebox left	14:18
	→ jottr_ joined	14:18
	→ truongtc joined	14:19
	→ fbwnd joined	14:19
	← cdg left	14:19
	← DWestCoast left	14:19
	← truongtc left	14:20
	→ truongtc joined	14:20
	→ ash_workz joined	14:21
	← jottr left	14:21
	← herr_barium left	14:21
	→ citizen-_ joined	14:21
	→ cdg joined	14:22
	→ lindenle joined	14:23
	→ Gloomy joined	14:23
	← citizen-stig left	14:25
	→ BigWillie joined	14:25
	← colegatron_origi left	14:27
	→ courrier joined	14:27
	← lindenle left	14:27
	← fbwnd left	14:28
	← reim- left	14:29
courrier	Hey guys! I've deleted the file azerty/optitrack/optitrack_pypot.py in the past and would like to display it (no need to restore), I find tracks of this file in a diff but git show reports that the file does not exist, how can it be possible?	14:29
	http://paste.debian.net/370986/	14:29
	→ tobias joined	14:30
osse	courrier: you gave the blob ID to git show	14:30
	tobias → Guest35001	14:31
osse	courrier: you could either do git show 4b04235c8:... or simply git show 854840c	14:31
	→ crose joined	14:31
	← blckbit10 left	14:32
	→ blckbit10 joined	14:32
courrier	osse: ha ok git show 854840c works; what's the blob ID? The file ID?	14:32
	→ MBlackburn joined	14:32
	→ Chill_Surf joined	14:33
osse	yes	14:33
	→ mrkat- joined	14:34
	← mrkat left	14:34
	→ alanwill joined	14:34
	→ notebox joined	14:35
	→ leeN joined	14:36
	← abc123 left	14:36
	→ leonarth joined	14:36
	→ abc123_ joined	14:36
	→ jottr joined	14:36
	→ flashpoint9 joined	14:36
courrier	osse: cool, thanks, and so git show 4b04235c8:/path should show that file as it was at the time of commit 4b04235c8? Cause it returns Path '/azerty/optitrack/optitrack_pypot.py' does not exist in '4b04235c8'	14:37
	→ tinajohnson__ joined	14:38
	← h43k3r left	14:39
	→ colegatron_origi joined	14:39
	← jottr_ left	14:39
	→ acetakwas joined	14:39
	← mezod left	14:39
	→ Pistachio2 joined	14:39
	→ usr819563 joined	14:40
osse	courrier: yes it should. try removing the first /	14:40
	gitinfo set mode: +v	14:40
usr819563	why is my git checkout -- . not discarding my changes	14:40
osse	usr819563: because they are staged	14:40
usr819563	no	14:40
courrier	osse: that's it (the /), thanks :)	14:41
usr819563	even git reset --hard leaves my working tree dirty	14:41
osse	usr819563: !repro	14:42
gitinfo	usr819563: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://gist.github.com/2415442 ) of your terminal session.	14:42
BtbN	by dirty you mean it leaves alone files that are not tracked at all?	14:43
	That's entirely expected	14:43
usr819563	No, this file is tracked. and git status displays it under "Not Staged for commit". However it doesn't change after git checkout -- . or git reset --hard	14:44
	→ AaronMT joined	14:45
usr819563	Sorry, I'm not sure if my company would be ok with me pasting a transcript	14:45
	→ faux___ joined	14:45
BtbN	Well, "works for me" then. You are doing something wrong.	14:45
	← faux___ left	14:46
	→ faux___ joined	14:46
	→ Po joined	14:47
usr819563	It's something to do with casing. This file was renamed to make a few letters lowercase,	14:47
_ikke_	yes	14:47
	← xvx left	14:48
	← Po left	14:48
	→ espindola joined	14:48
	→ reim joined	14:48
	← alanwill left	14:49
_ikke_	if you are on windows or mac that is	14:50
usr819563	a git bug?	14:50
	yeah, I'm on windows	14:50
	← crose left	14:50
usr819563	git version 2.6.3.windows.1	14:50
	← faux___ left	14:50
	→ alanwill joined	14:51
	→ crose joined	14:51
	→ mezod joined	14:51
	← acetakwas left	14:51
	→ faux___ joined	14:52
	→ jaguarmagenta joined	14:52
	→ IrishPrime joined	14:53
_ikke_	not a bug	14:53
	← NeverDie left	14:54
	→ uri_ joined	14:54
	← jaguarmagenta2 left	14:54
	→ NeverDie joined	14:54
	← NeverDie left	14:54
usr819563	what is it?	14:55
	link pls	14:56
	→ mizu_no_oto joined	14:56
_ikke_	It's the filesystem lying to git	14:56
	→ Po joined	14:56
	← Po left	14:58
	→ eka_ joined	14:58
	← eka left	14:58
usr819563	solution pls	14:59
	→ bannakaffalatta joined	14:59
	← rscata left	15:00
	→ daito joined	15:00
	→ sparetire joined	15:00
	→ Gsham joined	15:00
_ikke_	You have to do it in two steps	15:01
	rename to a -> b, b -> A	15:01
	→ KennosiS joined	15:01
	→ mblack joined	15:01
	← MBlackburn left	15:02
	← bannakaffalatta left	15:02
	← mahendra_ left	15:02
	→ evil-t0by joined	15:04
	← daito left	15:05
	← ckruczek left	15:05
	→ phaleth joined	15:05
	← leonarth left	15:05
usr819563	ok	15:06
	← alanwill left	15:06
	→ leonarth joined	15:07
	→ Whd joined	15:07
	← evil-t0by left	15:07
	← drodger left	15:07
	→ alanwill joined	15:07
	→ chitopunk joined	15:07
	→ evil-t0by joined	15:07
	← TheZeroNine left	15:07
	← t0by left	15:08
	→ drodger joined	15:08
	← drodger left	15:08
	← brrt left	15:08
	→ circ-user-ohseJ joined	15:09
	Guest35001 → tobias	15:09
	→ aswen joined	15:09
	← rchavik left	15:10
	→ usr819564 joined	15:10
	evil-t0by → t0by	15:12
	→ absk007 joined	15:12
	← Kulrak left	15:12
	→ happy-dude joined	15:12
	← absk007 left	15:12
	→ Dougie187 joined	15:13
	→ drodger joined	15:13
	← usr819563 left	15:13
	→ krawchyk joined	15:14
	→ EduardoMartins joined	15:14
	← Whd left	15:14
	← fission6 left	15:15
	→ artide joined	15:15
	→ Sucks joined	15:18
	→ jaafar joined	15:19
	← Gsham left	15:19
	← Raging_Hog left	15:19
	→ fission6 joined	15:20
	→ mahendra_ joined	15:20
	← jaguarmagenta left	15:20
	← sgen left	15:20
	→ jaguarmagenta joined	15:21
	→ goTAN joined	15:21
	← alanwill left	15:22
	→ iLembus_ joined	15:22
	← notebox left	15:22
	→ alanwill joined	15:23
	← EduardoMartins left	15:23
	→ pewu joined	15:23
pewu	hi!	15:24
gitinfo	pewu: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	15:24
	← iLembus left	15:24
	→ shinnya joined	15:24
	← rwb left	15:24
	→ rwb joined	15:25
pewu	what is the best way to create new branch from remote branch ? git checkout -tb new_name remote/name ?	15:25
	→ axl__ joined	15:25
osse	looks good to me	15:25
	← rwb left	15:25
osse	in fact you can drop the '-tb'	15:25
	← blckbit10 left	15:25
osse	git will do that part automagically	15:25
	← axl__ left	15:26
pewu	nice, didnt know that... thanks!	15:26
	→ Kulrak joined	15:26
	← Kulrak left	15:26
	→ Kulrak joined	15:26
	→ blckbit10 joined	15:27
osse	pewu: furthermore you can simply do 'git checkout name' provided name does not exist, origin/name exists and there is no otherremote/name	15:28
	→ tang^ joined	15:28
pewu	good to know :)	15:29
	→ notebox joined	15:29
	← sgambino left	15:30
	← jceb left	15:31
	← dopesong left	15:31
	→ jceb joined	15:32
	← ifra201 left	15:32
	→ UTAN_dev_ joined	15:32
	← UTAN_dev_ left	15:33
	→ ChillinOu joined	15:33
	→ UTAN_dev_ joined	15:33
	→ axl__ joined	15:33
	← UTAN_dev_ left	15:34
	→ rwb joined	15:34
	→ ad joined	15:34
	→ toogley joined	15:34
	← ChillinOu left	15:34
	→ UTAN_dev_ joined	15:34
	← UTAN_dev left	15:35
	← nilsi left	15:36
	→ dopesong joined	15:37
	← artide left	15:38
	→ lindistock joined	15:38
	→ Gamecubic joined	15:38
	← alanwill left	15:38
	→ alanwill joined	15:39
	→ sgambino joined	15:41
	→ cbonobo joined	15:42
	→ AtnevRed joined	15:45
	← goTAN left	15:46
	← dopesong left	15:46
	← Alienpruts left	15:46
_ikke_	so git checkout new_name, given that remote/new_name exists	15:47
	→ jaguarmagenta2 joined	15:47
	→ Junior joined	15:47
	→ Spacew00t joined	15:47
	← jaguarmagenta left	15:47
	→ davidosomething joined	15:48
	gitinfo set mode: +v	15:48
	← davidosomething left	15:48
	→ dopesong joined	15:48
	→ davidosomething joined	15:48
	← AtnevRed left	15:49
	→ darkschneider joined	15:50
	→ Gsham joined	15:50
	← synthroid left	15:51
	← mblack left	15:51
	← uri_ left	15:51
	← clmsy left	15:52
	← jceb left	15:52
	→ harleypig joined	15:52
	← sgambino left	15:52
	→ thiago joined	15:52
	→ mblack joined	15:52
darkschneider	i need a lil of help. I have a feature branch where i committed. Now i just checked it out and i want to rebase it to current master (as i forked from an older version of master). if i do $git rebase master, it tells me i have uncommited changes. but i can't figure out which those are, indeed git status reports none. I also tried to $git reset --hard featurebranch and then $git rebase master, but it still tells me i have uncommited changes	15:53
	→ nnyk_ joined	15:53
darkschneider	how to discover what those changes are, given that git status tells me "no changes added to commit"	15:54
	→ sgambino joined	15:54
harleypig	I know I can delete a branch both locally and remotely using "git branch -d branchname" and "git push origin --delete branchname" but when I run "git branch -ra" I still get remotes/origin/branchname. I can delete that file manually, but how do I do that the git way?	15:54
	← Meow-J left	15:54
	← alanwill left	15:54
	← flashpoint9 left	15:55
	← truongtc left	15:55
	→ alanwill joined	15:55
	← huQeQwdpu47q_ left	15:56
	← acolson left	15:56
	← JeroenT left	15:57
	← mostlybadfly left	15:57
moritz	harleypig: git fetch --prune	15:58
	← howdoi left	15:58
moritz	harleypig: or git config --global fetch.prune 1	15:58
	← sgambino left	15:58
moritz	(that way it'll automatically prune the remote/ branches on a fetch)	15:58
harleypig	moritz: the second one makes it automatic?	15:59
	heh	15:59
	ok, thanks.	15:59
	← Gonzo89 left	15:59
	→ sgambino joined	15:59
	→ kermit joined	15:59
	← ShooterMG left	15:59
	→ synthroid joined	16:00
	← lamppid left	16:01
	← interrobangd left	16:01
	→ samw joined	16:02
	→ clemf joined	16:03
	→ FunkyAss joined	16:03
	← clemf left	16:03
	← ad left	16:03
	→ kilo_bravo joined	16:04
	→ jjttjj joined	16:04
	→ clemf joined	16:04
	← synthroid left	16:04
	→ usr819565 joined	16:04
	← clemf left	16:05
	→ InfoTest joined	16:05
	← samw left	16:07
	→ jteneyck joined	16:07
	→ livcd joined	16:07
	→ henk joined	16:07
livcd	how do i clone only specific files from git repo ?	16:07
	→ bronson joined	16:07
	← crose left	16:08
	← usr819564 left	16:08
fragMental	Hi, I just finished a rather long merge of an old branch I hadn't worked on in a while, and now that I'm done, I realized I should have probably rebased instead, since the branch is not shared anywhere and I don't want to clutter the commit log graph with my pull request. Is there some easy way I can fix this?	16:08
	← ahmedelgabri left	16:09
fragMental	livcd: Did you even try searching google? The first results all tell you about `git archive` ;)	16:09
	← roelmonnens left	16:10
	→ noyb joined	16:10
	← alanwill left	16:10
	← thierryp left	16:10
	→ alanwill joined	16:11
	← bronson left	16:12
	← sgambino left	16:12
	→ sgambino joined	16:12
henk	hi, I see strange behaviour and would like to know if it could possibly be caused by git: http://pastie.org/private/rha6objrisajmsjvhtj2jq show the log before and after running the command shown. Every time I 'git reset --hard' to the 'before'-state and run the command, the git history gets more empty commits. Is that normal? Is it possibly caused by git or should I look closer at gbp?	16:12
	← PCatinean left	16:12
livcd	fragMental: i found out that with git archive you would not be able to push	16:13
	← Sceorem_ left	16:13
	← Kulrak left	16:13
	→ sibach joined	16:13
	← sibach left	16:14
	← rwb left	16:14
	→ sibach joined	16:14
	→ clemf joined	16:14
	→ rkazak joined	16:14
	← invapid left	16:15
	→ invapid1 joined	16:15
	← thiago left	16:15
	→ NeverDie joined	16:17
	→ NimeshNeema joined	16:17
	← mika left	16:17
	→ mika joined	16:17
	→ Noldorin joined	16:18
	→ dsop joined	16:18
	← madewokherd left	16:18
	← Noldorin left	16:18
	← rkazak left	16:19
	→ Noldorin joined	16:19
	→ jceb joined	16:19
	→ huQeQwdpu47q joined	16:19
	← rishi left	16:20
	← jast left	16:20
	→ jast joined	16:20
	← psacrifice left	16:21
	← pdgwien left	16:21
	← tvw left	16:21
	← manitu left	16:21
	→ d0lph1n98 joined	16:21
	→ synthroid joined	16:21
	← Blkt left	16:22
	← noyb left	16:22
	← heftig left	16:22
	→ pdgwien joined	16:22
	← lindistock left	16:22
	← Bombe left	16:22
	← gitinfo left	16:22
	→ jeffreylevesque joined	16:22
	← scorphus left	16:23
	← faux___ left	16:23
	← Nickeeh left	16:23
	→ dreiss joined	16:23
	← dopesong left	16:23
	← AlexanderS left	16:23
	← Hobbyboy left	16:24
	→ heftig joined	16:24
	← likewhoa left	16:24
	→ iokill_ joined	16:24
	← iokill left	16:24
	→ likewhoa- joined	16:24
	← PaulePanter left	16:24
	→ lindenle joined	16:24
	← gnarf left	16:25
	← Soliton left	16:25
	→ faux___ joined	16:25
	→ gnarf_ joined	16:25
	→ Soliton joined	16:25
	→ manitu joined	16:25
	→ Bombe joined	16:25
	→ Kobazz joined	16:26
	← Balliad left	16:26
	← synthroid left	16:26
	→ kpease joined	16:26
	→ psacrifice joined	16:26
	→ AlexanderS joined	16:26
	← alanwill left	16:27
	→ Ahmed90 joined	16:27
	→ Kulrak joined	16:27
	← Kulrak left	16:27
	→ Kulrak joined	16:27
	→ looper joined	16:27
	→ Hobbyboy joined	16:27
	→ alanwill joined	16:28
	→ gitinfo joined	16:29
	ChanServ set mode: +o	16:29
	← lindenle left	16:29
	→ subhojit777 joined	16:29
	→ PaulePanter joined	16:30
	→ kfpratt joined	16:30
	→ jemadux joined	16:31
	→ IdanM joined	16:31
	→ hobodave joined	16:32
jemadux	in github , how to make it not to asking my password ?	16:32
	→ rishi joined	16:33
	← Dougie187 left	16:33
	→ Faylite joined	16:34
	← IdanM left	16:35
	→ dev1x joined	16:35
	→ avgn5 joined	16:35
	← jceb left	16:35
dev1x	I'm seeing some weird chars on my tags, for example when I tag and push it, if I do an ls-remote i see the tag 'doubled'	16:36
	00420bf2997381fe5a9874b7bb936b3d8e450d5b refs/tags/3.0.2	16:36
	340211d916a158b521c4e261aa0d0beb6c28e335 refs/tags/3.0.2^{}	16:36
	any clues on what this might be?	16:36
	hello everyone :P	16:36
	→ terminal_echo joined	16:37
	← jjttjj left	16:37
	← clemf left	16:38
	→ edude03 joined	16:39
	← marscher left	16:39
	← PHPanos left	16:41
	← bonswouar left	16:41
	→ mwlang joined	16:42
	→ Dougie187 joined	16:43
	← alanwill left	16:43
	→ synthroid joined	16:43
	→ cyan__ joined	16:43
	→ PHPanos joined	16:43
	→ jjttjj joined	16:44
	← iLembus_ left	16:44
	← ag4ve left	16:45
mwlang	So I’ve been using git command line more and more for viewing history and changes rather than github and gitlab’s GUI. One thing I haven’t learned how to do is see what’s changed with someone’s last commit. When I do a “git pull” I see all the files that changed and it’s auto-merged with my local branch…how do I then see what was in those changes?	16:46
_ikke_	dev1x: apparently that's normal	16:46
	dev1x: Not sure, but it might mean they're annotated tags	16:46
	← reim left	16:46
osse	mwlang: git pull (fetch) output contains abc1234..def5668. you can copy paste that range to git log	16:46
_ikke_	dev1x: see man gitrevisions to understand what ^{} means	16:46
gitinfo	dev1x: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html	16:46
	← jteneyck left	16:47
dev1x	I'm doing: thank you sirs	16:47
	← PHPanos left	16:48
	← synthroid left	16:48
ToxicFrog	mwlang: "git log before..after" will show you the commits. Tack on a --stat to see changed files or --diff for a full diff on each commit.	16:48
	mwlang: or "git diff before..after" for a diff showing the sum total of changes rather than per-commit.	16:48
mwlang	nice…I’m trying it out now.	16:49
	← CheckDavid left	16:49
	→ Macaveli joined	16:49
	← tinajohnson__ left	16:49
	→ rwb joined	16:49
	← MeltedLux left	16:50
mwlang	looks like just a “git diff abc1234” without the other end of the range (i.e. the def5668 example above) also does the trick.	16:50
	→ dopesong joined	16:50
mwlang	ToxicFrog: I see now…makes sense.	16:50
	← ChoHag left	16:50
ToxicFrog	mwlang: that makes sense, IIRC diff defaults to HEAD as the other end of the range	16:51
	← flavi0 left	16:51
	← leonarth left	16:52
osse	most times I use !lol and wing it	16:52
gitinfo	A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	16:52
	← Noldorin left	16:52
	→ niels_ joined	16:53
	← niels_ left	16:53
	→ MeltedLux joined	16:53
	← circ-user-ohseJ left	16:53
	← amaury_d left	16:54
	→ reim joined	16:54
	← dopesong left	16:54
	→ uri_ joined	16:55
	→ samw joined	16:55
	← likewhoa- left	16:56
	→ likewhoa joined	16:56
	← TomyWork left	16:57
	← jottr left	16:57
	← uri_ left	16:58
	→ circ-user-ohseJ joined	16:58
	← mbrzuzy left	16:58
	→ leonarth joined	16:59
	← faux___ left	17:00
	→ synthroid joined	17:00
	→ astockton joined	17:00
	← edude03 left	17:01
	→ jottr joined	17:01
	→ editshare-ericf joined	17:01
	→ astockto_ joined	17:01
	→ Sonderblade joined	17:02
	→ uri_ joined	17:02
	← Gsham left	17:02
	gnarf_ → gnarf	17:03
	← Jellyg00se left	17:03
	← ThomasLocke left	17:04
	→ alanwill joined	17:04
	→ daito joined	17:04
	← Macaveli left	17:04
	← dan2k3k4 left	17:05
	→ Gsham joined	17:05
	← uri_ left	17:05
	← astockton left	17:05
	→ faux___ joined	17:06
	← aleksandar2810 left	17:07
	← leonarth left	17:07
	← gfixler left	17:08
	→ madewokherd joined	17:08
	← faux___ left	17:08
	→ faux___ joined	17:08
	← alanwill left	17:08
	← daito left	17:09
	← freimatz left	17:09
	← nnyk_ left	17:09
	→ howdoi joined	17:10
	← Kulrak left	17:10
	← astockto_ left	17:11
	→ astockton joined	17:12
	→ mr-rogers joined	17:13
	→ tinajohnson__ joined	17:13
	→ mbrzuzy joined	17:13
	← astockton left	17:14
	← govg left	17:14
	→ astockton joined	17:15
	→ thiago_ joined	17:16
	→ leonarth joined	17:16
	→ clemf joined	17:16
henk	nvm, it’s not git, I had to git reset another branch	17:17
	← henk left	17:17
	← bb010g left	17:18
	← jottr left	17:18
	← latrommi left	17:19
	→ aeontech joined	17:20
	← harveyphan left	17:20
	→ govg joined	17:21
	← {AS} left	17:21
	→ latrommi joined	17:22
	← permalac left	17:22
	← yn5 left	17:23
	← mezod left	17:23
	→ Kulrak joined	17:23
	← Kulrak left	17:23
	→ Kulrak joined	17:23
	← mischat_ left	17:23
	← sgambino left	17:24
	← sdothum left	17:25
	→ uri_ joined	17:25
	→ absk007 joined	17:26
	→ imachuchu joined	17:26
	← absk007 left	17:26
mr-rogers	I am working on a testing system that uses scripts and images, the scripts are platform-independent, but the images are not and are organized into folders. I have a heirarchy of these folders. When testing, I was thinking about using sparce_checkout to pull only the files needed for the specific OS, but don't know if this is possible. Any suggestions?	17:27
	→ freimatz joined	17:27
	← nilg left	17:27
	← astockton left	17:27
	→ sdothum joined	17:28
	← sbasso_ left	17:29
	→ sbasso joined	17:29
	← sbasso left	17:29
	← kurkale6ka left	17:30
	← mahendra_ left	17:30
	← synthroid left	17:30
	→ thorsten` joined	17:30
	→ zadock joined	17:30
thiago_	mr-rogers: forget sparse checkouts. Just check out everything.	17:31
	→ lindenle joined	17:31
	→ astockton joined	17:31
	→ felixn joined	17:31
thorsten`	how can see an accumulated diff of the entire history of a git repository? (i.e. git diff $emptycommit HEAD)	17:32
	← Radivarig left	17:32
	thiago_ → thiago	17:32
	→ TomyLobo joined	17:32
	→ ncd\|leeN joined	17:33
osse	thorsten`: 1) Why? The diff would be all the files themselves. 2) git diff 4b825dc642cb6eb9a060e54bf8d69288fbee4904 HEAD	17:33
_ikke_	thorsten`: Isn't that just showing the contents of the last commit?	17:33
	→ aerocarbine joined	17:33
	← aerocarbine left	17:34
	→ aerocarbine joined	17:35
mr-rogers	thiago: The concern for checking out everything was bandwidth and storage.	17:35
	← InfoTest left	17:35
thorsten`	osse: 1) in order to see all files and their contents at once	17:35
osse	mr-rogers: sparse checkouts won't save bandwidth. it might same some storage	17:35
	*save	17:36
	← clemf left	17:36
	→ edude03 joined	17:36
	← leeN left	17:36
	← uri_ left	17:36
mr-rogers	Is there a way to specify a pattern for getting the files?	17:37
thorsten`	osse: why does 4b825dc642cb6eb9a060e54bf8d69288fbee4904 in any git repository, or: where do you have the commit hash from?	17:37
	→ arooni joined	17:37
mr-rogers	and getting them recuresively.	17:37
_ikke_	it's hard coded in git	17:37
	gitinfo set mode: +v	17:37
osse	thorsten`: i googled "git empty tree"	17:37
_ikke_	It's the hash of an empty tree	17:37
nickthetait	mr-rogers: absolutely, there are plenty of regular expressions that you could use to do this	17:38
	← rominronin left	17:38
	← usr819565 left	17:38
	→ xvx joined	17:38
	← mbrzuzy left	17:38
	→ Jackneill joined	17:39
osse	thorsten`: to illustrate, it's the same sha you get if you do: git init && git commit --allow-empty && git rev-parse 'HEAD^{tree}'	17:39
	→ Ldip joined	17:39
	→ nour joined	17:39
thiago	mr-rogers: cloning takes long, but it's only once	17:39
	mr-rogers: you don't need to clone all the time	17:39
	mr-rogers: the incremental bandwidth for the updating is just the images that changed	17:39
	→ uri_ joined	17:40
	← samw left	17:40
thiago	mr-rogers: in any case, that wouldn't change even if you used sparse checkouts	17:40
	← aerocarbine left	17:40
thiago	mr-rogers: as for storage, how big is it? If storage is a problem, then Git doesn't sound like the correct solution in the first place.	17:40
	→ efco joined	17:41
mr-rogers	thiago: I'm not sure how big everything will be.	17:41
	← nour left	17:41
thiago	mr-rogers: if it's big enough to be a problem, Git isn't your tool	17:42
osse	thorsten`: that tree probably doesn't actually exist in a typical repo, but it's one of those magic values so Git knows what you mean	17:42
mr-rogers	thiago: What are the alternatives to git for large things?	17:42
thiago	mr-rogers: rsync	17:43
thorsten`	osse: I see, thanks!	17:43
thiago	mr-rogers: there's git-lfs, but I have never used it, seen it used or been ever told where to get it.	17:43
	← encod3 left	17:43
	→ felixn_ joined	17:44
	← felixn left	17:44
	← blckbit10 left	17:44
	→ blckbit10 joined	17:44
	→ Es0teric joined	17:44
	→ durham joined	17:46
	← durham left	17:46
	→ AtnevRed joined	17:46
mr-rogers	thiago: can cloning use regex patterns?	17:46
	← xelxebar left	17:46
thiago	mr-rogers: no	17:46
	→ durham joined	17:46
osse	thiago: http://tinyurl.com/gptucra	17:46
	→ David1977 joined	17:47
	→ Macaveli joined	17:47
thiago	osse: I don't need to know it :-)	17:47
	→ EduardoMartins joined	17:48
	← Macaveli left	17:48
	→ synthroid joined	17:48
osse	i jsut wanted to do the bing thing	17:49
	i don't need to know it either	17:49
	→ clemf joined	17:49
	← uri_ left	17:49
	→ felixn joined	17:49
	← felixn_ left	17:50
	→ Macaveli joined	17:50
	← Macaveli left	17:50
	← AtnevRed left	17:50
	→ Macaveli joined	17:51
	→ Anderson69s joined	17:51
	→ acetakwas joined	17:52
	← madewokherd left	17:52
	→ madewokherd joined	17:53
	← synthroid left	17:53
	← Kulrak left	17:53
	← d0lph1n98 left	17:54
	← nettoweb left	17:55
	← acetakwas left	17:55
	→ ac3takwas joined	17:55
	← Macaveli left	17:56
	→ noyb joined	17:56
	← aranea left	17:56
	→ nidr0x joined	17:57
	← aidalgol left	17:57
	→ scottschecter joined	17:57
	← scottschecter left	17:57
	→ durham_ joined	17:57
	← uranellus left	17:57
	→ mbrzuzy joined	17:59
	→ uranellus joined	18:00
	← noyb left	18:00
	← EduardoMartins left	18:00
	← CrazyBonz left	18:00
	→ FireArrow133 joined	18:00
	← durham left	18:01
	→ JexSys joined	18:01
	→ Silenced joined	18:01
	→ CrazyBonz joined	18:01
	→ Cryp71c joined	18:02
	← astockton left	18:02
	→ sr_____ joined	18:02
Cryp71c	Is there a way to compare the current branch against a certain commit in the past to determine the net change? (I have reverted some stuff and want to make sure I'm exactly as I was before...ie, an empty diff)	18:02
	← modocache left	18:02
	→ Relevant joined	18:03
	← clemf left	18:03
Silenced	Considering I have pushed my repo and later i updated my .gitignore . Now even after pushing the repo again , the files and folders in .gitignore is still present in github. How to remove them ?	18:03
osse	Cryp71c: git diff {certain commit} HEAD	18:03
Cryp71c	thanks	18:03
osse	Silenced: git rm --cached those files here	18:03
	gitinfo set mode: +v	18:03
	← edude03 left	18:04
Relevant	Hoping I could get some help/branching strategy advice	18:04
	→ gambl0re joined	18:04
gambl0re	hi guys	18:05
	→ samw joined	18:05
	→ sgambino joined	18:05
	← Faylite left	18:05
Silenced	osse: Thanks man	18:05
	→ daito joined	18:05
gambl0re	i forked a repo and made some changes to it. how do i push it to a new repo now?	18:05
	→ IWishIKnew joined	18:05
	← chll left	18:06
	→ Jellyg00se joined	18:06
	← zenithdk1 left	18:06
Relevant	We made a staging, QA, and dev branches off of master. Then we make branches for each Jira ticket. We've been encountering issues when trying to modify config files and such, then change branches, which have different versions of those files.	18:06
	Which makes sense, but we haven't figured out a way to deal with it.	18:07
osse	gambl0re: forked how?	18:07
	→ Kulrak joined	18:07
	← Kulrak left	18:07
	→ Kulrak joined	18:07
	→ woshty joined	18:07
Silenced	osse: Does it takes time ?	18:07
gambl0re	i forked somebody elses repo and i added some stuff to the files and now i want to oush it as a repo	18:08
Relevant	And we can't commit our config file changes, because we don't want to merge those changes up to master and mess it up	18:08
	→ zenithdk joined	18:08
	→ ShooterMG joined	18:08
gambl0re	push	18:08
tang^	gambl0re: sounds like you cloned it rather than forked	18:08
thiago	gambl0re: what's the problem?	18:08
gambl0re	oh yea sorry..i forked somebody's repo then cloned it	18:08
tang^	gambl0re: then push it	18:08
gambl0re	but it says that its already initialized	18:09
	→ moritz_s joined	18:09
gambl0re	how do i push it to my own repo	18:09
osse	gambl0re: just 'git push	18:09
thiago	gambl0re: git push	18:09
	gambl0re: again, what's the problem?	18:09
	← dreiss left	18:10
Silenced	thiago: I guess he doesn't know the commands	18:10
gambl0re	ok let me try.	18:10
	← daito left	18:10
gambl0re	i know the commands but i tried doing that and i was getting some errors	18:10
	wait	18:10
	→ synthroid joined	18:10
atrus	Relevant: that may be a sign that those files don't belong in that repository, but in a separate repo for config files.	18:10
osse	gambl0re: ahh, did you clone your own fork or the original?	18:10
Relevant	Hmm, interesting. I guess we could exclude those files. What's the best way of doing that? .gitignore? or remove completely?	18:11
osse	Silenced: does what take time?	18:11
gambl0re	remote: Permission to StephenGrider/ReduxSimpleStarter.git denied to rickywid.	18:11
	fatal: unable to access 'https://github.com/StephenGrider/ReduxSimpleStarter.git/': The requested URL returned error: 403	18:11
	← espindola left	18:11
gambl0re	i cloned the original	18:11
osse	gambl0re: then you have to add your fork as a second remote and push to that	18:12
	← Cryp71c left	18:12
thiago	gambl0re: add a remote to your own and push there	18:12
Silenced	osse: git rm -cached <files>	18:12
	← Gsham left	18:12
osse	gambl0re: git remote add myfork https://github.com/gambl0re/ReduxSimpleStarter.git && git push -u myfork master	18:12
gambl0re	whats the command for that	18:12
	ok	18:12
osse	Silenced: no.	18:12
atrus	Relevant: not sure what you mean, sorry.	18:12
osse	Silenced: git rm --cached unwantedfile1 unwantedfile2 && git commit -m 'Remove some crap'	18:13
gambl0re	i have to create the ReduxSimpleStarter repo first?	18:13
	← hobodave left	18:13
	→ CheckDavid joined	18:13
Silenced	Oh shit. I again did "git add -A"	18:13
osse	gambl0re: you already have it	18:13
	gambl0re: it's your fork	18:14
gambl0re	oh ok	18:14
osse	gambl0re: replace the URL i wrote with the correct one	18:14
	→ uri_ joined	18:14
	← synthroid left	18:14
	→ comcomist joined	18:15
Relevant	atrus: I guess maybe this is language specific. You said a different repository, but I'm not sure how that would work with a C# solution, since the config files are part of the solution. Opening a solution split between multiple repos doesn't seem feasible	18:15
	← zenithdk left	18:15
atrus	Relevant: maybe, i may also not grok exactly what config file means in this context	18:16
	→ roxlu joined	18:16
	→ sgen joined	18:16
	← zeroed left	18:17
	← troulouliou_div2 left	18:17
	→ Psychiatrist joined	18:18
gambl0re	fatal: remote myfork already exists.	18:18
	← tzero left	18:18
gambl0re	also i want to upload to gh-pages	18:18
	→ nettoweb joined	18:18
osse	gambl0re: git remote rm myfork and do it again then	18:19
	→ zenithdk joined	18:19
	→ m8 joined	18:19
	→ clemf joined	18:19
	← uri_ left	18:19
	← subhojit777 left	18:19
	→ tzero joined	18:20
gambl0re	yea seemed to work	18:20
	thanks	18:20
	→ yonatankoren joined	18:20
	→ Nickeeh joined	18:21
	ac3takwas → acetakwas	18:21
gambl0re	how would i push it to a gh-pages?	18:21
thiago	git push remotename local-branchname:gh-pages	18:22
	→ Borkr joined	18:22
	← sibach left	18:22
	→ astockton joined	18:23
	← faux___ left	18:23
	← nettoweb left	18:23
gambl0re	so im guess my remotename is myfork?	18:23
	← imack left	18:24
thiago	yes	18:24
	→ Balliad joined	18:25
	← HobGoblin left	18:26
	→ HobGoblin joined	18:26
	HobGoblin → UukGoblin	18:26
	→ imack joined	18:26
	← leonarth left	18:26
	→ Nes_To joined	18:26
gambl0re	error: src refspec local-branchname does not match any.	18:27
	error: failed to push some refs to 'https://github.com/rickywid/ReduxSimpleStarter.git'	18:27
	← imack left	18:27
thiago	you have to type the name of the local branch that you want to push	18:28
gambl0re	i did.. git push myfork local-branchname:gh-pages	18:28
	→ jimi_ joined	18:28
gambl0re	i already created a gh-pages branch	18:28
	→ faux___ joined	18:29
	← JexSys left	18:29
gambl0re	is it like this?.. git push myfork local-gh-pages:gh-pages	18:29
	→ Ronny222 joined	18:29
osse	gambl0re: the text 'local-branchname' is a hint to you that you need to replace it with the actual branchname	18:29
	← mariuscc left	18:30
	→ jteneyck joined	18:30
	← Ronny222 left	18:30
gambl0re	ok you should have mentioned that	18:30
	i thought it was part of the command	18:30
	→ Not_Whatever joined	18:31
gambl0re	fuck...	18:31
	! [rejected] gh-pages -> gh-pages (non-fast-forward)	18:31
	error: failed to push some refs to 'https://github.com/rickywid/ReduxSimpleStarter.git'	18:31
	hint: Updates were rejected because the tip of your current branch is behind	18:31
	hint: its remote counterpart. Integrate the remote changes (e.g.	18:31
	hint: 'git pull ...') before pushing again.	18:31
	hint: See the 'Note about fast-forwards' in 'git push --help' for details.	18:31
	← blckbit10 left	18:31
	← marcogmonteiro left	18:31
	← felixjet left	18:31
	← Internet13 left	18:31
	→ Ahmed-90 joined	18:32
	→ blckbit10 joined	18:32
	→ synthroid joined	18:32
thiago	gambl0re: it's telling you that you your remote has changes you don't	18:32
	← italoacasas left	18:32
thiago	gambl0re: if you want them, you have to first pull	18:32
	gambl0re: if you want to blow them away, use -f	18:32
	← junw left	18:32
thiago	gambl0re: also, please don't paste more than 3 lines into the channel. Use a pastebin instead.	18:32
gambl0re	sorry	18:32
	← ToxicFrog left	18:33
gambl0re	git push -f myfork local-gh-pages:gh-pages ?	18:33
thiago	if you want to force, yes	18:34
	← Ahmed90 left	18:34
	← faux___ left	18:34
gambl0re	thanks for your help...	18:35
	→ faux___ joined	18:35
	← Balliad left	18:35
	← IWishIKnew left	18:36
	→ EduardoMartins joined	18:36
	← EduardoMartins left	18:36
	→ paddyez joined	18:36
	← paddyez left	18:36
	→ paddyez joined	18:36
	← josuebrunel left	18:36
	→ ToxicFrog joined	18:37
Relevant	Could someone explain the .gitignore file? I added some file extensions, but it's still preventing me from changing branches with conflicts	18:37
	← synthroid left	18:37
	← ash_workz left	18:37
kadoban	Relevant: .gitignore only has an effect on content that's not tracked.	18:38
	→ gnudon joined	18:38
kadoban	Relevant: Essentially all it does is stop ignored files (that aren't also tracked) from showing up in 'git status', and it prevents you from accidentially 'git add'ing them in some circumstances, like 'git add .' won't add ignored files (unless they're already tracked).	18:39
	← faux___ left	18:39
	→ rominronin joined	18:40
	← acetakwas left	18:40
	→ faux___ joined	18:41
	← faux___ left	18:41
	→ faux___ joined	18:42
Silenced	kadoban: "git add ." doesn't works for me these days	18:42
	→ leonarth joined	18:42
milki	!doesntwork	18:43
gitinfo	Sorry to hear it doesn't work, but how about some details? At this point we don't even know whether it did nothing, spit out an error message, or abducted your pet unicorn in a flying saucer. That makes it hard to troubleshoot – unicorn abduction requires a completely different solution than an error message, for instance. So, please be specific...	18:43
milki	!doesnotwork	18:43
	o	18:43
	ok	18:43
	→ ciampix joined	18:43
	← faux___ left	18:43
Relevant	oh okay, thanks kadoban. So it won't resolve my issue of keeping different versions of some files (sln files and config files) on each branch	18:43
_ikke_	nope	18:44
	→ Sasazuka joined	18:44
	→ tesla joined	18:44
milki	isnt git used to keep different versions of files?	18:44
_ikke_	comitted version	18:44
	but you can't keep them different when merging	18:44
Relevant	Well the problem is that we can't commit our local versions	18:44
	Well I mean we can commit, we just can't push them to master	18:45
	→ faux___ joined	18:45
	← notebox left	18:45
	← rominronin left	18:45
	→ skcin7 joined	18:45
	→ Internet13 joined	18:46
	← sgambino left	18:46
_ikke_	Relevant: My experience over the years is that git should not be used to track configuration	18:46
	because these depend on the environment	18:46
Relevant	Yeah, so it seems like the solution for that would be to just remove those file from git?	18:46
	→ sgambino joined	18:47
	→ Sazhen86 joined	18:47
Relevant	But then we have the same issue for the .sln file. And that one we probably do need to keep in git, because someone may add a project to the solution.	18:48
	→ crose joined	18:49
kadoban	Relevant: !config has some ideas, the one I usually end up with is tracking a blah.config.sample file instead of blah.config, and either the user has to copy that and edit it, or the executable can do it itself if a blah.config doesn't exist.	18:49
gitinfo	Relevant: [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas	18:49
	→ hobodave joined	18:49
	→ espindola joined	18:49
	← circ-user-ohseJ left	18:50
kadoban	Oh I dunno how that's going to work with a .sln	18:50
	→ Kicer86 joined	18:50
	→ pantsman- joined	18:50
	← darkbit left	18:52
	← skcin7 left	18:52
	← Ldip left	18:53
Relevant	the .sln may be less of an issue, because it doesn't change often. And as long as the branches are all in sync, we should be able to modify the file and still be able to move between branches even with uncommitted changes	18:53
	→ mohabaks joined	18:53
	→ felixjet joined	18:53
	← viljaste left	18:53
Relevant	It's only when it changes, it seems that branches that are created before the change will have conflicts, even if we were to undo, pull, and reapply the changes, there still seem to be conflicts	18:54
	→ synthroid joined	18:54
	→ boombatower joined	18:54
	ktosiek → ja_chce_jeszcze_	18:54
	← pewu left	18:54
	ja_chce_jeszcze_ → ktosiek	18:54
	→ livingstn joined	18:55
	gitinfo set mode: +v	18:55
	← duderonomy left	18:55
	← comcomist left	18:56
Nes_To	hi guys.. i'm very new to Git and CI, is there any reason why people prever jenkins over git-hook? it seems hit-hook can do all the tasks anyway...?	18:56
	← pungi-man left	18:56
milki	what is git-hook?	18:57
Nes_To	milki, https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks	18:57
	← jfelchner_ left	18:57
preaction	because jenkins also maintains the data, and allows easier configuration, and allows user authentication, and has plugins to update other places easily	18:58
	← mbrzuzy left	18:58
preaction	basically: do you want to do it all yourself (hooks), or do you want to have it done for you (jenkins)?	18:58
	← synthroid left	18:58
	← boombatower left	18:59
	← durham_ left	18:59
milki	Nes_To: ah hooks	19:00
	→ circ-user-JJNIJ joined	19:00
Nes_To	preaction, em.. depends.. because i see people use jenkins with git-hook plugin, then why not just go for git-hooks. As most developers can live with CLI and scripts anyway.	19:00
milki	Nes_To: both jenkins and hooks can run shell commands	19:00
	Nes_To: jenkins is a complete CI solution	19:00
	Nes_To: hooks are triggered scripts	19:00
	you can do equivalent things in both	19:00
	→ pewu joined	19:00
milki	but hooks are not a complete CI solution	19:00
ojacobson	Nes_To: jenkins can do more, broadly. You can push while a build is in progress, Jenkins can deduplicate builds if multiple pushes happen in rapid succession, Jenkins deals with the git environment for you (see !deploy for why that would matter)	19:01
gitinfo	Nes_To: 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	19:01
	← leonarth left	19:01
	→ boombatower joined	19:01
	← faux___ left	19:01
	← terminal_echo left	19:02
	→ sangy joined	19:02
	← boombatower left	19:02
	← kfoonamalik left	19:02
	→ boombatower joined	19:02
	← astockton left	19:02
	→ tomog999_ joined	19:02
Nes_To	thx.. actually i'm a sys admin turnning to dev ops, need to setup build/QA automations (maybe deploy). my point of view is if hook can do all, why bother CI.. as we can also use system cron to do nightly build	19:03
	→ uri_ joined	19:03
	→ Tsutsukakushi joined	19:03
tang^	I've managed system cron builds	19:03
	→ IWishIKnew joined	19:03
preaction	because of the reasons i said, and others said...	19:03
Tsutsukakushi	hello, is there an easy way to view the file's different revisions?	19:03
tang^	I run jenkins today because of that	19:03
preaction	Tsutsukakushi: git log -u <file> perhaps?	19:03
	← sgambino left	19:04
Tsutsukakushi	i mean	19:04
_ikke_	preaction: funny that you use -u	19:04
ojacobson	cornjob build systems have one serious problem	19:04
Tsutsukakushi	i want to see the whole file	19:04
	and read it	19:04
	in that revision	19:04
	not see the commit	19:04
preaction	Tsutsukakushi: git checkout or git show	19:04
tang^	heh... cornjob	19:04
ojacobson	unless you take specific measures to prevent it, cronjob-based builds will start to overlap with themselves if the build ever takes longer than the interval between jobs	19:04
tang^	^^	19:05
ojacobson	you can fix that (flock(1), etc) but why	19:05
preaction	_ikke_: yeah, people keep saying that. i have no idea why i use -u and everyone else uses... whatever the other one is... -p?	19:05
ojacobson	you can fix each individual weakness individually.... or you can use a build system.	19:05
	→ hyperair joined	19:05
Nes_To	sorry, i'm slow.. i kind of see the point now.. its because jenkins log down all build pass/fail and logs, right?	19:05
	← tomog999 left	19:05
_ikke_	preaction: yeah, -p	19:05
	preaction: perhaps because of diff -u?	19:05
preaction	Nes_To: it also sends e-mails or notifications when builds fail. it also builds downstream projects. it also does other things.	19:05
Tsutsukakushi	preaction: in some way that lets me easily jump between versions	19:05
	→ sgambino joined	19:05
Tsutsukakushi	maybe	19:05
	→ dubphil joined	19:06
preaction	Tsutsukakushi: tig perhaps?	19:06
_ikke_	keeps history of failed and succeeded builds	19:06
	→ vdv joined	19:06
Tsutsukakushi	i didn't see any full file inspecting mode in tig	19:06
	← jeffreylevesque left	19:06
	→ dreiss joined	19:07
	→ jemadux_ joined	19:07
	→ modocache joined	19:08
	← sgambino left	19:08
	→ sgambino joined	19:09
Nes_To	preaction, catch make/build exit state then send email is scriptable, can be done just one line of code.	19:09
dubphil	hello, anyone using git cola on ubuntu ?	19:09
	← felixjet left	19:09
	→ durham joined	19:09
	← espindola left	19:09
	→ felixjet joined	19:10
	← jemadux left	19:10
	← Kulrak left	19:10
preaction	Nes_To: congratulations. you're now on the way towards building jenkins. what about downstream builds? what about the jenkins plugin ecosystem? how will you deploy your hooks? (another git repo, perhaps?) do you need remote build servers? (managed with vagrant or gnu parallel or just ssh perhaps?)	19:11
	→ faux___ joined	19:11
	← fscala left	19:11
preaction	Nes_To: if you want to do all this yourself, have fun. hope your bosses don't mind you spending weeks and months building, and then further months maintaining, all this stuff	19:11
	→ hahuang65 joined	19:11
Nes_To	preaction, lol sorry.. i'm dont mean to be mean.. sorry if any way that i offended you. i just want to know why.	19:12
preaction	Nes_To: we keep saying why. you keep ignoring it.	19:12
	← durham left	19:12
	→ elastix joined	19:12
	→ dopesong joined	19:12
dubphil	even if .gitconfig is ok and even if I have fill the ident/email in preferences, it still continue to tell "Who are you etc...", even after typing git --global user.name etc it continue to fail, I have restarted the app and also the session, i don't know what I can do else instead of throwing it :(, any ideas ?	19:12
preaction	and if you think all these things are trivial, you've never seen how they can go wrong	19:13
	→ fscala joined	19:13
	→ durham joined	19:13
	← dsantiago left	19:13
	← sgambino left	19:13
	← dopesong left	19:13
	← uri_ left	19:13
	→ sgambino joined	19:13
	→ dopesong joined	19:13
	→ {AS} joined	19:14
	→ Macaveli joined	19:15
	→ jeffreylevesque joined	19:15
	→ synthroid joined	19:15
	← faux___ left	19:15
	← manderke_ left	19:16
	→ cagedwisdom joined	19:16
Nes_To	preaction, for centralized and remote are good points to use jenkins. git may already have such plugin or whatever, but with jenkins seems easier.	19:16
	→ iLembus joined	19:16
preaction	there are other CI solutions besides Jenkins, but they're generally called CI, not git plugins	19:17
	buildbot comes to mind	19:17
	← sangy left	19:17
	→ faux___ joined	19:17
Tsutsukakushi	preaction: i couldn't find a way to do it with tig	19:17
	← robh71 left	19:18
	← algae left	19:18
preaction	Tsutsukakushi: i don't use tig, i was just making a suggestion. i don't know how to get what you want. i generally use git log -u to get the same kind of information. what do you need the information for? there might be a better way to do it	19:18
Tsutsukakushi	i think it would be an easier way to look for a specific version of a file	19:19
preaction	what are you looking for? there's also git grep	19:20
	← toogley left	19:20
	← synthroid left	19:20
	← iLembus left	19:21
	← faux___ left	19:21
	→ ahmedelgabri joined	19:22
Nes_To	I got my answer, will continue exploring jenkins. thx guys. :-)	19:23
	→ faux___ joined	19:23
	→ Kulrak joined	19:24
	← Kulrak left	19:24
	→ Kulrak joined	19:24
	← Silenced left	19:25
	→ pl3sk joined	19:27
	← faux___ left	19:27
	← sgambino left	19:30
	→ MistahKurtz joined	19:31
	→ sgambino joined	19:31
	← pl3sk left	19:32
	← Anderson69s left	19:32
	→ uri_ joined	19:32
	→ d4rklit3 joined	19:32
	← boombatower left	19:33
	→ ssb321 joined	19:33
	→ boombatower joined	19:34
	→ m0viefreak joined	19:35
	← mohabaks left	19:35
	← Jellyg00se left	19:36
	→ synthroid joined	19:37
	← Kamran left	19:37
	→ Kamran joined	19:37
	sendak.freenode.net set mode: +v	19:37
	← Kamran left	19:37
	→ Kamran joined	19:37
	sendak.freenode.net set mode: +v	19:37
	→ josuebrunel joined	19:38
	→ mohabaks joined	19:39
	→ sangy joined	19:39
	→ osgur joined	19:40
	→ Jellyg00se joined	19:40
	→ tylerdmace joined	19:40
	→ rominronin joined	19:41
	← synthroid left	19:42
tylerdmace	Hello! I can't seem to find any information on this but I just want to know if I've messaged something up or not: I resolved some conflicts that occurred during a rebase and as soon as I had updated my files, I did a git add and git commit; now the git rebase --continue is saying there's no changes. I am pretty sure I was supposed to just do a git add without doing a commit. Can anyone help me figure out where to go from here?	19:42
	messed something up, rather	19:43
	← Pistachio2 left	19:43
	→ mwhooker joined	19:44
	← gnudon left	19:46
	← rominronin left	19:46
	→ AtnevRed joined	19:47
	→ radsy joined	19:49
	→ aidalgol joined	19:50
	← NeverDie left	19:52
	← AtnevRed left	19:52
milki	tylerdmace: that means you didnt make any changes compared to the previous commit. which can be a valid resolution	19:53
	tylerdmace: if that is what you want, its safe to skip	19:53
	→ dsantiago joined	19:53
	→ herr_barium joined	19:53
	→ italoacasas joined	19:54
	→ skcin7 joined	19:55
tylerdmace	milki: I don't quite follow. I had lots of commits incoming from my rebase.	19:55
	Some of which caused two files to have conflicts. Once addressed, I did a git add/git commit	19:55
	Should I not have done the git commit?	19:56
	what's the normal process there?	19:56
	← mblack left	19:56
	→ squiddle joined	19:57
	→ Blkt joined	19:57
tylerdmace	And is that git commit something I should revert or am I ok just skipping the (only) patch?	19:57
	→ Gsham joined	19:57
	→ mblack joined	19:58
	← howdoi left	19:58
milki	tylerdmace: you dont need to do a manual git commit after you've resolved conflicts	19:58
	tylerdmace: git rebase --continue will take your stage and commit it with the original commit message	19:58
	← govg left	19:59
	→ zium joined	19:59
milki	tylerdmace: if you do a manual commit, then theres no changes in stage so thers no changes	19:59
	→ synthroid joined	19:59
	→ egraham joined	19:59
	→ faux___ joined	20:00
	← Sucks left	20:00
	→ govg joined	20:00
	← egraham left	20:01
tylerdmace	Ok so my manual commit brings me up to date (albeit differently) and I can now just --skip this patch, right?	20:01
	→ leksster joined	20:02
	→ hyphenated joined	20:02
	← faux___ left	20:02
	← synthroid left	20:04
	→ rpg joined	20:04
milki	yeah	20:04
	→ juacado joined	20:04
tylerdmace	Awesome, thank you	20:05
	← jaafar left	20:05
tylerdmace	someone on stack overflow suggested doing a `git reset --soft HEAD^` and the simply doing the `git rebase --continue`; I may do that instead.	20:05
	that way I get all the benefit of the rebase (squashed commits, I assume) where I wouldn't have them if I just --skip'd	20:06
	→ daito joined	20:06
	→ jemadux__ joined	20:06
	← dev1x left	20:06
	→ Guest89 joined	20:08
	→ dev1x joined	20:08
	→ faux___ joined	20:09
	← herr_barium left	20:09
	← jemadux_ left	20:09
milki	tylerdmace: that would be the same as undoing your manual commit	20:10
	← rnsanchez left	20:10
	← uri_ left	20:10
	← daito left	20:10
	← sanketdg left	20:10
	→ sanketdg joined	20:11
	→ uri_ joined	20:11
	→ mezod joined	20:12
	← zadock left	20:12
	← faux___ left	20:12
	← sgambino left	20:12
	← FunkyAss left	20:12
	→ faux___ joined	20:12
	← sanketdg left	20:12
	→ sgambino joined	20:12
	← NimeshNeema left	20:12
	← juacado left	20:14
	→ pawprint joined	20:14
pawprint	silly question: can git branch names have spaces in them?	20:14
squiddle	i need help with git rebase --no-ff. i want to copy a branch with new commits from git's perspective (same content) and preserve merges. so i tried git rebase --verbose --no-ff --preserve-merges branch-root branch-tip and other variations but it always just fast-forwards each commit	20:14
qsx	pawprint: !tias	20:14
gitinfo	pawprint: Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/tias.html may help with git-specific TIAS.	20:14
qsx	it does however sound like an idea you want to avoid.	20:15
	← FIQ left	20:15
squiddle	so for me it looks like git rebase --no-ff is not working correctly, git version is 2.7.0	20:15
	→ tildes joined	20:15
pawprint	thanks	20:15
	i guess they can't	20:15
	← pawprint left	20:15
jeffreylevesque	is versioning a file that is 799456477 too big to version?	20:16
	← mezod left	20:16
jeffreylevesque	specifically, bad idea to version a vagrant base box?	20:16
kadoban	799456477 square miles?	20:16
jeffreylevesque	bytes	20:17
	← efco left	20:17
_ikke_	800M?	20:17
jeffreylevesque	roughly	20:17
kadoban	There's no real limit, but that doesn't sound great.	20:17
	If you're going to do it you should probably use something like git-annex I'd guess.	20:17
ojacobson	Git doesn't care. `git diff` will ignore the file, since a base box (a tarball) looks like a binary. Some git hosts will care, and you'll end up with a repo that's close to the size of the sume of the sizes of all versions.	20:17
	→ mbrzuzy joined	20:18
qsx	ojacobson: not necessarily	20:18
ojacobson	true, but likely	20:18
qsx	if you only change a couple of bytes each version, it’s those couple of bytes	20:18
	but yeah. likely.	20:18
jeffreylevesque	I want to commit this bad boy :(	20:19
ojacobson	tar.gz tho	20:19
	← sgambino left	20:20
kadoban	jeffreylevesque: If it never changes, it's not going to hurt anything. If it changes often or changes in different ways in different branches and you want to merge, it's going to be bad. If it's somewhere in the middle … it's hard to say.	20:20
ojacobson	I'd expect gzip to mangle most of the similarities between versions	20:20
	→ sgambino joined	20:20
jeffreylevesque	can one clone a repository, and ignore a specific file? like if i have a colleague, and they want to use lamp / wamp, instead of a vagrant ?	20:20
ojacobson	no	20:20
kadoban	jeffreylevesque: No	20:20
milki	sparse checkout?	20:20
jeffreylevesque	yeah, the box shouldn't change for a while	20:20
ojacobson	git's remote operations are at commit granularity	20:20
	→ JZA joined	20:20
	→ synthroid joined	20:21
JZA	hi I want to commit my files to my remote server (on gitlab)	20:21
	I already create and push the branch	20:21
	edit the file and commit changes, but on git push it gives me: Changes not staged for commit: MyFile .. no changes added to commit	20:21
	did I miss something?	20:21
Hello71	!index	20:22
gitinfo	The index (or cache, or staging area) is one of git's most central concepts. Read http://git-scm.com/book/en/Getting-Started-Git-Basics "The Three States", and e.g. http://tomayko.com/writings/the-thing-about-git for some cool things it can help you do.	20:22
Hello71	!nochanges	20:22
	→ bluezone joined	20:22
milki	JZA: yeah you skipped a step. maybe those links will help	20:22
	← mwhooker left	20:23
JZA	which one?	20:23
milki	JZA: !fish	20:23
gitinfo	JZA: In the long run, it is much better to give pointers to answers than the answers themselves.	20:23
JZA	well I already read that	20:23
bluezone	Hey guys. I changed the user.name property with the --global option but when I push the e-mail is still not affected by the change and the push fails	20:23
JZA	how can I get pointers?	20:24
	→ yqt joined	20:24
Hello71	bluezone: what does that have to do with pushing	20:24
_ikke_	bluezone: this information is stored in the commits	20:24
	← josuebrunel left	20:24
milki	hm.. those links dont help either	20:24
	milki looks around	20:24
kadoban	bluezone: If you want to change the email that's in the commits, you'll have to use something like filter-branch, which changes history.	20:25
	← synthroid left	20:25
JZA	milki: yeh just shwo how it works, but doesnt give any console commands for doing stuff... I am also read this one:	20:25
	https://github.com/Kunena/Kunena-Forum/wiki/Create-a-new-branch-with-git-and-manage-branches	20:25
	but doesnt really address the issue on file push, only on brnaching	20:25
	branching	20:25
	← Gsham left	20:26
milki	huh, we dont have a trigger that addresses the issue	20:26
	JZA: the overall workflow should be - make changes, stage/add your changes, commit your changes, optionally push your changes	20:26
	JZA: so you are missing man git add	20:27
gitinfo	JZA: the git-add manpage is available at http://jk.gs/git-add.html	20:27
qsx	or in other words, introductory material. !book or so.	20:27
gitinfo	There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	20:27
JZA	ok thanks	20:27
	← jeffreylevesque left	20:28
	← colegatron_origi left	20:28
milki	JZA: please be enlightened by reading the book link	20:28
	otherwise, your asking will be for naught	20:28
	→ jeffreylevesque joined	20:28
	← JZA left	20:29
qsx	!next	20:29
gitinfo	Another satisfied customer. NEXT!	20:29
	← xdej left	20:29
	→ hanthings_ joined	20:31
	← clemf left	20:31
	← rpg left	20:32
	→ ahr3n joined	20:32
	← sgambino left	20:33
	← Guest89 left	20:33
	← skcin7 left	20:34
	← IWishIKnew left	20:34
	← dubphil left	20:35
	→ raijin joined	20:36
	→ Guest89 joined	20:37
	← t0by left	20:38
	← jeffreylevesque left	20:38
	← felixjet left	20:38
	→ Pulp joined	20:38
	→ felixjet joined	20:39
	→ jeffreylevesque joined	20:39
	← dev1x left	20:40
	→ mwhooker joined	20:40
	← raijin left	20:40
	← nickthetait left	20:41
	→ bbbthunda joined	20:42
	→ nickthetait joined	20:42
	→ synthroid joined	20:42
	← mbrzuzy left	20:43
	← IrishPrime left	20:43
	→ colegatron_origi joined	20:43
	→ t0by joined	20:44
	→ NeverDie joined	20:44
	→ roelmonnens joined	20:44
	← sangy left	20:44
	← hobodave left	20:44
	→ kfoonamalik joined	20:46
	← phaleth left	20:46
	← kfoonamalik left	20:46
	← synthroid left	20:47
dzho	so the bot doesn't accept pm's, or am I doing it wrong?	20:47
	→ sangy joined	20:47
	→ skcin7 joined	20:47
	dzho didn't want to flood the channel with all six of those suggestions	20:47
	← Not_Whatever left	20:48
dzho	I think I've seen the parable one before--that's from one of the github founders, iirc.	20:48
	→ sgambino joined	20:49
	← barneygale left	20:50
	→ hobodave joined	20:50
	→ MattMaker joined	20:50
	→ barneygale_ joined	20:50
	→ appledroid joined	20:51
	← Macaveli left	20:51
	→ bollullera joined	20:51
	← [Saint] left	20:51
	→ mbrzuzy joined	20:52
	← aidalgol left	20:52
qsx	dzho: it does	20:53
	but iirc it responds with a notice	20:53
	← abc123_ left	20:54
	→ abc123 joined	20:54
	← bollullera left	20:54
	→ tvw joined	20:54
	← faux___ left	20:54
	→ astockton joined	20:54
	→ kfoonamalik joined	20:54
	← appledroid left	20:55
dzho	qsx: maybe my client is just b0rked, I get a No such client/nick in response to everything I try to send it.	20:55
Hello71	five bucks says you misspelled it	20:56
	→ faux___ joined	20:57
dzho	gee eye tee eye en eff oh	20:57
	→ bollullera joined	20:57
dzho	my eyes have never been that good, but I'm a decent enough typist not to fat finger it if I'm reading it right.	20:57
	at least, not consistently	20:57
	← hyphenated left	20:58
	← tvw left	20:58
dzho	no biggie, just hadn't had much trouble with this kind of bot before	20:58
	← tildes left	20:59
	← roygbiv left	20:59
	→ synthroid joined	20:59
	→ aidalgol joined	21:00
	← jeffreylevesque left	21:00
	← sgambino left	21:01
	→ strayPuppy joined	21:01
	← Gloomy left	21:03
	→ [Saint] joined	21:03
	→ tvw joined	21:03
qsx	golf india tango india november foxtrott oscar.	21:03
	(foxtrot?)	21:04
	← synthroid left	21:04
preaction	yes	21:04
	→ synthroid joined	21:04
	→ sgambino joined	21:04
	← netj left	21:05
	← sgambino left	21:05
	→ sgambino joined	21:05
	→ netj joined	21:06
	← codeman left	21:07
	← ahmedelgabri left	21:07
	← synthroid left	21:08
	→ sssilver joined	21:08
	← CheckDavid left	21:09
	← tinajohnson__ left	21:09
	→ drocsid joined	21:10
	← rclanan left	21:10
	→ samw_ joined	21:11
	→ rclanan joined	21:11
	← rclanan left	21:11
	→ gfixler1 joined	21:12
	→ peoliye joined	21:12
	← zium left	21:13
	← samw left	21:14
	← mwhooker left	21:14
	→ rclanan joined	21:15
	← rclanan left	21:15
	→ rclanan joined	21:15
	← rclanan left	21:15
	← invapid1 left	21:16
dzho	right	21:16
	→ ag4ve_ joined	21:17
	→ rclanan joined	21:17
	← darkschneider left	21:17
	← rclanan left	21:17
	→ rclanan joined	21:18
	← rclanan left	21:18
	← uri_ left	21:18
	→ Balliad joined	21:18
	→ rclanan joined	21:18
	→ vF3hNGxc47h8 joined	21:18
	← rclanan left	21:18
	→ rclanan joined	21:19
	← rclanan left	21:19
	→ rclanan joined	21:20
	← rclanan left	21:20
	→ rclanan joined	21:21
	← rclanan left	21:21
	← Balliad left	21:21
	→ rclanan joined	21:21
	← rclanan left	21:21
Seveas	whisky tango fuckitall	21:22
	→ rclanan joined	21:22
	← rclanan left	21:22
	→ rclanan joined	21:23
	← rclanan left	21:23
	← roelmonnens left	21:23
	← aswen left	21:23
_ikke_	dzho: !parable @p	21:23
gitinfo	dzho: 'The git parable' provides some good reasoning behind git. http://tom.preston-werner.com/2009/05/19/the-git-parable.html	21:23
_ikke_	hmm,	21:24
	→ ash_workz joined	21:24
_ikke_	there is a way you can redirect it	21:24
	→ rclanan joined	21:24
	← rclanan left	21:24
	→ roelmonnens joined	21:24
_ikke_	dzho: !parable@p	21:24
	ah	21:24
	→ rclanan joined	21:24
	← rclanan left	21:24
	← jaeckel left	21:25
	→ Limes_ joined	21:25
	→ synthroid joined	21:26
	→ rclanan joined	21:26
	← rclanan left	21:26
	← mohabaks left	21:26
	→ rclanan joined	21:27
	← rclanan left	21:27
	← rwb left	21:27
	→ kazagistar joined	21:27
	→ rclanan joined	21:28
	← rclanan left	21:28
sybariten	hi, i'm a newbie, i have a small svn repo of basicly project files for something like a visualization system	21:28
	i am thinking of doing this in git instead now .... can i do a git init in the same basedir and basicly use git and svn at the same time?	21:28
	→ rclanan joined	21:28
	← rclanan left	21:28
sybariten	or should i clone the base dir off to somewhere else and start with git there	21:29
_ikke_	personally I would do the latter	21:29
	← crose left	21:29
	← roelmonnens left	21:30
sybariten	OK. Any specific reason why?	21:30
	← kpease left	21:30
	→ rclanan joined	21:30
	← rclanan left	21:30
	← synthroid left	21:30
kazagistar	is there a built-in command somewhere for extracting the tree hash from a commit? I am trying to tag build artifacts with their source to save work. This is my current solution: CURRENT_TREE=$( git cat-file -p HEAD \| grep "^tree" \| head -n 1 \| cut -d' ' -f2 )	21:30
	→ rclanan joined	21:31
	← rclanan left	21:31
	← PaulCapestany left	21:31
_ikke_	having two repositories sharing the same work tree is not going to give you a nice experience	21:31
	git rev-parse	21:31
	git rev-parse HEAD^{tree}	21:32
	→ rclanan joined	21:32
	← rclanan left	21:32
	← jteneyck left	21:32
	← sr_____ left	21:33
	← hanthings_ left	21:33
	→ PaulCapestany joined	21:33
	→ rclanan joined	21:34
	← rclanan left	21:34
courrier	Hey guys, my colleagues never commit to a repository, but I do by updating a calibration file regularly, however I would like not to see all updates of the calibration file in the history, can I reset the last calibration locally, commit the new one and then force push safely in this context? By this way git would see only the last calibration and by pulling my colleagues are always up to date?	21:34
	→ rclanan joined	21:34
	← rclanan left	21:34
	→ Gloomy joined	21:35
	→ Imek joined	21:35
_ikke_	courrier: What use has git in this case/	21:35
	?	21:35
	→ kpease joined	21:35
	→ rclanan joined	21:36
	← rclanan left	21:36
_ikke_	You could also scp it to a server and let your coleagues rsync it	21:36
	→ rclanan joined	21:37
	← freimatz left	21:37
	← rclanan left	21:37
courrier	_ikke_: All previous commits regarding code are there and stay there, but commiting the calibration every week is heavy	21:37
	← Kicer86 left	21:37
	← SimonNaa left	21:37
	→ rclanan joined	21:38
	← rclanan left	21:38
courrier	_ikke_ Yeah but that requires an additional command :)	21:38
	← mbrzuzy left	21:38
	← AaronMT left	21:38
courrier	There is also the option of another branch	21:38
	in which we publish calibrations	21:38
	and the main branch stays clear	21:38
	→ rclanan joined	21:38
	← rclanan left	21:38
	→ flobin joined	21:39
_ikke_	You can create an orphan branch	21:39
	→ rclanan joined	21:39
	← rclanan left	21:39
kazagistar	_ikke_: thanks! rev-parse is exactly what I was looking for!	21:39
	→ rclanan joined	21:40
	← rclanan left	21:40
_ikke_	courrier: also look into things like !media	21:40
gitinfo	courrier: [!annex] git-annex, git-media, and Git LFS are some solutions to the !binary problem. They work by keeping the blobs outside of the repo, storing a reference to the blob in the repo instead. http://git-annex.branchable.com https://github.com/alebedev/git-media http://git.io/git-lfs	21:40
	→ edude03 joined	21:40
	→ rclanan joined	21:41
	← rclanan left	21:41
kazagistar	_ikke_: actually, it looks like the magic is ^{tree} which is really interesting	21:41
	→ rominronin joined	21:41
_ikke_	yes	21:41
	see also man gitrevisions	21:41
gitinfo	the gitrevisions manpage is available at http://jk.gs/gitrevisions.html	21:41
	← tvw left	21:41
	→ nnyk_ joined	21:41
	→ BSaboia joined	21:41
courrier	_ikke_: what would be the advantage of an oprhan rbanch compared to a regular branch is that specific case? I don't want to pollute master, but the "calibration" branch can see the master history without problem	21:42
	← peoliye left	21:42
	→ rclanan joined	21:42
	← rclanan left	21:42
	← TomyLobo left	21:43
_ikke_	cleaner, because they're unrelated	21:43
	→ espindola joined	21:43
	→ clemf joined	21:43
	← osgur left	21:44
	→ BrunoSaboia joined	21:44
	→ rclanan joined	21:44
	← rclanan left	21:44
	→ rclanan joined	21:44
	← rclanan left	21:45
courrier	_ikke_: With LFS maybe, don't know how it works, yet, I'll rtfm, but wouldn't that be a heavy solution for a single files of several Bytes?	21:45
	← rominronin left	21:45
	← faux___ left	21:45
	→ rclanan joined	21:45
	← rclanan left	21:45
_ikke_	might be	21:45
	Why do you want to reset it then?	21:46
	→ tpollard joined	21:46
_ikke_	That means you don't want to version control it	21:46
	→ rclanan joined	21:46
	← rclanan left	21:46
	→ jaeckel joined	21:46
	→ rclanan joined	21:47
	← rclanan left	21:47
	malide → grammar_nazi	21:47
	← BSaboia left	21:47
	→ mbrzuzy joined	21:47
	→ synthroid joined	21:47
	→ AtnevRed joined	21:48
	→ namikr joined	21:48
courrier	For that file I don't want version control, exactly, but I would like all my collegues to be able to get the up-to-date version easily, since this repo is a submodule of a bigger one that we git submodule for each pull everyday it's immediate to pull the calibration	21:48
	→ rclanan joined	21:48
	← rclanan left	21:48
	grammar_nazi → malide	21:49
	→ rclanan joined	21:49
	← rclanan left	21:49
_ikke_	Have you also looked into git annex?	21:49
	→ rclanan joined	21:49
	→ allgoodAtTaoti joined	21:49
	→ peoliye joined	21:49
	← ahr3n left	21:49
courrier	_ikke_ nope, but I will ^^	21:50
	← rclanan left	21:50
allgoodAtTaoti	Hi All, we have some developers who are trying to use git to clone a project. Inside this project is an upstream module that contains \| in the file path. This is causing issue cloning for waht I assume is an illegal character. We're looking into git sparse checkout but is there another solution for this type of issue?	21:50
BtbN	Fix that files name.	21:50
allgoodAtTaoti	lol	21:50
	← gfixler1 left	21:50
BtbN	I don't think that's a legal character on at least Windows.	21:50
	→ rclanan joined	21:50
allgoodAtTaoti	can't, we'll loose the changes on updates =/	21:51
	← rclanan left	21:51
allgoodAtTaoti	lose*	21:51
	wow	21:51
courrier	_ikke_ Oh, but it's not part of git	21:51
	← mblack left	21:51
_ikke_	no	21:51
	→ rclanan joined	21:51
	← rclanan left	21:51
	← synthroid left	21:52
	← t0by left	21:52
	→ rclanan joined	21:52
	← rclanan left	21:52
	← AtnevRed left	21:53
	← namikr left	21:53
	← Gloomy left	21:53
	→ rclanan joined	21:53
	← rclanan left	21:53
	→ rclanan joined	21:53
	← rclanan left	21:54
	→ rclanan joined	21:54
	← rclanan left	21:54
	← sangy left	21:54
	→ rclanan joined	21:55
	← madewokherd left	21:56
	← rclanan left	21:56
	→ rclanan joined	21:57
	← rclanan left	21:57
	→ timeshifter joined	21:57
	← courrier left	21:57
	→ rclanan joined	21:57
	← rclanan left	21:57
	→ rclanan joined	21:58
	← rclanan left	21:58
	← netj left	21:58
	gitinfo set mode: +v	21:59
	→ netj joined	21:59
	← edude03 left	21:59
	← pantsman- left	21:59
	→ rclanan joined	21:59
timeshifter	alrighty, back for another dumb question..... how do i resolve a merge conflict without committing?	21:59
	← rclanan left	21:59
	→ rclanan joined	22:00
	← rclanan left	22:00
	→ sangy joined	22:01
	← Jackneill left	22:01
timeshifter	i have a merge conflict in a working dir that's meant to exclusively be a recipient.. no changes should ever be made in this dir	22:01
	→ rclanan joined	22:01
	← rclanan left	22:01
	→ rclanan joined	22:02
	← rclanan left	22:02
bremner	so don't merge there	22:02
	merge == change	22:02
	← mbrzuzy left	22:02
timeshifter	i suspect one of the client's guys did something, but it's no longer correct and needs to be replaced with what's in the repo	22:03
	→ rclanan joined	22:03
	← rclanan left	22:03
	→ mwhooker joined	22:03
timeshifter	and a pull won't complete properly because of the conflict	22:03
	even deleting the file and pulling results in the same thing	22:03
_ikke_	git checkout --ours dir	22:03
	→ rclanan joined	22:04
	→ jbalint joined	22:04
jbalint	hi	22:04
	← rclanan left	22:04
jbalint	is there a way to set --full-index for show with `git config'	22:04
	→ rclanan joined	22:05
	← rclanan left	22:05
timeshifter	_ikke_: that resolved the conflict, but git still insists i commit	22:05
	lvh_ → lvh	22:05
timeshifter	and as this dir is supposed to never EVER push anything back to the repo...	22:05
bremner	well, that's what git merge does.	22:06
	commit has nothing to do with pushing back	22:06
	→ rclanan joined	22:06
	← rclanan left	22:06
timeshifter	but this is supposed to be an entirely one-way process	22:06
	→ rclanan joined	22:07
	← rclanan left	22:07
	→ daito joined	22:07
timeshifter	why can't i just say "to hell with what's local, it's wrong"?	22:07
	→ calamari joined	22:07
	→ rclanan joined	22:07
	← rclanan left	22:07
bremner	timeshifter: as I said, don't use merge, if that's the case	22:07
_ikke_	timeshifter: The merge conflict means git is doing a merge	22:07
bremner	timeshifter: sounds like you should have a look at !deploy	22:08
gitinfo	timeshifter: 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	22:08
	→ rclanan joined	22:08
_ikke_	You can reset your local branch	22:08
	← rclanan left	22:08
	← Guest89 left	22:08
timeshifter	everything about this deployment process is weird, but i'm long over trying to fight that battle, lol.. client's a brick wall on the issue	22:08
	← squiddle left	22:09
	→ rclanan joined	22:09
timeshifter	but this problem is simply one file that i don't want the local version of anymore, but i don't know how to tell git that	22:09
	← rclanan left	22:09
_ikke_	git checkout --theirs <file>	22:09
	← allgoodAtTaoti left	22:10
_ikke_	This will use the file from the branch that is merged in	22:10
	→ edude03 joined	22:10
timeshifter	i did that, but like i said, git still insists on a commit	22:10
	→ rclanan joined	22:10
	← rclanan left	22:10
timeshifter	which actually raises an interesting question... why does git think all these files need to be pushed, when they were literally just pulled?	22:11
	← tylerdmace left	22:11
	→ rclanan joined	22:11
	← {AS} left	22:11
	← rclanan left	22:11
	← BigWillie left	22:11
	→ localuser- joined	22:12
	← daito left	22:12
	→ rclanan joined	22:12
	← rclanan left	22:12
_ikke_	timeshifter: Because a merged happened, which means the result is something neither you had local, nor is in the remote	22:12
	→ pale3 joined	22:12
_ikke_	a pull == fetch + merge	22:12
	if you have local changes, you cannot expect a pull to result in something that the remote already has	22:13
	→ rclanan joined	22:13
	← rclanan left	22:13
timeshifter	but i want to disregard my local changes, they're not correct	22:13
	← livingstn left	22:13
timeshifter	i just want the current state of the branch as it's in the repo, nothing local matters	22:13
	→ rclanan joined	22:13
	← rclanan left	22:13
calamari	then use a hard git reset	22:14
timeshifter	tried that, and a pull results in the same thing	22:14
kadoban	timeshifter: Then a pull isn't appropriate. If you want the state of the local branch to equal the state of the remote branch, yes there's a reset command for that.	22:14
	→ rclanan joined	22:14
	← blckbit10 left	22:14
	← rclanan left	22:14
_ikke_	timeshifter: pull == fetch + merge	22:14
	it's not meant as: make my local repo equal to remote	22:14
	what you want is fetch + reset	22:15
qsx	_ikke_: i will not buy this record: it is scratched.	22:15
	→ blckbit10 joined	22:15
	→ rclanan joined	22:15
	← rclanan left	22:15
_ikke_	Sometimes you have to repeat things to make them stick	22:15
timeshifter	repeating doesn't help when i'm in an ELI5 state about git :p	22:15
	← sfz- left	22:15
qsx	timeshifter: !book	22:16
gitinfo	timeshifter: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	22:16
_ikke_	I'm pretty much eli5ing you	22:16
	← citizen-_ left	22:16
	← astockton left	22:16
	← magnusstubman left	22:16
_ikke_	timeshifter: git reset --hard @{u}	22:17
	this will reset you branch to the same commit you fetch from the remote	22:17
	→ rclanan joined	22:18
	← rclanan left	22:18
	→ Not_Whatever joined	22:19
	→ rclanan joined	22:19
	← abc123 left	22:19
	→ abc123_ joined	22:19
	← rclanan left	22:19
	← italoacasas left	22:19
	→ rclanan joined	22:20
	← rclanan left	22:20
	← stoned left	22:21
	→ rclanan joined	22:21
	← rclanan left	22:21
	← MarkyC left	22:21
	← edude03 left	22:21
	→ rclanan joined	22:22
	← rclanan left	22:22
	→ flavi0 joined	22:22
	← apotry left	22:22
	polyzen → lactose	22:22
	→ rclanan joined	22:23
	← rclanan left	22:23
	→ t0by joined	22:23
	→ bannakaffalatta joined	22:24
	→ rclanan joined	22:24
	← rclanan left	22:24
	← eka_ left	22:24
	→ skinux joined	22:24
	→ CheckDavid joined	22:25
	→ rclanan joined	22:25
	← rclanan left	22:25
	→ rclanan joined	22:25
	jemadux__ → jemadux	22:26
	← rclanan left	22:26
skinux	Question. If I create and use a Git repo on localhost, splitting up versions by creating branches, can I compress and copy the entire git directory to a DVD or USB as a backup, and then copy it BACK, decompress and retrieve from it to have my backup restored?	22:26
	→ rclanan joined	22:26
	→ astockton joined	22:27
	← rclanan left	22:27
_ikke_	sure	22:27
	the entire repo is in the .git dir	22:27
	→ rclanan joined	22:27
	← rclanan left	22:27
	→ frem joined	22:28
bremner	if you're 5, you shouldn't be in charge of deployment for your company / NGO / intergalactic rebel movement <- explained ;)	22:28
_ikke_	lol	22:28
	→ rclanan joined	22:28
	← rclanan left	22:28
	→ jeffreylevesque joined	22:28
	← editshare-ericf left	22:29
	→ rclanan joined	22:29
	← rclanan left	22:29
	← astockton left	22:29
Hello71	skinux: yes, as long as you actually commit all your work	22:29
	→ astockton joined	22:29
Hello71	obviously if you leave files untracked then they will not be recoverable	22:29
	← bannakaffalatta left	22:29
	→ rclanan joined	22:30
	← rclanan left	22:30
	← astockton left	22:30
	← t0by left	22:30
	→ astockton joined	22:31
	→ tylerdmace joined	22:31
	→ rclanan joined	22:31
	← rclanan left	22:31
	← krawchyk left	22:31
skinux	Well, that is a no-brainer	22:32
	→ rclanan joined	22:32
	← rclanan left	22:32
skinux	To my understanding, Git doesn't handle binary globs such as images very well at all?	22:32
	← jjttjj left	22:32
	→ rclanan joined	22:33
skinux	So, I'd need to compress all images seperately for copying to backup media...?	22:33
	← rclanan left	22:33
qsx	for varying values of “very well”	22:33
	← pale3 left	22:33
	← leksster left	22:33
_ikke_	git doesn't handle them bad	22:33
	→ rclanan joined	22:33
	← rclanan left	22:33
_ikke_	it's just that a copy of each files get stored, and binary files usually don't compress very well	22:34
	but for normal images this shouldn't be a problem	22:34
	← tylerdmace left	22:34
	→ rclanan joined	22:34
qsx	this isn’t 100% true either	22:34
	← rclanan left	22:34
qsx	at first, upon each "git add" a copy of the file gets stored	22:34
	but later™, they get packed, i.e. diffed and then compressed together	22:35
	← LucaTM left	22:35
	→ rclanan joined	22:35
	← rclanan left	22:35
qsx	https://git.qsuscs.de/cgit/small-binary-diff.git/	22:35
	← flavi0 left	22:35
	→ flavi0_ joined	22:35
	← nnyk_ left	22:35
	→ jjttjj joined	22:36
	→ High joined	22:36
_ikke_	right	22:36
	delta compression	22:36
	← timeshifter left	22:36
	→ rclanan joined	22:36
	High → stoned	22:36
	← rclanan left	22:37
	→ al-damiri joined	22:37
	→ faux___ joined	22:37
	→ rclanan joined	22:37
	← rclanan left	22:37
al-damiri	Hi #git	22:38
	How can I do git show for a particular directory only?	22:38
	git show <commit_hash> mydir	22:38
	→ rclanan joined	22:39
	← rclanan left	22:39
_ikke_	have you tried exactly that?	22:39
al-damiri	It only shows me the current directory not its subdirectory	22:40
	→ dsdeiz joined	22:40
	← fees left	22:40
	→ rclanan joined	22:40
	← woshty left	22:40
	← jbalint left	22:40
	→ madewokherd joined	22:40
	← rclanan left	22:41
	← calamari left	22:41
	→ rclanan joined	22:41
al-damiri	Ah my bad. Sorry.	22:41
	I was checking the wrong commit hash.	22:41
	← rclanan left	22:41
al-damiri	It does display the changes in the sub-directories too.	22:41
	_ikke_: Thanks.	22:41
	← marienz left	22:42
	→ rclanan joined	22:42
	→ rominronin joined	22:42
	← rclanan left	22:42
	← DeltaHeavy left	22:42
	→ dan2k3k4 joined	22:42
	→ rclanan joined	22:42
	← dstarh left	22:43
	← rclanan left	22:43
	→ rclanan joined	22:43
	← rclanan left	22:44
	→ rclanan joined	22:44
	← rclanan left	22:44
	→ rclanan joined	22:45
	→ Gsham joined	22:45
	→ mezod joined	22:45
	← rclanan left	22:45
	← Dougie187 left	22:45
	→ rclanan joined	22:45
	→ linuxmint joined	22:46
	← rclanan left	22:46
	→ rclanan joined	22:46
	← rominronin left	22:46
	→ italoacasas joined	22:47
	← rclanan left	22:47
	→ rclanan joined	22:47
	← rclanan left	22:47
	→ rclanan joined	22:48
	← italoacasas left	22:48
	← rclanan left	22:48
	→ italoacasas joined	22:48
	→ rclanan joined	22:49
	← rclanan left	22:49
	→ rclanan joined	22:49
	← rclanan left	22:50
	← jjttjj left	22:50
	← italoacasas left	22:50
	→ rclanan joined	22:50
	← mizu_no_oto left	22:50
	← rclanan left	22:50
	← Es0teric left	22:51
	← dopesong left	22:51
	→ rclanan joined	22:51
	→ marienz joined	22:51
	← rclanan left	22:51
	→ rclanan joined	22:51
	← rclanan left	22:52
	→ rclanan joined	22:52
	← rclanan left	22:53
	→ rclanan joined	22:53
	→ italoacasas joined	22:53
	← rclanan left	22:53
	← yarnfive8 left	22:53
	← Cihan left	22:54
	← bbbthunda left	22:54
	← CihanKaygusuz left	22:54
	→ rclanan joined	22:54
	← rclanan left	22:54
	→ rclanan joined	22:55
	← rclanan left	22:55
	← italoacasas left	22:55
	→ rclanan joined	22:55
	→ dopesong joined	22:55
	← Borkr left	22:56
	← rclanan left	22:56
	→ rclanan joined	22:56
	→ ome joined	22:56
	← rclanan left	22:57
	← jemadux left	22:57
	→ rclanan joined	22:57
	→ MarkyC joined	22:57
	← faux___ left	22:57
	← rclanan left	22:57
	→ rclanan joined	22:58
	← netj left	22:58
	← rclanan left	22:58
	→ jemadux joined	22:58
	→ rclanan joined	22:58
	→ netj joined	22:58
	→ italoacasas joined	22:58
	← rclanan left	22:59
	→ rclanan joined	22:59
	← italoacasas left	22:59
	← rclanan left	23:00
	→ rclanan joined	23:00
	← modocache left	23:00
	← Ahmed-90 left	23:00
	← rclanan left	23:00
	→ italoacasas joined	23:01
	→ rclanan joined	23:01
	← cagedwisdom left	23:01
	← rclanan left	23:01
	← tesla left	23:01
	→ rclanan joined	23:02
	← kappy left	23:02
	← rclanan left	23:02
	→ rclanan joined	23:02
	← sgambino left	23:02
	← rclanan left	23:03
	→ rclanan joined	23:03
	← Anoia left	23:03
	← rclanan left	23:03
	→ rclanan joined	23:04
	← rclanan left	23:04
	→ rclanan joined	23:04
	← rclanan left	23:05
	← italoacasas left	23:05
	→ rclanan joined	23:05
	← rclanan left	23:06
	→ jteneyck joined	23:06
	→ rclanan joined	23:06
	→ francium joined	23:06
	← rclanan left	23:06
	→ rclanan joined	23:07
	← rclanan left	23:07
francium	I've got this old branch on my online repo, but I've deleted than branch. Why is it still showing up?	23:07
	→ t0by joined	23:07
	→ rclanan joined	23:08
	← Imaginativeone left	23:08
Hello71	rclanan: don't do that shit	23:08
	← rclanan left	23:08
Hello71	!branch_delete	23:08
gitinfo	Deleting a branch is easy. `git branch -d branchname` (or -D). However, this will NOT delete the branch upstream, that requires `git push --delete origin branchname`. However, this will NOT delete remote tracking branches. EACH USER must `git remote prune origin`, but if any users have local branches, they must likewise run `git branch -d branchname` (or -D)	23:08
	→ rclanan joined	23:08
	← flobin left	23:08
	← MarkyC left	23:08
	← rclanan left	23:09
	→ MarkyC joined	23:09
	→ rclanan joined	23:09
	← rclanan left	23:10
	→ rclanan joined	23:10
	→ flashpoint9 joined	23:10
	← flashpoint9 left	23:10
	← rclanan left	23:10
francium	So I have to do 'git push --delete origin Feature_X' as well as branch -d Feature_X locally?	23:10
	← jteneyck left	23:10
	→ rclanan joined	23:11
	← rclanan left	23:11
	→ rclanan joined	23:11
	← Poppa left	23:11
	→ Poppa joined	23:11
	← rclanan left	23:12
	→ rclanan joined	23:12
	← rclanan left	23:13
	← elastix left	23:13
	→ rclanan joined	23:13
osse	francium: yes	23:13
	they are two separate thing	23:13
	s	23:13
	← rclanan left	23:13
	→ rclanan joined	23:14
	← MarkyC left	23:14
	→ cagedwisdom joined	23:14
	← rclanan left	23:14
	← Imek left	23:14
	→ rclanan joined	23:14
francium	osse ty	23:15
	→ victortyau joined	23:15
	← rclanan left	23:15
	← francium left	23:15
	→ rclanan joined	23:15
	← rclanan left	23:16
	← PaulCapestany left	23:16
	→ rclanan joined	23:16
	← rclanan left	23:16
	→ rclanan joined	23:17
	→ elastix joined	23:17
	← rclanan left	23:17
	→ rclanan joined	23:18
	→ abc123 joined	23:18
	← rclanan left	23:18
	→ rclanan joined	23:18
	→ italoacasas joined	23:18
	← rclanan left	23:19
	← flavi0_ left	23:19
	→ rclanan joined	23:19
	→ flavi0 joined	23:20
	← rclanan left	23:20
	← abc123_ left	23:20
	abc123 → abc123_	23:20
	→ rclanan joined	23:20
	← t0by left	23:20
	← rclanan left	23:20
	← ShapeShifter499 left	23:20
	→ rclanan joined	23:21
	→ darkbit joined	23:21
	← rclanan left	23:21
	→ rclanan joined	23:21
	← rclanan left	23:22
	← Relevant left	23:22
	→ rclanan joined	23:22
	← AAoK left	23:22
	← elastix left	23:23
	← dan2k3k4 left	23:23
	→ PaulCapestany joined	23:23
	← rclanan left	23:23
	← David1977 left	23:23
	→ rclanan joined	23:23
	← rclanan left	23:23
	→ edude03 joined	23:23
	→ rclanan joined	23:24
	← fscala left	23:24
	← jaguarmagenta2 left	23:24
	← rclanan left	23:24
	← StuartMI left	23:24
	→ rclanan joined	23:24
	← rclanan left	23:25
	← diegoaguilar left	23:25
	→ rclanan joined	23:25
	← samw_ left	23:25
	← Gsham left	23:25
	→ fscala joined	23:25
	← rclanan left	23:26
	← fission6 left	23:26
	→ rclanan joined	23:26
	← rclanan left	23:26
	→ rclanan joined	23:27
	→ faux___ joined	23:27
	← sssilver left	23:27
	← circ-user-JJNIJ left	23:27
	← rclanan left	23:27
	→ rclanan joined	23:27
	← rclanan left	23:28
	→ diegoaguilar joined	23:28
	→ rclanan joined	23:28
	← rclanan left	23:29
	→ rclanan joined	23:29
	← rclanan left	23:29
	→ rclanan joined	23:30
	← rclanan left	23:30
	→ rclanan joined	23:31
	← rclanan left	23:31
	→ rclanan joined	23:31
	← jost_ left	23:31
	← rclanan left	23:32
	→ rclanan joined	23:32
	← edude03 left	23:32
	← kfpratt left	23:32
	← rclanan left	23:32
	→ nilg joined	23:33
	→ sssilver joined	23:33
	→ rclanan joined	23:33
	← rclanan left	23:33
	← italoacasas left	23:34
	→ rclanan joined	23:34
	← mwlang left	23:34
	← rclanan left	23:34
	→ rclanan joined	23:34
	← rclanan left	23:35
	→ rclanan joined	23:35
	← Sazhen86 left	23:35
	← rclanan left	23:36
	→ rclanan joined	23:36
	→ kfpratt joined	23:36
	← rclanan left	23:36
	→ rclanan joined	23:37
	← m8 left	23:37
	→ italoacasas joined	23:37
	← rclanan left	23:37
	→ rclanan joined	23:37
	← italoacasas left	23:38
	← rclanan left	23:38
	→ mizu_no_oto joined	23:38
	→ rclanan joined	23:38
	← sssilver left	23:38
	← rclanan left	23:39
	← strozyka left	23:39
	→ rclanan joined	23:39
	→ italoacasas joined	23:39
	→ algae joined	23:39
	← rclanan left	23:39
	← jemadux left	23:39
	→ rclanan joined	23:40
	→ sssilver joined	23:40
	← rclanan left	23:40
	→ rclanan joined	23:40
	← bollullera left	23:41
	→ localuser joined	23:41
	← rclanan left	23:41
	→ rclanan joined	23:41
	← vdv left	23:41
	← rclanan left	23:42
	→ showaz joined	23:42
	→ rclanan joined	23:42
	← sssilver left	23:42
	← rclanan left	23:42
	→ rclanan joined	23:43
	→ rominronin joined	23:43
	← rclanan left	23:43
	→ sssilver joined	23:43
	→ rclanan joined	23:43
	← ShooterMG left	23:44
	← rclanan left	23:44
	→ rclanan joined	23:44
	← rclanan left	23:45
	→ rclanan joined	23:45
	← localuser- left	23:45
	← rclanan left	23:45
	← roxlu left	23:45
	→ rclanan joined	23:46
	← githogori left	23:46
	← rclanan left	23:46
	→ rclanan joined	23:47
	→ jemadux joined	23:47
	← sssilver left	23:47
	← rclanan left	23:47
	← rominronin left	23:47
	→ rclanan joined	23:47
	← rclanan left	23:48
	→ rclanan joined	23:48
	→ AtnevRed joined	23:48
	← rclanan left	23:48
	← Limes_ left	23:49
	→ rclanan joined	23:49
	← rclanan left	23:49
	← axl__ left	23:50
	→ rclanan joined	23:50
	← rclanan left	23:50
	← skinux left	23:50
	→ rclanan joined	23:50
	← rclanan left	23:51
	← italoacasas left	23:51
	→ rclanan joined	23:51
	← looper left	23:51
	→ ShapeShifter499 joined	23:51
	← rclanan left	23:52
	→ rclanan joined	23:52
	← rclanan left	23:52
	→ rclanan joined	23:53
	→ nfk joined	23:53
	← rclanan left	23:53
	→ rclanan joined	23:53
	→ BobLobLawBlog joined	23:53
	← AtnevRed left	23:54
	← rclanan left	23:54
	→ rclanan joined	23:54
	← robbyoconnor left	23:54
	← rclanan left	23:55
	→ rclanan joined	23:55
	← rclanan left	23:55
	→ rclanan joined	23:56
	← rclanan left	23:56
	← hobodave left	23:56
	→ rclanan joined	23:56
	→ looper joined	23:57
	← rclanan left	23:57
	← astockton left	23:57
	→ rclanan joined	23:57
	← faux___ left	23:57
	← rclanan left	23:58
	→ samw joined	23:58
	→ rclanan joined	23:58
	← MistahKurtz left	23:58
	← rclanan left	23:58
	→ rclanan joined	23:59
	← rclanan left	23:59
	→ rclanan joined	23:59

Logs Search ←Prev date Next date→

Channels Documentation