"Sverre Hvammen Johansen" <hvammen@xxxxxxxxx> writes: > See the documentation for an explanation of this feature. That's good that the feature is documented. But I'd like to see 1.) why this feature is implemented, and perhaps also 2.) how this feature is implemented (for example: uses find_real_parents() function. > +If more than one commit are specified for the merge, git will try to > +reduce the number of commits (real parents) by eliminating commits > +than can be reached from other commits. The commit message will > +reflect the actual commits specified but the merge strategy will be > +selected based on the real parents, but always including `HEAD`. The > +real parents (only including `HEAD` if it is real) are the parents > +recorded in the merge commit object. By "real" you mean "reduced" set of commits to merge? This is not clear enough, IMHO. You would have to defend that recording reduced set of parents is a good idea (is it always done, or does --ff=never has side-effect of recording _specified_ parents for a merge?). -- Jakub Narebski Poland ShadeHawk on #git -- 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
