sync-upstream.sh: Add "git show --remerge-diff" tip

jonasnick · Jul 18, 2023 · 0a99156 · 0a99156
1 parent 30fc9d6
commit 0a99156
Showing 1 changed file with 1 addition and 2 deletions.
diff --git 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"