On Thu, May 12, 2011 at 13:09, Jeff King <peff@xxxxxxxx> wrote: > The merge-recursive strategy already handles root commits; > it cherry-picks the difference between the empty tree and > the root commit's tree. > > However, for external strategies, we dereference NULL and > segfault while building the argument list. Instead, let's > handle this by passing the empty tree sha1 to the merge > script. > > Signed-off-by: Jeff King <peff@xxxxxxxx> Works perfectly for me, thanks a lot for coming up with a patch incredibly fast! -- Sebastian Schuberth -- 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