Skip to content

Commit f0f9a03

Browse files
committed
Merge branch 'cl/rerere-train-with-no-sign'
"rerere-train" script (in contrib/) used to honor commit.gpgSign while recreating the throw-away merges. source: <PH7PR14MB5594A27B9295E95ACA4D6A69CE8F9@PH7PR14MB5594.namprd14.prod.outlook.com> * cl/rerere-train-with-no-sign: contrib/rerere-train: avoid useless gpg sign in training
2 parents 3d8e3dc + cc391fc commit f0f9a03

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

contrib/rerere-train.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ do
7575
continue
7676
fi
7777
git checkout -q "$parent1^0"
78-
if git merge $other_parents >/dev/null 2>&1
78+
if git merge --no-gpg-sign $other_parents >/dev/null 2>&1
7979
then
8080
# Cleanly merges
8181
continue

0 commit comments

Comments
 (0)