aboutsummaryrefslogtreecommitdiff
path: root/builtin-read-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-09-18 19:53:22 -0700
committerJunio C Hamano <gitster@pobox.com>2008-09-18 19:53:22 -0700
commit2ba3d5d9bd47c42400049e81d0e1e94948112277 (patch)
treee02b4bf9c6fd25cdc8d46bc07234cc8451d188b8 /builtin-read-tree.c
parent01409bbf75198289591ba9dfe2c8d2370b36a058 (diff)
parent5521883490e85f4d973141972cf16f89a79f1979 (diff)
downloadgit-2ba3d5d9bd47c42400049e81d0e1e94948112277.tar.gz
git-2ba3d5d9bd47c42400049e81d0e1e94948112277.tar.xz
Merge branch 'jc/maint-checkout-keep-remove' into maint
* jc/maint-checkout-keep-remove: checkout: do not lose staged removal
Diffstat (limited to 'builtin-read-tree.c')
-rw-r--r--builtin-read-tree.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin-read-tree.c b/builtin-read-tree.c
index ac219ac2d..0706c9581 100644
--- 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: