* [PATCH] Remove "unsure" for --message in subtree doc.
@ 2020-08-14 14:53 Danny Lin
2020-08-14 17:50 ` Junio C Hamano
0 siblings, 1 reply; 6+ messages in thread
From: Danny Lin @ 2020-08-14 14:53 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git develop, Danny Lin
It is definitely clear that --message is valid for add, merge and pull.
Signed-off-by: Danny Lin <danny0838@gmail.com>
---
contrib/subtree/git-subtree.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt
index 352deda69d..47e2c611fe 100644
--- a/contrib/subtree/git-subtree.txt
+++ b/contrib/subtree/git-subtree.txt
@@ -139,7 +139,7 @@ OPTIONS
-m <message>::
--message=<message>::
- This option is only valid for add, merge and pull (unsure).
+ This option is only valid for add, merge and pull.
Specify <message> as the commit message for the merge commit.
--
2.28.0.windows.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] Remove "unsure" for --message in subtree doc.
2020-08-14 14:53 [PATCH] Remove "unsure" for --message in subtree doc Danny Lin
@ 2020-08-14 17:50 ` Junio C Hamano
2020-08-15 2:31 ` Danny Lin
0 siblings, 1 reply; 6+ messages in thread
From: Junio C Hamano @ 2020-08-14 17:50 UTC (permalink / raw)
To: Danny Lin; +Cc: git develop
Danny Lin <danny0838@gmail.com> writes:
> It is definitely clear that --message is valid for add, merge and pull.
If it is also definitely clear that it is _only_ valid for those
three, then the change is good. I do not know if that is true
offhand, though.
>
> Signed-off-by: Danny Lin <danny0838@gmail.com>
> ---
> contrib/subtree/git-subtree.txt | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt
> index 352deda69d..47e2c611fe 100644
> --- a/contrib/subtree/git-subtree.txt
> +++ b/contrib/subtree/git-subtree.txt
> @@ -139,7 +139,7 @@ OPTIONS
>
> -m <message>::
> --message=<message>::
> - This option is only valid for add, merge and pull (unsure).
> + This option is only valid for add, merge and pull.
> Specify <message> as the commit message for the merge commit.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Remove "unsure" for --message in subtree doc.
2020-08-14 17:50 ` Junio C Hamano
@ 2020-08-15 2:31 ` Danny Lin
2020-08-15 2:32 ` [PATCH] Revise supported options " Danny Lin
0 siblings, 1 reply; 6+ messages in thread
From: Danny Lin @ 2020-08-15 2:31 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git develop
Sorry, I missed that.
Further investigation suggests that it works with 'split --rejoin' and
has nothing to do with 'push' (actually, push never generates a merged
commit at all). We can rephrase for that.
Junio C Hamano <gitster@pobox.com> writes:
>
> Danny Lin <danny0838@gmail.com> writes:
>
> > It is definitely clear that --message is valid for add, merge and pull.
>
> If it is also definitely clear that it is _only_ valid for those
> three, then the change is good. I do not know if that is true
> offhand, though.
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] Revise supported options for --message in subtree doc.
2020-08-15 2:31 ` Danny Lin
@ 2020-08-15 2:32 ` Danny Lin
2020-08-17 16:47 ` Junio C Hamano
0 siblings, 1 reply; 6+ messages in thread
From: Danny Lin @ 2020-08-15 2:32 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git develop, Danny Lin
Revise the documentation and remove previous "unsure" after making sure
that --message supports only 'add', 'merge', 'pull', and 'split --rejoin'.
Signed-off-by: Danny Lin <danny0838@gmail.com>
---
contrib/subtree/git-subtree.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt
index 352deda69d..9ccd431c7f 100644
--- a/contrib/subtree/git-subtree.txt
+++ b/contrib/subtree/git-subtree.txt
@@ -139,7 +139,7 @@ OPTIONS
-m <message>::
--message=<message>::
- This option is only valid for add, merge and pull (unsure).
+ This option is only valid for add, merge, pull, and split --rejoin.
Specify <message> as the commit message for the merge commit.
--
2.28.0.windows.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] Revise supported options for --message in subtree doc.
2020-08-15 2:32 ` [PATCH] Revise supported options " Danny Lin
@ 2020-08-17 16:47 ` Junio C Hamano
2020-08-18 5:21 ` [PATCH] contrib/subtree: fix "unsure" for --message in the document Danny Lin
0 siblings, 1 reply; 6+ messages in thread
From: Junio C Hamano @ 2020-08-17 16:47 UTC (permalink / raw)
To: Danny Lin; +Cc: git develop
Danny Lin <danny0838@gmail.com> writes:
> Subject: Re: [PATCH] Revise supported options for --message in subtree doc.
Documentation/SubmittingPatches:[[summary-section]]
> Revise the documentation and remove previous "unsure" after making sure
> that --message supports only 'add', 'merge', 'pull', and 'split --rejoin'.
>
> Signed-off-by: Danny Lin <danny0838@gmail.com>
> ---
> contrib/subtree/git-subtree.txt | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt
> index 352deda69d..9ccd431c7f 100644
> --- a/contrib/subtree/git-subtree.txt
> +++ b/contrib/subtree/git-subtree.txt
> @@ -139,7 +139,7 @@ OPTIONS
>
> -m <message>::
> --message=<message>::
> - This option is only valid for add, merge and pull (unsure).
> + This option is only valid for add, merge, pull, and split --rejoin.
> Specify <message> as the commit message for the merge commit.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] contrib/subtree: fix "unsure" for --message in the document
2020-08-17 16:47 ` Junio C Hamano
@ 2020-08-18 5:21 ` Danny Lin
0 siblings, 0 replies; 6+ messages in thread
From: Danny Lin @ 2020-08-18 5:21 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git develop, Danny Lin
Revise the documentation and remove previous "unsure" after making sure
that --message supports only 'add', 'merge', 'pull', and 'split --rejoin'.
Signed-off-by: Danny Lin <danny0838@gmail.com>
---
contrib/subtree/git-subtree.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt
index 352deda69d..9ccd431c7f 100644
--- a/contrib/subtree/git-subtree.txt
+++ b/contrib/subtree/git-subtree.txt
@@ -139,7 +139,7 @@ OPTIONS
-m <message>::
--message=<message>::
- This option is only valid for add, merge and pull (unsure).
+ This option is only valid for add, merge, pull, and split --rejoin.
Specify <message> as the commit message for the merge commit.
--
2.28.0.windows.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-08-18 5:21 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-14 14:53 [PATCH] Remove "unsure" for --message in subtree doc Danny Lin
2020-08-14 17:50 ` Junio C Hamano
2020-08-15 2:31 ` Danny Lin
2020-08-15 2:32 ` [PATCH] Revise supported options " Danny Lin
2020-08-17 16:47 ` Junio C Hamano
2020-08-18 5:21 ` [PATCH] contrib/subtree: fix "unsure" for --message in the document Danny Lin
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).