Re: [Intel-gfx] [PATCH] dim: Try git-merge --ff-only before git-rebase -i when updating branches.

On Tue, 06 Dec 2016, Maarten Lankhorst wrote: > When a branch can be fast-forwarded, try it first before rebasing. > This will prevent a whole lot of editor windows opening with 'noop' > when running dim ub. > > Signed-off-by: Maarten Lankhorst

[Intel-gfx] [PATCH] dim: Try git-merge --ff-only before git-rebase -i when updating branches.

When a branch can be fast-forwarded, try it first before rebasing. This will prevent a whole lot of editor windows opening with 'noop' when running dim ub. Signed-off-by: Maarten Lankhorst --- dim | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff