Skip to contentSkip to conversation

Fix --squash for push in subtree doc.

PATCH In review Danny Lin 2 participants 4 messages Aug 15, 2020 – Aug 18, 2020

lore
Share & tools
lore

Danny Lin

author
#0 lore raw

PATCH 1/1 Fix --squash for push in subtree doc.

git subtree push does not support --squash, as previously illustrated in revision 6ccc71a9d02726d59c1de818febf85a836f4e418.

---
 contrib/subtree/git-subtree.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
contrib/subtree/git-subtree.txt +2 -2
index 9ccd431c7f..0db02fe3c0 100644
@@ -143,8 +143,8 @@ OPTIONS
 	Specify <message> as the commit message for the merge commit.
 
 
-OPTIONS FOR add, merge, push, pull
-----------------------------------
+OPTIONS FOR add, merge, and pull
+--------------------------------
 --squash::
 	This option is only valid for add, merge, and pull
 	commands.
Signature · 1 line
2.28.0.windows.1
#1 lore raw
Quoted 1 line · Danny Lin

Subject: Re: [PATCH] Fix --squash for push in subtree doc.

Ditto. Perhaps

Subject: contrib/subtree: document 'push' does not take '--squash'

or something?

Quoted 2 lines

git subtree push does not support --squash, as previously illustrated in revision 6ccc71a9d02726d59c1de818febf85a836f4e418.

Documentation/SubmittingPatches[[commit-reference]]

"..., as previously illustrated in 6ccc71a9 (contrib/subtree:
there's no push --squash, 2015-05-07)"

`>

Quoted 17 lines
---
 contrib/subtree/git-subtree.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
contrib/subtree/git-subtree.txt +2 -2
index 9ccd431c7f..0db02fe3c0 100644
@@ -143,8 +143,8 @@ OPTIONS
 	Specify <message> as the commit message for the merge commit.
 
 
-OPTIONS FOR add, merge, push, pull
-----------------------------------
+OPTIONS FOR add, merge, and pull
+--------------------------------
author
#2 lore raw

PATCH 1/1 contrib/subtree: document 'push' does not take '--squash'

git subtree push does not support --squash, as previously illustrated in 6ccc71a9 (contrib/subtree: there's no push --squash, 2015-05-07)

---
 contrib/subtree/git-subtree.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
contrib/subtree/git-subtree.txt +2 -2
index 9ccd431c7f..0db02fe3c0 100644
@@ -143,8 +143,8 @@ OPTIONS
 	Specify <message> as the commit message for the merge commit.
 
 
-OPTIONS FOR add, merge, push, pull
-----------------------------------
+OPTIONS FOR add, merge, and pull
+--------------------------------
 --squash::
 	This option is only valid for add, merge, and pull
 	commands.
Signature · 1 line
2.28.0.windows.1
#3 lore raw

Re: [PATCH] contrib/subtree: document 'push' does not take '--squash'

Quoted 7 lines · Danny Lin

git subtree push does not support --squash, as previously illustrated in 6ccc71a9 (contrib/subtree: there's no push --squash, 2015-05-07)

---
 contrib/subtree/git-subtree.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Thanks. Will queue both patches.

Quoted 15 lines
contrib/subtree/git-subtree.txt +2 -2
index 9ccd431c7f..0db02fe3c0 100644
@@ -143,8 +143,8 @@ OPTIONS
 	Specify <message> as the commit message for the merge commit.
 
 
-OPTIONS FOR add, merge, push, pull
-----------------------------------
+OPTIONS FOR add, merge, and pull
+--------------------------------
 --squash::
 	This option is only valid for add, merge, and pull
 	commands.