Re: [PATCH] contrib/subtree: document 'push' does not take '--squash'
From: Junio C Hamano <hidden>
Date: 2020-08-18 19:13:12
Danny Lin [off-list ref] writes:
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 <redacted> --- contrib/subtree/git-subtree.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Thanks. Will queue both patches.
quoted hunk
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.