From: Junio C Hamano Date: Mon, 31 Mar 2014 23:30:52 +0000 (-0700) Subject: Merge branch 'dw/doc-status-no-longer-shows-pound-prefix' X-Git-Tag: v2.0.0-rc0~46 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e164a8fd79fd8cacdb30735c56c744807ec86f77?hp=-c Merge branch 'dw/doc-status-no-longer-shows-pound-prefix' * dw/doc-status-no-longer-shows-pound-prefix: doc: status, remove leftover statement about '#' prefix --- e164a8fd79fd8cacdb30735c56c744807ec86f77 diff --combined Documentation/git-status.txt index a4acaa038c,992ce27cda..def635f578 --- a/Documentation/git-status.txt +++ b/Documentation/git-status.txt @@@ -97,7 -97,7 +97,7 @@@ configuration variable documented in li OUTPUT ------ The output from this command is designed to be used as a commit - template comment, and all the output lines are prefixed with '#'. + template comment. The default, long format, is designed to be human readable, verbose and descriptive. Its contents and format are subject to change at any time. @@@ -210,13 -210,7 +210,13 @@@ directory If `status.submodulesummary` is set to a non zero number or true (identical to -1 or an unlimited number), the submodule summary will be enabled for the long format and a summary of commits for modified submodules will be -shown (see --summary-limit option of linkgit:git-submodule[1]). +shown (see --summary-limit option of linkgit:git-submodule[1]). Please note +that the summary output from the status command will be suppressed for all +submodules when `diff.ignoreSubmodules` is set to 'all' or only for those +submodules where `submodule..ignore=all`. To also view the summary for +ignored submodules you can either use the --ignore-submodules=dirty command +line option or the 'git submodule summary' command, which shows a similar +output but does not honor these settings. SEE ALSO --------