Skip to content

Commit

Permalink
Merge branch 'jm/git-status-submodule-states-docfix' into next
Browse files Browse the repository at this point in the history
Docfix.

* jm/git-status-submodule-states-docfix:
  git-status.txt: fix minor asciidoc format issue
  • Loading branch information
gitster committed Oct 4, 2023
2 parents d5d0a2c + 641307d commit 520b771
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions Documentation/git-status.txt
Original file line number Diff line number Diff line change
Expand Up @@ -246,10 +246,9 @@ U U unmerged, both modified

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
* '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 `git add` in the superproject to prepare a commit.
Expand Down

0 comments on commit 520b771

Please sign in to comment.