From: Junio C Hamano <gitster@pobox.com>
To: Danny Lin <danny0838@gmail.com>
Cc: git develop <git@vger.kernel.org>
Subject: Re: [PATCH] contrib/subtree: document 'push' does not take '--squash'
Date: Tue, 18 Aug 2020 12:13:03 -0700 [thread overview]
Message-ID: <xmqqwo1vydhc.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20200818052248.1880-1-danny0838@gmail.com> (Danny Lin's message of "Tue, 18 Aug 2020 13:22:49 +0800")
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.
prev parent reply other threads:[~2020-08-18 19:13 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-15 2:37 [PATCH] Fix --squash for push in subtree doc Danny Lin
2020-08-17 16:50 ` Junio C Hamano
2020-08-18 5:22 ` [PATCH] contrib/subtree: document 'push' does not take '--squash' Danny Lin
2020-08-18 19:13 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqwo1vydhc.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=danny0838@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).