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

4 messages from 2020-08-15 to 2020-08-18. Participants: Danny Lin, Junio C Hamano.
Thread: https://gitlist.dev/t/54051

## Danny Lin, 2020-08-15 02:37

Subject: [PATCH] Fix --squash for push in subtree doc.
Message-ID: <20200815023702.905-1-danny0838@gmail.com>
URL: https://gitlist.dev/e/20200815023702.905-1-danny0838%40gmail.com

```
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(-)

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, 2020-08-17 16:50

Subject: Re: [PATCH] Fix --squash for push in subtree doc.
Message-ID: <xmqqzh6t2p43.fsf@gitster.c.googlers.com>
URL: https://gitlist.dev/e/xmqqzh6t2p43.fsf%40gitster.c.googlers.com
In-Reply-To: <20200815023702.905-1-danny0838@gmail.com>

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

`>
> 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, 2020-08-18 05:22

Subject: [PATCH] contrib/subtree: document 'push' does not take '--squash'
Message-ID: <20200818052248.1880-1-danny0838@gmail.com>
URL: https://gitlist.dev/e/20200818052248.1880-1-danny0838%40gmail.com
In-Reply-To: <xmqqzh6t2p43.fsf@gitster.c.googlers.com>

```
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(-)

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, 2020-08-18 19:13

Subject: Re: [PATCH] contrib/subtree: document 'push' does not take '--squash'
Message-ID: <xmqqwo1vydhc.fsf@gitster.c.googlers.com>
URL: https://gitlist.dev/e/xmqqwo1vydhc.fsf%40gitster.c.googlers.com
In-Reply-To: <20200818052248.1880-1-danny0838@gmail.com>

```
Danny Lin <danny0838@gmail.com> writes:

> 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.


> 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.

```