Hi, Junio C Hamano wrote: > Olivier Marin <dkr+ml.git@xxxxxxx> writes: > > @@ -203,9 +204,10 @@ then > > > > case "$abort" in > > t) > > - rm -fr "$dotest" && > > + git rerere clear && > > git read-tree -m -u ORIG_HEAD && [...] > 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 Perhaps I am confused, but ... Why is there "HEAD" and "ORIG_HEAD" and not only "ORIG_HEAD"? Regards. -- Stephan Beyer <s-beyer@xxxxxxx>, PGP 0x6EDDD207FCC5040F -- 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
