On Fri, May 18, 2018 at 10:33 AM, Maarten Lankhorst <[email protected]> wrote: > Op 18-05-18 om 09:31 schreef Daniel Vetter: >> Obvious oversight. >> >> Signed-off-by: Daniel Vetter <[email protected]> >> --- >> 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" >> >> - if ! $DRY git pull $pull_branch ; then >> + if ! $DRY git pull --no-ff $pull_branch ; then >> if ! check_conflicts "$pull_branch" ; then >> echoerr "Please resolve and then commit normally using >> git" >> > > Reviewed-by: Maarten Lankhorst <[email protected]>
Thanks for the review, pushed. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ dim-tools mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dim-tools
