Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
revision walker: include a detached HEAD in --all
[gitweb.git]
/
builtin-read-tree.c
diff --git
a/builtin-read-tree.c
b/builtin-read-tree.c
index ac219ac2db3eafe8fc3363692e92fa7e1765138a..38fef34d3fb6c24ab89043951f1ecf6c96e9bf51 100644
(file)
--- 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 = is_cache_unborn();
break;
case 3:
default: