diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-16 11:49:59 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-16 11:49:59 +0400 |
| commit | 578421fbd8db6602f290862f44843fc896b4fb0b (patch) | |
| tree | 9d83cfd1e69665eca96d2fd3b69845efdea5dca3 /builtin-checkout.c | |
| parent | 8e909f80b41d1a14adede05b4a31f2f2caa56e55 (diff) | |
| parent | 5521883490e85f4d973141972cf16f89a79f1979 (diff) | |
Merge branch 'jc/maint-checkout-keep-remove'
* jc/maint-checkout-keep-remove:
checkout: do not lose staged removal
Diffstat (limited to 'builtin-checkout.c')
| -rw-r--r-- | builtin-checkout.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin-checkout.c b/builtin-checkout.c index d986ac7abb..9377a1c71e 100644 --- a/builtin-checkout.c +++ b/builtin-checkout.c @@ -269,6 +269,8 @@ static int merge_working_tree(struct checkout_opts *opts, } /* 2-way merge to the new branch */ + topts.initial_checkout = (!active_nr && + (old->commit == new->commit)); topts.update = 1; topts.merge = 1; topts.gently = opts->merge; |