On Fri, Dec 25, 2009 at 12:30:34PM +0100, Thomas Rast wrote: > > I can try hacking some internal option into the merge helpers, by > which they declare to be (in)compatible with rebasing. I think this > what Dscho or Sverre mentioned in the corresponding thread, but I > forgot about it when I noticed you had already promoted the above to > 'next'. If you do that, maybe do all relevant flags (such as "no fast forwards" and "no trivial merging") at the same time. That would allow external strategies to use those flags. -Ilari -- 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