# [PATCH] doc: update the order of the syntax `git merge --continue`

3 messages from 2018-06-13 to 2018-06-14. Participants: Meng-Sung Wu, Junio C Hamano.
Thread: https://gitlist.dev/t/48703

## Meng-Sung Wu, 2018-06-13 03:57

Subject: [PATCH] doc: update the order of the syntax `git merge --continue`
Message-ID: <20180613035702.15957-1-mengsungwu@fortunewhite.org>
URL: https://gitlist.dev/e/20180613035702.15957-1-mengsungwu%40fortunewhite.org

```
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(-)

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
-- 
2.15.1 (Apple Git-101)


```

## Junio C Hamano, 2018-06-13 18:21

Subject: Re: [PATCH] doc: update the order of the syntax `git merge --continue`
Message-ID: <xmqq36xq7dix.fsf@gitster-ct.c.googlers.com>
URL: https://gitlist.dev/e/xmqq36xq7dix.fsf%40gitster-ct.c.googlers.com
In-Reply-To: <20180613035702.15957-1-mengsungwu@fortunewhite.org>

```
Meng-Sung Wu <mengsungwu@fortunewhite.org> 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

```

## Meng-Sung Wu, 2018-06-14 01:33

Subject: [PATCH v2] doc: update the order of the syntax `git merge --continue`
Message-ID: <20180614013334.17145-1-mengsungwu@fortunewhite.org>
URL: https://gitlist.dev/e/20180614013334.17145-1-mengsungwu%40fortunewhite.org
In-Reply-To: <xmqq36xq7dix.fsf@gitster-ct.c.googlers.com>

```
The syntax "git merge <message> HEAD <commit>" has been removed. The
order of the syntax should also be updated.

Signed-off-by: Meng-Sung Wu <mengsungwu@fortunewhite.org>
---
 Documentation/git-merge.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
-- 
2.15.1 (Apple Git-101)


```