mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-08 13:36:15 +02:00
Code

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>
This commit is contained in:
Danny Lin 2015-05-07 15:52:33 +08:00 committed by Junio C Hamano
parent 16018ae5fb
commit 6ccc71a9d0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/subtree/git-subtree.sh
View File

@ -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 $?)"

2
contrib/subtree/git-subtree.txt
View File

@ -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