summaryrefslogtreecommitdiff
path: root/Documentation/git-commit.txt
diff options
context:
space:
mode:
authorKaartic Sivaraam <kaarticsivaraam91196@gmail.com>2017-07-18 14:34:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-07-18 22:04:49 (GMT)
commit3a33fe5c97c0556303367bfd94411448113b1332 (patch)
treeffbe22e5a7e0ecfe68cea24fe4b260c8da558dad /Documentation/git-commit.txt
parent95791be750c43fed878b965480d14cf5f995585c (diff)
downloadgit-3a33fe5c97c0556303367bfd94411448113b1332.zip
git-3a33fe5c97c0556303367bfd94411448113b1332.tar.gz
git-3a33fe5c97c0556303367bfd94411448113b1332.tar.bz2
doc: reformat the paragraph containing the 'cut-line'
The paragraph that describes the 'scissors' cleanup mode of 'commit' had the 'cut-line' in the middle of a sentence. This made it possible for the line to get wrapped on smaler windows. This shouldn't be the case as it makes it hard for the user to understand the structure of the cut-line. Reformat the pragraph to make the 'cut-line' stand on a line of it's own thus distinguishing it from the rest of the paragraph. This further prevents it from getting wrapped to some extent. Signed-off-by: Kaartic Sivaraam <kaarticsivaraam91196@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-commit.txt')
-rw-r--r--Documentation/git-commit.txt11
1 files changed, 6 insertions, 5 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index afb06ad..8c74a2c 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`.