Merge branch 'bc/commit-complete-lines-given-via-m-option' into next
commit1609f9d51d0dd3191849610801219dcea773fc09
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Mar 2013 22:57:03 +0000 (19 15:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Mar 2013 22:57:03 +0000 (19 15:57 -0700)
tree53e306dbbf63f617076ce7beee3c264fffadbafd
parentcf6fa47af16531094753ea83585334a380220e6c
parent46fbf7536404257a68fd4ea5d92a3bcb3f7b5848
Merge branch 'bc/commit-complete-lines-given-via-m-option' into next

'git commit -m "$str"' when $str was already terminated with a LF
now avoids adding an extra LF to the message.

* 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