![[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) |
* jc/checkout-from-tree-keep-local-changes:
checkout $tree $path: do not clobber local changes in $path not in $tree
checkout $tree $path: do not clobber local changes in $path not in $tree
| 1 | 2 | |||
|---|---|---|---|---|
| builtin/checkout.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc builtin/checkout.c
Simple merge