summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-09-20 19:29:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-09-20 19:29:01 (GMT)
commit6d3e1f2e453f7473d4ab64ef378309958613c5d7 (patch)
tree93863beb9bc01b1bd47dd61e66cf54939cc34e0c /Documentation/config.txt
parent638924fec2189f3f20ebf5d0ff4cc34ee551dd39 (diff)
parent2e582df0e0f1589054674c8ed3391f240a37a6df (diff)
downloadgit-6d3e1f2e453f7473d4ab64ef378309958613c5d7.zip
git-6d3e1f2e453f7473d4ab64ef378309958613c5d7.tar.gz
git-6d3e1f2e453f7473d4ab64ef378309958613c5d7.tar.bz2
Merge branch 'mm/status-without-comment-char'
"git status" now omits the prefix to make its output a comment in a commit log editor, which is not necessary for human consumption. We may want to tighten the output to omit unnecessary trailing blank lines, but that does not have to be in the scope of this series. * mm/status-without-comment-char: t7508: avoid non-portable sed expression status: add missing blank line after list of "other" files tests: don't set status.displayCommentPrefix file-wide status: disable display of '#' comment prefix by default submodule summary: ignore --for-status option wt-status: use argv_array API builtin/stripspace.c: fix broken indentation
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 44e7873..b320b63 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2183,6 +2183,13 @@ status.branch::
Set to true to enable --branch by default in linkgit:git-status[1].
The option --no-branch takes precedence over this variable.
+status.displayCommentPrefix::
+ If set to true, linkgit:git-status[1] will insert a comment
+ prefix before each output line (starting with
+ `core.commentChar`, i.e. `#` by default). This was the
+ behavior of linkgit:git-status[1] in Git 1.8.4 and previous.
+ Defaults to false.
+
status.showUntrackedFiles::
By default, linkgit:git-status[1] and linkgit:git-commit[1] show
files which are not currently tracked by Git. Directories which