From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 21 Oct 2011 17:49:24 +0000 (-0700)
Subject: Merge branch 'jc/checkout-from-tree-keep-local-changes' into maint
X-Git-Tag: v1.7.7.1~10
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=df6840855d24c2f54c0b8a66cbac33d8af43333a;p=git.git

Merge branch 'jc/checkout-from-tree-keep-local-changes' into maint

* jc/checkout-from-tree-keep-local-changes:
  checkout $tree $path: do not clobber local changes in $path not in $tree
---

df6840855d24c2f54c0b8a66cbac33d8af43333a