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

From: Junio C Hamano <gitster@pobox.com>
Date: May 7, 2015, 18:05 UTC
Message-ID: <xmqqy4l0p8kf.fsf@gitster.dls.corp.google.com>
In-Reply-To: <CAMbsUu4v9w6+wiAUm2hpiNrDaoL3U9Z_suXR3NPVGo-JhH3E+Q@mail.gmail.com>

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.