diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-18 00:00:07 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-18 00:00:07 (GMT) |
| commit | f8eb50f60b5c8efda3529fcf89517080c686ce0b (patch) | |
| tree | bc320ad67d4c6278f41c1beeff7d4884688133ff /Documentation | |
| parent | a4c3616b19700cc60e06096f59c4aae0e6635cfe (diff) | |
| parent | f9c01817bb7a0a7b61652ec8e3ac12c900526f0e (diff) | |
| download | git-f8eb50f60b5c8efda3529fcf89517080c686ce0b.zip git-f8eb50f60b5c8efda3529fcf89517080c686ce0b.tar.gz git-f8eb50f60b5c8efda3529fcf89517080c686ce0b.tar.bz2 | |
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')
| -rw-r--r-- | Documentation/config.txt | 5 | ||||
| -rw-r--r-- | Documentation/git-commit.txt | 14 |
2 files changed, 18 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 8acb613..2d6775c 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 diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 5fb43f9..d3a2dec 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -11,7 +11,8 @@ SYNOPSIS 'git commit' [-a | --interactive] [-s] [-v] [-u<mode>] [--amend] [--dry-run] [(-c | -C) <commit>] [-F <file> | -m <msg>] [--reset-author] [--allow-empty] [--no-verify] [-e] [--author=<author>] - [--date=<date>] [--cleanup=<mode>] [--] [[-i | -o ]<file>...] + [--date=<date>] [--cleanup=<mode>] [--status | --no-status] [--] + [[-i | -o ]<file>...] DESCRIPTION ----------- @@ -224,6 +225,17 @@ specified. to be committed, paths with local changes that will be left uncommitted and paths that are untracked. +--status:: + Include the output of linkgit:git-status[1] in the commit + message template when using an editor to prepare the commit + message. Defaults to on, but can be used to override + configuration variable commit.status. + +--no-status:: + Do not include the output of linkgit:git-status[1] in the + commit message template when using an editor to prepare the + default commit message. + \--:: Do not interpret any more arguments as options. |