[PATCH 2/2] doc: describe mergetool configuration in git-mergetool(1)
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Mar 13, 2021, 08:41 UTC
- Message-ID
- <YEx6ve6AbqacVTQH@google.com>
- In-Reply-To
- <YEx5hM/HWby3FBJv@google.com>
In particular, this describes mergetool.hideResolved, which can help users discover this setting (either because it may be useful to them or in order to understand mergetool's behavior if they have forgotten setting it in the past).
Tested by running
make -C Documentation git-mergetool.1 man Documentation/git-mergetool.1
and reading through the page.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> --- Documentation/git-mergetool.txt | 4 ++++ 1 file changed, 4 insertions(+)
Thanks for reading.
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt index 6b14702e784..e587c7763a7 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.
-- 2.31.0.rc2.261.g7f71774620