doc: update cola.signcommits documentation

Mention `--gpg-sign` instead of `-S` since that's what we
actually use and is more descriptive.

Mention `git merge` as well as `git commit` since they can both
be used to create signed commits.

Signed-off-by: David Aguilar <davvid@gmail.com>