diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-03-15 02:01:41 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-03-15 02:01:41 +0300 |
commit | 8775279891fd186ce847b7ddb7f0ac2339504300 (patch) | |
tree | 521a06bf41d0afc9881553ddaf8ba8e56a7d1254 /Documentation | |
parent | 074d162eff7487c9e296124510147d3856029f5a (diff) | |
parent | 53204061acbf7a03a6ba050f381e0bf9b01e3a78 (diff) |
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
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/config/mergetool.txt | 2 | ||||
-rw-r--r-- | Documentation/git-mergetool.txt | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/config/mergetool.txt b/Documentation/config/mergetool.txt index 90f76f5b9b..cafbbef46a 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 6b14702e78..e587c7763a 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. |