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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Danny Lin <danny0838@xxxxxxxxx> writes:

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

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]