Signed-off-by: Jani Nikula <jani.nik...@intel.com>
---
dim | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/dim b/dim
index 898889a28c69..f86ba6253e49 100755
--- a/dim
+++ b/dim
@@ -461,6 +461,16 @@ function dim_apply_resolved
git commit --amend &
}
+dim_alias_mrr=magic-rebase-resolve
+function dim_magic_rebase_resolve
+{
+ git diff HEAD | patch -p1 -R
+ cat .git/rebase-merge/patch | dim mp
+ make -j 20
+ git add -u
+ git rebase --continue
+}
+
dim_alias_ai=apply-igt
function dim_apply_igt
{
@@ -861,8 +871,6 @@ function dim_alias
}
# dim subcommand aliases
-dim_alias_mrr=magic-rebase-resolve
-
declare -n subcmd=dim_alias_${subcommand//-/_}
if [ -z "$subcmd" ]; then
subcmd="$subcommand"
@@ -882,13 +890,6 @@ case "$subcmd" in
cd $DIM_PREFIX/drm-intel-nightly
cat > `cat .fixup_file_path`
;;
- magic-rebase-resolve)
- git diff HEAD | patch -p1 -R
- cat .git/rebase-merge/patch | dim mp
- make -j 20
- git add -u
- git rebase --continue
- ;;
tc)
cd $DIM_PREFIX/$DIM_DRM_INTEL
tag=$(git tag --contains $1 | grep ^v | sort -V | head -n 1)
--
2.1.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
