Skip to content

Commit b5f306f

Browse files
szedergitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent c4e4644 commit b5f306f

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Documentation/git-am.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,9 @@ aborts in the middle. You can recover from this in one of two ways:
173173
the index file to bring it into a state that the patch should
174174
have produced. Then run the command with the '--resolved' option.
175175

176-
The command refuses to process new mailboxes while the `.git/rebase-apply`
177-
directory exists, so if you decide to start over from scratch,
178-
run `rm -f -r .git/rebase-apply` before running the command with mailbox
176+
The command refuses to process new mailboxes until the current
177+
operation is finished, so if you decide to start over from scratch,
178+
run `git am --abort` before running the command with mailbox
179179
names.
180180

181181
Before any patches are applied, ORIG_HEAD is set to the tip of the

0 commit comments

Comments
 (0)