Re: octopus merge --no-ff claims to fast-forward even though it doesn't

2017-01-27 Thread Junio C Hamano
Samuel Lijin writes: > I was doing an octopus merge earlier and noticed that it claims to > fast-forward when you specify --no-ff, even though it does actually > abide by --no-ff. This was intentional and hasn't changed since it was first designed; the octopus was to be used only for the simple

octopus merge --no-ff claims to fast-forward even though it doesn't

2017-01-27 Thread Samuel Lijin
I was doing an octopus merge earlier and noticed that it claims to fast-forward when you specify --no-ff, even though it does actually abide by --no-ff. I can consistently reproduce as follows: $ git clone https://github.com/sxlijin/merge-octopus-experiment $ cd merge-octopus-experiment $ git mer