From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 2 Jun 2008 05:55:33 +0000 (-0700)
Subject: Merge branch 'jc/checkout'
X-Git-Tag: v1.5.6-rc1~12
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8f1b0637c15bdd67170db423c86f06ee5db273b7;p=git.git

Merge branch 'jc/checkout'

* 'jc/checkout':
  checkout: "best effort" checkout
  unpack_trees(): allow callers to differentiate worktree errors from merge errors
  checkout: consolidate reset_{to_new,clean_to_new}()
  checkout: make reset_clean_to_new() not die by itself
---

8f1b0637c15bdd67170db423c86f06ee5db273b7