Re: [PATCH] status: suggest `git merge --continue`, not `git commit`
Show 11 quoted lines
>> 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
>
> When we use the output of "git show -s --format=reference" when
> referring to previous commits, so this would be
>
> 367ff69428 (merge: add '--continue' option as a synonym for 'git
> commit', 2016-12-14)
Show 12 quoted lines
>> `git merge --continue` is intended to be a synonym for `git commit`,
>> and the `git merge` man page already suggests to use
>> `git merge --continue`.
>
> This looks like a sensible improvement. I wonder if we should fix the
> grammar at the same time so it says
>
> (use "git merge --continue" to conclude the merge)
>
> rather than
>
> (use "git merge --continue" to conclude merge)
Makes sense to me, will change that too.