diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-08-11 07:52:33 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-11 07:52:33 +0300 |
| commit | acd3bce63fc21b50b4cfea18083a1a6ad3b04c8c (patch) | |
| tree | a85486e76a2993e09e391610e99fe343d2b8f64d /contrib | |
| parent | b1b489f4cc897b244126115853f965bf07ae4f34 (diff) | |
| parent | cc391fc886639fb589b4e8da6a4e1a98d3ee07ab (diff) | |
Merge branch 'cl/rerere-train-with-no-sign' into maint
"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
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/rerere-train.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/rerere-train.sh b/contrib/rerere-train.sh index 26b724c8c6..bd01e430ef 100755 --- a/contrib/rerere-train.sh +++ b/contrib/rerere-train.sh @@ -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 |