mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-02 00:06:11 +02:00
Code

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
This commit is contained in:
Junio C Hamano 2021-03-14 16:01:41 -07:00
parent 074d162eff 53204061ac
commit 8775279891
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/config/mergetool.txt
View File

@ -53,7 +53,7 @@ mergetool.hideResolved::
resolution. This flag causes 'LOCAL' and 'REMOTE' to be overwriten so resolution. This flag causes 'LOCAL' and 'REMOTE' to be overwriten so
that only the unresolved conflicts are presented to the merge tool. Can that only the unresolved conflicts are presented to the merge tool. Can
be configured per-tool via the `mergetool.<tool>.hideResolved` be configured per-tool via the `mergetool.<tool>.hideResolved`
configuration variable. Defaults to `true`. configuration variable. Defaults to `false`.
mergetool.keepBackup:: mergetool.keepBackup::
After performing a merge, the original file with conflict markers After performing a merge, the original file with conflict markers

4
Documentation/git-mergetool.txt
View File

@ -99,6 +99,10 @@ success of the resolution after the custom tool has exited.
(see linkgit:git-config[1]). To cancel `diff.orderFile`, (see linkgit:git-config[1]). To cancel `diff.orderFile`,
use `-O/dev/null`. use `-O/dev/null`.
CONFIGURATION
-------------
include::config/mergetool.txt[]
TEMPORARY FILES TEMPORARY FILES
--------------- ---------------
`git mergetool` creates `*.orig` backup files while resolving merges. `git mergetool` creates `*.orig` backup files while resolving merges.

9
git-mergetool.sh
View File

@ -358,13 +358,8 @@ merge_file () {
enabled=false enabled=false
fi fi
else else
# The user does not have a preference. Ask the tool. # The user does not have a preference. Default to disabled.
if hide_resolved_enabled enabled=false
then
enabled=true
else
enabled=false
fi
fi fi
if test "$enabled" = true if test "$enabled" = true