[PATCHv3 0/2] pull into unborn branch safety tree
- From
Jeff King <peff@peff.net>
- Date
- Jun 20, 2013, 22:35 UTC
- Message-ID
- <20130620223550.GA21667@sigill.intra.peff.net>
- In-Reply-To
- <20130620220328.GA3992@sigill.intra.peff.net>
On Thu, Jun 20, 2013 at 06:03:28PM -0400, Jeff King wrote:
> OK. I'll prepare a series with both patches. Stand by...
Here it is:
[1/2]: pull: update unborn branch tip after index [2/2]: pull: merge into unborn by fast-forwarding from empty tree
The first one is mine. The second is Thomas's v2, rebased on top of mine. I also added a note to the commit message explaining the resulting index state and lack of conflicts.
-Peff