diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2014-02-17 19:15:32 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-25 09:35:20 -0800 |
| commit | 75df1f434f8cfdac1c8eeacae259ab375c01385b (patch) | |
| tree | 073ed4370f17e679c2fd8047c1c7fd832266db7b /Documentation/git-commit.txt | |
| parent | fcef9312a4ad3d94bfa2d02c41e46eb6adcde9b1 (diff) | |
| download | git-75df1f434f8cfdac1c8eeacae259ab375c01385b.tar.gz | |
commit: add --cleanup=scissors
Since 1a72cfd (commit -v: strip diffs and submodule shortlogs from the
commit message - 2013-12-05) we have a less fragile way to cut out
"git status" at the end of a commit message but it's only enabled for
stripping submodule shortlogs.
Add new cleanup option that reuses the same mechanism for the entire
"git status" without accidentally removing lines starting with '#'.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-commit.txt')
| -rw-r--r-- | Documentation/git-commit.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 1a7616c73a..7948233035 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -176,7 +176,7 @@ OPTIONS --cleanup=<mode>:: This option determines how the supplied commit message should be cleaned up before committing. The '<mode>' can be `strip`, - `whitespace`, `verbatim`, or `default`. + `whitespace`, `verbatim`, `scissors` or `default`. + -- strip:: @@ -186,6 +186,12 @@ whitespace:: Same as `strip` except #commentary is not removed. verbatim:: Do not change the message at all. +scissors:: + Same as `whitespace`, except that everything from (and + including) the line + "`# ------------------------ >8 ------------------------`" + is truncated if the message is to be edited. "`#`" can be + customized with core.commentChar. default:: Same as `strip` if the message is to be edited. Otherwise `whitespace`. |