diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-01-12 15:11:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-12 15:11:41 -0800 |
| commit | cde28af37b19e07139ebb6a355d742e763b7a235 (patch) | |
| tree | ada3dee983c5b908d908a8b9837eeea2f0e335ad /commit.c | |
| parent | Git 2.35-rc0 (diff) | |
| parent | fmt-merge-msg: prevent use-after-free with signed tags (diff) | |
| download | git-cde28af37b19e07139ebb6a355d742e763b7a235.tar.gz git-cde28af37b19e07139ebb6a355d742e763b7a235.zip | |
Merge branch 'fs/ssh-signing-key-lifetime'
"git merge $signed_tag" started to drop the tag message from the
default merge message it uses by accident, which has been corrected.
* fs/ssh-signing-key-lifetime:
fmt-merge-msg: prevent use-after-free with signed tags
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions