git-rebase.txt: address confusion between --no-ff vs --force-rebase

diff --git a/sequencer.c b/sequencer.c
index cca968043ea86c4515e6af1b4fe9251a0140c0a3..4034c0461b5022dad01b25d824cdc4f47ee09d13 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -784,7 +784,7 @@ static int run_git_commit(const char *defmsg, struct replay_opts *opts,
        struct child_process cmd = CHILD_PROCESS_INIT;
        const char *value;
 
-       if (flags & CREATE_ROOT_COMMIT) {
+       if ((flags & CREATE_ROOT_COMMIT) && !(flags & AMEND_MSG)) {
                struct strbuf msg = STRBUF_INIT, script = STRBUF_INIT;
                const char *author = is_rebase_i(opts) ?
                        read_author_ident(&script) : NULL;