All of lore.kernel.org
 help / color / mirror / Atom feed
From: Danny Lin <danny0838@gmail.com>
To: git develop <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>, Danny Lin <danny0838@gmail.com>
Subject: [PATCH] Fix --squash for push in subtree doc.
Date: Sat, 15 Aug 2020 10:37:03 +0800	[thread overview]
Message-ID: <20200815023702.905-1-danny0838@gmail.com> (raw)

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


             reply	other threads:[~2020-08-15 21:57 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-15  2:37 Danny Lin [this message]
2020-08-17 16:50 ` [PATCH] Fix --squash for push in subtree doc 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

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=20200815023702.905-1-danny0838@gmail.com \
    --to=danny0838@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /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.