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

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 18, 2020, 19:13 UTC
Message-ID: <xmqqwo1vydhc.fsf@gitster.c.googlers.com>
In-Reply-To: <20200818052248.1880-1-danny0838@gmail.com>

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.