![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 21 Oct 2011 17:49:24 +0000 (10:49 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 21 Oct 2011 17:49:24 +0000 (10:49 -0700) | ||
| commit | df6840855d24c2f54c0b8a66cbac33d8af43333a | |
| tree | 355715d1b644e9fd88307485c424dfadcdae7e81 | tree | snapshot |
| parent | 634b29d2705af2e05d593b75ade2be64033468a5 | commit | diff |
| parent | 0a1283bc3955a97557019d077b96669c5c93c551 | commit | diff |
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
* jc/checkout-from-tree-keep-local-changes:
checkout $tree $path: do not clobber local changes in $path not in $tree
| builtin/checkout.c | diff1 | | diff2 | | blob | history |