summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-03-14 23:01:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-03-14 23:01:41 (GMT)
commit8775279891fd186ce847b7ddb7f0ac2339504300 (patch)
tree521a06bf41d0afc9881553ddaf8ba8e56a7d1254
parent074d162eff7487c9e296124510147d3856029f5a (diff)
parent53204061acbf7a03a6ba050f381e0bf9b01e3a78 (diff)
downloadgit-8775279891fd186ce847b7ddb7f0ac2339504300.zip
git-8775279891fd186ce847b7ddb7f0ac2339504300.tar.gz
git-8775279891fd186ce847b7ddb7f0ac2339504300.tar.bz2
Merge branch 'jn/mergetool-hideresolved-is-optional'
Disable the recent mergetool's hideresolved feature by default for backward compatibility and safety. * jn/mergetool-hideresolved-is-optional: doc: describe mergetool configuration in git-mergetool(1) mergetool: do not enable hideResolved by default
-rw-r--r--Documentation/config/mergetool.txt2
-rw-r--r--Documentation/git-mergetool.txt4
-rwxr-xr-xgit-mergetool.sh9
3 files changed, 7 insertions, 8 deletions
diff --git a/Documentation/config/mergetool.txt b/Documentation/config/mergetool.txt
index 90f76f5..cafbbef 100644
--- a/Documentation/config/mergetool.txt
+++ b/Documentation/config/mergetool.txt
@@ -53,7 +53,7 @@ mergetool.hideResolved::
resolution. This flag causes 'LOCAL' and 'REMOTE' to be overwriten so
that only the unresolved conflicts are presented to the merge tool. Can
be configured per-tool via the `mergetool.<tool>.hideResolved`
- configuration variable. Defaults to `true`.
+ configuration variable. Defaults to `false`.
mergetool.keepBackup::
After performing a merge, the original file with conflict markers
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
index 6b14702..e587c77 100644
--- a/Documentation/git-mergetool.txt
+++ b/Documentation/git-mergetool.txt
@@ -99,6 +99,10 @@ success of the resolution after the custom tool has exited.
(see linkgit:git-config[1]). To cancel `diff.orderFile`,
use `-O/dev/null`.
+CONFIGURATION
+-------------
+include::config/mergetool.txt[]
+
TEMPORARY FILES
---------------
`git mergetool` creates `*.orig` backup files while resolving merges.
diff --git a/git-mergetool.sh b/git-mergetool.sh
index 911470a..f751d9c 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -358,13 +358,8 @@ merge_file () {
enabled=false
fi
else
- # The user does not have a preference. Ask the tool.
- if hide_resolved_enabled
- then
- enabled=true
- else
- enabled=false
- fi
+ # The user does not have a preference. Default to disabled.
+ enabled=false
fi
if test "$enabled" = true