diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-07-31 13:51:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-31 13:51:06 -0700 |
| commit | 0baf0b839b45ed06ef560e3b035315ecff0d4bef (patch) | |
| tree | 89d442da39c0c56e45aac331fef28c968961573b /Documentation/git-commit.txt | |
| parent | 42dbdef1cac298c3faaab389b67a41005022fdfa (diff) | |
| parent | 3a33fe5c97c0556303367bfd94411448113b1332 (diff) | |
| download | git-0baf0b839b45ed06ef560e3b035315ecff0d4bef.tar.xz | |
Merge branch 'ks/doc-fixes' into maint
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`. |