"Sverre Hvammen Johansen" <hvammen@xxxxxxxxx> writes: > The more I think about this is that --ff-only should really be > specified as a merge strategy (single) and not as an special case of > --ff. All merge strategies can then take any number of commits, but > will only succeed if the commits can be reduced down to two or fewer > for resolve/recursive and one for single. Interesting. At one end of the spectrum, we have these crazy people who want git to record something that is not a merge at all as a merge with --no-ff. At the other end of the spectrum, we have these other crazy people who want git to outsmart them by allowing them to throw random set of commits as potential parents, remove duplicates and figure out how many real parents the resulting merge should have (including the case that it may not even have any). I'll have to think about it, but it sounds like a promising idea. - 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
