The integration branch moved! Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx> --- dim | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dim b/dim index 64edcda83084..d8b190efe2de 100755 --- a/dim +++ b/dim @@ -1291,13 +1291,14 @@ function dim_update_next remote=`url_to_remote $drm_tip_ssh` git pull --ff-only + git fetch drm-tip if ! git branch --merged $remote/drm-tip | grep -q drm-intel-fixes ; then - echo "drm-intel-fixes not merged into -nigthly, please update!" + echo "drm-intel-fixes not merged into drm-tip, please update!" exit 2 fi if ! git branch --merged $remote/drm-tip | grep -q drm-intel-next-queued ; then - echo "drm-intel-next-queued not merged into -nigthly, please update!" + echo "drm-intel-next-queued not merged into drm-tip, please update!" exit 2 fi -- 2.11.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
