Re: [PATCH] dim: Don't fast-forward in apply-pull

2018-05-21 Thread Daniel Vetter
On Fri, May 18, 2018 at 10:33 AM, Maarten Lankhorst wrote: > Op 18-05-18 om 09:31 schreef Daniel Vetter: >> Obvious oversight. >> >> Signed-off-by: Daniel Vetter >> --- >> dim | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/dim b/dim >> index ddfb809fcc5c..33acacb2479

Re: [PATCH] dim: Don't fast-forward in apply-pull

2018-05-18 Thread Maarten Lankhorst
Op 18-05-18 om 09:31 schreef Daniel Vetter: > Obvious oversight. > > Signed-off-by: Daniel Vetter > --- > dim | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dim b/dim > index ddfb809fcc5c..33acacb24790 100755 > --- a/dim > +++ b/dim > @@ -969,7 +969,7 @@ function dim_app

[PATCH] dim: Don't fast-forward in apply-pull

2018-05-18 Thread Daniel Vetter
Obvious oversight. Signed-off-by: Daniel Vetter --- dim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dim b/dim index ddfb809fcc5c..33acacb24790 100755 --- a/dim +++ b/dim @@ -969,7 +969,7 @@ function dim_apply_pull checkpatch_commit_push_range 0 "HEAD..FETCH_HEAD