git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Danny Lin <danny0838@gmail.com>
Date
Aug 18, 2020, 05:22 UTC
Message-ID
<20200818052248.1880-1-danny0838@gmail.com>
In-Reply-To
<xmqqzh6t2p43.fsf@gitster.c.googlers.com>

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(-)
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
Previous: Junio C HamanoNext: Junio C Hamano
Message 3 of 4 in “Fix --squash for push in subtree doc.”
  1. Fix --squash for push in subtree doc.Danny Lin, Aug 15, 2020
  2. Junio C HamanoAug 17, 2020
  3. contrib/subtree: document 'push' does not take '--squash'Danny Lin, Aug 18, 2020
  4. Junio C HamanoAug 18, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.