Back
[00:07:30] -!- Nick001-Shop has quit [Remote host closed the connection]
[00:23:42] -!- ve7it has quit [Remote host closed the connection]
[00:37:02] -!- morfic- has quit [Ping timeout: 240 seconds]
[00:40:33] -!- Err has quit [Read error: Connection reset by peer]
[00:40:46] -!- Wildhoney has quit [Ping timeout: 240 seconds]
[00:43:53] -!- PCW has quit [Remote host closed the connection]
[00:50:03] _BJFreeman is now known as BJfreeman
[00:57:54] -!- morfic- has quit [Ping timeout: 268 seconds]
[01:07:56] -!- servos4ever has quit [Quit: ChatZilla 0.9.85 [SeaMonkey 2.0.11/20101206162726]]
[01:08:38] -!- ravenlock has quit [Quit: Leaving]
[01:16:49] -!- erictheise has quit [Quit: erictheise]
[01:21:16] -!- c-bob|| has quit [Ping timeout: 240 seconds]
[01:28:16] -!- robh__ has quit [Ping timeout: 240 seconds]
[01:49:37] -!- mozmck has quit [Quit: Leaving.]
[01:51:52] -!- mozmck [mozmck!~moses@client-204.235.45.143.wcfltx.partnershipbroadband.com] has joined #linuxcnc-devel
[02:10:25] -!- ravenlock has quit [Read error: Operation timed out]
[02:19:29] -!- Servos4ever has quit [Quit: ChatZilla 0.9.90.1 [SeaMonkey 2.17.1/20130410210803]]
[02:38:29] -!- theorbtwo has quit [Ping timeout: 248 seconds]
[03:06:46] -!- Loetmichel has quit [Ping timeout: 240 seconds]
[03:07:17] -!- FinboySlick has quit [Quit: Leaving.]
[03:10:15] -!- sirdancealo2 has quit [Excess Flood]
[03:14:41] -!- fbx90 has quit [Ping timeout: 248 seconds]
[03:30:13] -!- mattiasb_ has quit [Ping timeout: 248 seconds]
[03:36:42] -!- Valen has quit [Quit: Leaving.]
[03:41:37] -!- mattiasb_ has quit [Ping timeout: 276 seconds]
[03:42:04] -!- PetefromTn has quit [Remote host closed the connection]
[03:46:57] -!- mattiasb_ has quit [Ping timeout: 246 seconds]
[03:49:20] -!- AR_ has quit [Ping timeout: 268 seconds]
[03:53:53] <zultron> skunkworks, Stella looks just like her dad! Except her faux-hawk is cooler than her dad's 'do. :)
[03:55:58] -!- BJfreeman has quit [Quit: had a good time]
[03:58:35] -!- mattiasb_ has quit [Ping timeout: 268 seconds]
[04:02:31] -!- Mikegg has quit [Ping timeout: 260 seconds]
[04:10:38] -!- mattiasb_ has quit [Ping timeout: 240 seconds]
[04:23:16] -!- mattiasb_ has quit [Ping timeout: 240 seconds]
[04:37:31] -!- mattiasb_ has quit [Ping timeout: 276 seconds]
[04:42:06] -!- tjtr33 has quit [Quit: Leaving]
[04:58:01] -!- mattiasb_ has quit [Ping timeout: 240 seconds]
[05:02:52] -!- Fox_Muldr has quit [Ping timeout: 276 seconds]
[05:04:37] -!- mattiasb_ has quit [Ping timeout: 248 seconds]
[05:26:41] -!- mattiasb_ has quit [Ping timeout: 256 seconds]
[05:49:53] -!- mattiasb_ has quit [Ping timeout: 240 seconds]
[05:57:50] -!- mattiasb_ has quit [Ping timeout: 240 seconds]
[06:02:28] -!- kwallace [kwallace!~kwallace@smb-49.sonnet.com] has parted #linuxcnc-devel
[06:09:11] -!- mattiasb_ has quit [Ping timeout: 256 seconds]
[06:12:14] <memleak> Nobody can pull of a faux hawk better than I can :P
[06:12:25] <memleak> i think that's actually my github profile picture..
[06:12:42] <memleak> heh, yeah, it is.
[06:23:33] <seb_kuzminsky> http://highlab.com/~seb/simon-mohawk.jpg
[06:25:53] -!- mattiasb_ has quit [Ping timeout: 240 seconds]
[06:26:23] <memleak> haha that's cute!
[06:31:16] -!- jfire has quit [Quit: Leaving.]
[06:31:44] -!- mattiasb_ has quit [Ping timeout: 240 seconds]
[06:36:20] -!- buster142 has quit [Quit: ChatZilla 0.9.90.1 [Firefox 22.0/20130618035212]]
[06:42:58] -!- mattiasb_ has quit [Ping timeout: 276 seconds]
[06:51:03] -!- zultron has quit [Ping timeout: 246 seconds]
[07:09:07] -!- mariusl [mariusl!~mariusl@41.13.60.135] has joined #linuxcnc-devel
[07:19:25] -!- Spida has quit [Read error: Operation timed out]
[07:32:16] -!- Spida has quit [Ping timeout: 240 seconds]
[07:32:59] -!- Valen has quit [Quit: Leaving.]
[07:36:26] -!- mattiasb_ has quit [Ping timeout: 240 seconds]
[07:39:41] Cylly is now known as Loetmichel
[07:40:37] -!- Valen has quit [Quit: Leaving.]
[07:43:33] -!- mattiasb_ has quit [Ping timeout: 248 seconds]
[07:55:46] -!- Spida has quit [Ping timeout: 276 seconds]
[08:00:46] -!- Spida has quit [Ping timeout: 240 seconds]
[08:00:46] -!- mhaberler [mhaberler!~mhaberler@macbook.stiwoll.mah.priv.at] has joined #linuxcnc-devel
[08:04:13] -!- abetusk has quit [Quit: Leaving]
[08:10:13] -!- mattiasb_ has quit [Ping timeout: 248 seconds]
[08:13:17] -!- mourner has quit [Ping timeout: 256 seconds]
[08:13:17] mourner_ is now known as mourner
[08:21:48] -!- Kenneth_Lerman_ [Kenneth_Lerman_!~chatzilla@24-151-1-146.static.nwtn.ct.charter.com] has joined #linuxcnc-devel
[08:25:07] -!- memleak2 [memleak2!~memleak@adsl-75-57-152-30.dsl.emhril.sbcglobal.net] has joined #linuxcnc-devel
[08:25:58] <memleak2> KimK: not exactly sure what you're trying to do but you can always run a git diff HEAD (or HEAD~ if it's committed in your local repo) then rebase the code (if needed) against the newer branch.
[08:26:13] -!- mattiasb_ has quit [Ping timeout: 268 seconds]
[08:28:09] <memleak2> its ugly but it's failsafe. Something like this: git add -A && git diff HEAD &> ../my_patch.patch && git reset --hard HEAD && git pull && git checkout origin/<new branch that you want to push against> && patch -p1 < ../my_patch.patch && git push
[08:28:29] -!- ssi [ssi!~ssi@app2.prototechnical.com] has joined #linuxcnc-devel
[08:28:56] <memleak2> my nick is messed up, one moment..
[08:29:00] -!- memleak2 has quit [Client Quit]
[08:29:52] -!- memleak2 [memleak2!~memleak@adsl-75-57-152-30.dsl.emhril.sbcglobal.net] has joined #linuxcnc-devel
[08:30:23] -!- memleak2 [memleak2!~memleak@adsl-75-57-152-30.dsl.emhril.sbcglobal.net] has parted #linuxcnc-devel
[08:30:26] -!- Mikeggg has quit [*.net *.split]
[08:30:26] -!- xxoxx has quit [*.net *.split]
[08:30:26] -!- SadMan has quit [*.net *.split]
[08:30:27] -!- memleak has quit [*.net *.split]
[08:30:27] -!- djinni` has quit [*.net *.split]
[08:30:27] -!- Kenneth_Lerman has quit [*.net *.split]
[08:30:27] -!- ssi_ has quit [*.net *.split]
[08:30:27] -!- gene78 has quit [*.net *.split]
[08:30:28] -!- vax__ has quit [*.net *.split]
[08:30:28] -!- donkey has quit [*.net *.split]
[08:30:47] -!- memleak [memleak!~memleak@unaffiliated/memleak] has joined #linuxcnc-devel
[08:31:11] <memleak> sorry about that..
[08:32:46] -!- mattiasb_ has quit [Ping timeout: 240 seconds]
[08:34:15] <memleak> use HEAD~ if you committed your changes at all, if it's several commits behind than where you currently are, the syntax is either HEAD~~ -> HEAD~~~ or HEAD~1 -> HEAD~2
[08:34:27] <memleak> etc etc
[08:35:54] -!- karavanjoW has quit [Ping timeout: 246 seconds]
[08:36:11] -!- SadMan [SadMan!sadman@sadman.net] has joined #linuxcnc-devel
[08:36:53] -!- rob_h [rob_h!~rob_h@94.4.73.239] has joined #linuxcnc-devel
[08:46:02] -!- Mikegg has quit [*.net *.split]
[08:46:02] -!- Tecan has quit [*.net *.split]
[08:46:02] -!- mrsun has quit [*.net *.split]
[08:46:02] -!- mle has quit [*.net *.split]
[08:46:02] -!- Nick001 has quit [*.net *.split]
[08:46:03] -!- OhmEye has quit [*.net *.split]
[08:46:03] -!- jfrmilner has quit [*.net *.split]
[08:46:03] -!- spacka has quit [*.net *.split]
[08:46:38] mle- is now known as mle
[08:54:07] -!- mal``` [mal```!~mal``@li125-242.members.linode.com] has joined #linuxcnc-devel
[08:54:48] -!- mattiasb_ has quit [*.net *.split]
[08:54:48] -!- Spida has quit [*.net *.split]
[08:54:48] -!- mal`` has quit [*.net *.split]
[08:54:48] -!- cpresser has quit [*.net *.split]
[08:54:49] -!- whoza has quit [*.net *.split]
[08:54:49] -!- MattyMatt has quit [*.net *.split]
[09:05:55] -!- mourner has quit [Quit: mourner]
[09:06:41] -!- ron has quit [*.net *.split]
[09:06:41] -!- Jymmm has quit [*.net *.split]
[09:06:41] -!- fragalot has quit [*.net *.split]
[09:06:41] -!- jdh has quit [*.net *.split]
[09:06:41] -!- l0ggy_ has quit [*.net *.split]
[09:06:42] -!- doobeh has quit [*.net *.split]
[09:06:42] -!- Nick001 has quit [*.net *.split]
[09:06:42] -!- OhmEye has quit [*.net *.split]
[09:06:42] -!- jfrmilner has quit [*.net *.split]
[09:06:42] -!- scooter has quit [*.net *.split]
[09:06:43] -!- tris has quit [*.net *.split]
[09:06:43] -!- awallin has quit [*.net *.split]
[09:06:43] -!- roycroft has quit [*.net *.split]
[09:06:43] -!- gene78 has quit [*.net *.split]
[09:06:43] -!- fbx90 has quit [*.net *.split]
[09:06:44] -!- knownasilya2 has quit [*.net *.split]
[09:06:44] -!- jthornton has quit [*.net *.split]
[09:06:44] -!- RyanS has quit [*.net *.split]
[09:06:44] -!- davec_ has quit [*.net *.split]
[09:06:44] -!- pcw_home has quit [*.net *.split]
[09:06:45] -!- jef79m has quit [*.net *.split]
[09:06:45] -!- mattiasb has quit [*.net *.split]
[09:06:45] -!- ChuangTzu_ has quit [*.net *.split]
[09:06:45] -!- Loetmichel has quit [*.net *.split]
[09:06:45] -!- L33TG33KG34R has quit [*.net *.split]
[09:06:45] -!- sparr has quit [*.net *.split]
[09:06:46] -!- toner has quit [*.net *.split]
[09:06:46] -!- toastydeath has quit [*.net *.split]
[09:06:46] -!- archivist_herron has quit [*.net *.split]
[09:06:46] -!- ankesh11 has quit [*.net *.split]
[09:06:46] -!- pjm_ has quit [*.net *.split]
[09:06:47] -!- Poincare has quit [*.net *.split]
[09:06:47] -!- RoyOnWheels has quit [*.net *.split]
[09:06:47] -!- stephan48 has quit [*.net *.split]
[09:06:47] -!- sliptonic has quit [*.net *.split]
[09:06:47] -!- TekniQue has quit [*.net *.split]
[09:06:48] -!- slara has quit [*.net *.split]
[09:06:48] -!- Logxen has quit [*.net *.split]
[09:06:48] -!- Mikeggg has quit [*.net *.split]
[09:06:48] -!- ssi has quit [*.net *.split]
[09:06:48] -!- s1dev_ has quit [*.net *.split]
[09:06:49] -!- asdfasd has quit [*.net *.split]
[09:06:49] -!- mozmck has quit [*.net *.split]
[09:06:49] -!- morfic- has quit [*.net *.split]
[09:06:49] -!- Thetawaves has quit [*.net *.split]
[09:06:49] -!- CaptHindsight has quit [*.net *.split]
[09:06:49] -!- steves_logging has quit [*.net *.split]
[09:06:50] -!- hashfail has quit [*.net *.split]
[09:07:37] -!- ssi [ssi!~ssi@app2.prototechnical.com] has joined #linuxcnc-devel
[09:07:37] -!- mozmck [mozmck!~moses@client-204.235.45.143.wcfltx.partnershipbroadband.com] has joined #linuxcnc-devel
[09:07:38] -!- jthornton [jthornton!~john@99.198.67.11] has joined #linuxcnc-devel
[09:07:38] -!- CaptHindsight [CaptHindsight!~2020@unaffiliated/capthindsight] has joined #linuxcnc-devel
[09:07:38] -!- pcw_home [pcw_home!~chatzilla@ip-66-80-167-54.sjc.megapath.net] has joined #linuxcnc-devel
[09:07:38] -!- steves_logging [steves_logging!~Steve@wsip-70-168-134-18.dc.dc.cox.net] has joined #linuxcnc-devel
[09:07:38] -!- awallin [awallin!awallin@lakka.kapsi.fi] has joined #linuxcnc-devel
[09:08:53] -!- scooter has quit [*.net *.split]
[09:08:54] -!- tris has quit [*.net *.split]
[09:08:54] -!- awallin has quit [*.net *.split]
[09:08:56] -!- roycroft has quit [*.net *.split]
[09:10:22] -!- mattiasb_ has quit [Ping timeout: 246 seconds]
[09:10:30] -!- awallin [awallin!awallin@lakka.kapsi.fi] has joined #linuxcnc-devel
[09:10:51] -!- ron has quit [Client Quit]
[09:12:27] -!- asdfasd has quit [Ping timeout: 255 seconds]
[09:12:58] -!- theorbtwo has quit [Remote host closed the connection]
[09:14:25] -!- 45PAA5K4N has quit [Ping timeout: 252 seconds]
[09:15:24] -!- jthornton_ [jthornton_!~john@99.198.67.11] has joined #linuxcnc-devel
[09:15:45] _BJFreeman is now known as BJfreeman
[09:23:35] -!- mattiasb has quit [Ping timeout: 264 seconds]
[09:24:43] -!- mattiasb_ has quit [*.net *.split]
[09:24:43] -!- Jymmmm has quit [*.net *.split]
[09:24:43] -!- gene78 has quit [*.net *.split]
[09:24:44] -!- fbx90 has quit [*.net *.split]
[09:24:44] -!- knownasilya2 has quit [*.net *.split]
[09:24:44] -!- jthornton has quit [*.net *.split]
[09:24:44] -!- RyanS has quit [*.net *.split]
[09:24:45] -!- davec_ has quit [*.net *.split]
[09:24:45] -!- pcw_home has quit [*.net *.split]
[09:24:45] -!- jef79m has quit [*.net *.split]
[09:24:45] jef79m_ is now known as jef79m
[09:25:53] -!- jthornton_ has quit [Read error: Connection reset by peer]
[09:26:21] -!- jthornton_ [jthornton_!~john@99.198.67.11] has joined #linuxcnc-devel
[09:29:22] -!- jujujujuju has quit [Ping timeout: 275 seconds]
[09:30:42] -!- pcw_home [pcw_home!~chatzilla@ip-66-80-167-54.sjc.megapath.net] has joined #linuxcnc-devel
[09:33:06] -!- knownasilya has quit [*.net *.split]
[09:37:24] -!- BJfreeman has quit [Quit: had a good time]
