Back
[00:04:08] -!-
servos4ever has quit [Quit: ChatZilla 0.9.85 [SeaMonkey 2.0.11/20101206162726]]
[00:04:19] -!-
theorbtwo has quit [Ping timeout: 245 seconds]
[00:04:31] theorb is now known as
theorbtwo
[00:12:28] -!-
mhaberler [mhaberler!~mhaberler@195.191.253.94] has joined #linuxcnc-devel
[00:31:18] -!-
mhaberler has quit [Quit: mhaberler]
[00:31:46] -!-
robh__ has quit [Ping timeout: 260 seconds]
[00:37:46] -!-
vladimirek has quit [Remote host closed the connection]
[00:47:53] -!-
jtr has quit [Ping timeout: 252 seconds]
[00:48:52] -!-
Loetmichel has quit [Ping timeout: 252 seconds]
[01:02:35] -!-
adb2 has quit [Remote host closed the connection]
[01:34:21] -!-
clytle374 [clytle374!~clytle374@75.105.212.57] has joined #linuxcnc-devel
[01:34:36] -!-
joe9 has quit [Quit: leaving]
[01:34:56] -!-
Gensor has quit []
[01:35:47] -!-
Gensor [Gensor!~Gensor@67.158.6.110] has joined #linuxcnc-devel
[01:44:20] -!-
clytle374 has quit [Remote host closed the connection]
[01:47:53] -!-
clytle374 [clytle374!~clytle374@75.105.212.57] has joined #linuxcnc-devel
[02:05:48] -!-
ries has quit [Quit: ries]
[02:10:49] -!-
ries has quit [Ping timeout: 276 seconds]
[02:24:15] -!-
joe9 has quit [Quit: Lost terminal]
[02:28:34] -!-
scanf has quit [Quit: fuuuuuu]
[02:50:34] -!-
Valen has quit [Ping timeout: 272 seconds]
[03:05:29] -!-
A2Sheds has quit [Ping timeout: 240 seconds]
[03:20:16] -!-
pfred1 has quit [Quit: now its time to say goodbye to all our company]
[03:31:33] -!-
sumpfralle has quit [Ping timeout: 248 seconds]
[03:36:26] -!-
clytle374 has quit [Remote host closed the connection]
[03:42:05] -!-
FinboySlick has quit [Quit: Leaving.]
[04:10:22] -!-
Valen has quit [Quit: Leaving.]
[04:30:55] -!-
skunkworks has quit [Remote host closed the connection]
[04:49:56] -!-
cstop has quit [Quit: Leaving]
[04:50:38] -!-
factor has quit [Ping timeout: 240 seconds]
[05:01:23] -!-
psha[work] [psha[work]!~psha@195.135.238.205] has joined #linuxcnc-devel
[05:10:19] -!-
factor has quit [Read error: Connection reset by peer]
[05:24:59] -!-
skunkworks [skunkworks!~chatzilla@str-bb-cable-south2-static-6-425.dsl.airstreamcomm.net] has joined #linuxcnc-devel
[05:48:06] -!-
jtr [jtr!~jtr@cpe-071-076-196-103.triad.res.rr.com] has joined #linuxcnc-devel
[05:58:56] -!-
Redialtone has quit [Quit: AndroIRC - Android IRC Client (
http://www.androirc.com )]
[06:01:48] -!-
Redialtone [Redialtone!~redialton@69.76.4.154] has joined #linuxcnc-devel
[06:05:19] -!-
mhaberler [mhaberler!~mhaberler@195.191.253.94] has joined #linuxcnc-devel
[06:09:13] -!-
Redialtone has quit [Ping timeout: 256 seconds]
[06:42:48] -!-
ve7it has quit [Remote host closed the connection]
[07:03:32] -!-
kb8wmc has quit [Quit: ChatZilla 0.9.88 [Firefox 10.0/20120130145648]]
[07:04:09] -!-
jonnyATroot has quit [Read error: Connection reset by peer]
[07:06:01] -!-
jonnyATroot has quit [Read error: Connection reset by peer]
[07:54:07] -!-
e-ndy [e-ndy!jkastner@nat/redhat/x-xnludqpzusmatkpy] has joined #linuxcnc-devel
[08:00:30] Loetmichel_ is now known as
Loetmichel
[08:00:53] -!-
jonnyATroot has quit [Ping timeout: 248 seconds]
[08:19:31] -!-
mhaberler has quit [Quit: mhaberler]
[08:41:17] -!-
cncbasher [cncbasher!~quassel@cpc15-hart9-2-0-cust101.11-3.cable.virginmedia.com] has parted #linuxcnc-devel
[08:44:37] -!-
e-ndy has quit [Quit: Ex-Chat]
[08:57:58] -!-
e-ndy [e-ndy!jkastner@nat/redhat/x-smzbtefempzhdvbv] has joined #linuxcnc-devel
[08:59:02] -!-
mhaberler [mhaberler!~mhaberler@195.191.253.94] has joined #linuxcnc-devel
[09:18:06] -!-
vladimirek [vladimirek!~vladimire@bband-dyn226.178-40-36.t-com.sk] has joined #linuxcnc-devel
[09:21:19] -!-
rob_h [rob_h!~rob_h@5ace7001.bb.sky.com] has joined #linuxcnc-devel
[09:50:55] -!-
maximilian_h has quit [Ping timeout: 252 seconds]
[10:00:35] -!-
mk0 has quit [Quit: поздравляю всех с кредитом. халява продолжается.]
[10:27:03] -!-
cncMaker has quit [Quit: ChatZilla 0.9.87 [Firefox 10.0/20120130145648]]
[10:28:10] -!-
e-ndy has quit [Quit: Ex-Chat]
[10:42:31] -!-
e-ndy [e-ndy!jkastner@nat/redhat/x-igwjcjejopmosdpu] has joined #linuxcnc-devel
[10:55:09] -!-
maximilian_h [maximilian_h!~bonsai@109.235.229.77] has joined #linuxcnc-devel
[11:39:21] -!-
maximilian_h has quit [Quit: Leaving.]
[11:43:07] -!-
maximilian_h [maximilian_h!~bonsai@109.235.229.77] has joined #linuxcnc-devel
[11:43:23] -!-
maximilian_h [maximilian_h!~bonsai@109.235.229.77] has parted #linuxcnc-devel
[11:57:38] -!-
vladimirek has quit [Remote host closed the connection]
[12:21:19] -!-
jonnyATroot has quit [Read error: Connection reset by peer]
[12:29:26] -!-
sumpfralle has quit [Ping timeout: 260 seconds]
[13:00:10] -!-
jonnyATroot has quit [Ping timeout: 252 seconds]
[13:06:33] -!-
skunkworks has quit [Remote host closed the connection]
[13:29:57] -!-
Valen has quit [Quit: Leaving.]
[13:42:11] -!-
psha[work] has quit [Quit: leaving]
[14:10:23] <CIA-104> 03jepler 07v2.5_branch * r8593d363e201 10/docs/man/man9/hostmot2.9: docs: hostmot2 manpage markup improvements
[14:24:24] -!-
cevad has quit [Quit: Leaving]
[14:29:34] -!-
joe9 has quit [Quit: leaving]
[14:42:42] -!-
mhaberler has quit [Quit: mhaberler]
[14:45:52] -!-
psha [psha!~psha@195.135.237.18] has joined #linuxcnc-devel
[15:02:32] -!-
kb8wmc [kb8wmc!~chatzilla@nat.mtp.cmsinter.net] has joined #linuxcnc-devel
[15:17:30] -!-
joe9 has quit [Quit: leaving]
[15:33:09] -!-
GoSebGo has quit [Ping timeout: 240 seconds]
[15:48:32] <jthornton> dangit I did git pull and forgot --rebase and got "Merge made by recursive."
[15:54:06] <jepler> that's no big deal
[15:54:28] <jepler> but as long as all the commits you want are simple commits (not merges), you can: git rebase @{u}
[15:55:01] <jepler> that is, as long as the only merge commit you have is the one you just created with 'git pull'
[15:55:31] <jepler> if that doesn't totally make sense to you, though, better to just go on with the merge commit
[15:58:08] -!-
skunkworks [skunkworks!~chatzilla@68-115-41-210.static.eucl.wi.charter.com] has joined #linuxcnc-devel
[15:59:10] <skunkworks> logger[psha]:
[16:07:36] -!-
shade88 [shade88!~shade88@92.240.209.42] has joined #linuxcnc-devel
[16:25:02] -!-
automata_ has quit [Ping timeout: 272 seconds]
[16:29:13] -!-
GoSebGo [GoSebGo!~Seb@184-229-165-237.pools.spcsdns.net] has joined #linuxcnc-devel
[16:34:47] -!-
e-ndy has quit [Quit: Ex-Chat]
[17:17:17] <psha> jepler: if there was merge he may try 'git rebase -i' and don't pick merge commit
[17:23:13] <CIA-104> 03jthornton 07v2.5_branch * rf25e856c1ec6 10/docs/src/drivers/ (pluto_p.txt pluto_p_de.txt pluto_p_es.txt pluto_p_pl.txt): Docs: note the problems known for pluto p boards
[17:23:14] <CIA-104> 03jthornton 07v2.5_branch * rc063a3db9af4 10/docs/src/gcode/ (m-code.txt m-code_de.txt m-code_es.txt m-code_pl.txt): Docs: use same convention for G code
[17:23:33] <jthornton> thanks guys, I just did a new clone... easier for me to understand
[17:42:40] <GoSebGo> Easiest way to get rid of the accidental merge would be to reset to the previous HEAD
[17:43:19] <GoSebGo> you guys know about the reflog? A list of all the commits your HEAD has pointed to in the past
[17:44:23] <GoSebGo> Run "git reflog" to see it
[17:45:52] -!-
shade88 has quit [Ping timeout: 244 seconds]
[17:58:18] -!-
ve7it [ve7it!~LawrenceG@S0106001c10b7770f.pk.shawcable.net] has joined #linuxcnc-devel
[18:03:12] <JT-Shop> sometimes I need flogging and maybe some reflogging too :)
[18:03:38] <GoSebGo> Heh
[18:05:24] <jepler> it actually is short for "reference log", but that's funny too
[18:05:52] -!-
Tomas__ has quit [Ping timeout: 245 seconds]
[18:23:27] <CIA-104> 03jthornton 07v2.5_branch * rb8417ee76863 10/docs/src/drivers/ (pluto_p.txt pluto_p_de.txt pluto_p_es.txt pluto_p_pl.txt): Docs: add a bit more info about EPP
[18:25:15] -!-
mhaberler [mhaberler!~mhaberler@195.191.253.94] has joined #linuxcnc-devel
[18:26:19] -!-
redwil has quit [Remote host closed the connection]
[18:29:47] -!-
The_Ball has quit [Ping timeout: 244 seconds]
[18:38:18] <CIA-104> 03jthornton 07v2.5_branch * rab604a3711b8 10/docs/src/gcode/ (m-code.txt m-code_de.txt m-code_es.txt m-code_pl.txt): Docs: add example to m1xx section
[18:43:34] -!-
ries has quit [Read error: Connection reset by peer]
[18:58:04] -!-
bjam28 has quit [Quit: Page closed]
[18:59:07] -!-
vladimirek [vladimirek!~vladimire@bband-dyn226.178-40-36.t-com.sk] has joined #linuxcnc-devel
[18:59:39] -!-
psha has quit [Quit: Lost terminal]
[19:05:07] -!-
sirhoax has quit [Quit: ..!..]
[19:27:46] -!-
shade88 [shade88!~shade88@92.240.209.42] has joined #linuxcnc-devel
[19:32:11] -!-
shade88 has quit [Ping timeout: 260 seconds]
[19:35:55] -!-
Tom_L has quit []
[19:47:26] -!-
packrat has quit [Ping timeout: 252 seconds]
[19:48:55] -!-
Tom_L has quit []
[19:55:38] -!-
vladimirek has quit [Remote host closed the connection]
[19:56:02] -!-
vladimirek [vladimirek!~vladimire@bband-dyn226.178-40-36.t-com.sk] has joined #linuxcnc-devel
[20:23:45] -!-
isssy has quit [Quit: Bye Bye]
[20:27:14] -!-
vladimirek has quit [Remote host closed the connection]
[21:05:58] -!-
e-ndy [e-ndy!~jkastner@static-84-242-102-36.net.upcbroadband.cz] has joined #linuxcnc-devel
[21:28:21] -!-
e-ndy has quit [Quit: Ex-Chat]
[21:57:34] -!-
packrat has quit [Ping timeout: 252 seconds]
[21:58:45] <cradek> jthornton: thanks for doing that
[21:58:53] -!-
FinboySlick has quit [Quit: Leaving.]
[22:00:55] -!-
skunkworks_ [skunkworks_!~chatzilla@str-bb-cable-south2-static-6-425.dsl.airstreamcomm.net] has joined #linuxcnc-devel
[22:09:25] -!-
theorbtwo has quit [Remote host closed the connection]
[22:09:42] theorb is now known as
theorbtwo
[22:09:44] -!-
kb8wmc has quit [Ping timeout: 245 seconds]
[22:13:22] -!-
Gromits has quit [Quit: ChatZilla 0.9.88 [Firefox 10.0/20120130145648]]
[22:17:57] -!-
ries has quit [Ping timeout: 248 seconds]
[22:19:30] -!-
ries_ has quit [Read error: Connection reset by peer]
[22:25:04] -!-
kb8wmc [kb8wmc!~chatzilla@nat.mtp.cmsinter.net] has joined #linuxcnc-devel
[22:25:15] -!-
factor has quit [Read error: Connection reset by peer]
[22:47:16] -!-
GoSebGo has quit [Quit: Bye]
[22:48:26] -!-
GoSebGo [GoSebGo!~Seb@184-229-165-237.pools.spcsdns.net] has joined #linuxcnc-devel
[22:53:15] -!-
Fox_Muldr has quit [Ping timeout: 265 seconds]
[22:54:24] -!-
jonnyATroot has quit [Quit: Leaving]
[23:08:04] -!-
rob_h has quit [Ping timeout: 245 seconds]
[23:08:05] -!-
sumpfralle has quit [Ping timeout: 248 seconds]
[23:08:08] -!-
syyl has quit [Quit: Leaving]
[23:13:53] -!-
mhaberler has quit [Read error: Operation timed out]
[23:38:02] -!-
Valen has quit [Quit: Leaving.]
[23:58:03] -!-
mhaberler [mhaberler!~mhaberler@195.191.253.94] has joined #linuxcnc-devel