Merge branch 'js/doc-status-with-submodules-mark-up-fix'
Docfix. * js/doc-status-with-submodules-mark-up-fix: Documentation/git-status: add missing line breaksmaint
commit
4a0bcc832a
|
@ -245,10 +245,12 @@ U U unmerged, both modified
|
||||||
....
|
....
|
||||||
|
|
||||||
Submodules have more state and instead report
|
Submodules have more state and instead report
|
||||||
|
|
||||||
M the submodule has a different HEAD than
|
M the submodule has a different HEAD than
|
||||||
recorded in the index
|
recorded in the index
|
||||||
m the submodule has modified content
|
m the submodule has modified content
|
||||||
? the submodule has untracked files
|
? the submodule has untracked files
|
||||||
|
|
||||||
since modified content or untracked files in a submodule cannot be added
|
since modified content or untracked files in a submodule cannot be added
|
||||||
via `git add` in the superproject to prepare a commit.
|
via `git add` in the superproject to prepare a commit.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue