diff options
Diffstat (limited to 'man1/git-config.1')
| -rw-r--r-- | man1/git-config.1 | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/man1/git-config.1 b/man1/git-config.1 index 441f38713..d9d7ece63 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-03-01 +.\" Date: 2024-03-05 .\" Manual: Git Manual -.\" Source: Git 2.44.0.84.gb387623c12 +.\" Source: Git 2.44.0.117.g43072b4ca1 .\" Language: English .\" -.TH "GIT\-CONFIG" "1" "2024\-03\-01" "Git 2\&.44\&.0\&.84\&.gb387623" "Git Manual" +.TH "GIT\-CONFIG" "1" "2024\-03\-05" "Git 2\&.44\&.0\&.117\&.g43072b" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -1498,6 +1498,11 @@ submoduleAlternateErrorStrategyDie Advice shown when a submodule\&.alternateErrorStrategy option configured to "die" causes a fatal error\&. .RE .PP +submoduleMergeConflict +.RS 4 +Advice shown when a non\-trivial submodule merge conflict is encountered\&. +.RE +.PP submodulesNotUpdated .RS 4 Advice shown when a user runs a submodule command that fails because |