From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 18 Oct 2011 04:37:09 +0000 (-0700)
Subject: Merge branch 'jc/checkout-from-tree-keep-local-changes'
X-Git-Tag: v1.7.8-rc0~63
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=66d2c22f416cda652f08e8db5820abf3e87592e5;p=git.git

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

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

66d2c22f416cda652f08e8db5820abf3e87592e5