diff options
| author |  SZEDER Gábor <szeder@ira.uka.de> | 2011-03-22 19:42:25 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-03-22 14:31:21 -0700 |
| commit | b5f306fbe1bf1a75341f85b84358d25870b010f3 (patch) | |
| tree | 76da6ef56c4ce47722fda7823db4212fda8e80dc /contrib | |
| parent | bisect: visualize with git-log if gitk is unavailable (diff) | |
| download | tgif-b5f306fbe1bf1a75341f85b84358d25870b010f3.tar.xz | |
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 'contrib')
0 files changed, 0 insertions, 0 deletions