From: Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>
Date: Fri, 09 Oct 2026 14:28:11 GMT
Subject: Re: [PATCH v2] status: suggest `git merge --continue`, not `git commit`
Message-ID: <3e26cf00-ce81-486a-a6a6-720d22b8f118@app.fastmail.com>
In-Reply-To: <pull.2249.v2.git.1791551486318.gitgitgadget@gmail.com>

On Fri, Oct 9, 2026, at 15:11, Julia Evans via GitGitGadget wrote:
> From: Julia Evans <julia@jvns.ca>
>
> During a merge conflict, we suggest using --continue to continue the
> merge for rebase, revert, and cherry-pick.
>
> Change the `git merge` advice to be consistent.
> Commit 367ff694281ce569edd8f6e444fc770f92f5d215 says that
>[snip]
> Signed-off-by: Julia Evans <julia@jvns.ca>
>[snip]
>     Changes in v2:
>
>      * Use git show -s --format=reference to format the reference in the
>        commit message (thanks to Phillip)

But this isn’t changed?

You can use this `commit --amend` snippet to change it. It worked for me
at least.

    cat >rewrite-msg.sh <<-\EOF
    #!/bin/sh

    file="$1"
    git format-rev --stdin-mode=text --format=reference <"$file" \
        | par g0 \
        | sponge "$file"
    EOF
    chmod +x rewrite-msg.sh
    GIT_EDITOR=./rewrite-msg.sh git commit --amend


>      * change to "conclude the merge" (thanks to Phillip)
>
>[snip]