--squash has no effect in git subtree push?

Danny Lin· May 4, 2015, 13:58 UTC · lore

The document says that --squash is for 'add', 'merge', 'pull' and 'push'.

However, it seems that --squash has no effect for push. Am I doing something wrong or is the document outdated?

git version 2.3.7.windows.1

Danny Lin· May 7, 2015, 07:52 UTC · re: Danny Lin · lore

Re: --squash has no effect in git subtree push?

Subject: [PATCH] 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>
---
 contrib/subtree/git-subtree.sh  | 2 +-
 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

-- 
2.3.7.windows.1

Junio C Hamano· May 7, 2015, 18:05 UTC · re: Danny Lin · lore

Re: --squash has no effect in git subtree push?

Danny Lin <danny0838@gmail.com> writes:

Show 10 quoted lines

> 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

You seem to have lost leading TABs in the patch somehow.

I manually typed the same change and commited, so no need to resend this one, but for future reference, please try sending a patch to yourself (and nobody else) and make sure what you reeived applies cleanly with "git am" on the commit you based your patch on.

And if it doesn't, figure out where tabs are eaten and lines are wrapped and fix that problem before sending the patch to the list.

Thanks.