X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-am.txt;h=6b1b5af64e2daec1ecc8ee832f58f5186d740a79;hb=c5a5f12e5a514d198f49a76d4e001c88570bf7d1;hp=621b720091f92008c11a03ea2a1e69b72e50a03b;hpb=dc7f96f1f4a071150d2c817e6ca72ecfb7edd72d;p=git.git

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