From 4cacc621f80bbd878a320a664dff1440a9358785 Mon Sep 17 00:00:00 2001 From: Sebastian Schuberth Date: Fri, 22 Jan 2010 17:36:36 +0100 Subject: [PATCH] Make difftool.prompt fall back to mergetool.prompt The documentation states that "git-difftool falls back to git-mergetool config variables when the difftool equivalents have not been defined". Until now, this was not the case for "difftool.prompt". Signed-off-by: Sebastian Schuberth Acked-by: David Aguilar Signed-off-by: Junio C Hamano --- git-difftool--helper.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh index e43b5d64de..524f5ea8ab 100755 --- a/git-difftool--helper.sh +++ b/git-difftool--helper.sh @@ -11,7 +11,8 @@ TOOL_MODE=diff # difftool.prompt controls the default prompt/no-prompt behavior # and is overridden with $GIT_DIFFTOOL*_PROMPT. should_prompt () { - prompt=$(git config --bool difftool.prompt || echo true) + prompt_merge=$(git config --bool mergetool.prompt || echo true) + prompt=$(git config --bool difftool.prompt || echo $prompt_merge) if test "$prompt" = true; then test -z "$GIT_DIFFTOOL_NO_PROMPT" else -- 2.11.4.GIT