Skip to content

Commit 0a99156

Browse files
sync-upstream.sh: Add "git show --remerge-diff" tip
1 parent 30fc9d6 commit 0a99156

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

contrib/sync-upstream.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,7 @@ do
104104
done
105105
# Remove trailing ","
106106
TITLE=${TITLE%?}
107-
108-
BODY=$(printf "%s\n\n%s" "$BODY" "This PR can be recreated with \`$REPRODUCE_COMMAND\`.")
107+
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.")
109108

110109
echo "-----------------------------------"
111110
echo "$TITLE"

0 commit comments

Comments
 (0)