From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 31 Aug 2008 02:44:17 +0000 (-0700)
Subject: Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-resolution'
X-Git-Tag: v1.6.1-rc1~195^2~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=29a1f99b4b81cd28163de1275265234c5ab804b4;p=git.git

Merge branch 'jc/maint-checkout-fix' into 'jc/better-conflict-resolution'

* jc/maint-checkout-fix:
  checkout --ours/--theirs: allow checking out one side of a conflicting merge
  checkout -f: allow ignoring unmerged paths when checking out of the index
  checkout: do not check out unmerged higher stages randomly
---

29a1f99b4b81cd28163de1275265234c5ab804b4