conq for co drm-intel-next-queued.
Signed-off-by: Daniel Vetter <[email protected]>
---
bash_completion | 4 ++--
dim | 4 ++--
dim.rst | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/bash_completion b/bash_completion
index e35a001dcb73..7f129ca818eb 100644
--- a/bash_completion
+++ b/bash_completion
@@ -24,7 +24,7 @@ _dim ()
cmds="setup nightly-forget update-branches"
cmds="$cmds rebuild-nightly cat-to-fixup"
cmds="$cmds push-queued pq push-fixes pf push-next-fixes pnf
push-branch"
- cmds="$cmds checkout co cof conf"
+ cmds="$cmds checkout co conq cof conf"
cmds="$cmds apply-branch ab sob apply-queued aq apply-fixes af
apply-next-fixes anf"
cmds="$cmds magic-patch mp cd"
cmds="$cmds magic-rebase-resolve mrr"
@@ -96,7 +96,7 @@ _dim ()
COMPREPLY=( $( compgen -o nospace -W "drm-
topic/" -- $cur ) )
fi
;;
- checkout)
+ checkout|co)
if [[ $COMP_CWORD == "$((i+1))" ]] ; then
COMPREPLY=( $( compgen -W "$nightly_branches"
-- $cur ) )
fi
diff --git a/dim b/dim
index 98efba80d9a4..bd7cae828ee7 100755
--- a/dim
+++ b/dim
@@ -759,14 +759,14 @@ case "$subcommand" in
push-fixes|pf)
dim_push drm-intel-fixes "$@"
;;
- checkout)
+ checkout|co)
if [[ "x$1" = "x" ]]; then
echo "usage: $0 $subcommand branch"
exit 1
fi
dim_co "$@"
;;
- co)
+ conq)
dim_co drm-intel-next-queued
;;
cof)
diff --git a/dim.rst b/dim.rst
index b909e1d87a40..91308f420338 100644
--- a/dim.rst
+++ b/dim.rst
@@ -112,12 +112,12 @@ drm-intel-next-queued branch respectively. Complains if
that's not the current
branch, assuming that patches got merged to the wrong branch. After pushing
also
updates linux-next and drm-intel-nightly branches.
-checkout *branch*
+checkout|co *branch*
-----------------
Checks out the named branch.
-co
---
+conq
+----
cof
---
--
2.5.1
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
