Skip to content

Commit 6ccc71a

Browse files
danny0838gitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 16018ae commit 6ccc71a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

contrib/subtree/git-subtree.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ b,branch= create a new branch from the split subtree
2626
ignore-joins ignore prior --rejoin commits
2727
onto= try connecting new tree to an existing one
2828
rejoin merge the new branch back into HEAD
29-
options for 'add', 'merge', 'pull' and 'push'
29+
options for 'add', 'merge', and 'pull'
3030
squash merge subtree changes as a single commit
3131
"
3232
eval "$(echo "$OPTS_SPEC" | git rev-parse --parseopt -- "$@" || echo exit $?)"

contrib/subtree/git-subtree.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ OPTIONS
146146
OPTIONS FOR add, merge, push, pull
147147
----------------------------------
148148
--squash::
149-
This option is only valid for add, merge, push and pull
149+
This option is only valid for add, merge, and pull
150150
commands.
151151
+
152152
Instead of merging the entire history from the subtree project, produce

0 commit comments

Comments
 (0)