]> git.ipfire.org Git - thirdparty/git.git/commit - Documentation/gitworkflows.txt
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 90d242d c39fc06)
Merge branch 'fs/ssh-signing-key-lifetime'
authorJunio C Hamano <gitster@pobox.com>
Wed, 12 Jan 2022 23:11:41 +0000 (15:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 12 Jan 2022 23:11:41 +0000 (15:11 -0800)
commitcde28af37b19e07139ebb6a355d742e763b7a235
treeada3dee983c5b908d908a8b9837eeea2f0e335adtree | snapshot
parent90d242d36e248acfae0033274b524bfa55a947fdcommit | diff
parentc39fc06b999305963600358f3f5e99698440cad2commit | diff
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
fmt-merge-msg.c diff1 | diff2 | blob | history
t/t6200-fmt-merge-msg.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.