threads / patch / 54043

patchRemove "unsure" for --message in subtree doc.

Subject: [PATCH] Remove "unsure" for --message in subtree doc.

## tl;dr

6 messages between Aug 14, 2020 and Aug 18, 2020. Diffs are folded; open one to read it.

replies: 5people: 2as markdown or json

Danny Lin· Aug 14, 2020, 14:53 UTC · lore
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(-)
Show changes to contrib/subtree/git-subtree.txt +1 −1
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
Junio C Hamano· Aug 14, 2020, 17:50 UTC · re: Danny Lin · lore

Re: [PATCH] Remove "unsure" for --message in subtree doc.

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.

Show 17 quoted lines
>
> 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.
Danny Lin· Aug 15, 2020, 02:31 UTC · re: Junio C Hamano · lore

Re: [PATCH] Remove "unsure" for --message in subtree doc.

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:
Show 9 quoted lines
>
> 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.
>
Danny Lin· Aug 15, 2020, 02:32 UTC · re: Danny Lin · lore

[PATCH] Revise supported options for --message in subtree doc.

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(-)
Show changes to contrib/subtree/git-subtree.txt +1 −1
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
Junio C Hamano· Aug 17, 2020, 16:47 UTC · re: Danny Lin · lore

Re: [PATCH] Revise supported options for --message in subtree doc.

Danny Lin <danny0838@gmail.com> writes:
> Subject: Re: [PATCH] Revise supported options for --message in subtree doc.
Documentation/SubmittingPatches:[[summary-section]]
Show 19 quoted lines
> 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.
Danny Lin· Aug 18, 2020, 05:21 UTC · re: Junio C Hamano · lore

[PATCH] contrib/subtree: fix "unsure" for --message in the document

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

← back to recent threads