mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'dl/subtree-push-no-squash'
"git subtree" script (in contrib/) does not have --squash option when pushing, but the documentation and help text pretended as if it did. * dl/subtree-push-no-squash: contrib/subtree: there's no push --squash
This commit is contained in:
commit
6263f58f86
|
@ -26,7 +26,7 @@ b,branch= create a new branch from the split subtree
|
|||
ignore-joins ignore prior --rejoin commits
|
||||
onto= try connecting new tree to an existing one
|
||||
rejoin merge the new branch back into HEAD
|
||||
options for 'add', 'merge', 'pull' and 'push'
|
||||
options for 'add', 'merge', and 'pull'
|
||||
squash merge subtree changes as a single commit
|
||||
"
|
||||
eval "$(echo "$OPTS_SPEC" | git rev-parse --parseopt -- "$@" || echo exit $?)"
|
||||
|
|
|
@ -146,7 +146,7 @@ OPTIONS
|
|||
OPTIONS FOR add, merge, push, pull
|
||||
----------------------------------
|
||||
--squash::
|
||||
This option is only valid for add, merge, push and pull
|
||||
This option is only valid for add, merge, and pull
|
||||
commands.
|
||||
+
|
||||
Instead of merging the entire history from the subtree project, produce
|
||||
|
|
Loading…
Reference in a new issue