Merge branch 'jc/maint-checkout-keep-remove' into maint

* jc/maint-checkout-keep-remove: checkout: do not lose staged removal
2008-09-18 19:53:22 -07:00
parent 01409bbf75 5521883490
commit 2ba3d5d9bd
5 changed files with 24 additions and 2 deletions
--- a/builtin-read-tree.c
+++ b/builtin-read-tree.c
@ -206,6 +206,7 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
 			break;
 		case 2:
 			opts.fn = twoway_merge;
+			opts.initial_checkout = !active_nr;
 			break;
 		case 3:
 		default: