From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 23 Jun 2016 22:24:41 +0000 (-0700)
Subject: Meta/Reintegrate: give a blank to separate cut mark
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=083f201b04e8250800110660a2002aee2cb1d035;p=thirdparty%2Fgit.git

Meta/Reintegrate: give a blank to separate cut mark

The reintegrate script can have "### cut here" comments to separate
the list of topics at certain points to group them better.  Add a
blank line after them to make a long list easier to see.
---

diff --git a/Reintegrate b/Reintegrate
index a15114a690..5dbf853a02 100755
--- a/Reintegrate
+++ b/Reintegrate
@@ -242,7 +242,7 @@ show_merge () {
 show_pick () {
 	case "$msg" in
 	"### "* | "###")
-		merged="$msg"
+		merged="$msg$LF"
 		;;
 	*)
 		merged="$(git rev-parse --verify "$commit") pick $msg"