Junio C Hamano <gitster@xxxxxxxxx> writes: > I'm happy with the documentation and help-text parts of your patch, but > probably this, on top of 1a6f6bb (git am --abort, 2008-07-16), is more > appropriate? > > --- > git-am.sh | 6 +++--- > t/t4151-am-abort.sh | 46 +++++++++++++++++++++++++++------------------- > 2 files changed, 30 insertions(+), 22 deletions(-) > > diff --git a/git-am.sh b/git-am.sh > index a44bd7a..5cbf8f4 100755 > --- a/git-am.sh > +++ b/git-am.sh > @@ -203,9 +203,9 @@ then > > case "$abort" in > t) > - rm -fr "$dotest" && > - git read-tree -m -u ORIG_HEAD && > - git reset ORIG_HEAD && : > + git rerere clear > + git read-tree --reset -u HEAD ORIG_HEAD > + rm -fr "$dotest" We still need "git reset ORIG_HEAD" after the read-tree. Sorry about the noise. > exit ;; > esac > else -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
