#emc-devel | Logs for 2009-09-17

[00:04:20] <jepler> dgarr: ok, sorry to be a spoil sport though
[00:06:42] <dgarr> jepler: np, is there a simple way that i can revert one file change in git?
[00:30:10] <jepler> dgarr: not a whole commit?
[00:30:35] <jepler> dgarr: you can go back to the contents of a specific file as it was in a specific commit with: git checkout ref filename
[00:30:49] <jepler> in that case you'd choose the ref before the one that changed it
[00:30:57] <jepler> but you'll lose any other change introduced by subsequent commits
[00:31:36] <jepler> there's git-revert for reverting an entire commit
[00:31:53] <jepler> (add a new commit that undoes the changes of the original commit, so that changes after that commit are still there)
[00:34:11] <jepler> if rev r introduced the change you don't want, then something like git diff rev rev^ -- path | patch -R will undo just the change to path in rev
[00:37:26] <dgarr> git revert does it -- thanks
[18:16:20] <jepler> cradek: how close to usable is your pluto-servo lathe?
[18:17:07] <jepler> my current machine can't run the pluto hardware, and I'll soon want to test changes to parport location/registration on a pluto
[18:17:29] <jepler> (I'm doing what I did in master for hal_parport: optionally cooperate with linux parport_pc)
[18:20:14] <cradek> jepler: it is on a shelf. it just needs to be all plugged in.
[18:20:56] <jepler> cradek: OK, I'll let you know if/when I need your help
[18:21:05] <jepler> my system is probably just about as easy to put back together
[18:37:58] <BJT-Work_> BJT-Work_ is now known as BJT-Work