[Cryptech Tech] git-fu with merge and signed commits

Joachim Strömbergson joachim at secworks.se
Thu Feb 5 20:02:16 UTC 2015


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Aloha!

I just tried to merge the sha-256 branch of the novena_baseline into
master. Since there were no conflicts, git automatically adds and
commits everything in a single commit. Unfortunately that is not done as
a signed commit. And thus our repo screams.

Anybody have a good idea how to rollback or fix/sign the pending commits
properly?

- -- 
Med vänlig hälsning, Yours

Joachim Strömbergson - Alltid i harmonisk svängning.
========================================================================
 Joachim Strömbergson          Secworks AB          joachim at secworks.se
========================================================================
-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2
Comment: GPGTools - http://gpgtools.org
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBCAAGBQJU08xIAAoJEF3cfFQkIuyN9K0P/Ry8Id0Ia7aGzcApwEQqBMau
l4AAwqGNmWoYBYeMwY/5DbBEcbJnAPLgbvm3iUxF9SqFG7owCWSJHqWz6yLB3uDX
PyXehUMfdJvU6hJ/XgEgh39ByJIFqzsWnE6re9471eyUfNNWjU1sTDEXtJUnaXeA
RdF6SQh4d3GWuFcx55ueJd0zkFOh4/trIJz3YkiJ5dXNQdbfSOouLAxaSqYcxamH
59r470cd+4q9YxvC1GDD22Hj11sKGgQmHhA1+KktDkZx8iwrOuPDQ9iXXQyfRe1l
/4zDGhuk/rs4MhVLrTmbjX5K2iSl8dxjEOIFH/TyELsJzdc1RETrEDkAZqiQEJiX
j8MaB+nmN8btekIvAdwkVJqruBUvsBwDglPPIIetHvXBJmj9oq7iYg4Xpa2A++0Q
nlgSDc5qihll+ZBcjz+WL1hwAQtakRSdX3Dafd0EP++a9q4cXtzJlnJBnd088G6m
bZvHLmjkRhUJ62JsOQXqfM8UB8m20oajz6qsx0JMS3Xh7mC6CsiLxwhH6uzhbAhl
FSZTu/YCN35GChgpq1FDLtAnpPDzSMkNmstcYD1B4EL4dqiHWjPZAfvMOS1efIed
gG19Ke5N5XBRwgIz+3JybI4U70SHV2MmYu06+EbUty0/AJoVONgGChx7rQV0DSKm
72dlMQXeEoeDOHGVmlZV
=F7JL
-----END PGP SIGNATURE-----


More information about the Tech mailing list