On Thu, Nov 15, 2018 at 12:20 PM Andreas Gruenbacher <agrue...@redhat.com> wrote: > > I guess rebasing the for-next branch onto something more recent to > avoid the back-merge in the first place will be best, resulting in a > cleaner history.
Rebases aren't really any better at all. If you have a real *reason* for a merge, do the merge. But then the reason should be clearly stated in the merge commit. Not just some random undocumented merge message. Tell why some other branch was relevant to your fix and needed to be pulled in. Better yet, don't do either merges or rebases. Linus