summaryrefslogtreecommitdiffstats
path: root/git-commit.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-07-21 15:42:28 -0700
committerJunio C Hamano <gitster@pobox.com>2017-07-21 15:42:28 -0700
commitbb34c10b2b5ad6f0828f0f5f85e7e020c137abe6 (patch)
tree5916f643ba5c9fc8c14dc2aff750cd404b718e64 /git-commit.txt
parentf29330e1f4e0be393846605cb15e31a79ba785bb (diff)
downloadgit-htmldocs-bb34c10b2b5ad6f0828f0f5f85e7e020c137abe6.tar.gz
Autogenerated HTML docs for v2.14.0-rc0-40-g5eada
Diffstat (limited to 'git-commit.txt')
-rw-r--r--git-commit.txt11
1 files changed, 6 insertions, 5 deletions
diff --git a/git-commit.txt b/git-commit.txt
index afb06adba..8c74a2ca0 100644
--- a/git-commit.txt
+++ b/git-commit.txt
@@ -196,11 +196,12 @@ whitespace::
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.
+ Same as `whitespace` except that everything from (and including)
+ the line found below is truncated, if the message is to be edited.
+ "`#`" can be customized with core.commentChar.
+
+ # ------------------------ >8 ------------------------
+
default::
Same as `strip` if the message is to be edited.
Otherwise `whitespace`.