diff options
Diffstat (limited to 'man1/git-config.1')
| -rw-r--r-- | man1/git-config.1 | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/man1/git-config.1 b/man1/git-config.1 index fbef39ff7..49f567312 100644 --- a/man1/git-config.1 +++ b/man1/git-config.1 @@ -2,12 +2,12 @@ .\" Title: git-config .\" 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\-CONFIG" "1" "2024\-02\-26" "Git 2\&.44\&.0\&.35\&.ga2082db" "Git Manual" +.TH "GIT\-CONFIG" "1" "2024\-02\-27" "Git 2\&.44\&.0\&.53\&.g0f9d4d2" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -6571,7 +6571,7 @@ mode of \fBgit-restore\fR(1), \fBgit-commit\fR(1), \fBgit-reset\fR(1), and -\fBgit-stash\fR(1)\&. Note that this setting is silently ignored if portable keystroke input is not available; requires the Perl module Term::ReadKey\&. +\fBgit-stash\fR(1)\&. .RE .PP interactive\&.diffFilter @@ -7276,10 +7276,28 @@ avoids using altogether, and is the default value\&. .RE .PP -mergetool\&.vimdiff\&.layout +mergetool\&.<vimdiff variant>\&.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 in -\fBgit-mergetool\fR(1)\&. for details\&. +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 in +\fBgit-mergetool\fR(1)\&. .RE .PP mergetool\&.hideResolved |