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

[Rob Austein]

At Thu, 05 Feb 2015 21:02:16 +0100, Joachim Strömbergson wrote:
> 
> 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?

Probably "git commit -S --amend", but I will defer to the real git
wizards if they have an opinion.

In the future, you might prefer "git merge --no-commit".