Gentoo Archives: gentoo-dev

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-dev@l.g.o
Subject: Re: [gentoo-dev] Re: [gentoo-commits] repo/gentoo:master commit in: /
Date: Sat, 10 Oct 2015 11:36:29
Message-Id: 5618F81C.3040501@gentoo.org
In Reply to: [gentoo-dev] Re: [gentoo-commits] repo/gentoo:master commit in: / by "Andreas K. Huettel"
1 -----BEGIN PGP SIGNED MESSAGE-----
2 Hash: SHA512
3
4 On 10/10/15 13:33, Andreas K. Huettel wrote:
5 >
6 >> You should (almost) never commit reverse-merges of
7 >> git.gentoo.org master[0].
8 >
9 >> Instead, you have to use git pull --rebase=preserve origin
10 >> master
11 >
12 >> in case you get "push conflicts" [1]
13 >
14 >
15 > Which I tried several times, but git steadfast refused to sign the
16 > commit properly. Maybe a new bug somewhere?
17 >
18 >
19
20 There was/is a bug when you explicitly set user.singingkey. But that
21 is fixed in 2.6.1-r2
22
23
24 Justin
25 -----BEGIN PGP SIGNATURE-----
26 Version: GnuPG/MacGPG2 v2.0
27
28 iQJ8BAEBCgBmBQJWGPgcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
29 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
30 OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi+QYP/3l6pH0GJrSk1bbhVS5bKOEY
31 m6ConS8Z3tqGAsOdT72Ia5FyAla2VewQ32eANWyx8/MRRGOl9Nrv9LOP1s0Zskaa
32 nGK9PPRX5n+xTLICyaV7Mmq2awhfD7Ao1n1pxu4csCtSpTWivWlW/E9tLj6+oluu
33 KLT4NPj9WOULLEveZzaqRuKfI9uD2JsJw+XGr3TfI5ZDqirvOnYFbwEJibN34eER
34 OS3U8PxiUqxAFoTsf1WovFJbqOMJC3pkz35zfS/FLHPa7QRl0ngYi/tglOJR77MR
35 XevOliNkZ7ukYTft+ODywBS6PF6y9xDUsO1RrtBF2KdMsmvXoprTzFTAOPjAtIhC
36 ipAOPftK23S5vwWQCTnYPJLmaL/15wCfHJ8Bdbw6Zcm/0XLs1HvXYlQuZtbTiLe5
37 l45Cfh8uGNNuLMeNyw6baMhl6qSVkOIA7FlL58TwNeIrYIXqBYEd11NLia5ZIfba
38 iTpiXxt+6flRxnjiMjZPtuTcXe6WhRTk9qHblmashDYKL03NclYiPIXwkOFEA8C+
39 +qyXY3X3OmOwvmx4CKJbP6x1AL6c1ZT91ewyL1ZHEV2U4s85z6yfDOhgknbg6A08
40 nPDCkp+LhDknvZjgKLaSHdGW2nkeyhh+25HRhLm6EgXU3HsRymAY3eiiv6/d/5wd
41 cV0Zur6JKyhkGRLjqVF7
42 =o+qG
43 -----END PGP SIGNATURE-----