diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-07-21 14:57:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-21 14:57:37 -0700 |
| commit | 4326211593ca0acd682a9a40aa1e6f174d88a438 (patch) | |
| tree | d7f4c218b099fb803cf6664caed394201d691e52 /Documentation/git-commit.txt | |
| parent | 3e05c534314fd5933ff483e73f54567a20c94a69 (diff) | |
| parent | 3a33fe5c97c0556303367bfd94411448113b1332 (diff) | |
| download | git-4326211593ca0acd682a9a40aa1e6f174d88a438.tar.xz | |
Merge branch 'ks/doc-fixes'
Doc clean-up.
* ks/doc-fixes:
doc: reformat the paragraph containing the 'cut-line'
doc: camelCase the i18n config variables to improve readability
Diffstat (limited to 'Documentation/git-commit.txt')
| -rw-r--r-- | Documentation/git-commit.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index afb06adba4..8c74a2ca03 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/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`. |