Hi, On Wed, 4 Jun 2008, Junio C Hamano wrote: > diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh > index 0ca986f..a6b6c9e 100755 > --- a/git-rebase--interactive.sh > +++ b/git-rebase--interactive.sh > @@ -390,11 +390,14 @@ do > die "Cannot find the author identity" > if test -f "$DOTEST"/amend > then > + do_edit=-e > git reset --soft HEAD^ || > die "Cannot rewind the HEAD" > + else > + do_edit= > fi > export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE && > - git commit --no-verify -F "$DOTEST"/message -e || > + git commit --no-verify -F "$DOTEST"/message $do_edit || > die "Could not commit staged changes." > fi I guess with the recent changes, I do not count as author of rebase -i anymore. Otherwise, I would say "NACK" for the reasons described in my other mail. Ciao, Dscho -- 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
