at 09:26:02AM -0700, Junio C Hamano wrote: > Celeste Liu <coelacanthus@xxxxxxxxxxx> writes: > needed. Write something like > > The user may have configured "git merge" to always require GPG > signing the resulting commit. As we run "git merge" not for the > recreated merge commits, but merely to trigger merge conflicts, > and we will discard the resulting commits, signing them is not > necessary. > > Override such configuration that forces useless signing from the > command line with the "--no-gpg-sign" optoin. > > perhaps? > Ok, I will add in next verison. (Sorry, forgot cc, resend)
Attachment:
signature.asc
Description: PGP signature
