Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
grep.c: remove implicit dependency on the_index
[gitweb.git]
/
builtin
/
am.c
diff --git
a/builtin/am.c
b/builtin/am.c
index 9f7ecf6ecb7711c35277fa827c4c2afc0dfba867..5e866d17c7c7b46ccf671916c853be228bf38ad6 100644
(file)
--- a/
builtin/am.c
+++ b/
builtin/am.c
@@
-1598,6
+1598,7
@@
static int fall_back_threeway(const struct am_state *state, const char *index_pa
o.branch1 = "HEAD";
their_tree_name = xstrfmt("%.*s", linelen(state->msg), state->msg);
o.branch2 = their_tree_name;
+ o.detect_directory_renames = 0;
if (state->quiet)
o.verbosity = 0;