mirror of
https://github.com/git/git.git
synced 2024-05-31 00:16:20 +02:00
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
This commit is contained in:
commit
8923a45f14
|
@ -139,12 +139,12 @@ OPTIONS
|
||||||
|
|
||||||
-m <message>::
|
-m <message>::
|
||||||
--message=<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.
|
Specify <message> as the commit message for the merge commit.
|
||||||
|
|
||||||
|
|
||||||
OPTIONS FOR add, merge, push, pull
|
OPTIONS FOR add, merge, and pull
|
||||||
----------------------------------
|
--------------------------------
|
||||||
--squash::
|
--squash::
|
||||||
This option is only valid for add, merge, and pull
|
This option is only valid for add, merge, and pull
|
||||||
commands.
|
commands.
|
||||||
|
|
Loading…
Reference in New Issue