From: Danny Lin <danny0838@gmail.com>
Date: Tue, 18 Aug 2020 05:22:49 +0000 (+0800)
Subject: contrib/subtree: document 'push' does not take '--squash'
X-Git-Tag: v2.29.0-rc0~131^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce820cbd584171a2d09c0ce5b9cfb5756b8c9af6;p=thirdparty%2Fgit.git

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

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

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.