On Mon, Aug 17, 2015 at 2:48 AM, Paul Tan <pyokagan@xxxxxxxxx> wrote:
>
> It's true that we need to merge the ORIG_HEAD tree into the index
> instead of overwriting it. Patch below.
Seems to work for me. Thanks,
Linus
--
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