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

[Rob Austein]

At Thu, 05 Feb 2015 21:08:34 +0100, Joachim Strömbergson wrote:
> 
> > Probably "git commit -S --amend", but I will defer to the real git 
> > wizards if they have an opinion.
> 
> Nope, didn't work."

No clue, then.  Did you commit anything after the merge?

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

Or "git merge -S", or try the commit.gpgsign configuration option