![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 19 Sep 2008 02:53:22 +0000 (19:53 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 19 Sep 2008 02:53:22 +0000 (19:53 -0700) |
* jc/maint-checkout-keep-remove:
checkout: do not lose staged removal
checkout: do not lose staged removal
| 1 | 2 | |||
|---|---|---|---|---|
| builtin-checkout.c | patch | | diff1 | | diff2 | | blob | history |
| builtin-read-tree.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc builtin-checkout.c
Simple merge
diff --cc builtin-read-tree.c
Simple merge