From 1a3af7830202323c0ef306e4a3a57f21ac24a09b Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Mon, 25 Nov 2019 15:51:47 +0100 Subject: [PATCH] SCRIPTS: git-show-backports: add "-s" to proposed cherry-pick commands Since we're using signed-off-by tags for backports, let's add -s to the command so that we can finally copy-paste it! --- scripts/git-show-backports | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/git-show-backports b/scripts/git-show-backports index ab44eaf1b..0fad6c1e5 100755 --- a/scripts/git-show-backports +++ b/scripts/git-show-backports @@ -251,10 +251,10 @@ dump_commit_matrix | column -t | \ echo echo "In order to show and/or apply all leftmost commits to current branch :" echo " git show ${left_commits[@]}" - echo " git cherry-pick -x ${left_commits[@]}" + echo " git cherry-pick -sx ${left_commits[@]}" echo echo "In order to show and/or apply all rightmost commits to current branch :" echo " git show ${right_commits[@]}" - echo " git cherry-pick -x ${right_commits[@]}" + echo " git cherry-pick -sx ${right_commits[@]}" fi )