All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Danny Lin <danny0838@gmail.com>
Cc: git develop <git@vger.kernel.org>
Subject: Re: [PATCH] Fix --squash for push in subtree doc.
Date: Mon, 17 Aug 2020 09:50:36 -0700	[thread overview]
Message-ID: <xmqqzh6t2p43.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20200815023702.905-1-danny0838@gmail.com> (Danny Lin's message of "Sat, 15 Aug 2020 10:37:03 +0800")

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


  reply	other threads:[~2020-08-17 16:50 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 [this message]
2020-08-18  5:22   ` [PATCH] contrib/subtree: document 'push' does not take '--squash' Danny Lin
2020-08-18 19:13     ` Junio C Hamano

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqzh6t2p43.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. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.