From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 7 Mar 2024 23:59:41 +0000 (-0800)
Subject: Merge branch 'jt/commit-redundant-scissors-fix'
X-Git-Tag: v2.45.0-rc0~131
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=798ddfc17fbbe58494f2af0f71e0b53264ee82b5;p=thirdparty%2Fgit.git

Merge branch 'jt/commit-redundant-scissors-fix'

"git commit -v --cleanup=scissors" used to add the scissors line
twice in the log message buffer, which has been corrected.

* jt/commit-redundant-scissors-fix:
  commit: unify logic to avoid multiple scissors lines when merging
  commit: avoid redundant scissor line with --cleanup=scissors -v
---

798ddfc17fbbe58494f2af0f71e0b53264ee82b5