summaryrefslogtreecommitdiffstats
path: root/git-commit.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-03-25 12:54:38 -0700
committerJunio C Hamano <gitster@pobox.com>2014-03-25 12:54:38 -0700
commit3214e5f10c469804fcdd6096f3c3f32098ae9052 (patch)
treee5d0d5a19675447f6eb86a18b524343a608e1db7 /git-commit.txt
parent7c59c67912d7b4c6aec60b899ba560b47de6a034 (diff)
downloadgit-htmldocs-3214e5f10c469804fcdd6096f3c3f32098ae9052.tar.gz
Autogenerated HTML docs for v1.9.1-352-gd393d
Diffstat (limited to 'git-commit.txt')
-rw-r--r--git-commit.txt8
1 files changed, 7 insertions, 1 deletions
diff --git a/git-commit.txt b/git-commit.txt
index 7c42e9cab..429267abf 100644
--- a/git-commit.txt
+++ b/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`.