Re: iio togreg branch rebase.

[Jonathan Cameron <Jonathan.Cameron@Huawei.com>]

On Fri, 26 Mar 2021 13:10:04 +0200
Andy Shevchenko <andy.shevchenko@gmail.com> wrote:

> On Thu, Mar 25, 2021 at 9:20 PM Jonathan Cameron <jic23@kernel.org> wrote:
> >
> > Hi All,
> >
> > Unfortunately the mess I made of building the immutable branch earlier
> > in this cycle to deal with the SCMI driver meant I'd missed some
> > fixes tags that needed updating.
> >
> > Anyhow, upshot is I only realised during last minute tests before
> > a pull request.   Had to rebase to fix, so apologies to anyone who
> > happened to be basing their trees on IIO.
> >
> > No actual code changes, but the history will be different.
> >
> > I need to redo the SCMI IB merge on top, but for now the togreg
> > branch should be good again.  
> 
> To make less impact I use --rebase-merges option for `git rebase
> --interactive ...`, so I can save as much history as possible in this
> case.
> 

Thanks!  That came in very handy this morning :)

Jonathan

> > It's likely any fixes in flight for stuff this cycle will need
> > their tags updating, but hopefully I'll spot them this time!  
> 
> 
>