diff options
| author |  Danny Lin <danny0838@gmail.com> | 2020-08-18 13:22:49 +0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-08-18 12:12:29 -0700 |
| commit | ce820cbd584171a2d09c0ce5b9cfb5756b8c9af6 (patch) | |
| tree | bf33b4117db3c89c7c267ee0e739b6b46f398d35 /contrib | |
| parent | contrib/subtree: fix "unsure" for --message in the document (diff) | |
| download | tgif-ce820cbd584171a2d09c0ce5b9cfb5756b8c9af6.tar.xz | |
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 <danny0838@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/subtree/git-subtree.txt | 4 |
1 files 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 <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. |