Elijah Newren <newren@xxxxxxxxx> writes: > On Fri, Aug 30, 2019 at 12:45 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: >> >> Martin Ågren <martin.agren@xxxxxxxxx> 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? I was assuming that outside the context of the patch there also are the same malformatted reference to refs/blah and --option "you're just inheriting", which would be cleaned up outside of this topic after the dust settles, if the suggestions are followed through.
