diff options
| -rw-r--r-- | builtin/merge.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 7158e8e2d..99f1429b3 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1253,6 +1253,12 @@ int cmd_merge(int argc, const char **argv, const char *prefix) sha1_to_hex(commit->object.sha1)); setenv(buf.buf, argv[i], 1); strbuf_reset(&buf); + if (merge_remote_util(commit) && + merge_remote_util(commit)->obj && + merge_remote_util(commit)->obj->type == OBJ_TAG) { + option_edit = 1; + allow_fast_forward = 0; + } } if (!use_strategies) { |