git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* [PATCH] Fix --squash for push in subtree doc.
@ 2020-08-15  2:37 Danny Lin
  2020-08-17 16:50 ` Junio C Hamano
  0 siblings, 1 reply; 4+ messages in thread
From: Danny Lin @ 2020-08-15  2:37 UTC (permalink / raw)
  To: git develop; +Cc: Junio C Hamano, Danny Lin

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


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2020-08-18 19:13 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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

Code repositories for project(s) associated with this 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).