diff options
Diffstat (limited to 'man1/git-status.1')
| -rw-r--r-- | man1/git-status.1 | 45 |
1 files changed, 34 insertions, 11 deletions
diff --git a/man1/git-status.1 b/man1/git-status.1 index 1a8625d5e..571902834 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-10-10 +.\" Date: 2023-10-12 .\" Manual: Git Manual -.\" Source: Git 2.42.0.345.gaab89be2eb +.\" Source: Git 2.42.0.357.g59167d7d09 .\" Language: English .\" -.TH "GIT\-STATUS" "1" "2023\-10\-10" "Git 2\&.42\&.0\&.345\&.gaab89b" "Git Manual" +.TH "GIT\-STATUS" "1" "2023\-10\-12" "Git 2\&.42\&.0\&.357\&.g59167d" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -465,18 +465,41 @@ U U unmerged, both modified .sp Submodules have more state and instead report .sp -.if n \{\ .RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c .\} -.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 \{\ +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +\fIM\fR += the submodule has a different HEAD than recorded in the index +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +\fIm\fR += the submodule has modified content .RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c .\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +\fI?\fR += the submodule has untracked files +.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 |