![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 18 Oct 2011 04:37:09 +0000 (21:37 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 18 Oct 2011 04:37:09 +0000 (21:37 -0700) | ||
| commit | 66d2c22f416cda652f08e8db5820abf3e87592e5 | |
| tree | ad4e5e2e38eec22aa6cb769e5d2d1dd896b19629 | tree | snapshot |
| parent | a9af6c451d68267a605b7b7385cdffa939b167b2 | commit | diff |
| parent | 0a1283bc3955a97557019d077b96669c5c93c551 | commit | diff |
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
* 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 |