X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/1c804cbaa55ba2dcdc6bfc33d6f4c86a68e0fcdc..85aaed816bde469b3de72e80d8f8ed7830302fbf:/contrib/stgit-completion.bash

diff --git a/contrib/stgit-completion.bash b/contrib/stgit-completion.bash
index 2d0d5f2..1467c28 100644
--- a/contrib/stgit-completion.bash
+++ b/contrib/stgit-completion.bash
@@ -11,16 +11,14 @@
 #         . ~/.stgit-completion.bash
 
 _stg_commands="
-    add
-    applied
-    assimilate
     branch
     delete
     diff
     clean
     clone
+    coalesce
     commit
-    cp
+    edit
     export
     files
     float
@@ -41,15 +39,14 @@ _stg_commands="
     rebase
     refresh
     rename
+    repair
     resolved
-    rm
     series
     show
     sink
     status
     sync
     top
-    unapplied
     uncommit
     unhide
 "
@@ -108,7 +105,7 @@ _all_other_patches ()
 _all_branches ()
 {
     local g=$(_gitdir)
-    [ "$g" ] && (cd .git/patches/ && echo *)
+    [ "$g" ] && (cd $g/patches/ && echo *)
 }
 
 _conflicting_files ()
@@ -237,6 +234,7 @@ _stg ()
         # repository commands
         id)     _stg_patches $command _all_patches ;;
         # stack commands
+        coalesce) _stg_patches $command _applied_patches ;;
         float)  _stg_patches $command _all_patches ;;
         goto)   _stg_patches $command _all_other_patches ;;
         hide)   _stg_patches $command _unapplied_patches ;;
@@ -247,7 +245,8 @@ _stg ()
         unhide) _stg_patches $command _hidden_patches ;;
         # patch commands
         delete) _stg_patches $command _all_patches ;;
-        export) _stg_patches $command _applied_patches ;;
+        edit)   _stg_patches $command _applied_patches ;;
+        export) _stg_patches $command _all_patches ;;
         files)  _stg_patches $command _all_patches ;;
         log)    _stg_patches $command _all_patches ;;
         mail)   _stg_patches $command _all_patches ;;
@@ -260,8 +259,6 @@ _stg ()
         # working-copy commands
         diff)   _stg_patches_options $command _applied_patches "-r --range" ;;
 	resolved) _complete_files $command "$(_conflicting_files)" ;;
-	add)	_complete_files $command "$(_unknown_files)" ;;
-#	rm)	_complete_files $command "$(_known_files)" ;;
 	# commands that usually raher accept branches
 	branch) _complete_branch $command _all_branches ;;
 	rebase) _complete_branch $command _all_branches ;;