Hi, I usually sign my commits and merges. But when a merge has collisions I can't continue and sign in one step, because --continue and -S seem to be mutually exclusive. My way out is: git merge --continue git commit --amend --no-edit -S ... but this could be a bit simpler. Or maybe --continue could remember if I have passed "-S" to the original "git merge" command. Regards, Eike -- Rolf Eike Beer, emlix GmbH, https://www.emlix.com Fon +49 551 30664-0, Fax +49 551 30664-11 Gothaer Platz 3, 37083 Göttingen, Germany Sitz der Gesellschaft: Göttingen, Amtsgericht Göttingen HR B 3160 Geschäftsführung: Heike Jordan, Dr. Uwe Kracke – Ust-IdNr.: DE 205 198 055 emlix - smart embedded open source
Attachment:
signature.asc
Description: This is a digitally signed message part.
