public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Sergey Organov <sorganov@gmail•com>
To: Junio C Hamano <gitster@pobox•com>
Cc: git@vger•kernel.org
Subject: Re: [PATCH v2] Documentation/git-rebase.txt: discuss --fork-point assumption of vanilla "git rebase" in DESCRIPTION.
Date: Tue, 30 Sep 2014 00:17:48 +0400	[thread overview]
Message-ID: <8738ba5ggj.fsf@osv.gnss.ru> (raw)
In-Reply-To: <xmqq7g0m75qk.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Mon, 29 Sep 2014 09:26:27 -0700")

Junio C Hamano <gitster@pobox•com> writes:
> Sergey Organov <sorganov@gmail•com> writes:
>

[...]

>> As asked by Junio C Hamano <gitster@pobox•com>, the newly introduced
>> 'fork_point' term has been described.
>>
>
> I suspect "will be used as a fallback" might be easier to understand
> what is going on instead of "will be used instead", but other than
> that, the new explanation of what fork-point is is a very welcome
> update, I think.

Yeah, sure. Wasn't satisfied with the wording myself.

[...]

> The patch failed to apply

Sorry about it.

> Applying: Documentation/git-rebase.txt: discuss --fork-point assumption of vanilla "git rebase" in DESCRIPTION.
> fatal: corrupt patch at line 38

I rather get:

$ git apply x.patch
x.patch:38: trailing whitespace.
	introduced by <branch>. 
warning: 1 line adds whitespace errors.

I've used 'git format-patch' to prepare the patch. Shouldn't it warn
about such things? Or what should I do to avoid such problems in the
future? 

>
> but the fix-up is trivial, so no need to resend.

Thanks.

-- 
Sergey.

next prev parent reply	other threads:[~2014-09-29 20:17 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-18 19:03 [PATCH] Documentation/git-rebase.txt: discuss --fork-point assumption of vanilla "git rebase" in DESCRIPTION Sergey Organov
2014-09-18 19:03 ` [PATCH v2] " Sergey Organov
2014-09-29 16:26   ` Junio C Hamano
2014-09-29 20:17     ` Sergey Organov [this message]
2014-09-22 19:35 ` [PATCH] " Junio C Hamano
2014-09-23  9:04   ` Sergey Organov
2014-09-26 22:46     ` Junio C Hamano
2014-09-29 10:05       ` Sergey Organov

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=8738ba5ggj.fsf@osv.gnss.ru \
    --to=sorganov@gmail$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=gitster@pobox$(echo .)com \
    /path/to/YOUR_REPLY

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox