Commit 2dfbc883 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

dim: force merge commit for backmerges



We have all these reminders to actually type a commit message, but
--no-commit doesn't imply --no-ff, so let's fix that.

Noticed because Maarten managed to do a fast-forward backmerge into
drm-misc-next somehow.
Reviewed-by: Jani Nikula's avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter's avatarDaniel Vetter <daniel.vetter@intel.com>
parent 66bd5be5
Pipeline #382792 passed with stages
in 1 minute and 15 seconds
......@@ -1246,7 +1246,7 @@ function dim_backmerge
validate_upstream_baseline $branch $upstream
git merge --rerere-autoupdate --no-commit $upstream >& /dev/null || true
git merge --rerere-autoupdate --no-commit --no-ff $upstream >& /dev/null || true
patch_file=$(git_dir)/MERGE_MSG
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment