![[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) | ||
| commit | 2ba3d5d9bd47c42400049e81d0e1e94948112277 | |
| tree | e02b4bf9c6fd25cdc8d46bc07234cc8451d188b8 | tree | snapshot |
| parent | 01409bbf75198289591ba9dfe2c8d2370b36a058 | commit | diff |
| parent | 5521883490e85f4d973141972cf16f89a79f1979 | commit | diff |
Merge branch 'jc/maint-checkout-keep-remove' into maint
* jc/maint-checkout-keep-remove:
checkout: do not lose staged removal
* jc/maint-checkout-keep-remove:
checkout: do not lose staged removal
| builtin-checkout.c | diff1 | | diff2 | | blob | history |
| builtin-read-tree.c | diff1 | | diff2 | | blob | history |