Re: [PATCH v2] merge-options.txt: clarify meaning of various ff-related options
- From
Elijah Newren <newren@gmail.com>
- Date
- Aug 30, 2019, 19:48 UTC
- Message-ID
- <CABPp-BGsPEikU=KZgZgMbSLFn7Cf+fy0L==w8m4Wk95BnpHj+Q@mail.gmail.com>
- In-Reply-To
- <xmqqef12xwr4.fsf@gitster-ct.c.googlers.com>
On Fri, Aug 30, 2019 at 12:45 PM Junio C Hamano <gitster@pobox.com> wrote:
Show 21 quoted lines
> > 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.
I'm confused; these suggestions were incorporated into V3 already. Am I misunderstanding something here?
(But yes, I agree that Martin's reviews are valuable.)