Merge branch 'bc/commit-complete-lines-given-via-m-option' into maint

'git commit -m "$msg"' used to add an extra newline even when
$msg already ended with one.

* bc/commit-complete-lines-given-via-m-option:
Documentation/git-commit.txt: rework the --cleanup section
git-commit: only append a newline to -m mesg if necessary
t7502: demonstrate breakage with a commit message with trailing newlines
t/t7502: compare entire commit message with what was expected

diff --combined Documentation/git-commit.txt
index 42c22bb59da1dac87ee94994ab3f56a07b132887,24a99ccc992555e01b9ac586e7bbbd9bb8332a6c..05f82973687bb3fd7fbb066f725d72d386cd446f
--- 1/Documentation/git-commit.txt
--- 2/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@@ -137,8 -137,6 +137,8 @@@ OPTION
  -m <msg>::
  --message=<msg>::
        Use the given <msg> as the commit message.
 +      If multiple `-m` options are given, their values are
 +      concatenated as separate paragraphs.
  
  -t <file>::
  --template=<file>::
@@@ -174,16 -172,25 +174,25 @@@
         linkgit:git-commit-tree[1].
  
  --cleanup=<mode>::
-       This option sets how the commit message is cleaned up.
-       The  '<mode>' can be one of 'verbatim', 'whitespace', 'strip',
-       and 'default'. The 'default' mode will strip leading and
-       trailing empty lines and #commentary from the commit message
-       only if the message is to be edited. Otherwise only whitespace
-       removed. The 'verbatim' mode does not change message at all,
-       'whitespace' removes just leading/trailing whitespace lines
-       and 'strip' removes both whitespace and commentary. The default
-       can be changed by the 'commit.cleanup' configuration variable
-       (see linkgit:git-config[1]).
+       This option determines how the supplied commit message should be
+       cleaned up before committing.  The '<mode>' can be `strip`,
+       `whitespace`, `verbatim`, or `default`.
+ +
+ --
+ strip::
+       Strip leading and trailing empty lines, trailing whitespace, and
+       #commentary and collapse consecutive empty lines.
+ whitespace::
+       Same as `strip` except #commentary is not removed.
+ verbatim::
+       Do not change the message at all.
+ default::
+       Same as `strip` if the message is to be edited.
+       Otherwise `whitespace`.
+ --
+ +
+ The default can be changed by the 'commit.cleanup' configuration
+ variable (see linkgit:git-config[1]).
  
  -e::
  --edit::