Skip to content

Commit c70e7a3

Browse files
committed
Merge branch 'jm/git-status-submodule-states-docfix'
Docfix. * jm/git-status-submodule-states-docfix: git-status.txt: fix minor asciidoc format issue
2 parents 6e47cfc + 641307d commit c70e7a3

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

Documentation/git-status.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,10 +246,9 @@ U U unmerged, both modified
246246

247247
Submodules have more state and instead report
248248

249-
M the submodule has a different HEAD than
250-
recorded in the index
251-
m the submodule has modified content
252-
? the submodule has untracked files
249+
* 'M' = the submodule has a different HEAD than recorded in the index
250+
* 'm' = the submodule has modified content
251+
* '?' = the submodule has untracked files
253252

254253
since modified content or untracked files in a submodule cannot be added
255254
via `git add` in the superproject to prepare a commit.

0 commit comments

Comments
 (0)