"Sverre Hvammen Johansen" <hvammen@xxxxxxxxx> writes: > I intend to also submit a patch that does fast forward in combination > with a real merge. Please make the next round an in-line patch. Attachments cannot be commented on, and an RFC patch is all about getting comments, not about being included. Whitespace breakages do not matter as much as the final submissions; readability and commentability matters more. Instead of adding many new sub-strategies at once, I think it would make it easier to review to split the patch into (1) code movement without adding any functionality changes to make your further changes easier, if such a change is needed in your work (I did not really look at the attachment carefully), (2) add logic to find out the set of independent parents to remove redundant parents (perhaps using show-branch --independent? I dunno) and conditionally use it, (3) add infrastructure to allow adding different --ff=<what-to-do>, and then finally (4) a separate patch for each of <what-to-do>. I suspect (2) is controversial if made unconditional. Some people do not even like the fast-forward "merges" we have traditionally done. - 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
