diff options
Diffstat (limited to 'man1/git-status.1')
| -rw-r--r-- | man1/git-status.1 | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/man1/git-status.1 b/man1/git-status.1 index 59e880ce9..845385a78 100644 --- a/man1/git-status.1 +++ b/man1/git-status.1 @@ -2,12 +2,12 @@ .\" Title: git-status .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-09-29 +.\" Date: 2023-10-02 .\" Manual: Git Manual -.\" Source: Git 2.42.0.296.g493f462273 +.\" Source: Git 2.42.0.307.gd0e8084c65 .\" Language: English .\" -.TH "GIT\-STATUS" "1" "2023\-09\-29" "Git 2\&.42\&.0\&.296\&.g493f46" "Git Manual" +.TH "GIT\-STATUS" "1" "2023\-10\-02" "Git 2\&.42\&.0\&.307\&.gd0e808" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -463,7 +463,22 @@ U U unmerged, both modified .RE .\} .sp -Submodules have more state and instead report M the submodule has a different HEAD than recorded in the index m the submodule has modified content ? the submodule has untracked files since modified content or untracked files in a submodule cannot be added via \fBgit add\fR in the superproject to prepare a commit\&. +Submodules have more state and instead report +.sp +.if n \{\ +.RS 4 +.\} +.nf +M the submodule has a different HEAD than + recorded in the index +m the submodule has modified content +? the submodule has untracked files +.fi +.if n \{\ +.RE +.\} +.sp +since modified content or untracked files in a submodule cannot be added via \fBgit add\fR in the superproject to prepare a commit\&. .sp \fIm\fR and \fI?\fR are applied recursively\&. For example if a nested submodule in a submodule contains an untracked file, this is reported as \fI?\fR as well\&. .sp |