IRCloggy #git 2015-02-28

Provider of IRC logs since 2005.

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

	2015-02-28
	→ jaznow joined	00:00
	← Ahmed90 left	00:00
	← knownasilya left	00:01
	← hexagoxel left	00:02
Celelibi	Is there an automated way to rebase several (related) branches onto another commit?	00:02
	I have several local branches that forked from master some time ago.	00:03
	Some of those branches share some commits.	00:03
	And some of them are merged afterwards.	00:03
	I'd like to take the whole DAG, cut it, and reapply it on another commit.	00:04
	← jaznow left	00:04
	← joki left	00:04
holo1	osse, yes, that's what i did, except for the switch. thanks a lot	00:04
	osse, oh, switch is not part of the command. i should go rest haha	00:05
	→ devoldmx3 joined	00:05
	← devoldmx left	00:05
	← Mengu left	00:07
	→ sinkensabe joined	00:08
	← baweaver left	00:08
holo1	guys (or girls if you happen to be), thanks for the emotional support :) i'm going out now. gnight!	00:08
	← jadne left	00:08
	← Asiajey left	00:08
	→ ferr joined	00:08
	→ Segfault_ joined	00:09
heftig	Celelibi: maybe look into rebase --fork-point?	00:09
	← holo1 left	00:09
	← sinkensabe left	00:09
	→ sinkensabe joined	00:09
	→ joki joined	00:09
Celelibi	Hum, I didn't know this option.	00:10
heftig	Celelibi: there's also rebase --preserve-merges	00:10
	→ zackiv31 joined	00:10
	← joebz left	00:11
	→ pcypher joined	00:11
	→ alekks joined	00:11
	← zackiv31 left	00:13
Celelibi	Actually, I think I'd need something like a way to "zip" commits that would behave like this: if two commits apply the same change and have the same parents, then discard the newest commit.	00:14
	← devoldmx3 left	00:14
Celelibi	And use the oldest one instead.	00:15
	→ joeyDB_ joined	00:15
	→ devoldmx joined	00:15
	← lpax left	00:16
	← highcup left	00:16
	← alekks left	00:16
	← eijk left	00:17
	→ sinkensa_ joined	00:17
	← sinkensabe left	00:17
	→ Guest74998 joined	00:17
	→ highcup joined	00:18
	← highcup left	00:18
	→ wakd joined	00:18
	→ highcup joined	00:19
	← highcup left	00:19
	→ highcup joined	00:19
	← joeyDB_ left	00:19
	← cdown left	00:20
	← rvandam left	00:20
	→ ome joined	00:20
	→ sinkensabe joined	00:21
	← sinkensa_ left	00:21
	← sinkensabe left	00:23
	→ nikio__ joined	00:24
	← govg left	00:24
	← devoldmx left	00:25
	→ devoldmx joined	00:25
	→ sinkensabe joined	00:25
	← davidfetter_fbn left	00:25
	← Consuela left	00:25
jim	Celelibi, "I'd like to take the whole DAG ...", I just wanted to point out that "the whole dag" might have branches, some merged, others not; so there are situations where you might not want that	00:26
	→ multi_io_ joined	00:26
jim	other than that, it kinda sounds like a rebase	00:27
	→ BlaDe^ joined	00:27
	← kermit left	00:27
Celelibi	Yeah, execpt that keeping the relationship between the branches is non-trivial.	00:27
BlaDe^	Does anyone here use Amazon CodeDeploy? Wondering if it's worth using	00:27
	← batrick left	00:28
jim	yep, and, some branches could be not intended to apply to a particular commit	00:28
	→ Mitchbones joined	00:28
	← Guest74998 left	00:28
	→ kermit joined	00:28
jim	in particular unmerged ones with deleted branches	00:28
	but not limited to that	00:29
Celelibi	I know which branches I want to rebase, these are my wip branches that I stopped working on some time ago.	00:29
	← multi_io left	00:29
	← smccarthy left	00:29
	→ sinkensa_ joined	00:29
	→ hi_ joined	00:30
	→ smccarthy joined	00:30
jim	so consider the possibility you might want a subset of the dag	00:30
	← sinkensabe left	00:30
	← hi_ left	00:31
	→ hi_ joined	00:31
	← pecg left	00:31
	← highcup left	00:32
	← harish_ left	00:32
Celelibi	In another case, that might be a possibility.	00:32
	← jfran left	00:32
	→ baweaver joined	00:33
	→ madewokherd joined	00:33
	← im8bit left	00:33
	→ Consuela joined	00:34
	← EminenceHC left	00:34
	← Zupoman left	00:34
	← D-Boy left	00:36
	→ EminenceHC joined	00:36
	← stantonk left	00:36
jim	Celelibi, I think what you just said is a big part of my point: it's really case-by-case	00:37
	← hi_ left	00:37
	→ devoldmx3 joined	00:38
	← Consuela left	00:38
Celelibi	One day, I shall write a git-zip command.	00:39
	→ m0ltar joined	00:40
	→ Consuela joined	00:41
	→ dsdeiz joined	00:42
	← devoldmx left	00:42
	← Bpit left	00:42
	← opdavies left	00:43
	← ErKa left	00:43
	→ gopar joined	00:44
	← pcypher left	00:44
	→ D-Boy joined	00:44
jim	a coupla possibilities from my perspective results from exactly the same sub-dag, which is you have a branch, let's say it's not pushed to publicness (or at least other-seen-ness) and you generally don't commit to it... so one reason for that is the one you expect, tried something and it didn't work, or was otherwise unsatisfactory... another, is it contains config files (like for a web server, which is true in at least a few of my cases) and I check out that bra	00:45
	nch while I'm running the server and testing	00:45
	← phantombeta left	00:45
	→ phantombeta joined	00:46
	← rgenito left	00:46
	← Paa left	00:46
	jim makes phantombeta canadian by putting a y at the end of all the As	00:46
	← sinkensa_ left	00:47
	← tmager left	00:48
	← geomyidae_ left	00:48
	→ xkza joined	00:48
Celelibi	jim: I started working on some bug fixes like a year ago, I wanna get back to them.	00:48
	← xkza left	00:49
	→ stantonk joined	00:49
	→ rkmylo joined	00:49
	→ Duoe joined	00:49
jim	a year ago? then the branch they're on, would be useful if it still exists, and you can just checkout that branch	00:50
	← Duoe left	00:50
	→ dougsland joined	00:50
	← rkmylo left	00:50
jim	if the branch doesn't exist, those commits could have been garbage collected	00:50
	→ Guest53671 joined	00:51
	← jamesheston left	00:51
Celelibi	I have for instance a branch wip/fix/efi/linux-load-cs	00:51
	← stantonk left	00:51
jim	obviously I like the ease of branching, and took to it pretty easily	00:52
	← m_tadeu left	00:52
Celelibi	But I guess producing patches that only apply on the master branch of last year isn't of any help.	00:52
	← Bootinbull left	00:52
	← nmz787_i left	00:53
jim	that's why rebase and in fact also merge is so cool in git, because in many cases it can figure that stuff out	00:53
Celelibi	That's why I want to rebase all my wip/* branches onto the new master.	00:53
	→ pcypher joined	00:54
jim	by looking for common ancestor commits	00:54
	← dreiss left	00:54
Celelibi	And all my wip/* branches aren't just forks from a single commit.	00:54
jim	what you're saying tho, is there are no common ancestors	00:55
	→ batrick joined	00:55
	← hurley left	00:55
Celelibi	There is one, obviously, but just doing 10 rebase will replicate some commits.	00:55
	← dougsland left	00:55
Celelibi	imagine this: oldmastercommit -- stuff1 -- stuff2 -- wip/fix1 -- stuff3 -- wip/fix2. And append to wip/fix1 -- stuff4 -- wip/fix3.	00:56
	← hahuang65 left	00:57
Celelibi	And probably merge wip/fix2 and wip/fix3 into a wip/merge.	00:57
jim	you can freely experiment, by backing up your working dir/repo and restoring if you didn't like the result (like if you got the duplicate commits)	00:57
	← hcc23 left	00:57
Celelibi	(Everything is pushed to my github anyway.)	00:58
jim	this is of course a reach, but you probably won't get dups or duplicated code	00:58
	→ tomog999_ joined	00:59
	← PCatinean left	00:59
	→ Lyqyd joined	00:59
	→ dm7freek joined	00:59
	← EminenceHC left	00:59
Celelibi	I don't see how I could avoid duplicates.	00:59
	← baweaver left	00:59
Celelibi	Except by carefully recreating the DAG.	00:59
	← fstd left	01:00
jim	I mean the backup/restore thing to allow you more freedom to experiment	01:00
	such that you don't have to depend on the public history as the only backup	01:00
	→ fstd joined	01:00
jim	for example...	01:01
	→ kcj joined	01:01
	← _Atom_ left	01:01
jim	you coulc tar up your workign dir/repo... and then try the merge	01:01
	← listenrightmeow left	01:01
jim	and then blow it all away and try the merge again	01:01
	← tomog999 left	01:01
jim	that way you don't have to add to or rewrit6e history while you're experimenting	01:03
	→ macabre joined	01:03
	← sentriz left	01:03
	← arez left	01:04
jim	just food for thought, of course	01:04
	← neonalpine left	01:05
	→ eletuchy_ joined	01:05
	← wambam left	01:06
	→ sx1 joined	01:06
	← macabre left	01:07
	← batrick left	01:07
	→ unomystEz joined	01:07
	→ Gitzilla joined	01:08
	← eletuchy left	01:09
	→ jottr joined	01:09
	← eletuchy_ left	01:09
	→ d4ryus__ joined	01:10
	← d4ryus left	01:10
	← Nikhil_D left	01:12
	→ Nikhil_D joined	01:12
	← bluesm left	01:12
	← pcypher left	01:13
	→ baweaver joined	01:14
	← jottr left	01:14
	→ mvensky joined	01:16
	→ jamesheston joined	01:17
mvensky	how to work around fatal: unable to connect to 10.9.11.64:	01:17
	10.9.11.64[0: 10.9.11.64]: errno=Connection refused	01:17
	← jagob left	01:18
osse	initial impression is that your problem has nothing to do with git	01:19
	← mvensky left	01:19
	→ Corey84 joined	01:19
	→ otter768 joined	01:20
	← jamesheston left	01:21
	← ghostpl_ left	01:22
	← baweaver left	01:22
jim	that's a networking issue, the IP address is unroutable	01:23
	→ jtPretzel80 joined	01:23
	← Thorn left	01:24
	← pheaver left	01:24
	→ jadne joined	01:26
	← diegoviola left	01:27
	→ CKyle joined	01:27
	→ highcup joined	01:33
	← mikecmpbll left	01:33
	← cagedwisdom left	01:35
	← Gamecubic left	01:35
	→ maqr joined	01:35
	← Consuela left	01:36
	→ Gamecubic joined	01:36
	→ devoldmx joined	01:38
	← devoldmx3 left	01:38
	← highcup left	01:38
	← ctag left	01:40
	→ harish_ joined	01:40
	→ diegoviola joined	01:40
	→ ErKa joined	01:40
	→ wethu joined	01:41
	← imachuchu left	01:41
	← akushner left	01:42
	← devoldmx left	01:44
	← ashokrajar left	01:44
	← AndroidLoverInSF left	01:44
	→ devoldmx joined	01:45
	→ baweaver joined	01:45
	→ mekhami joined	01:47
	→ jaznow joined	01:48
	→ geomyidae_ joined	01:49
	→ bitkiller joined	01:50
	← Guest53671 left	01:50
	← otter768 left	01:52
	← baweaver left	01:52
	← robustus left	01:53
	← jaznow left	01:53
jim	when I use git to push over ssh, what does that imply about what software has to be installed where? (one thing it implies is ssh installed locally and sshd installed on the remote)	01:53
	→ robustus\|Off joined	01:54
	robustus\|Off → robustus	01:54
	← stylica_ left	01:54
	→ dougsland joined	01:56
	→ deuterium joined	01:57
	→ AlKapone joined	01:57
	← curvv left	01:58
	← wethu left	01:58
	← Sasazuka left	01:58
	← CKyle left	01:59
	→ eletuchy joined	01:59
	← unomystEz left	01:59
	← texasmynsted left	02:00
	← Quevin left	02:00
	→ sinkensabe joined	02:00
	← PragCypher left	02:01
jim	where does git obtain time-of-day for timestamps? where the repo is? or?	02:01
	→ stantonk joined	02:02
	← dougsland left	02:02
Eugene	Machine's timezone	02:04
	→ joeyDB_ joined	02:04
	→ Vampire0_ joined	02:04
Eugene	You can override it by specifying GIT_AUTHOR/COMITTER_DATE variables; man git-commit-tree.	02:04
gitinfo	the git-commit-tree manpage is available at http://jk.gs/git-commit-tree.html	02:04
	→ aao joined	02:05
	← sinkensabe left	02:05
	→ axisys joined	02:05
	← axisys left	02:05
	→ axisys joined	02:05
	← aao left	02:05
	→ Milkweed joined	02:05
	← b0nn left	02:05
	→ nwkr joined	02:06
	← nwkr left	02:07
	← devoldmx left	02:07
	← Vampire0 left	02:07
	← stantonk left	02:07
	→ eiog joined	02:07
	← eiog left	02:08
	← joeyDB_ left	02:08
	← axsuul left	02:09
	→ devoldmx joined	02:10
	→ Eoaa joined	02:11
	← adamben left	02:12
	→ michelangelo joined	02:12
	← ValicekB left	02:13
	← diegoviola left	02:13
	→ diegoviola joined	02:13
	← intransit left	02:13
	← mekhami left	02:14
	→ joo-_ joined	02:14
	← madewokherd left	02:15
	→ dm7freek_ joined	02:16
	← donmichelangelo left	02:16
	← osw left	02:16
	→ madewokherd joined	02:17
	← MLM left	02:17
	→ ValicekB joined	02:18
	← dm7freek left	02:19
	← harish_ left	02:20
	← joo-_ left	02:22
	→ devoldmx3 joined	02:23
	← devoldmx3 left	02:23
	→ devoldmx3 joined	02:24
	→ ctag joined	02:25
	← devoldmx left	02:26
	dm7freek_ → dm7freek	02:27
	← liamkeily left	02:27
	→ nettoweb joined	02:27
	→ Vgr_ joined	02:29
	→ Vadimus joined	02:29
	← maqr left	02:29
	→ Goplat joined	02:29
	← Vgr left	02:31
	Vgr_ → Vgtr	02:31
	Vgtr → Vgr	02:31
	→ Polyatomic joined	02:32
	→ pcypher joined	02:33
	← gsingh93 left	02:36
	← ferr left	02:38
jim	Eugene, thanks... let me think (out loud) about this...	02:39
	so if I'm pushing, it's only already-existing commits...	02:39
	if I've been committing locally (which we all do), it's the local machine's time that gets into the commits	02:40
	→ cagedwisdom joined	02:41
	→ harish_ joined	02:43
	→ xk_id joined	02:43
	→ joebz joined	02:44
	→ stylica joined	02:45
	→ wethu joined	02:45
jim	that leads to prev question	02:45
	when I use git to push over ssh, what does that imply about what software has to be installed where? (one thing it implies is ssh installed locally and sshd installed on the remote)	02:45
	so more specifically... does git need remote git installed to receive a push?	02:46
	← joebz left	02:46
	← stylica left	02:46
	→ stylica joined	02:46
	← wethu left	02:47
	→ EminenceHC joined	02:47
	← jtPretzel80 left	02:48
	→ wethu joined	02:48
	→ ferr joined	02:48
	← Vadimus left	02:48
	→ joebz joined	02:49
	→ jamesheston joined	02:49
milki	jim: yes	02:49
	→ rvandam joined	02:49
milki	jim: or an equivalent that understands how to speak git	02:49
	← pcypher left	02:49
	← xolubi left	02:51
Eugene	jim - `git push` to a ssh:// url ends up invoking something like `ssh <hostname> git-receive-pack`. So the remote end of the ssh command needs to have at least that binary, or something similar that can speak git	02:52
	← tieTYT2 left	02:52
	← pks left	02:52
Eugene	As for the timestamp thing, the commit object has the commiter/author_dates baked into it; it's not converted anywhere.	02:52
	← EminenceHC left	02:52
	← Mitchbones left	02:52
Eugene	Internally its a UNIX timestamp plus a local offset(for the TZ). This is used on display to make a pretty datetime	02:53
	→ axsuul joined	02:54
	→ pks joined	02:55
	← Arsonide left	02:55
jim	ok so it needs git-receive-pack which means it could just as easily use a full git binary instsll (make/make install in git source dir)	02:55
	but that can't be missing for git to work	02:55
	polyzen → psyzen	02:56
jim	good to know... thanks	02:56
	← bitkiller left	02:56
	→ watabou joined	02:57
	→ pcypher joined	02:58
	← CheckDavid left	02:58
	← pcypher left	03:00
	→ bitkiller joined	03:00
jim	when you build git, does the build hard-wire its own install location?	03:00
	→ tyll joined	03:01
	→ sinkensabe joined	03:01
	← diegoaguilar left	03:02
	← SimonNa left	03:03
	← eletuchy left	03:03
	← stylica left	03:03
	→ eletuchy joined	03:03
	← jadne left	03:04
	← tyll_ left	03:04
	→ joeyDB_ joined	03:05
	← madewokherd left	03:05
	← sinkensabe left	03:05
	← bitkiller left	03:05
	→ ScioMin joined	03:05
	→ bitkiller joined	03:06
	→ pcypher joined	03:06
	→ LucasTT_ joined	03:06
	→ codr joined	03:07
	← codr left	03:07
	→ codr joined	03:07
	← eletuchy left	03:08
	← cagedwisdom left	03:08
	← mezod left	03:09
	→ madewokherd joined	03:09
	← joeyDB_ left	03:10
	← LucasTT left	03:10
	→ Vadimus joined	03:11
	→ intransit joined	03:11
	→ AndroidLoverInSF joined	03:13
	← deuterium left	03:14
	→ batrick joined	03:15
linuxmint	Can we setup git in apache2?	03:16
	...to track apache2 website edits?	03:16
	← pcypher left	03:18
	→ APerson_ joined	03:19
	← jamesheston left	03:19
	← bitkiller left	03:19
	← nnyk left	03:20
	→ zenguy_pc joined	03:20
zenguy_pc	how can i copy this build https://github.com/np1/pafy/tree/6476150f92b91536d9e8ce0d364af84878b8d8fe	03:21
	← jwhisnant left	03:23
	← APerson_ left	03:23
	→ jwhisnant joined	03:24
	← ferr left	03:24
	→ cagedwisdom joined	03:25
	← m0ltar left	03:25
	← Corey84 left	03:25
	→ MLM joined	03:27
	← AndroidLoverInSF left	03:27
	← SumDude left	03:28
	→ hahuang65 joined	03:30
	← rvandam left	03:30
	← MattMaker left	03:32
	← joebz left	03:33
	→ scientes joined	03:33
	← scientes left	03:33
	→ scientes joined	03:33
	← PasiFist left	03:33
	→ PasiFist joined	03:33
	→ Thorn joined	03:33
	← Vadimus left	03:33
	← axsuul left	03:35
	→ APerson_ joined	03:35
	← FreezingCold left	03:35
	→ FreezingCold joined	03:36
	→ jaznow joined	03:37
	← harish_ left	03:38
	→ Thorn__ joined	03:39
	← rubyonrailed left	03:39
	→ Corey84 joined	03:39
	→ TheNet joined	03:40
	← Thorn__ left	03:40
	→ Thorn__ joined	03:41
	→ LucasTT__ joined	03:41
	← jaznow left	03:42
	← Thorn left	03:42
	← darkbasic_ left	03:43
	← APerson_ left	03:44
	← intransit left	03:44
	→ darkbasic joined	03:44
	← LucasTT_ left	03:44
	← msonntag left	03:45
	→ xolubi joined	03:45
	→ msonntag joined	03:47
	← duderonomy left	03:48
	← Eoaa left	03:48
	← cagedwisdom left	03:49
	← Rakkan left	03:49
	← Thorn__ left	03:50
	→ eyvg joined	03:50
	→ kerrick__ joined	03:50
	→ eletuchy joined	03:51
	← m0viefreak left	03:52
	→ otter768 joined	03:53
	← dsdeiz left	03:54
	← basiclaser left	03:54
	← eletuchy left	03:55
	→ APerson_ joined	03:56
	← setuid left	03:57
	→ setuid_ joined	03:57
	→ setuid joined	03:57
	← otter768 left	03:58
	← Noldorin left	03:58
	← setuid left	03:59
	← nettoweb left	04:00
	→ Mavericks988 joined	04:00
	← neanderslob left	04:01
	← Mavericks988 left	04:01
	→ neanderslob joined	04:02
	→ e3 joined	04:02
e3	Hello, should I name a folder for a repository without working directory projectx.git or projectx_git?	04:03
deltab	the former	04:04
e3	deltab: projectx.git? Is there any semantic difference?	04:05
	→ eletuchy joined	04:06
deltab	it affects git clone at least: "The "humanish" part of the source repository is used if no directory is explicitly given (repo for /path/to/repo.git and foo for host.xz:foo/.git)."	04:06
	→ IIT joined	04:07
e3	I see	04:07
	→ cagedwisdom joined	04:08
	← cagedwisdom left	04:08
	→ Thorn joined	04:09
	→ cagedwisdom joined	04:10
	→ voldial joined	04:10
	← eyvg left	04:10
	← cagedwisdom left	04:10
	→ setuid joined	04:10
voldial	I accidently typed "git branch info" in the middle of a bisect: https://bpaste.net/show/52556c09c097 how do I undo that?	04:10
	→ eletuchy_ joined	04:10
	← eletuchy left	04:11
voldial	ah, got it I think. git branch -d	04:12
deltab	yep	04:12
	← voldial left	04:12
	→ cagedwisdom joined	04:13
	← dropdrive left	04:13
	← cagedwisdom left	04:14
	→ Xananax joined	04:14
	← eletuchy_ left	04:15
jim	"git branch info"probably just creates a branch, and does not switch to it, so you should be OK, same branch checked out as before, just deleting the branch you accidentally created, info	04:16
deltab	indeed: "Note that this will create the new branch, but it will not switch the working tree to it; use "git checkout <newbranch>" to switch to the new branch."	04:17
	← setuid_ left	04:18
	← Xananax left	04:19
	→ pcypher joined	04:19
	→ MattMaker joined	04:19
	← APerson_ left	04:21
	← mostlybadfly left	04:22
	→ ghostpl_ joined	04:23
	← pcypher left	04:23
	→ lys joined	04:24
	← TheNet left	04:24
	→ kojijeovo joined	04:25
	→ TheNet joined	04:25
	→ dropdrive joined	04:26
	→ blr joined	04:26
	← wethu left	04:27
	← kojijeovo left	04:27
	← ghostpl_ left	04:27
	← smccarthy left	04:31
	← rethnor left	04:31
	← Segfault_ left	04:33
	→ gfixler joined	04:33
	→ EminenceHC joined	04:37
	→ cagedwisdom joined	04:37
	← cagedwisdom left	04:37
	→ axsuul joined	04:41
	← EminenceHC left	04:41
	→ Mitchbones joined	04:44
	← MattMaker left	04:46
	← Bmw1000c left	04:47
	← blr left	04:47
	← TheNet left	04:49
	→ TheNet joined	04:49
	→ CKyle joined	04:49
	→ MattMaker joined	04:49
	→ incredible joined	04:51
	→ wethu joined	04:52
	→ rchavik joined	04:53
	→ joeyDB_ joined	04:53
	← kerrick__ left	04:54
	← IIT left	04:54
	→ rubyonrailed joined	04:54
	← thiago left	04:54
	→ f03lipe_ joined	04:55
	← rubyonrailed left	04:56
	← lys left	04:56
	→ rubyonrailed joined	04:57
	← Mitchbones left	04:57
	← leeN left	04:58
	→ nuy_10461903 joined	04:59
	← Tuna-Fish left	04:59
	← f03lipe left	04:59
	→ beautifulmind joined	04:59
	← joeyDB_ left	05:00
	→ sinkensabe joined	05:03
	← axsuul left	05:04
	← sinkensabe left	05:07
	→ Tuna-Fish joined	05:10
	← xolubi left	05:10
	← MattMaker left	05:11
	→ highcup joined	05:11
	← Corey84 left	05:11
	→ Error404NotFound joined	05:11
	← lost1nfound left	05:12
	← rubyonrailed left	05:13
	← LucasTT__ left	05:14
	← ScioMin left	05:15
	← highcup left	05:16
	← madewokherd left	05:16
	→ The_Phoenix joined	05:17
	→ Asiajey joined	05:17
	← Asiajey left	05:17
	→ Asiajey joined	05:17
	→ listenrightmeow joined	05:19
	→ pcypher joined	05:19
	← pcypher left	05:24
	→ thumpba joined	05:25
	→ jaznow joined	05:26
	← fstd left	05:27
	← wethu left	05:28
	→ wethu joined	05:30
	← jaznow left	05:30
	→ fstd joined	05:31
	→ settermjd joined	05:32
	← CKyle left	05:32
	→ ehmatthes joined	05:34
	← kadoban left	05:34
	← scientes left	05:35
	→ thiago joined	05:35
	→ duderonomy joined	05:36
	← TheNet left	05:37
	← geomyidae_ left	05:38
	← thumpba left	05:41
	← wethu left	05:41
	← aidalgol left	05:42
	→ Literphor joined	05:45
	→ Cryp71c joined	05:45
	→ wethu joined	05:45
	← listenrightmeow left	05:49
	→ Tommy[D] joined	05:50
	→ Corey84 joined	05:50
	→ harish_ joined	05:51
	codr → stylica	05:52
	← Tommy[D]_ left	05:53
	→ thomas1 joined	05:53
	← stylica left	05:53
	→ thumpba joined	05:53
	← psyzen left	05:53
	← settermjd left	05:54
	→ otter768 joined	05:54
	→ sourc3 joined	05:54
	→ corey84_ joined	05:54
	← thomas1 left	05:54
	→ settermjd joined	05:55
	← thumpba left	05:55
	→ teufelChiCoder joined	05:55
	← Corey84 left	05:55
	← teufelChiCoder left	05:55
	→ teufelChiCoder joined	05:56
	→ tieTYT2 joined	05:58
	← otter768 left	05:59
	← CEnnis91 left	06:00
	← wakd left	06:01
	→ xbob joined	06:02
	← settermjd left	06:05
	→ settermjd joined	06:06
	← Walex2 left	06:07
	→ DrHouse\|DellM650 joined	06:10
	→ tokik joined	06:11
	← helgikrs left	06:12
	← jongravo_ left	06:12
	→ jongravois joined	06:13
	→ ciampix joined	06:14
	→ helgikrs joined	06:15
	← frogonwheels_ left	06:15
	← settermjd left	06:16
	← misterpink left	06:16
	→ frogonwheels_ joined	06:17
	→ settermjd joined	06:17
	← jongravois left	06:17
	→ htqp joined	06:20
	← nikio__ left	06:21
	→ Consuela joined	06:22
	← DrHouse\|DellM650 left	06:22
	← mhite left	06:22
	→ mostlybadfly joined	06:23
	← pacon left	06:23
	→ pacon joined	06:24
	← htqp left	06:25
	→ EminenceHC joined	06:25
	← hahuang65 left	06:29
	← Cryp71c left	06:29
	← tyreld left	06:29
	→ joebz joined	06:29
	← EminenceHC left	06:30
	→ ashnur joined	06:30
	→ pretodor joined	06:31
	→ jamesheston joined	06:33
	← tokik left	06:33
	→ pcypher joined	06:34
	← joebz left	06:34
	← Cerber left	06:34
	← settermjd left	06:36
	→ Auaq joined	06:36
	← Error404NotFound left	06:36
	→ Err404NotFound joined	06:36
	← Auaq left	06:37
	→ Uybb joined	06:38
	← pcypher left	06:39
	← Uybb left	06:39
	→ Cerber joined	06:40
	→ Iez joined	06:41
	← Thorn left	06:41
	← Iez left	06:42
	← hvxgr left	06:43
	→ Oaj joined	06:43
	→ joeyDB_ joined	06:44
	← Oaj left	06:44
	→ Tuiru joined	06:45
	← aerth_ left	06:46
	→ squeegily joined	06:46
	← Tuiru left	06:46
	→ MechtiIde joined	06:46
	← weltall left	06:46
	→ weltall joined	06:47
squeegily	I have two branches; I want to merge one in with the normal method, and use the "ours" method on the other. But I want this to only make one commit. How can I do this?	06:47
	→ aerth_ joined	06:47
	→ ioik joined	06:47
	← ioik left	06:48
	→ brownbathrobe joined	06:48
	← joeyDB_ left	06:48
	→ udeoi joined	06:49
	→ Error404NotFound joined	06:50
	← udeoi left	06:50
	→ tevfik joined	06:51
	← weltall left	06:51
	← Err404NotFound left	06:52
	→ ooad joined	06:52
	→ weltall joined	06:52
squeegily	Merging the branches with "git merge branch1 branch2" handled the changes OK, but didn't mark the branches as merged	06:52
	← Error404NotFound left	06:53
	→ Err404NotFound joined	06:53
	← ooad left	06:53
	→ Ccrey joined	06:54
	← Ccrey left	06:55
	→ lost1nfound joined	06:56
	→ alanwill_ joined	06:57
	→ cfp joined	06:58
	← Cerber left	06:58
	← cfp left	06:59
	→ highcup joined	07:00
	← lost1nfound left	07:00
	→ pantsman- joined	07:01
	→ Lqgn joined	07:01
	← pacon left	07:01
	→ pacon joined	07:02
	← starkhallo left	07:03
	← Gamecubic left	07:03
	→ otter768 joined	07:04
	← highcup left	07:04
	← dannymichel left	07:06
	← ciampix left	07:07
	→ pcypher joined	07:09
	← corey84_ left	07:10
	→ dreiss joined	07:11
	← jamesheston left	07:11
	→ gebjgd joined	07:12
	← gebjgd left	07:12
	→ gebjgd joined	07:12
	→ cdown joined	07:13
	→ hvxgr joined	07:13
	← otter768 left	07:13
	→ CEnnis91 joined	07:14
	← pcypher left	07:14
	→ TomyLobo joined	07:14
	← brownbathrobe left	07:15
	→ jaznow joined	07:15
	→ EminenceHC joined	07:16
moritz	you can't	07:17
	merging more than one branch only works with the ocotopus merge, not with the 'ours' strategy	07:18
	← lindenle left	07:18
	← jaznow left	07:19
	← weltall left	07:19
	← aerth_ left	07:20
	← EminenceHC left	07:20
	← Lqgn left	07:20
	→ aerth_ joined	07:21
	← Lyqyd left	07:21
	→ weltall joined	07:21
	→ Noodlewitt joined	07:22
	← wethu left	07:23
	← Tronsha left	07:23
	← Noodlewitt left	07:24
	→ curvv joined	07:25
	→ mizu_no_oto joined	07:25
	→ jagob joined	07:25
	← Ionic left	07:27
	← teufelChiCoder left	07:27
	← f03lipe_ left	07:29
	→ Heimdall joined	07:30
	→ mennea joined	07:30
	→ Kpna joined	07:32
	← squeegily left	07:32
	→ pacon2 joined	07:34
	→ sgen_ joined	07:34
	← pacon left	07:36
	← dreiss left	07:37
	→ cmn joined	07:38
	→ curiousmansi___ joined	07:40
curiousmansi___	guys getting this issue Permission denied (publickey).	07:40
	→ wicope joined	07:41
iveqy	curiousmansi___: okay. Looks like ssh is using the wrong public key or that the server doesn't recoqnize your public key	07:44
curiousmansi___	how to fix	07:45
	fatal: Could not read from remote repository.	07:46
	also this error	07:46
iveqy	curiousmansi___: figure out if the problem is the wrong public key or if the server doesn't recoqnize your public key. Then correct the error	07:46
	that's because you don't get permissions to read the remote repo	07:46
	have you created a public ssh key and uploaded it to the server?	07:46
curiousmansi___	ooh no	07:47
	its not written there	07:47
	→ xolubi joined	07:47
curiousmansi___	how to do that	07:47
	→ wakd joined	07:48
	→ ciampix joined	07:48
iveqy	curiousmansi___: then add your key to the server. You do it just like you usually do with ssh. If you're connecting to a standard ssh server with shell access I recommend using ssh-copy-id otherwise it depends on what software your server are using	07:48
	curiousmansi___: do you've an ssh key?	07:49
curiousmansi___	i have [email@hidden.address]	07:49
	nothing else	07:49
	i created a new repository using github	07:50
iveqy	curiousmansi___: create a ssh-key on your local computer using ssh-keygen	07:50
	then upload your id_rsa.pub to github using the github webinterface	07:50
curiousmansi___	i have to download anything ?	07:50
	← beautifulmind left	07:50
curiousmansi___	it says 'ssh-keygen' is not recognized as an internal or external command,	07:50
iveqy	curiousmansi___: depends, I assume that you're using git from the command line using a linux operating system. If you've a different enviroment you might	07:50
curiousmansi___	tell me how i can do using password	07:51
ciampix	curiousmansi, what system do you have?	07:52
	→ in3xes joined	07:52
curiousmansi___	windows	07:53
iveqy	curiousmansi___: if you don't have a public key the system will fallback to using password automatically.	07:53
	curiousmansi___: what command did you execute to clone_	07:53
	?	07:53
curiousmansi___	it is not doing that	07:53
	what is the command or options i can do that	07:53
	i did	07:53
	git commit -m "first commit"	07:53
	and then git remote add origin [email@hidden.address]	07:54
ciampix	curiousmansi, http://wiki.joyent.com/wiki/display/jpc2/Manually+Generating+Your+SSH+Key+in+Windows	07:54
	← tevfik left	07:54
	→ ashokrajar joined	07:55
curiousmansi___	i am ok to add username and password everytime i push	07:57
	→ MattMaker joined	07:57
curiousmansi___	can i do that	07:57
	?	07:57
	← tieTYT2 left	07:58
ciampix	curiousmansi, here says that "f you have GitHub for Windows installed, you can use it to clone repositories and not deal with SSH keys." https://windows.github.com/	07:59
	← mennea left	07:59
curiousmansi___	how to send password with push in github	08:00
	→ wachterjohannes joined	08:01
	→ jongravois joined	08:01
iveqy	curiousmansi___: please show us a !transcript	08:01
gitinfo	curiousmansi___: Please paste (using https://gist.github.com/ or similar) a transcript ( https://gist.github.com/2415442 ) of your terminal session.	08:01
	← diegoviola left	08:02
	→ mennea joined	08:03
iveqy	curiousmansi___: anyway, the simplies way for you to "get this working" is to use https instead of ssh	08:03
	→ zadock joined	08:03
iveqy	curiousmansi___: instead of using [email@hidden.address] use the https:// address for your repo. For example https://github.com/anishathalye/dotbot.git	08:04
	(just a random repository chosen here, replace with your own address)	08:05
	← jongravois left	08:06
	← totte left	08:07
	← thiago left	08:07
	← Literphor left	08:08
	← ashokrajar left	08:08
	← ChrisWarrick left	08:10
	→ pcypher joined	08:10
	→ Kicer86 joined	08:10
	→ ChrisWarrick joined	08:10
	← cdown left	08:11
curiousmansi___	iveqy:	08:12
	← gopar left	08:12
curiousmansi___	i am not able to push in a new repository what is created let me know what i can do simply	08:12
	→ cdown joined	08:13
curiousmansi___	i am using http://lifehacker.com/5983680/how-the-heck-do-i-use-github as reference	08:13
iveqy	curiousmansi___: I have told you how to do that. Please tell me what you don't understand or what errors you get (when you're trying what command). Otherwise I'm unable to help you	08:14
	← pcypher left	08:15
curiousmansi___	but when i try command like git push	08:15
	i get error	08:15
	→ jaznow joined	08:16
	→ lqi joined	08:16
	→ freestyl3r joined	08:16
iveqy	curiousmansi___: what exactly are you using for command (only git push? no arguments?) and what error do you get?	08:17
	→ tarkus joined	08:17
iveqy	did you followed my advice on using https instead of ssh	08:17
	?	08:17
curiousmansi___	ony git push	08:17
	← ErKa left	08:17
curiousmansi___	done	08:18
	thanks	08:18
	← cdown left	08:19
	→ lindenle joined	08:19
	← jaznow left	08:20
	← michael_mbp left	08:20
	← ehmatthes left	08:21
	← Asiajey left	08:22
	→ Asiajey joined	08:22
	→ michael_mbp joined	08:22
	→ devll joined	08:23
	← lindenle left	08:23
	→ random-user-name joined	08:24
	← jagob left	08:27
	← TheOneWhoKnocks left	08:28
	→ daedeloth joined	08:30
	← OnkelTem left	08:30
	← MattMaker left	08:31
	→ TheOneWhoKnocks joined	08:31
	← mennea left	08:32
	→ joeyDB_ joined	08:33
	→ mennea joined	08:33
	→ OnkelTem joined	08:33
	→ WaReZ joined	08:34
	← alanwill left	08:36
	alanwill_ → alanwill	08:36
	← joeyDB_ left	08:37
	← pretodor left	08:39
curiousmansi___	when i am trying to add the collaborator it is giving me error	08:39
iveqy	curiousmansi___: again, what are you doing and what error do you get? !doesntwork	08:41
gitinfo	curiousmansi___: 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...	08:41
	→ sinkensabe joined	08:42
e3	quit	08:43
	← e3 left	08:43
	← sinkensabe left	08:43
	→ sinkensabe joined	08:43
	→ lost1nfound joined	08:45
	→ wethu joined	08:45
	→ pwds joined	08:46
	→ lyang0 joined	08:48
	← oojacoboo left	08:48
	← lost1nfound left	08:49
	← sinkensabe left	08:51
	← watabou left	08:51
	← AlKapone left	08:53
	← sourc3 left	08:53
	→ PragCypher joined	08:54
	→ sourc3 joined	08:54
	→ f03lipe joined	08:55
	← Goplat left	08:55
	→ jceb joined	08:55
	→ tvw joined	08:56
	← Mobutils left	09:00
	← sourc3 left	09:00
	→ nnyk joined	09:00
	→ petersr joined	09:01
	← mostlybadfly left	09:02
	← mennea left	09:02
	→ sinkensabe joined	09:02
	← jceb left	09:02
	→ mennea joined	09:03
	← zumba_addict left	09:03
ciampix	gitinfo, ;-) nice that of unicorn abduction ...	09:03
	→ dror joined	09:04
	→ EminenceHC joined	09:04
	→ sourc3 joined	09:05
	← curiousmansi___ left	09:06
iveqy	ciampix: !bot ;)	09:07
gitinfo	ciampix: [!gitinfo] I am an IRC bot which responds to certain keywords to provide helpful(?) information to humans. Please see http://jk.gs/git/bot for more information about how to (ab)use me.	09:07
	← MLM left	09:07
ciampix	iveqy, anyway a really nice bot! ;-)	09:08
	← EminenceHC left	09:09
	← bb010g left	09:10
	→ curiousmansi_ joined	09:10
	→ pcypher joined	09:11
	→ rvandam joined	09:12
	→ otter768 joined	09:14
	← pcypher left	09:15
	→ Shusshu joined	09:16
	← Shusshu left	09:16
	← otter768 left	09:19
	→ lost1nfound joined	09:20
	← CEnnis91 left	09:20
	→ opdavies joined	09:20
	→ dsdeiz joined	09:21
	→ BlaXpirit joined	09:23
	← opdavies left	09:23
BlaXpirit	is it so uncommon to do some changes before merging? couldn't google any info. had to guess --no-ff --no-commit - seems to work	09:24
	→ fightback joined	09:24
	← mizu_no_oto left	09:25
	← boombatower left	09:25
	→ mizu_no_oto joined	09:26
	→ blr joined	09:27
	← kcj left	09:28
	← zadock left	09:30
	← mkaesz left	09:32
	← twoface88 left	09:33
	← The_Phoenix left	09:33
	→ mennea_ joined	09:33
	→ mkaesz joined	09:33
	→ twoface88 joined	09:33
	← curiousmansi_ left	09:34
	← pacon2 left	09:34
	→ pacon2 joined	09:35
	→ SimonNa joined	09:35
	← coastr left	09:36
	← mennea left	09:36
	← wachterjohannes left	09:37
	→ fatalhalt joined	09:37
	← FreezingCold left	09:37
	→ wachterjohannes joined	09:38
	→ FreezingCold joined	09:38
	← daedeloth left	09:38
	← wachterjohannes left	09:38
	→ htqp joined	09:39
	← htqp left	09:39
	← k3nPi left	09:39
	→ htqp joined	09:39
	← kermit left	09:42
	→ zadock joined	09:44
	← zadock left	09:44
Seveas	BlaXpirit: it's not just uncommon, it's discouraged to dirty merges like that.	09:44
	fix the branch before merging	09:44
BlaXpirit	i'm not gonna tell the contributor to add one newline	09:47
	→ Walex joined	09:47
	← twoface88 left	09:49
	← pacon2 left	09:49
tango_	BlaXpirit: checkout his branch, do the change and commit (-m "Cleanup before merge"), merge	09:49
Seveas	you don't need to, you can do it yourself. Hell, I'd even squash that in afterward with a rebase -i	09:49
j416	tango_: ew	09:49
	→ pacon2 joined	09:49
tango_	j416: what	09:49
	better than editing the merge itself	09:49
j416	cleaner but ..	09:49
	D:	09:50
	→ jongravois joined	09:50
	← helgikrs left	09:52
	← ranchodev left	09:53
	← pwds left	09:54
	→ helgikrs joined	09:55
	← jongravois left	09:55
	← nnyk left	09:55
	← tarkus left	09:55
	→ Skapadapaduu joined	09:57
	← mizu_no_oto left	09:58
	→ senkin joined	10:00
	← Walex left	10:01
	→ nnyk joined	10:01
	← mennea_ left	10:02
	→ mennea joined	10:03
	← mkaesz left	10:03
	→ mkaesz joined	10:03
	→ jaznow joined	10:04
	← Vile left	10:05
	→ Walex joined	10:05
	→ opdavies joined	10:05
	→ x0s_ joined	10:07
	← zapb_ left	10:07
	← mkaesz left	10:08
	→ lindenle joined	10:08
	→ stamina joined	10:08
	→ twoface88 joined	10:09
	← jaznow left	10:09
	→ zxd joined	10:10
	→ anchorite joined	10:11
	→ pcypher joined	10:12
	→ zapb_ joined	10:12
	→ _ska-fan joined	10:12
	← lindenle left	10:12
	← kyb3r_ left	10:13
	→ alekks joined	10:13
	→ PCatinean joined	10:15
	← ska-fan left	10:15
	← pcypher left	10:16
	← alekks left	10:17
	→ Vile joined	10:18
	→ curiousmansi_ joined	10:20
	← sparetire left	10:20
	→ joeyDB_ joined	10:21
	→ Acidnerd joined	10:23
	d4ryus__ → d4ryus	10:23
	← nnyk left	10:24
	← PragCypher left	10:25
	← joeyDB_ left	10:26
	← wicope left	10:27
	← devll left	10:27
	→ jceb joined	10:31
	← mennea left	10:32
	→ mennea joined	10:33
	← dror left	10:34
	← tvw left	10:34
	← ap0c left	10:36
	← opdavies left	10:36
	→ highcup joined	10:37
	→ arez joined	10:37
	← sinkensabe left	10:38
	← highcup left	10:41
	→ Gizburdt joined	10:44
	→ nagromlt joined	10:47
	→ nfk joined	10:48
	→ Arsonide joined	10:48
	→ netzmonster joined	10:50
	→ dsdeiz_ joined	10:50
	← dsdeiz left	10:51
	← Gizburdt left	10:51
	← fightback left	10:51
	→ Gizburdt joined	10:51
	← zxd left	10:52
	→ wachterjohannes joined	10:52
	→ EminenceHC joined	10:53
	← arez left	10:54
	→ Gama11 joined	10:55
	← devians left	10:55
	→ devians joined	10:57
	→ arez joined	10:57
	← EminenceHC left	10:58
	← arez left	10:58
	← Kulrak left	10:59
	→ zumba_addict joined	11:01
	← j416 left	11:01
	← mennea left	11:02
	→ The_Phoenix joined	11:03
	→ mennea joined	11:03
	→ arez joined	11:03
	→ psoo joined	11:04
FreezingCold	So if I want to steal a bit of code from somebody else's project, what's the proper git way of doing it?	11:04
	clone their repo, merge it with mine, delete all the extra files/code?	11:05
luto	FreezingCold: is it a whole ifle?	11:05
	file*	11:05
FreezingCold	er, often just a snippet in the middle	11:06
	← Gizburdt left	11:06
FreezingCold	Probably like 25-50 lines out of a 250-1000 line file	11:06
	→ skylite_ joined	11:06
	→ zxd joined	11:06
luto	I'd just copy it, do what the license requires me to do and be done with it..	11:07
	→ Gizburdt joined	11:08
FreezingCold	meh, that's what I usually do, but I thought it would cool to be able to update their bits of code with git if they ever fix something	11:08
luto	works for whole files, I doubt that there is way for bits of code	11:08
	← Gizburdt left	11:09
luto	but maybe there is :)	11:09
	← skylite left	11:09
FreezingCold	luto: for whole files, how would you suggest doing it?	11:10
	I can just create a commit that deletes a bunch of lines	11:10
luto	subtree merges maybe	11:10
	just a direction, but should work, even though I've never done it myself	11:11
	← The_Phoenix left	11:12
	→ pcypher joined	11:12
	← ome left	11:13
	→ otter768 joined	11:15
	→ Takle joined	11:15
	← pacon2 left	11:16
	← jceb left	11:16
	→ pacon2 joined	11:16
	← curiousmansi_ left	11:16
	→ jceb joined	11:16
	← senkin left	11:17
	← arez left	11:17
	← pcypher left	11:17
	→ arez joined	11:18
	← arez left	11:19
	→ mizu_no_oto joined	11:19
	← netzmonster left	11:19
	→ PeterBooker joined	11:19
	← Acidnerd left	11:19
	← XVirus left	11:20
	← otter768 left	11:20
	→ arez joined	11:21
	→ jagob joined	11:21
	→ Gizburdt joined	11:21
	← Gizburdt left	11:22
	← arez left	11:22
	→ BigBear joined	11:23
	← sarri left	11:24
	→ arez joined	11:24
	← pacon2 left	11:25
	→ pacon2 joined	11:25
	← arez left	11:25
	→ nnyk joined	11:26
	→ sarri joined	11:26
	→ arez joined	11:26
	← arez left	11:27
	→ devll joined	11:28
BigBear	Good day! I am relatively new to git and wondering how to best do the following. I have a set of twelve access points which boot off some text config files. I would like to maintain this in git. ;-) Am I right in thinking that I could have one master or "template" set of config files, and then 12 branches? And that git woudl really help me pull the chnages or additons form the master...	11:28
	...template inot the indivudual access points brnaches? Is that the git way to go about this?	11:28
	← mennea left	11:33
	→ mennea joined	11:33
	→ arez joined	11:33
	→ ome joined	11:34
	→ leeN joined	11:35
	← mizu_no_oto left	11:35
	← arez left	11:35
	← leeN left	11:35
	→ j416 joined	11:36
	→ arez joined	11:36
	→ curiousmansi_ joined	11:36
	→ netzmonster joined	11:37
	← wachterjohannes left	11:37
jim	if say you had the template config on master, then if you altered the config on 12 branches, you could maintain the config that way, you'd have to check out the branch to get the config you wanted	11:38
	← arez left	11:38
	→ jongravois joined	11:39
	← j416 left	11:39
	→ j416 joined	11:40
	→ leeN joined	11:41
	→ ParsectiX joined	11:42
	← wethu left	11:43
BigBear	jim: yes, that was my thinking. does that make some sense, or is there an OBVIOUS much better way to do this with git?	11:44
	← jongravois left	11:44
Seveas	BigBear: I wouldn't abuse branches here, but actually generate your config files from a template, so you can have that template and the 12 datasets feeding that template all in the same branch.	11:46
	→ shuaib joined	11:46
	→ arez joined	11:47
	← in3xes left	11:47
	← arez left	11:47
	← f03lipe left	11:48
	→ IIT joined	11:48
	← SimonNa left	11:49
	→ f03lipe joined	11:50
	← jceb left	11:50
	→ jceb joined	11:51
	← mennea left	11:51
BigBear	Seveas: yes I get your point, but my template toolkit vodoo is not to strong. But I CAN handle diff and merges manually. Unless you can tell me of a templating methiod that will be as easy as using diff and merge manually?	11:51
	→ arez joined	11:52
	← Kpna left	11:52
	→ jaznow joined	11:53
	→ aayf joined	11:54
Seveas	BigBear: data in yaml files, a simple jinja2 template and a quick python script should do the trick	11:55
	← blr left	11:55
Seveas	Or you could go all-out and write a puppet module for your device :)	11:55
	→ Parsecti_ joined	11:56
	← ParsectiX left	11:56
	← hgl left	11:56
	← jaznow left	11:58
	→ hgl joined	11:58
	← frogonwheels_ left	11:58
	→ King_Hual joined	11:59
	→ m_tadeu joined	12:00
BigBear	Seveas: you say all the "wrong" things. ;-) I am trying to also learn salt and for that I coudl really do with being stronger in python an jinja. As for the puppet module, don't think I stand a chance. it's very weak and slow openwrt access points, and I'd be surprised if there are puppet slaves or agents for that. there certainly aren't any for salt.	12:00
	→ Junior joined	12:01
	← neanderslob left	12:01
	← shuaib left	12:02
jim	BigBear, using git for this would make your configs static, and by that I mean they won;t change until you edit them	12:02
Seveas	BigBear: generally such devices are managed with 'puppet device', which is an agent running on a different machine that uses ssh or any other api to configure the device, but still based on puppet manifests and templates.	12:02
	BigBear: see it as a good reason to learn more python and jinja :D DO IT! :)	12:03
	→ okanck joined	12:04
jim	if you can generate the configs with some sort of template generator that knows how to (say) divide up the IPs or the channels, then your configs would be generated, and maybe you wouldnt like git for that	12:04
	← mkoskar left	12:05
BigBear	Seveas: OK, that sounds much more like the way this should be done. Rats. It' the ways I explored at first. But I have to have this up and running by end of weekend. ;-) Then I am in the office for another week and then gone for 3.5 months. So I need a week to discover teething problems etc before I go. And I have not done ANYTHING with puppet, ever. So that probably has it's own learning...	12:06
	...curve as well.	12:06
Seveas	BigBear: then don't try puppet, just some jinja magic will do	12:07
	a weekend is not enough to properly dive into puppet	12:08
	← jceb left	12:08
	→ jceb joined	12:08
	← m_tadeu left	12:09
	← okanck left	12:09
	→ ScioMin joined	12:10
	→ joeyDB_ joined	12:10
	← teran_ left	12:11
BigBear	Seveas: Thanks. Will "play" with that for an hour and see what gives.	12:11
	→ pcypher joined	12:13
	← joeyDB_ left	12:15
	← nuy_10461903 left	12:16
	← pcypher left	12:17
	← _Vi left	12:19
	→ Gizburdt joined	12:19
	← Gizburdt left	12:20
	← psoo left	12:20
	← stamina left	12:21
	← sourc3 left	12:24
	← jceb left	12:25
	→ jceb joined	12:26
	→ highcup joined	12:26
	→ teran joined	12:28
	→ nuy_10461903 joined	12:29
	→ SimonNa joined	12:30
	← highcup left	12:31
	→ aswen joined	12:33
	→ Gizburdt joined	12:34
	→ Zupoman joined	12:34
	→ Nizumzen joined	12:34
	→ jadne joined	12:35
	← Gizburdt left	12:37
	← warthog9 left	12:38
	← ciampix left	12:38
	→ Gizburdt joined	12:39
	→ mostlybadfly joined	12:39
	← nagromlt left	12:41
	→ tcurdt joined	12:41
	← Jetchisel left	12:41
	→ knownasilya joined	12:41
	→ EminenceHC joined	12:42
	→ _Vi joined	12:42
	← htqp left	12:43
	← teran left	12:43
	← cbreak left	12:44
	← EminenceHC left	12:47
	← xolubi left	12:50
	→ cbreak joined	12:51
	→ mkoskar joined	12:52
	→ lindenle joined	12:53
	← Gizburdt left	12:54
	← lindenle left	12:55
	→ m0viefreak joined	12:56
	→ liamkeily joined	12:56
	→ ColdKeyboard joined	12:56
	→ fightback joined	12:57
	→ lpax joined	12:57
	← fightback left	12:58
	→ warthog9 joined	12:59
	← Nizumzen left	12:59
	← fstd left	13:00
	← warthog9 left	13:00
	→ fstd joined	13:00
	← Asiajey left	13:01
	→ warthog9 joined	13:01
	→ Asiajey joined	13:01
	← BigBear left	13:02
	← cbreak left	13:06
	→ jaznow joined	13:06
	→ Xethron joined	13:06
	→ Zoddo joined	13:06
	← Zoddo left	13:06
	→ Zoddo joined	13:06
	→ cbreak joined	13:07
	→ in3xes joined	13:08
	→ opdavies joined	13:09
	← _Vi left	13:11
	→ _Vi joined	13:11
	← lpax left	13:12
	→ mtakkman joined	13:14
	→ pcypher joined	13:14
	→ lpax joined	13:14
	← duckson left	13:14
	→ otter768 joined	13:16
	→ BigBear joined	13:17
	← nuy_10461903 left	13:18
	← pcypher left	13:19
	→ subhojit777 joined	13:19
	← warthog9 left	13:19
	← subhojit777 left	13:20
	→ bitkiller joined	13:20
	← aswen left	13:20
	← otter768 left	13:21
	← Skapadapaduu left	13:21
	→ lys joined	13:22
	→ kyb3r_ joined	13:24
	Parsecti_ → ParsectiX	13:25
	→ nettoweb joined	13:26
	← Polyatomic left	13:28
	→ jongravois joined	13:28
	→ mkaesz joined	13:28
	→ Vgtr joined	13:29
	← Vgtr left	13:29
	→ Vgtr joined	13:29
	→ hexagoxel joined	13:29
	→ adamben joined	13:29
	→ adamben_ joined	13:30
	← adamben_ left	13:30
	→ adamben_ joined	13:30
	← adamben left	13:30
	← Vgr left	13:31
	← x0s_ left	13:31
	← ScioMin left	13:31
	→ netcarver joined	13:31
	← jongravois left	13:33
	← WaReZ left	13:34
	→ blyssy joined	13:37
	← jceb left	13:37
	← ParsectiX left	13:38
	→ jceb joined	13:38
	← pacon2 left	13:38
	→ ParsectiX joined	13:38
	→ PigFlu joined	13:38
	← PigFlu left	13:38
	→ PigFlu joined	13:38
	→ sinkensabe joined	13:39
OnkelTem	Hi	13:40
	← wakd left	13:41
	→ Nizumzen joined	13:41
OnkelTem	How to make git to use my editor? I have already specified mcedit in .gitconfig, but git runs damned nano	13:41
nanonyme	Doesn't it respect your general editor settings?	13:42
canton7	git apparently listens to GIT_EDITOR first	13:43
	what is GIT_EDITOR set to?	13:43
	also, in a repo, what's the output of 'git config core.editor'?	13:43
	← sinkensabe left	13:44
	→ metastableB joined	13:44
	→ teran joined	13:44
	← nettoweb left	13:47
OnkelTem	canton7: not set :-/. Seems I only set editor for [sequence]	13:48
	← Orbitrix left	13:48
canton7	ah righty	13:48
	set core.editor instead :P sequence.editor uses core.editor if it isn't set	13:48
	← teran left	13:49
	← devll left	13:49
	← Nizumzen left	13:51
	→ Orbitrix joined	13:52
	← Orbitrix left	13:52
	← anchorite left	13:52
	→ wrouesnel joined	13:52
	→ nettoweb joined	13:52
	← mtakkman left	13:53
OnkelTem	canton7: thanks!	13:53
	→ Orbitrix joined	13:53
	← Orbitrix left	13:53
canton7	:)	13:53
	→ Orbitrix joined	13:54
	← devoldmx3 left	13:54
	← blyssy left	13:54
	← f03lipe left	13:54
	→ devoldmx joined	13:55
	→ anchorite joined	13:55
	← opdavies left	13:55
	→ lindenle joined	13:56
	← jadne left	13:56
	← gena2x left	13:57
	→ warthog9 joined	13:57
	→ gena2x joined	13:57
	→ sourc3 joined	13:58
	→ jost joined	13:59
	→ joeyDB_ joined	13:59
	← sourc3 left	13:59
	← freestyl3r left	13:59
	→ jongravois joined	14:00
	← lindenle left	14:00
	→ stylica joined	14:00
	→ freestyl3r joined	14:00
	→ opdavies joined	14:01
	← jaznow left	14:02
	← netzmonster left	14:04
	← joeyDB_ left	14:04
	→ dreiss joined	14:05
	→ shum joined	14:06
	→ jadne joined	14:06
	← netj left	14:07
	→ zadock joined	14:08
	→ netj joined	14:08
	← jceb left	14:08
	← anchorite left	14:08
	→ jceb joined	14:09
	→ anchorite joined	14:09
	→ tier joined	14:12
	← ome left	14:13
	→ CEnnis91 joined	14:14
	→ starkhallo joined	14:14
	→ mennea joined	14:14
	→ pcypher joined	14:14
	← linuxmint left	14:15
	→ _Atom_ joined	14:16
	← gluten_hell_ left	14:17
	← v0n left	14:19
	← PigFlu left	14:19
	← pcypher left	14:19
	→ cavallari joined	14:19
	→ Gizburdt joined	14:20
	→ SirRetnu_ joined	14:21
	→ sinkensabe joined	14:21
	← DistantStar left	14:23
	← cavallari left	14:24
	← sinkensabe left	14:26
	← Zoddo left	14:26
	→ Zoddo joined	14:27
	← Zoddo left	14:27
	→ Zoddo joined	14:27
	← Gizburdt left	14:27
	← liamkeily left	14:28
	→ senkin joined	14:28
	← Zoddo left	14:29
	→ Zoddo joined	14:30
	← Zoddo left	14:30
	→ Zoddo joined	14:30
	← aayf left	14:31
	← jceb left	14:31
	→ EminenceHC joined	14:31
	→ Gizburdt joined	14:31
	→ jceb joined	14:32
	→ rsgra joined	14:32
	← michael_mbp left	14:32
	→ dannymichel joined	14:33
	← devoldmx left	14:33
	→ michael_mbp joined	14:33
	← rsgra left	14:34
	→ mezod joined	14:34
	→ devoldmx joined	14:34
	→ fightback joined	14:34
	← zadock left	14:34
	→ devoldmx3 joined	14:35
	→ zoox joined	14:35
	← EminenceHC left	14:36
	→ devoldmx27 joined	14:36
	← zoox left	14:37
	← michael_mbp left	14:37
	← lys left	14:37
	→ tevfik joined	14:37
	← rchavik left	14:37
	→ Vjvn joined	14:38
	← devoldmx left	14:38
	→ michael_mbp joined	14:38
	← devoldmx3 left	14:40
	→ m0ltar joined	14:40
	← devoldmx27 left	14:41
	→ devoldmx joined	14:41
	← michael_mbp left	14:42
	← dreiss left	14:42
	← Heimdall left	14:43
	→ michael_mbp joined	14:43
	← dsdeiz_ left	14:44
	← mennea left	14:44
	→ mennea joined	14:44
	← _Atom_ left	14:44
	→ circ-user-wwcIp joined	14:45
	→ teran joined	14:45
	← opdavies left	14:45
	← circ-user-wwcIp left	14:45
	→ v0n joined	14:46
	→ Gizburdt_ joined	14:47
	→ BlaXpirit_ joined	14:47
	→ Error404NotFound joined	14:48
	← Zoddo left	14:48
	← Error404NotFound left	14:48
	→ Error404NotFound joined	14:48
	← BlaXpirit left	14:49
	← nikio_ left	14:49
	← Err404NotFound left	14:50
	← Gizburdt left	14:50
	← sx1 left	14:50
	← Gizburdt_ left	14:51
	→ devoldmx3 joined	14:52
	← teran left	14:52
	→ jottr joined	14:52
	→ Gizburdt joined	14:54
	← fightback left	14:54
	→ Zoddo joined	14:54
	← devoldmx left	14:55
	→ Ahmed90 joined	14:56
	← Gizburdt left	14:56
	← Ahmed90 left	14:56
	→ Ahmed90 joined	14:57
	→ Gizburdt joined	14:57
	← Ahmed90 left	14:57
	→ lindenle joined	14:57
	→ Ahmed90 joined	14:57
	← fatalhalt left	14:57
	→ Dougie187 joined	14:59
	→ livingstn joined	14:59
	→ Nizumzen joined	14:59
	→ agd joined	15:00
	→ joeyDB_ joined	15:00
	← tevfik left	15:00
agd	is it possible to clone a tree?	15:00
	if yes, then how?	15:00
	→ netzmonster joined	15:00
_ikke_	clone a tree?	15:01
agd	I would like to clone this; https://github.com/jhellis3/Stockfish/tree/stockfish6mf	15:01
	not the main branch, just the tree 'stockfish6mf'	15:01
	_ikke_; that's right, cloning a tree	15:01
_ikke_	agd: https://github.com/jhellis3/Stockfish/archive/stockfish6mf.zip	15:01
	← lindenle left	15:01
	← random-user-name left	15:01
	← Zoddo left	15:01
agd	_ikke_; no, not that. I want to clone it	15:02
	← anchorite left	15:02
_ikke_	You clone repositories, not trees	15:02
agd	so I can 'git pull' to update it and so on	15:02
_ikke_	You can do shallow clones though	15:02
agd	sure, how?	15:02
	→ Zoddo joined	15:03
_ikke_	git clone --depth=<n>	15:03
	← Ahmed90 left	15:03
agd	_ikke_; i don't know what's the depth of that tree	15:03
jim	what happens when you pull on a shallow clone? does it get less shallow?	15:03
	← livingstn left	15:04
_ikke_	agd: aparently that's just the latest tree	15:04
	← joeyDB_ left	15:04
aspiers	_ikke_: I'm curious why you pasted https://github.com/aspiers/git-deps/blob/master/CONTRIBUTING.md link yesterday? :)	15:05
_ikke_	aspiers: Because I had it open and needed an example	15:05
	→ htqp joined	15:05
aspiers	_ikke_: an example of what? and does this mean I can look forward to a pull request? ;)	15:05
_ikke_	haha, sorry, no, was just regarding github in general	15:06
	← SirRetnu_ left	15:06
aspiers	_ikke_: well, feedback is also very welcome	15:07
	I made a 2nd screencast, not sure if you saw that	15:07
agd	_ikke_; how can I clone that stockfish6mf tree? any idea?	15:07
	← tier left	15:07
CryptoCrack	agd: `git clone --depth=1`.	15:07
_ikke_	aspiers: Ah, I tried git-deps a while ago	15:08
	→ Noldorin joined	15:08
CryptoCrack	agd: Read the git-clone(1) man page :)	15:08
agd	CryptoCrack; thank you!	15:08
CryptoCrack	agd; You're welcome!	15:09
	→ Ahmed90 joined	15:10
	→ anchorite joined	15:12
	→ _Atom_ joined	15:12
	→ SirRetnuh joined	15:13
	← mennea left	15:14
	→ devoldmx joined	15:14
	→ ehmatthes joined	15:14
	→ mennea joined	15:14
	→ pcypher joined	15:15
	← devoldmx3 left	15:15
	← zxd left	15:16
	→ cavallari joined	15:17
	→ otter768 joined	15:17
	← metastableB left	15:18
	→ Heimdall joined	15:18
	← Heimdall left	15:18
	→ basiclaser joined	15:18
	→ WifiBrain joined	15:19
	← jceb left	15:19
	← pcypher left	15:20
	→ jceb joined	15:20
	← bhavul left	15:21
	← otter768 left	15:22
	← agd left	15:22
	→ leolrrj joined	15:23
	→ mtakkman joined	15:25
	← bgerber left	15:27
	→ pcypher joined	15:27
	→ dendazen joined	15:27
	← nettoweb left	15:28
	→ Gamecubic joined	15:28
	← devoldmx left	15:30
	Zupoman → gender	15:30
	← stylica left	15:31
	→ stylica joined	15:31
	→ devoldmx joined	15:31
	→ The_Phoenix joined	15:32
	← jadne left	15:32
	← pcypher left	15:32
	← leolrrj left	15:32
	→ Ahmed-90 joined	15:34
	← Ahmed90 left	15:34
	→ dsdeiz joined	15:35
	→ bhavul joined	15:35
	← aucecil left	15:37
	← Junior left	15:40
	→ pecg joined	15:40
	→ joebz joined	15:41
	← Ahmed-90 left	15:41
	→ Ahmed90 joined	15:42
	→ mennea_ joined	15:44
	→ metastableB joined	15:45
	→ bgerber joined	15:46
	← jost left	15:46
	← netj left	15:47
	← mennea left	15:47
	→ netj joined	15:48
	← jceb left	15:48
	→ osw joined	15:48
	→ bluesm joined	15:49
	→ livingstn joined	15:50
	→ roelmonnens joined	15:51
	← tcurdt left	15:51
	→ nettoweb joined	15:52
	← jottr left	15:52
	← SirRetnuh left	15:54
	← joebz left	15:55
	← roelmonnens left	15:55
	→ nemaonenis joined	15:56
	→ zadock joined	15:56
	← zadock left	15:56
	→ CheckDavid joined	15:58
	→ ojacobson joined	15:58
BigBear	Seveas: How would you write the python loop to have jinja2 read all my *.jijna templates in a templates subdir and write them out to 12 subdirs named after a list of access points ?	16:00
	./templates/network,jinja -> ./ap1/network + ./templates/wireless.jinja -> ./ap1/wireless + ./templates/system.jinja -> /ap1/system	16:00
	./templates/network,jinja -> ./ap2/network + ./templates/wireless.jinja -> ./ap2/wireless + ./templates/system.jinja -> /ap2/system	16:00
	← Gizburdt left	16:00
	→ SirRetnu_ joined	16:01
	→ joeyDB_ joined	16:01
	→ Gizburdt joined	16:01
_ikke_	BigBear: This is #git	16:01
	→ psoo joined	16:02
	→ DrHouse\|DellM650 joined	16:03
BigBear	_ikke_: sorry , it am tryign to ttrack it in git - honest. But Seveas here has put me unto basing it all on python and jinja2 templates as the basis about a couple hours ago on this channel. So I thought he might help me write the simple python loop. Will go and see if a kind person in #python helps me with that.	16:04
	→ Ahmed-90 joined	16:05
	← joeyDB_ left	16:05
	← fr33domlover left	16:06
	← Ahmed90 left	16:06
	→ cavallari1 joined	16:06
	→ polyzen joined	16:07
	← Gizburdt left	16:08
	← cavallari left	16:08
	→ fr33domlover joined	16:09
	← jagob left	16:11
	← rj1 left	16:12
	→ normalra_ joined	16:13
	→ evanc joined	16:14
	→ zadock joined	16:14
	← nemaonenis left	16:14
	→ eletuchy joined	16:14
	← eletuchy left	16:14
	← mennea_ left	16:15
evanc	hey folks! a quick question: I find `git branch -v` far more useful than `git branch`. Is there any way to set -v to be on by default? I'm hoping there's some ~/.gitconfig magic I can do	16:15
	→ eletuchy joined	16:15
	→ Gizburdt joined	16:15
	→ mennea joined	16:15
normalra_	Ohai! Suppose I apply several commits. Then I wish to "replace" a commit with a "newer" version (gerrit does it this way), can I do it in an interactive rebase or in some other way?	16:16
	← mtakkman left	16:16
	← Gizburdt left	16:16
_ikke_	evanc: The only way is using aliases	16:17
	← spacejumpjim left	16:17
evanc	_ikke_: like `alias gbv='git branch -v'` and then remembering to use `gbv`?	16:18
	← jason237 left	16:18
	→ Gizburdt joined	16:19
_ikke_	yes	16:19
	→ voiceofgrog joined	16:19
	→ teufelChiCoder joined	16:20
	→ EminenceHC joined	16:20
	→ intransit joined	16:20
	normalra_ → normalra	16:20
	← eletuchy left	16:20
	→ jagob joined	16:21
	→ jgardella joined	16:21
	→ CustosLimen joined	16:22
	→ CKyle joined	16:23
	→ danielmahon joined	16:23
	→ jottr joined	16:23
	← EminenceHC left	16:24
	← Lovich left	16:24
	→ roelmonnens joined	16:26
	← nettoweb left	16:26
	← ehmatthes left	16:27
	← King_Hual left	16:27
	→ King_Hual joined	16:27
	← intransit left	16:27
	→ madewokherd joined	16:28
	→ intransit joined	16:28
	→ sebhoss joined	16:28
	→ ncd\|leeN joined	16:30
	→ joo-_ joined	16:30
	← senkin left	16:30
	← roelmonnens left	16:31
	→ joebz joined	16:31
	← Ahmed-90 left	16:31
	→ DrShoggoth joined	16:32
	← Takle left	16:32
	→ Ahmed90 joined	16:32
	← intransit left	16:32
	← danielmahon left	16:33
	← SirRetnu_ left	16:33
	← Consuela left	16:33
	← leeN left	16:33
	← WifiBrain left	16:33
	← psoo left	16:34
	← joo-_ left	16:36
	→ eijk joined	16:36
	← sebhoss left	16:36
	← aretecode left	16:37
	→ lpax_ joined	16:38
	→ listenrightmeow joined	16:38
	→ Takle joined	16:39
	→ mtakkman joined	16:40
	← lpax left	16:40
	← htqp left	16:41
	← knownasilya left	16:41
	→ danielmahon joined	16:41
	← pandeiro left	16:43
	← jwhisnant left	16:43
	→ joo-_ joined	16:44
	← mennea left	16:44
	→ mennea joined	16:44
	← danielmahon left	16:44
	Vgtr → Vgr	16:44
	→ Ahmed-90 joined	16:46
	← Ahmed90 left	16:46
	← Gizburdt left	16:47
	→ Gizburdt joined	16:47
	← IIT left	16:48
	→ sebascar joined	16:50
	→ WaReZ joined	16:50
	← joo-_ left	16:50
	← jagob left	16:50
	→ Neozonz joined	16:51
	← Neozonz left	16:51
	→ Neozonz joined	16:51
	← Milkweed left	16:53
	→ zxd joined	16:53
	← PCatinean left	16:54
	← Vjvn left	16:54
	→ Uhp joined	16:55
	← mtakkman left	16:55
	→ ErKa joined	16:56
	← dsdeiz left	16:57
	← Uhp left	16:57
	← sebascar left	16:58
	→ Corey84 joined	16:58
	← zadock left	16:58
	→ zui joined	16:58
	→ sebascar joined	16:59
	← Ahmed-90 left	16:59
	→ agumonkey joined	17:00
	→ Ahmed90 joined	17:00
agumonkey	hi there	17:00
	→ kadoban joined	17:01
	← vla left	17:01
agumonkey	I have changes on 3 files, unrelated enough for 3 branches. How can I do so ?	17:02
	In my limited use of git, if I create a branch b1, stage file1 and commit, I can't go back to the root branch because of the remaining 2 changed files	17:02
evanc	_ikke_: aw, that's unfortunate. Thanks, though!	17:03
kadoban	agumonkey: !float or if you can't do that, 'git stash' the ones you don't want at the moment and then 'git stash apply' them when you do	17:03
gitinfo	agumonkey: If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there. If the files you changed differ between branches, the checkout will fail. In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.	17:03
	← Gizburdt left	17:04
	→ gsingh93 joined	17:05
	← Ahmed90 left	17:05
	→ Solid1 joined	17:07
	→ mekhami joined	17:09
	→ chiemseesurfer joined	17:09
	→ danielmahon joined	17:10
	← zui left	17:10
	→ Lonvo joined	17:11
	← mennea left	17:14
	← DrHouse\|DellM650 left	17:14
	→ mennea joined	17:14
	→ SonikBoom joined	17:15
	← mekhami left	17:15
	→ joeyDB_ joined	17:16
	← Lonvo left	17:17
	← Noldorin left	17:17
	→ teran joined	17:18
	→ otter768 joined	17:18
	→ jason237 joined	17:19
agumonkey	kadoban: aight, thanks, I thought stashing was a non proper solution for noobs like me who dont really get branches	17:19
	→ Kzkm joined	17:19
kadoban	agumonkey: Naw, stashing is pretty common. Hope it works out. Don't give up on branches, they're great once you're comfortable with them :)	17:20
	→ bb010g joined	17:20
	← joeyDB_ left	17:21
	→ voiceofgrog_ joined	17:22
	← teran left	17:22
	← voiceofgrog left	17:22
	← otter768 left	17:22
	→ cdown joined	17:23
	→ dannymic_ joined	17:23
	→ jagob joined	17:24
	→ eijk_ joined	17:24
	← dharrigan left	17:27
	← dannymichel left	17:27
	← eijk left	17:27
	→ dreiss joined	17:27
	→ Gizburdt joined	17:29
	→ dharrigan joined	17:32
	← dharrigan left	17:32
	→ dharrigan joined	17:32
	← sebascar left	17:32
	→ RedShift joined	17:32
	→ TotempaaltJ joined	17:32
	→ xolubi joined	17:32
	← blubberbop left	17:33
	→ Lovich joined	17:35
	← voiceofgrog_ left	17:36
	← RedShift left	17:37
agumonkey	kadoban: thanks	17:39
	← Gizburdt left	17:39
	→ voiceofgrog joined	17:40
	→ RedShift joined	17:40
	→ kukks joined	17:41
	← mtscout6 left	17:41
	→ tyreld joined	17:42
	← cdown left	17:43
	← michael_mbp left	17:43
	→ devll joined	17:43
	← mennea left	17:44
	→ Thorn joined	17:44
	→ michael_mbp joined	17:44
	← teufelChiCoder left	17:45
	→ SirRetn__ joined	17:45
	→ mennea joined	17:45
	→ druidd joined	17:46
	→ nettoweb joined	17:47
	← dilfridge left	17:47
	← eijk_ left	17:48
	← nettoweb left	17:48
	→ dilfridge joined	17:49
	→ eijk joined	17:49
	← pecg left	17:50
	→ mtscout6 joined	17:50
	← agumonkey left	17:51
	← TotempaaltJ left	17:51
	← eijk left	17:51
	→ eijk_ joined	17:51
	→ HelloShitty joined	17:51
	← Kzkm left	17:52
	→ smccarthy joined	17:52
	← WaReZ left	17:53
	← [cust] left	17:53
	← BigBear left	17:53
	→ eletuchy joined	17:54
	→ scientes joined	17:54
	← scientes left	17:54
	→ scientes joined	17:54
	→ blubberbop joined	17:56
	→ lindenle joined	17:58
	← anchorite left	17:58
	← eijk_ left	17:58
	gender → middlesex	17:59
	← tomtclai left	17:59
	middlesex → Middlesex	18:00
	→ eburcat joined	18:00
	← michael_mbp left	18:00
	→ eijk joined	18:01
	→ michael_mbp joined	18:02
	← RedShift left	18:02
	← lindenle left	18:03
	← jason237 left	18:04
	← wrouesnel left	18:05
	→ RedShift joined	18:05
	← sgen_ left	18:05
	← eburcat left	18:05
	→ timini joined	18:05
	→ anchorite joined	18:05
	→ dannymichel joined	18:05
	→ wachterjohannes joined	18:06
	← blubberbop left	18:06
	→ pecg joined	18:06
timini	hey is there a way to get a graphical representation of the commits in git? I can get a list of all the commits, but ow do I get a list of the edges?	18:06
	← zapb_ left	18:07
	→ zapb_ joined	18:07
ojacobson	!lol	18:07
gitinfo	A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	18:07
ojacobson	gitk, sourcetree, gitx, tower, MANY others	18:08
	← Solid1 left	18:08
	→ kermit joined	18:09
	← dannymic_ left	18:09
	→ EminenceHC joined	18:09
	→ jwhisnant joined	18:09
timini	ok But i just want to get the edges so I can draw the graph myself	18:09
	→ blubberbop joined	18:09
	→ Thorn__ joined	18:09
	→ BigBear joined	18:10
_ikke_	What do you mean with the edges?	18:10
ojacobson	Oh; you can make git-log print out commit - parent parent parent lists, if you want. It'd require a custom format, but not a terribly complicated one. Does that match what you're looking for?	18:10
timini	yeah that sounds about right	18:12
	← FreezingCold left	18:12
	← Takle left	18:12
timini	I also just found rev-list	18:12
	← Thorn left	18:13
	← EminenceHC left	18:13
	← joebz left	18:13
	→ mennea_ joined	18:15
	→ FreezingCold joined	18:15
	gitinfo set mode: +v	18:15
Celelibi	If I have the commit tree: A -- master; A -- B.	18:15
timini	i guess rev-list is just a reverse of list LOL	18:16
Celelibi	I want to obtain A -- master -- B.	18:16
	← HedgeMage left	18:16
	← Hedgework left	18:16
Celelibi	The syntax is git rebase --onto master B A, right?	18:16
ojacobson	timini: list of revisions (commit objects)	18:17
	← michael_mbp left	18:17
	← mennea left	18:17
Seveas	Celelibi: just git rebase master will do	18:17
ojacobson	git-rev-list is the guts of a bunch of user-facing things (git-log most obviously)	18:17
Celelibi	Depends which one is checked out.	18:17
	→ Ahmed90 joined	18:17
timini	so how do i list all the first ancestors of a commit?	18:17
	→ michael_mbp joined	18:17
Seveas	Celelibi: true. this works when on B	18:17
	← Ahmed90 left	18:17
	→ [cust] joined	18:18
Celelibi	The full command give me more control.	18:18
	→ Ahmed90 joined	18:18
ojacobson	Celelibi: 'git rebase master B', then	18:18
	← Ahmed90 left	18:18
	← msonntag left	18:18
ojacobson	the --onto is spurious here (harmless, but unnecessary) if A is the last common ancestor of master and B	18:19
	→ Ahmed90 joined	18:19
	→ okanck joined	18:19
	← SirRetn__ left	18:19
	← lpax_ left	18:19
comps	timini: git log --first-parent ?	18:19
	← druidd left	18:20
	→ SirRetnu_ joined	18:20
	→ diegoviola joined	18:20
	← SirRetnu_ left	18:21
ojacobson	timini: if you want a parser-friendly list of commits with parents, git log --format='format:%H %P' --all	18:21
	→ SirRetnu_ joined	18:21
	← dm7freek left	18:22
Celelibi	ojacobson: I have more complex case to come and would like to say explicitely exactly which commit to take.	18:22
	← jottr left	18:22
jwhisnant	I can't check out a particular repository as a submodule, and I don't know where to start trying to debug the problem. https://gist.github.com/jwhisnant/7d620852879272fb7e31	18:23
	gitinfo set mode: +v	18:23
	→ Literphor joined	18:23
	← pecg left	18:24
	→ slassh joined	18:25
	← BigBear left	18:26
	→ pecg joined	18:26
	← scientes left	18:27
_ikke_	jwhisnant: What version of git do you have?	18:27
timini	ojacobson: :) cool!	18:27
	← MechtiIde left	18:27
	→ daito joined	18:28
	← michael_mbp left	18:28
	→ Vgr_ joined	18:29
	→ michael_mbp joined	18:29
	← SirRetnu_ left	18:29
	→ Solid1 joined	18:30
jwhisnant	_ikke_: git version 1.7.9.5; ubuntu 12.04, although I will try to replicate on an ubuntu 14.04 ...	18:30
	← ParsectiX left	18:31
	→ ParsectiX joined	18:31
	→ MLM joined	18:31
	← Lovich left	18:31
	← eletuchy left	18:32
	← Vgr left	18:32
	→ joeyDB_ joined	18:32
	→ Aazpw joined	18:33
jwhisnant	_ikke_: works on git version 1.9.1; ubuntu 14.04	18:33
	→ Lovich joined	18:33
	→ teran joined	18:33
	← Aazpw left	18:34
	← michael_mbp left	18:34
	→ Goplat joined	18:34
	→ michael_mbp joined	18:34
milki	why was .git catted o.O	18:35
	→ ckeol joined	18:35
jwhisnant	so I wouldn't spend many cycles on it if there isn't a simple fix, because I can just make it a submodule when I upgrade my OS	18:35
milki	o	18:35
	is it a symlink?	18:35
	← pecg left	18:35
	milki doesnt remember how the .git/modules layout works	18:35
milki	that always confused me	18:35
ojacobson	milki: "badly"	18:36
	← ckeol left	18:36
ojacobson	however, git 1.7 can deal with submodules _checked out_ by git 1.7 -- this looks more like it was checked out in a later git	18:36
jwhisnant	milki: no; I did a cat on the file in case it was helpful to debug, since the gitdir in the .git file is wrong. That was the only file downloaded.	18:36
	← daito left	18:37
milki	its not supposed to be a file unless thats how .git/modules works	18:37
_ikke_	milki: it's a gitlink	18:37
	.git is in that case a file with the location of the actual .git directory	18:37
	→ Ljp joined	18:37
	← joeyDB_ left	18:37
milki	when i started using submodules, the submodule path contained the full repo and didnt use .git/modules	18:37
	hm	18:37
_ikke_	a gsoc fixed that	18:37
milki	ah	18:37
ojacobson	"fixed"	18:37
milki	lol	18:37
_ikke_	The problem was git could not checkout other branches because the .git directory would have to be removed	18:37
milki	ok, so thats why it could be incompatible	18:37
ojacobson	I remain unconvinced the additional complexity is the Right Thing, but there are upsides :)	18:37
	← arez left	18:38
	← dendazen left	18:38
	← teran left	18:38
	← michael_mbp left	18:38
	← FreezingCold left	18:38
_ikke_	It's so much better than confusing message about git not going to remove some files	18:39
	→ naftilos76 joined	18:39
	→ michael_mbp joined	18:39
milki	jwhisnant: is the submodule already added or are you trying to init one thats already defined?	18:39
	er	18:40
	trying to add a _new_ submodule	18:41
	>.>	18:41
	→ eletuchy joined	18:41
jwhisnant	milki: it was originally installed with a "git clone"; I deleted the previous tree with "rm -rf"; and then attempted to reinstall as a submodule. I have never tried to make this one a submodule before.	18:41
	← Dougie187 left	18:41
jwhisnant	FWIW I did the same with a couple of other repos and it worked. And there is another report on thie repo (from 3 years ago) that "did not work" as a submodule.	18:42
milki	then you probably need to delete the actual clone in .git/modules too	18:42
	you need to completely remove any trace of the gitmodule before you get to a clean state where it can be added	18:42
	probablly	18:42
ojacobson	and then, when you're done that, throw submodules into the abyss and use a library/module manager :)	18:43
milki	haha	18:43
	i use... a Makefile >.>	18:43
	git archive repo \| (cd dir && tar -xvf -)	18:43
	>.>	18:43
ojacobson	heh	18:43
	→ red_horned_rihno joined	18:44
	→ mennea joined	18:45
	← ag4ve_ left	18:45
	← mennea_ left	18:48
	← Solid1 left	18:49
	← nnyk left	18:49
	→ skorgon joined	18:50
	→ thiago joined	18:50
_ikke_	milki: also tar -C	18:50
jwhisnant	resolved, updated gist with steps in case it helps others	18:51
	milki: ^ thanks for the help	18:51
	← eletuchy left	18:53
	← Ahmed90 left	18:54
	← Lovich left	18:54
	→ jottr joined	18:55
	→ Lovich joined	18:55
	→ Solid1 joined	18:57
	← Gitzilla left	18:58
	← red_horned_rihno left	18:59
	→ red_horned_rihno joined	18:59
	Vampire0_ → Vampire0	19:06
	← Vile left	19:06
	→ irqq joined	19:06
	← Vampire0 left	19:06
	→ Lyqyd joined	19:06
	→ tarkus joined	19:07
	→ Gitzilla joined	19:07
	→ dm7freek joined	19:09
	→ eletuchy joined	19:09
	→ WaReZ joined	19:10
	← dm7freek left	19:13
milki	_ikke_: o...that makes it nicer >.>	19:13
	→ dm7freek joined	19:14
	← mennea left	19:14
	← eletuchy left	19:14
_ikke_	aye	19:14
	← devoldmx left	19:15
	→ mennea joined	19:15
	→ devoldmx joined	19:15
	→ diego1 joined	19:15
	→ dm7freek_ joined	19:16
	← diego1 left	19:16
	→ diego1 joined	19:16
	→ hans_s joined	19:17
	← WaReZ left	19:17
	← diegoviola left	19:17
	→ scientes joined	19:18
	← scientes left	19:18
	→ scientes joined	19:18
	← ParsectiX left	19:18
	← wachterjohannes left	19:18
	→ ParsectiX joined	19:18
	→ HedgeMage joined	19:18
	← scientes left	19:18
	→ FreezingCold joined	19:18
	→ otter768 joined	19:19
	→ Hedgework joined	19:19
	→ eletuchy joined	19:19
	← dm7freek left	19:19
osse	ojacobson: can you recommend one?	19:19
ojacobson	?	19:19
osse	ojacobson: a library/module manager	19:20
	I was scrolled up a bit	19:20
	→ scientes joined	19:20
	← scientes left	19:20
	→ scientes joined	19:20
milki	lol	19:20
	dowser works well for uh	19:20
	python?	19:20
	← scientes left	19:21
milki	wait	19:21
	bower	19:21
	diego1 → diegoviola	19:21
milki	maybe...	19:21
ojacobson	osse: oh. I use whatever's widely used for my language/runtime of choice, or the OS package manager if at all possible	19:21
	(so, never, on OS X)	19:21
milki	http://bower.io/	19:22
	i guess its actuall not for any particular language	19:22
	→ scientes joined	19:22
	← Neozonz left	19:22
	← scientes left	19:22
osse	hmm i think i misunderstood	19:22
ojacobson	osse: my underlying assumption is that about 90% of the time, people are using submodules for libraries :)	19:23
	→ scientes joined	19:23
	← scientes left	19:23
	→ scientes joined	19:23
ojacobson	shared code/resources, etc	19:23
	→ Neozonz joined	19:23
	← Neozonz left	19:23
	→ Neozonz joined	19:23
	→ Takle joined	19:24
	← otter768 left	19:24
	← jagob left	19:24
	→ jceb joined	19:26
	← adamben_ left	19:26
	← Gama11 left	19:26
	→ Gama11 joined	19:26
	→ ColdKeybo[a]rd joined	19:27
	← dm7freek_ left	19:28
osse	Yes, isn't that the kntention.	19:28
	?	19:28
	← timini left	19:28
	← ColdKeyboard left	19:28
	← dreiss left	19:33
	→ teran joined	19:34
	→ mont453 joined	19:35
	→ jason237 joined	19:37
	→ arez joined	19:38
	← mont453 left	19:38
	← teran left	19:39
	→ dreiss joined	19:43
	→ WaReZ joined	19:44
	← mennea left	19:45
	→ random-user-name joined	19:45
	→ teufelChiCoder joined	19:46
	→ mennea joined	19:47
	Vgr_ → Vgr	19:49
	→ APerson_ joined	19:51
	← Literphor left	19:51
	← APerson_ left	19:52
	← bluesm left	19:52
	→ liamkeily joined	19:53
	→ gopar joined	19:53
	→ dougsland joined	19:55
	→ PigFlu joined	19:55
	→ MasterPiece joined	19:55
	→ diego1 joined	19:55
	→ settermjd joined	19:56
	→ kerrick__ joined	19:56
	← freeroute left	19:57
	← cavallari1 left	19:57
	→ aswen joined	19:57
	← listenrightmeow left	19:58
	→ ranchodev joined	19:58
	← diegoviola left	19:58
	← dreiss left	19:58
	← MasterPiece left	19:59
	→ ropav joined	19:59
	← zxd left	20:00
	← kerrick__ left	20:01
	phantombeta → phantombeta\|AFK	20:01
	→ aidalgol joined	20:01
	← WaReZ left	20:02
	→ kerrick__ joined	20:02
	← curiousmansi_ left	20:04
	← dougsland left	20:05
	→ adamben joined	20:07
	← adamben left	20:07
	→ adamben joined	20:07
	← The_Phoenix left	20:10
	← chiemseesurfer left	20:10
	→ ap0c joined	20:11
	→ pheaver joined	20:12
	→ _2_shelly49 joined	20:12
	aerth_ → aerth	20:13
	← aerth left	20:14
	→ aerth joined	20:14
	← squentin left	20:14
	← mennea left	20:14
	→ mennea joined	20:15
	→ WaReZ joined	20:15
	→ alekks joined	20:15
	← _2_shelly49 left	20:15
	← Gama11 left	20:16
	→ Gama11 joined	20:16
	→ SirRetnu_ joined	20:16
	← diego1 left	20:19
	→ diego1 joined	20:19
	diego1 → diegoviola	20:19
	← alekks left	20:20
	← jceb left	20:20
	← ParsectiX left	20:20
	→ ParsectiX joined	20:20
	← irqq left	20:20
	← ParsectiX left	20:21
	→ joeyDB_ joined	20:21
	→ FunkybAss joined	20:21
	→ irqq joined	20:21
	→ ParsectiX joined	20:21
	→ squentin joined	20:22
	→ m_tadeu joined	20:23
	← m_tadeu left	20:23
	← FunkyAss left	20:23
	→ aard_ joined	20:24
	← aard_ left	20:24
	← joeyDB_ left	20:25
	→ normalra_ joined	20:26
	← squentin left	20:26
	← okanck left	20:28
	→ jceb joined	20:28
	← normalra left	20:28
	→ TotempaaltJ joined	20:28
	→ dreiss joined	20:28
	← random-user-name left	20:28
	← normalra_ left	20:29
	← anchorite left	20:29
	→ jagob joined	20:29
	→ ehmatthes joined	20:29
	→ squentin joined	20:29
	→ random-user-name joined	20:31
	→ dermoth_ joined	20:32
	← dermoth left	20:32
	dermoth_ → dermoth	20:33
	← jceb left	20:33
	← danielmahon left	20:33
	→ ferr joined	20:34
	→ mikecmpbll joined	20:34
	← SirRetnu_ left	20:35
	→ axsuul joined	20:35
	← TotempaaltJ left	20:36
	← jottr left	20:36
	→ jadne joined	20:37
	← random-user-name left	20:37
	→ ThiefMaster joined	20:37
	→ otter768 joined	20:38
ThiefMaster	just out of curiosity, why is https://github.com/zsh-users/zsh/blob/master/Functions/VCS_Info/Backends/VCS_INFO_get_data_git not maintained by whoever maintains https://github.com/git/git/blob/master/contrib/completion/git-prompt.sh - would't it make lots of sense to have the same functionality in the zsh completion that the standalone script provides (i know, i could just run git-prompt.sh in	20:39
	zsh but it's much cleaner to use the vcs_info system when using zsh)	20:39
	← gsingh93 left	20:39
	← dannymichel left	20:39
	← Mixologic left	20:40
	→ dannymichel joined	20:40
	→ nnyk joined	20:41
	→ jottr joined	20:42
	→ random-user-name joined	20:42
	→ ciampix joined	20:43
	→ astrofog joined	20:43
	← metastableB left	20:44
	← mennea left	20:44
	→ jceb joined	20:44
	→ mennea joined	20:45
	→ Rakkan joined	20:46
	← Celelibi left	20:48
	→ okanck joined	20:49
	→ teran joined	20:51
	→ joel_falcou joined	20:51
	→ Celelibi joined	20:53
	→ gsingh93 joined	20:53
	← irqq left	20:54
	→ irqq joined	20:55
	← Zoddo left	20:55
	← teran left	20:55
	→ sparetire joined	20:55
	→ Mixologic joined	20:56
	→ anomalyst joined	20:57
	← dreiss left	20:57
	→ joebz joined	20:57
	← devll left	20:59
	→ Polyatomic joined	20:59
	← liamkeily left	21:00
	→ nettoweb joined	21:00
	← adamben left	21:01
	← nettoweb left	21:01
	← D-Boy left	21:02
	→ dvaske joined	21:02
	→ adamben joined	21:02
	← adamben left	21:02
	→ adamben joined	21:02
	← joebz left	21:03
	→ iamjarvo joined	21:03
	→ zsero joined	21:03
zsero	hi, how can I “compress” a history of a repository into only one commit? I tried doing local clone with —depth 1 but it tells me: “warning: --depth is ignored in local clones; use file:// instead.”	21:03
	← astrofog left	21:03
	→ dreiss joined	21:04
	← ErKa left	21:04
CareBear\	zsero : so use file://	21:04
	zsero : you can also create a branch and rebase/squash all commits together	21:04
zsero	I tried it, but it didn’t work. should I use it at the source or the destination?	21:05
CareBear\	source	21:05
	git clone file:///home/zsero/gits/thegit	21:05
	with --depth of course	21:05
	sorry	21:05
	→ dm7freek joined	21:05
	← iamjarvo left	21:05
	← dm7freek left	21:05
	→ dm7freek joined	21:05
zsero	so I need fullpath?	21:06
_ikke_	git clone --depth doesn't compress any history, it would just give you one commit	21:06
	→ Zoddo joined	21:06
zsero	i’m happy to forget history	21:06
CareBear\	_ikke_ : that's the same thing	21:06
	zsero : yes	21:06
	← m0ltar left	21:07
zsero	ok, pretty much I could do rm -rf .git	21:07
CareBear\	also an idea	21:07
	→ m0ltar joined	21:07
	← teufelChiCoder left	21:07
	→ devoldmx3 joined	21:07
	→ NosBit joined	21:09
	→ f03lipe joined	21:10
	← pheaver left	21:10
zsero	ok, this works, although really slow, 3 MB/s on a local SSD	21:10
	← NosBit left	21:10
	→ D-Boy joined	21:10
	← dreiss left	21:11
	← Zoddo left	21:11
	← axsuul left	21:11
	→ BigBear joined	21:11
	← devoldmx left	21:11
	← mennea left	21:14
zsero	thanks	21:14
	→ Sasazuka joined	21:14
	→ rubyonrailed joined	21:14
	← jceb left	21:15
	← otter768 left	21:15
	→ mennea joined	21:15
	→ hrendalf joined	21:15
	→ jceb joined	21:15
	← Ljp left	21:16
	← petersr left	21:16
	← flaguy48 left	21:16
	→ axsuul joined	21:17
	→ intransit joined	21:18
	→ xolubi_ joined	21:19
	← skorgon left	21:20
	→ beastd joined	21:20
	← irqq left	21:20
	← xolubi left	21:21
	→ irqq joined	21:21
	← jceb left	21:22
	→ dreiss joined	21:22
	← basiclaser left	21:24
	→ Zoddo joined	21:25
	→ osa joined	21:25
	← osa left	21:26
	→ bluesm joined	21:26
	← slassh left	21:27
	→ iruq joined	21:27
	→ xolubi joined	21:27
	← intransit left	21:28
	← hrendalf left	21:28
	← iruq left	21:28
	← settermjd left	21:28
	← xolubi_ left	21:29
	→ Bhu joined	21:31
	← Bhu left	21:32
	← dvaske left	21:33
	← neunon left	21:33
	← RedShift left	21:33
	→ neunon joined	21:34
	→ lgga joined	21:34
	→ lindenle joined	21:36
	← ashnur left	21:39
	← _Atom_ left	21:39
	← Lovich left	21:39
	→ sbogg joined	21:40
	← bb010g left	21:40
	← lindenle left	21:40
	← bhavul left	21:41
	← shum left	21:41
	→ bhavul joined	21:42
	→ shum joined	21:42
	← Takle left	21:42
	← jadne left	21:44
	← mennea left	21:44
	→ mennea joined	21:45
	← zsero left	21:45
	← ehmatthes left	21:46
	→ EminenceHC joined	21:46
	→ Takle joined	21:49
	→ _Mateo_W joined	21:50
	← okanck left	21:50
	← EminenceHC left	21:50
	← mennea left	21:51
	→ flaguy48 joined	21:51
	→ hans_s_ joined	21:51
	→ liamkeily joined	21:52
	→ macabre joined	21:52
	→ Segfault_ joined	21:52
	← Celelibi left	21:53
	← bhavul left	21:54
	← random-user-name left	21:54
	← hans_s left	21:55
	→ Celelibi joined	21:56
	→ ehmatthes joined	21:56
	→ pecg joined	21:56
	← shum left	21:57
	→ shum joined	21:57
	← Corey84 left	21:57
	← f03lipe left	21:58
	hans_s_ → hans_s	21:59
	phantombeta\|AFK → phantombeta	21:59
	← irqq left	21:59
	← lgga left	22:00
	← ehmatthes left	22:00
	← Xethron left	22:00
	→ Aajb joined	22:01
	← JEEB left	22:01
	← shum left	22:02
	→ shum joined	22:02
	← Aajb left	22:03
	← macabre left	22:03
	→ mellernoia joined	22:03
	← fr33domlover left	22:04
	→ SirRetnuh joined	22:04
	→ Aer joined	22:05
	← gebjgd left	22:05
	→ whitby joined	22:05
	→ JEEB joined	22:06
	→ King_Hual` joined	22:06
	→ teran joined	22:06
	→ ErKa joined	22:08
	← jalmeida left	22:09
	→ jonalmeida joined	22:09
	← King_Hual left	22:09
	→ joeyDB_ joined	22:10
	← mellernoia left	22:10
	← teran left	22:11
	← scientes left	22:11
	← joeyDB_ left	22:14
	→ Dougie187 joined	22:16
	← robbyoconnor left	22:16
	→ BigBear_ joined	22:16
	→ listenrightmeow joined	22:17
	← BigBear left	22:17
	BigBear_ → BigBear	22:17
	← Celelibi left	22:18
	→ tcurdt joined	22:19
	→ nikio_ joined	22:20
	→ scientes joined	22:23
	← scientes left	22:23
	→ scientes joined	22:23
	← pantsman- left	22:23
	→ Celelibi joined	22:23
	← shum left	22:24
	→ shum joined	22:24
	robustus → robustus\|Off	22:25
	→ druidd joined	22:25
	← BigBear left	22:26
	→ BigBear joined	22:26
	→ bb010g joined	22:27
	→ vreo joined	22:27
	← Nizumzen left	22:27
	← shum left	22:28
	→ shum joined	22:28
Remram	No reply from maintainers a month after patch? Should I bump? http://thread.gmane.org/gmane.comp.version-control.git/263199	22:30
	← joel_falcou left	22:30
	← TomyLobo left	22:31
	← duderonomy left	22:31
	← freestyl3r left	22:31
	→ duderonomy joined	22:32
	→ neanderslob_ joined	22:32
	← Kartagis left	22:32
	← UmbraMalison left	22:34
	→ bhavul joined	22:35
	← druidd left	22:35
	← vreo left	22:36
	→ stylica_ joined	22:37
	← Solid1 left	22:37
	← incredible left	22:37
	← BigBear left	22:37
	← stylica left	22:37
	← netcarver left	22:37
	→ BigBear_ joined	22:37
	BigBear_ → BigBear	22:37
	→ Kartagis joined	22:38
	→ rj1 joined	22:38
	← gsingh93 left	22:38
	→ gsingh93 joined	22:39
	← stylica_ left	22:39
	→ stylica_ joined	22:39
	stylica_ → stylica	22:40
	→ phantombeta_ joined	22:40
	← voiceofgrog left	22:40
	← xbob left	22:41
	← jim left	22:41
CareBear\	I can't open that - do you have another link	22:41
	?	22:41
	← phantombeta left	22:42
	← Kicer86 left	22:45
	← duderonomy left	22:45
	→ ghostpl_ joined	22:46
	→ pandeiro joined	22:46
	→ joebz joined	22:47
	← phantombeta_ left	22:47
bremner	gmane hates you?	22:48
	← smccarthy left	22:48
	← doener left	22:49
	← pecg left	22:51
	← joebz left	22:52
	← SirRetnuh left	22:52
	→ sgen_ joined	22:52
	← tarkus left	22:53
CareBear\	what is kdbus doing these days?	22:53
	→ pacon2 joined	22:55
	aerth → aerth_	22:56
	→ BigBear_ joined	22:57
	→ oojacoboo joined	22:57
	← pacon2 left	22:57
	← bhavul left	22:58
	← jgardella left	22:58
	aerth_ → aerth_afk	22:59
	← BigBear left	22:59
	BigBear_ → BigBear	22:59
	← WaReZ left	22:59
	← tcurdt left	22:59
	aerth_afk → aerth_afaik	22:59
	→ linuxmint joined	23:01
	← gsingh93 left	23:02
	→ gsingh93 joined	23:03
	→ tcurdt joined	23:03
	→ pacon joined	23:04
	← jmpp left	23:06
	← joelm left	23:08
	→ danielmahon joined	23:09
	← tcurdt left	23:09
	← Celelibi left	23:11
	← liamkeily left	23:11
	→ Celelibi joined	23:12
	← mkaesz left	23:12
	→ mkaesz joined	23:13
	→ mizu_no_oto joined	23:14
	← myst\|work left	23:14
	← JanC left	23:14
	→ sinkensabe joined	23:15
	← adamben left	23:15
	→ otter768 joined	23:16
	→ myst\|work joined	23:16
	→ ahr3n joined	23:17
	→ adamben joined	23:17
	← adamben left	23:17
	→ adamben joined	23:17
	← Aer left	23:17
	→ Poulet_ joined	23:18
	← mkaesz left	23:18
	→ iqa joined	23:18
	← iqa left	23:19
	→ Hmeu joined	23:20
	← otter768 left	23:21
	← Hmeu left	23:21
	← Korvin left	23:21
	→ lgxi joined	23:22
	← jonalmeida left	23:23
	← byaruhaf left	23:23
	→ korvin joined	23:24
	→ jalmeida joined	23:24
	→ byaruhaf joined	23:24
	← lgxi left	23:25
	→ skorgon joined	23:25
	← skorgon left	23:25
	→ skorgon joined	23:25
	→ danzilio joined	23:25
	← danzilio left	23:26
	← ciampix left	23:26
	→ danzilio joined	23:26
	← mizu_no_oto left	23:27
	→ ndiv joined	23:27
	← hans_s left	23:27
	← Domhack left	23:27
	→ phantombeta joined	23:28
	← ndiv left	23:28
	→ JanC joined	23:28
	← nfk left	23:28
	→ zuae joined	23:29
	→ bhavul joined	23:30
	→ Err404NotFound joined	23:33
	← Error404NotFound left	23:33
	← Gama11 left	23:34
	→ EminenceHC joined	23:35
	← phix left	23:35
	→ phix joined	23:36
	← Poulet_ left	23:37
	→ Gama11 joined	23:37
	← EminenceHC left	23:39
	← aswen left	23:39
	→ th3fallen joined	23:42
	← MadsRC left	23:43
	→ bollullera joined	23:44
	→ Gama11_ joined	23:45
	← Gama11 left	23:45
	← nnyk left	23:45
	← Gama11_ left	23:45
	→ duderonomy joined	23:46
	→ nkouevda joined	23:46
	← _Mateo_W left	23:47
	← th3fallen left	23:48
	← King_Hual` left	23:49
	→ Nizumzen joined	23:51
	← dataangel left	23:52
	← scientes left	23:52
	→ frogonwheels joined	23:52
	→ dataangel joined	23:52
	← sinkensabe left	23:54
	→ joeyDB_ joined	23:59
	→ frogonwheels_ joined	23:59
	← frogonwheels left	23:59

Logs Search ←Prev date Next date→

Channels Documentation