From 6ccc71a9d02726d59c1de818febf85a836f4e418 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Thu, 7 May 2015 15:52:33 +0800 Subject: contrib/subtree: there's no push --squash The documentation says that --squash is for 'add', 'merge', 'pull' and 'push', while --squash actually doesn't change the behavior of 'push'. Correct the documentation. Signed-off-by: Danny Lin Signed-off-by: Junio C Hamano --- contrib/subtree/git-subtree.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib/subtree/git-subtree.txt') diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt index 54e4b4a243..60d76cdddf 100644 --- a/contrib/subtree/git-subtree.txt +++ b/contrib/subtree/git-subtree.txt @@ -146,7 +146,7 @@ OPTIONS OPTIONS FOR add, merge, push, pull ---------------------------------- --squash:: - This option is only valid for add, merge, push and pull + This option is only valid for add, merge, and pull commands. + Instead of merging the entire history from the subtree project, produce -- cgit v1.2.3