unannex: Commit staged changes at end

to avoid some confusing behavior with the pre-commit hook, which would see
some types of commits after an unannex as checking in of an unlocked file.

1 files changed, 7 insertions, 4 deletions

diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index 83a286b0e..68a1672df 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -156,10 +156,13 @@ Many git-annex commands will stage changes for later `git commit` by you.
 
 * unannex [path ...]
 
-  Use this to undo an accidental add command. This is not the command you
-  should use if you intentionally annexed a file and don't want its contents
-  any more. In that case you should use `git annex drop` instead, and you
-  can also `git rm` the file.
+  Use this to undo an accidental `git annex add` command. You can use
+  `git annex unannex` to move content out of the annex at any point,
+  even if you've already committed it.
+
+  This is not the command you should use if you intentionally annexed a
+  file and don't want its contents any more. In that case you should use
+  `git annex drop` instead, and you can also `git rm` the file.
 
 * uninit