Skip to content
Snippets Groups Projects
Commit fea11477 authored by Jani Nikula's avatar Jani Nikula
Browse files

dim: do a non-interactive rebase on dim ub when nothing has changed

With more and more branches handled, requiring interactive user action
for each "noop" rebase has become tedious.
parent 0cbc9810
No related branches found
No related tags found
No related merge requests found
......@@ -663,7 +663,11 @@ case "$subcommand" in
for branch in $dim_branches ; do
dim_co $branch
$DRY git rebase -i
if git diff --quiet $DIM_DRM_INTEL_REMOTE/$branch; then
$DRY git rebase
else
$DRY git rebase -i
fi
done
dim_co drm-intel-next
$DRY git reset --hard $DIM_DRM_INTEL_REMOTE/drm-intel-next
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment