summaryrefslogtreecommitdiff
path: root/contrib/subtree/git-subtree.sh
diff options
context:
space:
mode:
authorDanny Lin <danny0838@gmail.com>2015-05-07 07:52:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-05-07 18:03:32 (GMT)
commit6ccc71a9d02726d59c1de818febf85a836f4e418 (patch)
tree7691f2ae348a7d16b2863dc10124738529c6e2c5 /contrib/subtree/git-subtree.sh
parent16018ae5fb368151f3eff13730cf089b63f41962 (diff)
downloadgit-6ccc71a9d02726d59c1de818febf85a836f4e418.zip
git-6ccc71a9d02726d59c1de818febf85a836f4e418.tar.gz
git-6ccc71a9d02726d59c1de818febf85a836f4e418.tar.bz2
contrib/subtree: there's no push --squash
The documentation says that --squash is for 'add', 'merge', 'pull' and 'push', while --squash actually doesn't change the behavior of 'push'. Correct the documentation. Signed-off-by: Danny Lin <danny0838@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/subtree/git-subtree.sh')
-rwxr-xr-xcontrib/subtree/git-subtree.sh2
1 files changed, 1 insertions, 1 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 $?)"