diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-09-16 00:49:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-16 00:49:59 -0700 |
| commit | 578421fbd8db6602f290862f44843fc896b4fb0b (patch) | |
| tree | 9d83cfd1e69665eca96d2fd3b69845efdea5dca3 /builtin-read-tree.c | |
| parent | Merge branch 'jc/maint-diff-quiet' (diff) | |
| parent | checkout: do not lose staged removal (diff) | |
| download | tgif-578421fbd8db6602f290862f44843fc896b4fb0b.tar.xz | |
Merge branch 'jc/maint-checkout-keep-remove'
* 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 dddc3044b8..362216b272 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: |