summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-10-10 14:33:26 -0700
committerJunio C Hamano <gitster@pobox.com>2022-10-10 14:33:26 -0700
commit82f56fe383c1c71f3107b6b0f24ad9786afd079c (patch)
treed47e5cfe2bf722000f9109f40c514739690731b6
parent72b3189970b5c54f963efabfe2b56e680ec758ac (diff)
downloadgit-82f56fe383c1c71f3107b6b0f24ad9786afd079c.tar.gz
Meta/Reintegrate: omit source message ID from the merge message
-rwxr-xr-xReintegrate1
1 files changed, 1 insertions, 0 deletions
diff --git a/Reintegrate b/Reintegrate
index 85d95bcecb..ddff2664bc 100755
--- a/Reintegrate
+++ b/Reintegrate
@@ -63,6 +63,7 @@ annotate_merge () {
}
next unless ($in_section && $in_desc);
next if (/Originally merged to '\''next'\'' on ([-0-9]+)/);
+ next if (/^source: /);
last if (wildo_match($_));
push @msg, "$_\n";
}