Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
git-rebase: Update --whitespace documentation
[gitweb.git]
/
builtin-read-tree.c
diff --git
a/builtin-read-tree.c
b/builtin-read-tree.c
index 0706c958181c54aeb18d91f6e3dbe7c9f572b94d..38fef34d3fb6c24ab89043951f1ecf6c96e9bf51 100644
(file)
--- a/
builtin-read-tree.c
+++ b/
builtin-read-tree.c
@@
-206,7
+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
;
+ opts.initial_checkout =
is_cache_unborn()
;
break;
case 3:
default: