Re: Rebasing core-updates-next branch

2016-07-12 Thread Leo Famulari
On Tue, Jul 12, 2016 at 03:57:34PM +0300, Manolis Ragkousis wrote: > On 07/12/16 09:04, Ricardo Wurmus wrote: > > Do we need to rebase? Is a merge not possible? > > It's definitely possible but I agree with Ludo on this. It's better to > avoid unnecessary merge commits. Merges *are* ugly but, in

Re: Rebasing core-updates-next branch

2016-07-12 Thread Manolis Ragkousis
Hello, On 07/12/16 10:29, Alex Kost wrote: > Is there a reason for this? Are you going to commit something there > that needs to be based on core-updates? If it's just the "time to do > that", then I think it's not really needed. Yes my work is based on commits from core-updates and in order to

Re: Rebasing core-updates-next branch

2016-07-12 Thread Ricardo Wurmus
Ludovic Courtès writes: > Hi! > > Manolis Ragkousis skribis: > >> Core-updates-next has not been updated for some time so I think it's >> time to do that. I was planning to rebase core-updates-next on >> core-updates and create a new core-updates-next. >> >> There is a problem though. Rebasing

Re: Rebasing core-updates-next branch

2016-07-12 Thread Ludovic Courtès
Hi! Manolis Ragkousis skribis: > Core-updates-next has not been updated for some time so I think it's > time to do that. I was planning to rebase core-updates-next on > core-updates and create a new core-updates-next. > > There is a problem though. Rebasing changes the pgp signature of the > co

Re: Rebasing core-updates-next branch

2016-07-12 Thread Alex Kost
Manolis Ragkousis (2016-07-11 16:01 +0300) wrote: > Hello Guix, > > Core-updates-next has not been updated for some time so I think it's > time to do that. I was planning to rebase core-updates-next on > core-updates and create a new core-updates-next. Is there a reason for this? Are you going

Re: Rebasing core-updates-next branch

2016-07-11 Thread Leo Famulari
On Tue, Jul 12, 2016 at 02:45:30PM +1000, Ben Woodcroft wrote: > As a general solution, can we differentiate between author and committer in > git? Yes. You can pass '--format=full' to `git show` or `git log` to see it. There is surely a lower-level way to get the information too. But, you can ma

Re: Rebasing core-updates-next branch

2016-07-11 Thread Ricardo Wurmus
Manolis Ragkousis writes: > Hello Guix, > > Core-updates-next has not been updated for some time so I think it's > time to do that. I was planning to rebase core-updates-next on > core-updates and create a new core-updates-next. > > There is a problem though. Rebasing changes the pgp signature

Re: Rebasing core-updates-next branch

2016-07-11 Thread Ben Woodcroft
On 11/07/16 23:01, Manolis Ragkousis wrote: Hello Guix, Core-updates-next has not been updated for some time so I think it's time to do that. I was planning to rebase core-updates-next on core-updates and create a new core-updates-next. There is a problem though. Rebasing changes the pgp sig

Re: Rebasing core-updates-next branch

2016-07-11 Thread Leo Famulari
On Mon, Jul 11, 2016 at 04:01:36PM +0300, Manolis Ragkousis wrote: > d35bc36 gnu: curl: Update to 7.49.1. You can re-sign this commit. > I have cc'ed the authors of those commits. If you are okay with it, I > will sign those commits with my key and push the new core-udpates-next. This situation

Rebasing core-updates-next branch

2016-07-11 Thread Manolis Ragkousis
Hello Guix, Core-updates-next has not been updated for some time so I think it's time to do that. I was planning to rebase core-updates-next on core-updates and create a new core-updates-next. There is a problem though. Rebasing changes the pgp signature of the commit. The affected commits are t