On Tue, 28 Apr 2015 10:15:13 -0700 (PDT) "Edward K. Ream" <[email protected]> wrote:
> Don't know how it happened. Please redo it. I think I'm done with > leoEditCommands.py. > > Sorry about that. No problem. You had not done real evil, and undone my commit, which I think requires special "force" flags on a push. You'd just somehow undone my changes with more changes. Saving from an editor (i.e. Leo) after pulling without refreshing could do that I guess. git diff 7d21d1a^ 7d21d1a leo/core/leoEditCommands.py | git apply applies the diff between the commit before 7d21d1a and 7d21d1a again. Specifying the file, leo/core/leoEditCommands.py would not be unnecessary, but without it git apply gets upset about leo/core/commit_timestamp.json, so easier to include it. Also, the command above gave a 'warning' about 'whitespace errors', but I don't know what it meant and see no problem. I've pushed the re-applied diff. Cheers -Terry -- You received this message because you are subscribed to the Google Groups "leo-editor" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at http://groups.google.com/group/leo-editor. For more options, visit https://groups.google.com/d/optout.
