diff options
Diffstat (limited to 'man1/git-mergetool.1')
| -rw-r--r-- | man1/git-mergetool.1 | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/man1/git-mergetool.1 b/man1/git-mergetool.1 index 80a248a6d..14570040f 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: 2024-02-26 +.\" Date: 2024-02-27 .\" Manual: Git Manual -.\" Source: Git 2.44.0.35.ga2082dbdd3 +.\" Source: Git 2.44.0.53.g0f9d4d28b7 .\" Language: English .\" -.TH "GIT\-MERGETOOL" "1" "2024\-02\-26" "Git 2\&.44\&.0\&.35\&.ga2082db" "Git Manual" +.TH "GIT\-MERGETOOL" "1" "2024\-02\-27" "Git 2\&.44\&.0\&.53\&.g0f9d4d2" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -239,9 +239,27 @@ avoids using altogether, and is the default value\&. .RE .PP -mergetool\&.vimdiff\&.layout -.RS 4 -The vimdiff backend uses this variable to control how its split windows appear\&. Applies even if you are using Neovim (\fBnvim\fR) or gVim (\fBgvim\fR) as the merge tool\&. See BACKEND SPECIFIC HINTS section for details\&. +mergetool\&.<vimdiff variant>\&.layout +.RS 4 +Configure the split window layout for vimdiff\(cqs +\fB<variant>\fR, which is any of +\fBvimdiff\fR, +\fBnvimdiff\fR, +\fBgvimdiff\fR\&. Upon launching +\fBgit mergetool\fR +with +\fB\-\-tool=<variant>\fR +(or without +\fB\-\-tool\fR +if +\fBmerge\&.tool\fR +is configured as +\fB<variant>\fR), Git will consult +\fBmergetool\&.<variant>\&.layout\fR +to determine the tool\(cqs layout\&. If the variant\-specific configuration is not available, +\fBvimdiff\fR\*(Aqs is used as fallback\&. If that too is not available, a default layout with 4 windows will be used\&. To configure the layout, see the +\fBBACKEND SPECIFIC HINTS\fR +section\&. .RE .PP mergetool\&.hideResolved @@ -704,7 +722,7 @@ Instead of \fB\-\-tool=vimdiff\fR, you can also use one of these other variants: \fB\-\-tool=nvimdiff\fR, to open Neovim instead of Vim\&. .RE .sp -When using these variants, in order to specify a custom layout you will have to set configuration variables \fBmergetool\&.gvimdiff\&.layout\fR and \fBmergetool\&.nvimdiff\&.layout\fR instead of \fBmergetool\&.vimdiff\&.layout\fR +When using these variants, in order to specify a custom layout you will have to set configuration variables \fBmergetool\&.gvimdiff\&.layout\fR and \fBmergetool\&.nvimdiff\&.layout\fR instead of \fBmergetool\&.vimdiff\&.layout\fR (though the latter will be used as fallback if the variant\-specific one is not set)\&. .sp In addition, for backwards compatibility with previous Git versions, you can also append \fB1\fR, \fB2\fR or \fB3\fR to either \fBvimdiff\fR or any of the variants (ex: \fBvimdiff3\fR, \fBnvimdiff1\fR, etc\&...) to use a predefined layout\&. In other words, using \fB\-\-tool=[g,n,]vimdiffx\fR is the same as using \fB\-\-tool=[g,n,]vimdiff\fR and setting configuration variable \fBmergetool\&.[g,n,]vimdiff\&.layout\fR to\&... .sp |