summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorSZEDER Gábor <szeder@ira.uka.de>2011-03-22 18:42:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-22 21:31:21 (GMT)
commitb5f306fbe1bf1a75341f85b84358d25870b010f3 (patch)
tree76da6ef56c4ce47722fda7823db4212fda8e80dc /Documentation
parentc4e4644e17e0fad4a6ffedba22b739cf1b1ac3fc (diff)
downloadgit-b5f306fbe1bf1a75341f85b84358d25870b010f3.zip
git-b5f306fbe1bf1a75341f85b84358d25870b010f3.tar.gz
git-b5f306fbe1bf1a75341f85b84358d25870b010f3.tar.bz2
git-am.txt: advertise 'git am --abort' instead of 'rm .git/rebase-apply'
'git am --abort' is around for quite a long time now, and users should normally not poke around inside the .git directory, yet the documentation of 'git am' still recommends the following: ... if you decide to start over from scratch, run `rm -f -r .git/rebase-apply` ... Suggest 'git am --abort' instead. It's not quite the same as the original, because 'git am --abort' will restore the original branch, while simply removing '.git/rebase-apply' won't, but that's rather a thinko in the original wording, because that won't actually "start over _from scratch_". Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-am.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 51297d0..4d37de6 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