Merge branch 'mg/doc-submodule-status-cached' into next

gitster · gitster · commit fa833392a3b0 · 2019-11-25T15:44:55.000+09:00
"git submodule status" and "git submodule status --cached" show
different things, but the documentation did not cover them
correctly, which has been corrected.

* mg/doc-submodule-status-cached:
  doc: document 'git submodule status --cached'
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
@@ -80,6 +80,9 @@ status [--cached] [--recursive] [--] [<path>...]::
 	does not match the SHA-1 found in the index of the containing
 	repository and `U` if the submodule has merge conflicts.
 +
+If `--cached` is specified, this command will instead print the SHA-1
+recorded in the superproject for each submodule.
++
 If `--recursive` is specified, this command will recurse into nested
 submodules, and show their status as well.
 +

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,9 @@ status [--cached] [--recursive] [--] [<path>...]::`
`80`	`80`	`does not match the SHA-1 found in the index of the containing`
`81`	`81`	repository and `U` if the submodule has merge conflicts.
`82`	`82`	`+`
	`83`	+If `--cached` is specified, this command will instead print the SHA-1
	`84`	`+recorded in the superproject for each submodule.`
	`85`	`++`
`83`	`86`	If `--recursive` is specified, this command will recurse into nested
`84`	`87`	`submodules, and show their status as well.`
`85`	`88`	`+`