From af9c8fa6a25a491cd32843a7948e9c24f299a511 Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Fri, 9 May 2014 21:04:19 -0500 Subject: [PATCH] commit: support for multiple MERGE_MODE Signed-off-by: Felipe Contreras --- builtin/commit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/commit.c b/builtin/commit.c index b3bd2d4181..2d50756b7a 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1703,7 +1703,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix) if (!stat(git_path_merge_mode(), &statbuf)) { if (strbuf_read_file(&sb, git_path_merge_mode(), 0) < 0) die_errno(_("could not read MERGE_MODE")); - if (!strcmp(sb.buf, "no-ff")) + if (strstr(sb.buf, "no-ff")) allow_fast_forward = 0; } if (allow_fast_forward) -- 2.32.0.93.g670b81a890