threads / patch / 48703

patchdoc: update the order of the syntax `git merge --continue`

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

## tl;dr

3 messages between Jun 13, 2018 and Jun 14, 2018. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Meng-Sung Wu· Jun 13, 2018, 03:57 UTC · lore
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(-)
Show changes to Documentation/git-merge.txt +1 −1
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· Jun 13, 2018, 18:21 UTC · re: Meng-Sung Wu · lore

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

Meng-Sung Wu <mengsungwu@fortunewhite.org> writes:
Show 5 quoted lines
> 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
Show 13 quoted lines
> 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· Jun 14, 2018, 01:33 UTC · re: Junio C Hamano · lore

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

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(-)
Show changes to Documentation/git-merge.txt +1 −1
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)

← back to recent threads