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>
Danny Lin committed
May 7, 2015 at 15:52 UTC
6ccc71a9d02726d59c1de818febf85a836f4e418
2 files changed
+2
-2
contrib/subtree/git-subtree.sh
+1
-1
@@ -26,7 +26,7 @@ b,branch= create a new branch from the split subtree
26
ignore-joins ignore prior --rejoin commits
27
onto= try connecting new tree to an existing one
28
rejoin merge the new branch back into HEAD
29
- options for 'add', 'merge', 'pull' and 'push'
29
+ options for 'add', 'merge', and 'pull'
30
squash merge subtree changes as a single commit
31
"
32
eval "$(echo "$OPTS_SPEC" | git rev-parse --parseopt -- "$@" || echo exit $?)"
contrib/subtree/git-subtree.txt
+1
-1
@@ -146,7 +146,7 @@ OPTIONS
146
OPTIONS FOR add, merge, push, pull
147
----------------------------------
148
--squash::
149
- This option is only valid for add, merge, push and pull
149
+ This option is only valid for add, merge, and pull
150
commands.
151
+
152
Instead of merging the entire history from the subtree project, produce