development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-06 00:29:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cl/rerere-train-with-no-sign' into maint

Browse source 
"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
This commit is contained in:
Junio C Hamano 2022-08-10 21:52:33 -07:00
parent b1b489f4cc cc391fc886
commit acd3bce63f
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/rerere-train.sh
View file

@ -75,7 +75,7 @@ do
continue
fi
git checkout -q "$parent1^0"
if git merge $other_parents >/dev/null 2>&1
if git merge --no-gpg-sign $other_parents >/dev/null 2>&1
then
# Cleanly merges
continue