From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 3 Aug 2015 17:41:30 +0000 (-0700)
Subject: Merge branch 'sg/commit-cleanup-scissors' into maint
X-Git-Tag: v2.4.8~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a94594dcf7522652363773c06e1ff617914dffe8;p=thirdparty%2Fgit.git

Merge branch 'sg/commit-cleanup-scissors' into maint

"git commit --cleanup=scissors" was not careful enough to protect
against getting fooled by a line that looked like scissors.

* sg/commit-cleanup-scissors:
  commit: cope with scissors lines in commit message
---

a94594dcf7522652363773c06e1ff617914dffe8