Re: [PATCH v1] rebase -p: Command line option --no-ff is ignored

On 14-07-16 12:01 PM, Fabian Ruch wrote: > Hi Marc, > > I forgot to cc your mailbox when I posted this patch last week. Do you > still remember whether there was a particular reason why > pick_one_preserving_merges wasn't touched by the commit b499549 ("Teach > rebase the --no-ff option."), by any

Re: [PATCH v1] rebase -p: Command line option --no-ff is ignored

Hi Marc, I forgot to cc your mailbox when I posted this patch last week. Do you still remember whether there was a particular reason why pick_one_preserving_merges wasn't touched by the commit b499549 ("Teach rebase the --no-ff option."), by any chance? Kind regards, Fabian Fabian Ruch writes

[PATCH v1] rebase -p: Command line option --no-ff is ignored

The --no-ff option instructs git-rebase to always recreate commits as they are being replayed, even if fast-forwards are possible. However, if git-rebase is asked to recreate merge commits (via the -p option), it suddenly ignores the --no-ff option and fast-forwards both normal and merge commits w