diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-08-24 21:54:33 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-24 21:54:33 (GMT) |
| commit | 8923a45f148ba083c45935f1440e8363a37e4f0e (patch) | |
| tree | 4e40e5f31e633e38f41bbc6a5968b11c28210691 /contrib | |
| parent | 43c80d270387458cbf891bd8b3b81d4b14f397dd (diff) | |
| parent | ce820cbd584171a2d09c0ce5b9cfb5756b8c9af6 (diff) | |
| download | git-8923a45f148ba083c45935f1440e8363a37e4f0e.zip git-8923a45f148ba083c45935f1440e8363a37e4f0e.tar.gz git-8923a45f148ba083c45935f1440e8363a37e4f0e.tar.bz2 | |
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')
| -rw-r--r-- | contrib/subtree/git-subtree.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt index 352deda..0db02fe 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. |