Hi, This attempt fixes the various issues raised, except for the case of octopus ending in 1 or more fast forwards. I'm not sure what the best way to fix this is. I see three obvious options, none of which seem optimal: 1. git-merge-octopus will take a --ff-only flag as well, adding a branch for that 2. ff-only could be a merge strategy, and octopus is forbidden in --ff-only, while this new strategy will behave just like octopus when the merge can be fast forward only. 3. the logic from git-merge-octopus could be duplicated into builtin-merge, to handle only the fast forward case. Please advise. Regards, Yuval -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
