From: Junio C Hamano Date: Tue, 16 Sep 2008 07:49:59 +0000 (-0700) Subject: Merge branch 'jc/maint-checkout-keep-remove' X-Git-Tag: v1.6.1-rc1~237 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=578421fbd8db6602f290862f44843fc896b4fb0b;p=git.git Merge branch 'jc/maint-checkout-keep-remove' * jc/maint-checkout-keep-remove: checkout: do not lose staged removal --- 578421fbd8db6602f290862f44843fc896b4fb0b