summaryrefslogtreecommitdiff
path: root/contrib/subtree
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-08-24 14:54:33 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-08-24 14:54:33 -0700
commit8923a45f148ba083c45935f1440e8363a37e4f0e (patch)
tree4e40e5f31e633e38f41bbc6a5968b11c28210691 /contrib/subtree
parentMerge branch 'mt/checkout-entry-dead-code-removal' (diff)
parentcontrib/subtree: document 'push' does not take '--squash' (diff)
downloadtgif-8923a45f148ba083c45935f1440e8363a37e4f0e.tar.xz
Merge branch 'dl/subtree-docs'
Doc updates for subtree (in contrib/) * dl/subtree-docs: contrib/subtree: document 'push' does not take '--squash' contrib/subtree: fix "unsure" for --message in the document
Diffstat (limited to 'contrib/subtree')
-rw-r--r--contrib/subtree/git-subtree.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt
index 352deda69d..0db02fe3c0 100644
--- a/contrib/subtree/git-subtree.txt
+++ b/contrib/subtree/git-subtree.txt
@@ -139,12 +139,12 @@ OPTIONS
-m <message>::
--message=<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 <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.