diff options
| -rw-r--r-- | doc/todo/direct_mode_undo/comment_1_bd7e9f152805a57cce97bef64e4891dd._comment | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/doc/todo/direct_mode_undo/comment_1_bd7e9f152805a57cce97bef64e4891dd._comment b/doc/todo/direct_mode_undo/comment_1_bd7e9f152805a57cce97bef64e4891dd._comment new file mode 100644 index 000000000..35e1b90b0 --- /dev/null +++ b/doc/todo/direct_mode_undo/comment_1_bd7e9f152805a57cce97bef64e4891dd._comment @@ -0,0 +1,14 @@ +[[!comment format=mdwn + username="https://id.koumbit.net/anarcat" + subject="comment 1" + date="2015-02-15T05:46:01Z" + content=""" +> This way, if a file has a staged change, it gets committed, and then that commit is reverted, resulting in another commit. Which a later run of undo can in turn revert. If it didn't commit, the history about the staged change that was reverted would be lost. + +so far, my experience with this is that unstaged changes get dropped and the change that gets undoed is the last committed change. In other words, if i have: + + $ git annex status + M file + +`git annex undo` is going to drop that modification and `git revert HEAD`. but maybe i got confused, in which care some of the documentation i just did in [[direct mode]] needs to be corrected. --[[anarcat]] +"""]] |