Thomas Rast <trast@xxxxxxxxxxxxxxx> writes:
> I still think that the _right_ solution is first redoing the merge on
> its original parents and then seeing how the actual merge differs from
> that.
I think that is what was suggested in
http://article.gmane.org/gmane.comp.version-control.git/198316
> Perhaps a new option to git-rebase could trigger the above behavior for
> merges, who knows. (It could be called --first-parent.)
Yeah, I think that is what the old thread concluded to be the way to
move forward:
http://thread.gmane.org/gmane.comp.version-control.git/198125
I'll throw it in to the "leftover bits".
http://git-blame.blogspot.com/2013/02/more-leftover-bits.html
--
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