diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-19 06:53:22 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-19 06:53:22 +0400 |
| commit | 2ba3d5d9bd47c42400049e81d0e1e94948112277 (patch) | |
| tree | e02b4bf9c6fd25cdc8d46bc07234cc8451d188b8 /builtin-read-tree.c | |
| parent | 01409bbf75198289591ba9dfe2c8d2370b36a058 (diff) | |
| parent | 5521883490e85f4d973141972cf16f89a79f1979 (diff) | |
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.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin-read-tree.c b/builtin-read-tree.c index ac219ac2db..0706c95818 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: |