-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 On 10/10/15 13:33, Andreas K. Huettel wrote: > >> You should (almost) never commit reverse-merges of >> git.gentoo.org master[0]. > >> Instead, you have to use git pull --rebase=preserve origin >> master > >> in case you get "push conflicts" [1] > > > Which I tried several times, but git steadfast refused to sign the > commit properly. Maybe a new bug somewhere? > >
There was/is a bug when you explicitly set user.singingkey. But that is fixed in 2.6.1-r2 Justin -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0 iQJ8BAEBCgBmBQJWGPgcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi+QYP/3l6pH0GJrSk1bbhVS5bKOEY m6ConS8Z3tqGAsOdT72Ia5FyAla2VewQ32eANWyx8/MRRGOl9Nrv9LOP1s0Zskaa nGK9PPRX5n+xTLICyaV7Mmq2awhfD7Ao1n1pxu4csCtSpTWivWlW/E9tLj6+oluu KLT4NPj9WOULLEveZzaqRuKfI9uD2JsJw+XGr3TfI5ZDqirvOnYFbwEJibN34eER OS3U8PxiUqxAFoTsf1WovFJbqOMJC3pkz35zfS/FLHPa7QRl0ngYi/tglOJR77MR XevOliNkZ7ukYTft+ODywBS6PF6y9xDUsO1RrtBF2KdMsmvXoprTzFTAOPjAtIhC ipAOPftK23S5vwWQCTnYPJLmaL/15wCfHJ8Bdbw6Zcm/0XLs1HvXYlQuZtbTiLe5 l45Cfh8uGNNuLMeNyw6baMhl6qSVkOIA7FlL58TwNeIrYIXqBYEd11NLia5ZIfba iTpiXxt+6flRxnjiMjZPtuTcXe6WhRTk9qHblmashDYKL03NclYiPIXwkOFEA8C+ +qyXY3X3OmOwvmx4CKJbP6x1AL6c1ZT91ewyL1ZHEV2U4s85z6yfDOhgknbg6A08 nPDCkp+LhDknvZjgKLaSHdGW2nkeyhh+25HRhLm6EgXU3HsRymAY3eiiv6/d/5wd cV0Zur6JKyhkGRLjqVF7 =o+qG -----END PGP SIGNATURE-----
