diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-03-25 11:07:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-25 11:07:48 -0700 |
| commit | 46c0f913a49218a8a94d30c5a2df792a16aab827 (patch) | |
| tree | efc504f849bced5dd3c5b155ab5c4fce4fcbcf14 /Documentation | |
| parent | Merge branch 'jk/warn-on-object-refname-ambiguity' (diff) | |
| parent | commit: add --cleanup=scissors (diff) | |
| download | tgif-46c0f913a49218a8a94d30c5a2df792a16aab827.tar.xz | |
Merge branch 'nd/commit-editor-cleanup'
"git commit --cleanup=<mode>" learned a new mode, scissors.
* nd/commit-editor-cleanup:
commit: add --cleanup=scissors
wt-status.c: move cut-line print code out to wt_status_add_cut_line
wt-status.c: make cut_line[] const to shrink .data section a bit
Diffstat (limited to 'Documentation')
| -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 7c42e9cabc..429267abf6 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`. |