summaryrefslogtreecommitdiff
path: root/doc/git-annex.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-11-13 16:41:21 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-11-14 14:41:07 -0400
commita471f380bd56373bf9613c3b4bfe7448318a0619 (patch)
tree356263e3de291e19d60a4ed3461706f5062877b0 /doc/git-annex.mdwn
parent49e97f31528351af46437bcccfa645d949bc85a1 (diff)
undo command
This commit was sponsored by Andrew Cant.
Diffstat (limited to 'doc/git-annex.mdwn')
-rw-r--r--doc/git-annex.mdwn16
1 files changed, 16 insertions, 0 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index 0fd5b08a6..f1404af46 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -282,6 +282,22 @@ subdirectories).
are on a video hosting site, and the video is downloaded. This allows
importing e.g., youtube playlists.
+* `undo [filename|directory] ...`
+
+ When passed a filename, undoes the last change that was made to that
+ file.
+
+ When passed a directory, undoes the last change that was made to the
+ contents of that directory.
+
+ Running undo a second time will undo the undo, returning the working
+ tree to the same state it had before. In order for undoing an undo of
+ staged changes, any staged changes are first committed by the
+ undo command.
+
+ Note that this does not undo get/drop of a file's content; it only
+ operates on the file tree committed to git.
+
* `watch`
Watches for changes to files in the current directory and its subdirectories,