From: SZEDER Gábor <szeder@ira.uka.de>
Date: Tue, 22 Mar 2011 18:42:25 +0000 (+0100)
Subject: git-am.txt: advertise 'git am --abort' instead of 'rm .git/rebase-apply'
X-Git-Tag: v1.7.4.2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b5f306fbe1bf1a75341f85b84358d25870b010f3?ds=inline;hp=b5f306fbe1bf1a75341f85b84358d25870b010f3

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>
---