Skip to contentSkip to conversation

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

PATCH In review Danny Lin 2 participants 6 messages Aug 14, 2020 – Aug 18, 2020

lore
Share & tools
lore

Danny Lin

author
#0 lore raw

PATCH 1/1 Remove "unsure" for --message in subtree doc.

It is definitely clear that --message is valid for add, merge and pull.

---
 contrib/subtree/git-subtree.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
contrib/subtree/git-subtree.txt +1 -1
index 352deda69d..47e2c611fe 100644
@@ -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.
 
 
Signature · 1 line
2.28.0.windows.1
#1 lore raw
Quoted 1 line · Danny Lin

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.

Quoted 17 lines
---
 contrib/subtree/git-subtree.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
contrib/subtree/git-subtree.txt +1 -1
index 352deda69d..47e2c611fe 100644
@@ -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.
author
#2 lore raw

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.

Quoted 9 lines · Junio C Hamano
Quoted 1 line · Danny Lin

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.

author
#3 lore raw

PATCH 1/1 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'.

---
 contrib/subtree/git-subtree.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
contrib/subtree/git-subtree.txt +1 -1
index 352deda69d..9ccd431c7f 100644
@@ -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.
 
 
Signature · 1 line
2.28.0.windows.1
#4 lore raw

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

Quoted 1 line · Danny Lin

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

Documentation/SubmittingPatches:[[summary-section]]

Quoted 19 lines

Revise the documentation and remove previous "unsure" after making sure that --message supports only 'add', 'merge', 'pull', and 'split --rejoin'.

---
 contrib/subtree/git-subtree.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
contrib/subtree/git-subtree.txt +1 -1
index 352deda69d..9ccd431c7f 100644
@@ -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.
author
#5 lore raw

PATCH 1/1 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'.

---
 contrib/subtree/git-subtree.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
contrib/subtree/git-subtree.txt +1 -1
index 352deda69d..9ccd431c7f 100644
@@ -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.
 
 
Signature · 1 line
2.28.0.windows.1