From: Junio C Hamano <gitster@pobox.com>
To: "Martin Ågren" <martin.agren@gmail.com>
Cc: Elijah Newren <newren@gmail.com>,
Git Mailing List <git@vger.kernel.org>,
Sergey Organov <sorganov@gmail.com>
Subject: Re: [PATCH v2] merge-options.txt: clarify meaning of various ff-related options
Date: Fri, 30 Aug 2019 12:45:51 -0700 [thread overview]
Message-ID: <xmqqef12xwr4.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <CAN0heSoqy4sCY8NUWKuEkXwe2XxnYAN6Mn2N75hYwfQ_5WGYdQ@mail.gmail.com> ("Martin Ågren"'s message of "Wed, 28 Aug 2019 20:45:27 +0200")
Martin Ågren <martin.agren@gmail.com> writes:
>> +--ff::
>> + Whether to only allow resolving the merge as a fast forward
>> + (only updating the branch pointer to match the merged branch
>> + and not creating a merge commit), to never allow it (always
>> + creating a merge commit), or to prefer it when possible. The
>> + default is --ff, except when merging an annotated (and
>
> It would be great if you'd write this as `--ff` so that it got
> monospaced in the rendered documentation. ...
> I'd also write `refs/tags/`, but I realize that you're just inheriting
> what is already here. ...
These comments may sound nitpicky at times, and some parts may be
beyond the scope of the discussion on the patch and are better left
for a later time, but the consistency is valuable.
Thanks for mentioning them; and it would be appreciated if these
suggesions are followed through after the dust settles.
next prev parent reply other threads:[~2019-08-30 19:45 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-28 0:13 [PATCH] merge-options.txt: clarify meaning of various ff-related options Elijah Newren
2019-08-28 9:05 ` Sergey Organov
2019-08-28 15:51 ` [PATCH v2] " Elijah Newren
2019-08-28 18:45 ` Martin Ågren
2019-08-28 19:15 ` Sergey Organov
2019-08-28 19:53 ` Martin Ågren
2019-08-29 9:35 ` Sergey Organov
2019-08-28 22:51 ` Elijah Newren
2019-08-29 9:15 ` Sergey Organov
2019-08-28 22:57 ` [PATCH v3] " Elijah Newren
2019-08-30 19:57 ` Junio C Hamano
2019-08-30 20:16 ` Eric Sunshine
2019-08-31 0:23 ` [PATCH v4] " Elijah Newren
2019-08-30 19:45 ` Junio C Hamano [this message]
2019-08-30 19:48 ` [PATCH v2] " Elijah Newren
2019-08-30 20:27 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqef12xwr4.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=martin.agren@gmail.com \
--cc=newren@gmail.com \
--cc=sorganov@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).