diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-05-22 19:41:43 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-22 19:41:43 (GMT) |
| commit | 6263f58f86895096c21a07ad8dced76f84bd4708 (patch) | |
| tree | 63c231cdc63fa8829bcb1257c00d5f27f1acb395 /contrib | |
| parent | 823ac2b6330859bd145e6424663a98d85d455bf9 (diff) | |
| parent | 6ccc71a9d02726d59c1de818febf85a836f4e418 (diff) | |
| download | git-6263f58f86895096c21a07ad8dced76f84bd4708.zip git-6263f58f86895096c21a07ad8dced76f84bd4708.tar.gz git-6263f58f86895096c21a07ad8dced76f84bd4708.tar.bz2 | |
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
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/subtree/git-subtree.sh | 2 | ||||
| -rw-r--r-- | contrib/subtree/git-subtree.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh index fa1a583..6328c87 100755 --- a/contrib/subtree/git-subtree.sh +++ b/contrib/subtree/git-subtree.sh @@ -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 $?)" diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt index 54e4b4a..60d76cd 100644 --- a/contrib/subtree/git-subtree.txt +++ b/contrib/subtree/git-subtree.txt @@ -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 |