diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-01-17 16:00:07 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-01-17 16:00:07 -0800 |
commit | f8eb50f60b5c8efda3529fcf89517080c686ce0b (patch) | |
tree | bc320ad67d4c6278f41c1beeff7d4884688133ff /Documentation/config.txt | |
parent | a4c3616b19700cc60e06096f59c4aae0e6635cfe (diff) | |
parent | f9c01817bb7a0a7b61652ec8e3ac12c900526f0e (diff) | |
download | git-f8eb50f60b5c8efda3529fcf89517080c686ce0b.tar.gz |
Merge branch 'jh/commit-status'
* jh/commit-status:
t7502: test commit.status, --status and --no-status
commit: support commit.status, --status, and --no-status
Conflicts:
Documentation/git-commit.txt
builtin-commit.c
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r-- | Documentation/config.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 8acb613ec3..2d6775c135 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -716,6 +716,11 @@ color.ui:: terminal. When more specific variables of color.* are set, they always take precedence over this setting. Defaults to false. +commit.status + A boolean to enable/disable inclusion of status information in the + commit message template when using an editor to prepare the commit + message. Defaults to true. + commit.template:: Specify a file to use as the template for new commit messages. "{tilde}/" is expanded to the value of `$HOME` and "{tilde}user/" to the |