All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Danny Lin <danny0838@gmail.com>
Cc: git develop <git@vger.kernel.org>
Subject: Re: --squash has no effect in git subtree push?
Date: Thu, 07 May 2015 11:05:20 -0700	[thread overview]
Message-ID: <xmqqy4l0p8kf.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CAMbsUu4v9w6+wiAUm2hpiNrDaoL3U9Z_suXR3NPVGo-JhH3E+Q@mail.gmail.com> (Danny Lin's message of "Thu, 7 May 2015 15:52:33 +0800")

Danny Lin <danny0838@gmail.com> 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.

      reply	other threads:[~2015-05-07 18:05 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-04 13:58 --squash has no effect in git subtree push? Danny Lin
2015-05-07  7:52 ` Danny Lin
2015-05-07 18:05   ` Junio C Hamano [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqy4l0p8kf.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox.com \
    --cc=danny0838@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.