threads / patch / 54051

patchFix --squash for push in subtree doc.

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

## tl;dr

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

replies: 3people: 2as markdown or json

Danny Lin· Aug 15, 2020, 02:37 UTC · lore

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

Signed-off-by: Danny Lin <danny0838@gmail.com>
---
 contrib/subtree/git-subtree.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Show changes to contrib/subtree/git-subtree.txt +2 −1

diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt
index 9ccd431c7f..0db02fe3c0 100644
--- a/contrib/subtree/git-subtree.txt
+++ b/contrib/subtree/git-subtree.txt
@@ -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.

-- 
2.28.0.windows.1

Junio C Hamano· Aug 17, 2020, 16:50 UTC · re: Danny Lin · lore

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

Danny Lin <danny0838@gmail.com> writes:

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

Ditto.  Perhaps

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

or something?

> 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)"

`>

Show 17 quoted lines

> Signed-off-by: Danny Lin <danny0838@gmail.com>
> ---
>  contrib/subtree/git-subtree.txt | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt
> index 9ccd431c7f..0db02fe3c0 100644
> --- a/contrib/subtree/git-subtree.txt
> +++ b/contrib/subtree/git-subtree.txt
> @@ -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
> +--------------------------------

Danny Lin· Aug 18, 2020, 05:22 UTC · re: Junio C Hamano · lore

[PATCH] 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)

Signed-off-by: Danny Lin <danny0838@gmail.com>
---
 contrib/subtree/git-subtree.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Show changes to contrib/subtree/git-subtree.txt +2 −1

diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt
index 9ccd431c7f..0db02fe3c0 100644
--- a/contrib/subtree/git-subtree.txt
+++ b/contrib/subtree/git-subtree.txt
@@ -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.

-- 
2.28.0.windows.1

Junio C Hamano· Aug 18, 2020, 19:13 UTC · re: Danny Lin · lore

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

Danny Lin <danny0838@gmail.com> writes:

Show 7 quoted lines

> git subtree push does not support --squash, as previously illustrated in
> 6ccc71a9 (contrib/subtree: there's no push --squash, 2015-05-07)
>
> Signed-off-by: Danny Lin <danny0838@gmail.com>
> ---
>  contrib/subtree/git-subtree.txt | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Thanks.  Will queue both patches.

Show 15 quoted lines

> diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt
> index 9ccd431c7f..0db02fe3c0 100644
> --- a/contrib/subtree/git-subtree.txt
> +++ b/contrib/subtree/git-subtree.txt
> @@ -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.