From f99c0c996b7977b6ceba134a884068c56d4a530b Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Tue, 18 Aug 2020 13:21:10 +0800 Subject: [PATCH 1/2] contrib/subtree: fix "unsure" for --message in the document Revise the documentation and remove previous "unsure" after making sure that --message supports only 'add', 'merge', 'pull', and 'split --rejoin'. Signed-off-by: Danny Lin Signed-off-by: Junio C Hamano --- contrib/subtree/git-subtree.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt index 352deda69d..9ccd431c7f 100644 --- a/contrib/subtree/git-subtree.txt +++ b/contrib/subtree/git-subtree.txt @@ -139,7 +139,7 @@ OPTIONS -m :: --message=:: - This option is only valid for add, merge and pull (unsure). + This option is only valid for add, merge, pull, and split --rejoin. Specify as the commit message for the merge commit. From ce820cbd584171a2d09c0ce5b9cfb5756b8c9af6 Mon Sep 17 00:00:00 2001 From: Danny Lin Date: Tue, 18 Aug 2020 13:22:49 +0800 Subject: [PATCH 2/2] 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 Signed-off-by: Junio C Hamano --- 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 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.