Meng-Sung Wu <mengsungwu@xxxxxxxxxxxxxxxx> writes: > The syntax "git merge <message> HEAD <commit>" has been removed. The > order of the syntax should also be updated. > --- > Documentation/git-merge.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) An obviously good change. Could you please sign-off your patch? cf. https://git.github.io/htmldocs/SubmittingPatches.html#sign-off > diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt > index d5dfd8430..6a5c00e2c 100644 > --- a/Documentation/git-merge.txt > +++ b/Documentation/git-merge.txt > @@ -57,7 +57,7 @@ reconstruct the original (pre-merge) changes. Therefore: > discouraged: while possible, it may leave you in a state that is hard to > back out of in the case of a conflict. > > -The fourth syntax ("`git merge --continue`") can only be run after the > +The third syntax ("`git merge --continue`") can only be run after the > merge has resulted in conflicts. > > OPTIONS
