mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-14 19:46:27 +02:00
Code

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:
Junio C Hamano 2020-08-24 14:54:33 -07:00
parent 43c80d2703 ce820cbd58
commit 8923a45f14
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/subtree/git-subtree.txt
View File

@ -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.