git@vger.kernel.org mailing list mirror (one of many)
 help / Atom feed
* [PATCH] doc: update the order of the syntax `git merge --continue`
@ 2018-06-13  3:57 Meng-Sung Wu
  2018-06-13 18:21 ` Junio C Hamano
  0 siblings, 1 reply; 3+ messages in thread
From: Meng-Sung Wu @ 2018-06-13  3:57 UTC (permalink / raw)
  To: git; +Cc: Meng-Sung Wu

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)


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] doc: update the order of the syntax `git merge --continue`
  2018-06-13  3:57 [PATCH] doc: update the order of the syntax `git merge --continue` Meng-Sung Wu
@ 2018-06-13 18:21 ` Junio C Hamano
  2018-06-14  1:33   ` [PATCH v2] " Meng-Sung Wu
  0 siblings, 1 reply; 3+ messages in thread
From: Junio C Hamano @ 2018-06-13 18:21 UTC (permalink / raw)
  To: Meng-Sung Wu; +Cc: git

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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH v2] doc: update the order of the syntax `git merge --continue`
  2018-06-13 18:21 ` Junio C Hamano
@ 2018-06-14  1:33   ` " Meng-Sung Wu
  0 siblings, 0 replies; 3+ messages in thread
From: Meng-Sung Wu @ 2018-06-14  1:33 UTC (permalink / raw)
  To: gitster; +Cc: git, mengsungwu

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)


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-13  3:57 [PATCH] doc: update the order of the syntax `git merge --continue` Meng-Sung Wu
2018-06-13 18:21 ` Junio C Hamano
2018-06-14  1:33   ` [PATCH v2] " Meng-Sung Wu

git@vger.kernel.org mailing list mirror (one of many)

Archives are clonable:
	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.org/gmane.comp.version-control.git

 note: .onion URLs require Tor: https://www.torproject.org/
       or Tor2web: https://www.tor2web.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox