From: Junio C Hamano <gitster@pobox.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: Mihail Atanassov <m.atanassov92@gmail.com>, git@vger.kernel.org
Subject: Re: [PATCH v2] Documentation/git-bisect.txt: add --no-ff to merge command
Date: Tue, 29 Oct 2019 11:28:59 +0900 [thread overview]
Message-ID: <xmqqmudk709g.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20191028235426.GF12487@google.com> (Jonathan Nieder's message of "Mon, 28 Oct 2019 16:54:26 -0700")
Jonathan Nieder <jrnieder@gmail.com> writes:
> Mihail Atanassov wrote:
>
>> The hotfix application example uses `git merge --no-commit` to apply
>> temporary changes to the working tree during a bisect operation. In some
>> situations this can be a fast-forward and `merge` will apply the hotfix
>> branch's commits regardless of `--no-commit` (as documented in the `git
>> merge` manual).
>>
>> In the pathological case this will make a `git bisect run` invocation
>> loop indefinitely between the first bisect step and the fast-forwarded
>> post-merge HEAD.
>>
>> Add `--no-ff` to the merge command to avoid this issue.
>
> Makes sense.
>
>> Changes since v1:
>> - removed comment change
>
> This kind of note, that doesn't need to be recorded in the Git commit
> history, should go after the "---" marker. See [1]:
Thanks for mentoring. No need to resend as I can edit it out while
queuing.
Thanks both.
>
> You often want to add additional explanation about the patch, other
> than the commit message itself. Place such "cover letter" material
> between the three-dash line and the diffstat. For patches requiring
> multiple iterations of review and discussion, an explanation of
> changes between each iteration can be kept in Git-notes and inserted
> automatically following the three-dash line via `git format-patch
> --notes`.
>
>> Signed-off-by: Mihail Atanassov <m.atanassov92@gmail.com>
>> ---
>> Documentation/git-bisect.txt | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Except for that one nit,
> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
>
> Thanks.
>
> [1] https://www.kernel.org/pub/software/scm/git/docs/SubmittingPatches.html#send-patches
prev parent reply other threads:[~2019-10-29 2:29 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-28 22:01 [PATCH v2] Documentation/git-bisect.txt: add --no-ff to merge command Mihail Atanassov
2019-10-28 23:54 ` Jonathan Nieder
2019-10-29 2:28 ` 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=xmqqmudk709g.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=m.atanassov92@gmail.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).