[akmods: 3/3] Merge branch 'el7'

[Sérgio Basto]

On Qua, 2016-11-23 at 14:09 +0100, Nicolas Chauvet wrote:
> 2016-11-23 13:46 GMT+01:00 Dominik 'Rathann' Mierzejewski
> <dominik at greysector.net>:
> > 
> > On Wednesday, 23 November 2016 at 13:40, Nicolas Chauvet wrote:
> > > 
> > > 2016-11-23 0:38 GMT+01:00 Sérgio M. Basto <sergiomb at rpmfusion.org
> > > >:
> > > > 
> > > > commit 580f919341f903be8383f4159a5b47b3d0c78dd2
> > > > Merge: 3673a38 2d1568a
> > > > Author: Sérgio M. Basto <sergio at serjux.com>
> > > > Date:   Tue Nov 22 23:35:20 2016 +0000
> > > > 
> > > >     Merge branch 'el7'
> > > HOW IS THAT even possible that you merge back and forth el7
> > > branch to devel.
> > > STOP doing that this is totally insane!
> > Only fast-forward merges should be done from non-master branches to
> > master. Otherwise we're getting junk "merge commits" unnecessarily.
> Well, I would even say don't even merge anything "TO" master. Master
> is the main branch for development, so there are no reason that any
> commit isn't there first if relevant.
> If you have diverged from master, you cannot merge anymore, only
> cherry-pick the commit or range you wan't back to your particular
> branch.
> 
> 
> @sergio,
> Please re-do another clone for akmod, I've cleaned this change

what commands did you use to fix akmods NonFastForward ? 


> NonFastForward
> 
-- 
Sérgio M. B.