From: Junio C Hamano Date: Wed, 24 Jun 2015 19:21:55 +0000 (-0700) Subject: Merge branch 'sg/commit-cleanup-scissors' X-Git-Tag: v2.5.0-rc0~11 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=07528be1018b72e463404624b8752ead7eb0eb8d;p=git Merge branch 'sg/commit-cleanup-scissors' "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 --- 07528be1018b72e463404624b8752ead7eb0eb8d