author | Junio C Hamano <gitster@pobox.com> | |
Tue, 16 Sep 2008 07:49:59 +0000 (00:49 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 16 Sep 2008 07:49:59 +0000 (00:49 -0700) | ||
commit | 578421fbd8db6602f290862f44843fc896b4fb0b | |
tree | 9d83cfd1e69665eca96d2fd3b69845efdea5dca3 | tree | snapshot |
parent | 8e909f80b41d1a14adede05b4a31f2f2caa56e55 | commit | diff |
parent | 5521883490e85f4d973141972cf16f89a79f1979 | commit | diff |
Merge branch 'jc/maint-checkout-keep-remove'
* 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 |