diff options
Diffstat (limited to 'man1/git-mergetool.1')
| -rw-r--r-- | man1/git-mergetool.1 | 37 |
1 files changed, 32 insertions, 5 deletions
diff --git a/man1/git-mergetool.1 b/man1/git-mergetool.1 index 608dffa18..af7bd910f 100644 --- a/man1/git-mergetool.1 +++ b/man1/git-mergetool.1 @@ -2,12 +2,12 @@ .\" Title: git-mergetool .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 04/11/2023 +.\" Date: 04/17/2023 .\" Manual: Git Manual -.\" Source: Git 2.40.0.335.g9857273be0 +.\" Source: Git 2.40.0.352.g667fcf4e15 .\" Language: English .\" -.TH "GIT\-MERGETOOL" "1" "04/11/2023" "Git 2\&.40\&.0\&.335\&.g985727" "Git Manual" +.TH "GIT\-MERGETOOL" "1" "04/17/2023" "Git 2\&.40\&.0\&.352\&.g667fcf" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -128,7 +128,8 @@ variable instead of \fBmerge\&.tool\fR\&. If \fBmerge\&.guitool\fR is not set, we will fallback to the tool configured under -\fBmerge\&.tool\fR\&. +\fBmerge\&.tool\fR\&. This may be autoselected using the configuration variable +\fBmergetool\&.guiDefault\fR\&. .RE .PP \-\-no\-gui @@ -137,7 +138,9 @@ This overrides a previous \fB\-g\fR or \fB\-\-gui\fR -setting and reads the default merge tool will be read from the configured +setting or +\fBmergetool\&.guiDefault\fR +configuration and reads the default merge tool from the configured \fBmerge\&.tool\fR variable\&. .RE @@ -292,6 +295,30 @@ mergetool\&.prompt .RS 4 Prompt before each invocation of the merge resolution program\&. .RE +.PP +mergetool\&.guiDefault +.RS 4 +Set +\fBtrue\fR +to use the +\fBmerge\&.guitool\fR +by default (equivalent to specifying the +\fB\-\-gui\fR +argument), or +\fBauto\fR +to select +\fBmerge\&.guitool\fR +or +\fBmerge\&.tool\fR +depending on the presence of a +\fBDISPLAY\fR +environment variable value\&. The default is +\fBfalse\fR, where the +\fB\-\-gui\fR +argument must be provided explicitly for the +\fBmerge\&.guitool\fR +to be used\&. +.RE .SH "TEMPORARY FILES" .sp \fBgit mergetool\fR creates \fB*\&.orig\fR backup files while resolving merges\&. These are safe to remove once a file has been merged and its \fBgit mergetool\fR session has completed\&. |