Merge branch 'rs/archive'

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 1395c7d986c82eb1e7e91140c8f97b80e7a8a41d..2d7f162594cb69d5a5f6d8ef1714111ad0bbc67a 100644 (file)
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -140,9 +140,9 @@ aborts in the middle,.  You can recover from this in one of two ways:
   the index file to bring it in a state that the patch should
   have produced.  Then run the command with '--resolved' option.
 
-The command refuses to process new mailboxes while `.dotest`
+The command refuses to process new mailboxes while `.git/rebase`
 directory exists, so if you decide to start over from scratch,
-run `rm -f -r .dotest` before running the command with mailbox
+run `rm -f -r .git/rebase` before running the command with mailbox
 names.
 
 Before any patches are applied, ORIG_HEAD is set to the tip of the