Re: Unexpected or wrong ff, no-ff and ff-only behaviour

> On 09 July 2019 at 22:51 Bryan Turner wrote: > > On Tue, Jul 9, 2019 at 1:33 PM Elijah Newren wrote: > > > > On Tue, Jul 9, 2019 at 10:00 AM wrote: > > > > > > Additionally I would also want to change the wording for --ff-only, as it > > > currently reads as if it only performs a check (whic

Re: Unexpected or wrong ff, no-ff and ff-only behaviour

> On 09 July 2019 at 18:35 Elijah Newren wrote: > > > Hi Roland, > > On Tue, Jul 9, 2019 at 9:17 AM Roland Jäger wrote: > > > > Thanks for answering Junio. > > > > I get what git does. But I believe that either the documentation ist > > wrong/ambiguous or --no-ff and --ff-only should be able

Unexpected or wrong ff, no-ff and ff-only behaviour

Hello, I'm rather confused about --ff, --no-ff and --ff-only. They seam to be all mutual exclusive while the man page documentation and help reads as if only the first two are mutual exclusive, while the later is a check that can be enabled additionally to the former ones. I'm not sure why I co