From 0a9915687191cabba0241bd45c3a3416b7f36e29 Mon Sep 17 00:00:00 2001 From: Tim Ruffing Date: Tue, 18 Jul 2023 15:05:27 +0200 Subject: [PATCH] sync-upstream.sh: Add "git show --remerge-diff" tip --- contrib/sync-upstream.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/sync-upstream.sh b/contrib/sync-upstream.sh index 1f021bbb..b910a599 100755 --- a/contrib/sync-upstream.sh +++ b/contrib/sync-upstream.sh @@ -104,8 +104,7 @@ do done # Remove trailing "," TITLE=${TITLE%?} - -BODY=$(printf "%s\n\n%s" "$BODY" "This PR can be recreated with \`$REPRODUCE_COMMAND\`.") +BODY=$(printf "%s\n\n%s\n%s" "$BODY" "This PR can be recreated with \`$REPRODUCE_COMMAND\`." "Tip: Use \`git show --remerge-diff\` to show the changes manually added to the merge commit.") echo "-----------------------------------" echo "$TITLE"