X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/06848faba60e1c4e637b15b608e5bd94989c4196..22037590baa995704b6cc08d844e024c85c7c578:/contrib/stgit-completion.bash

diff --git a/contrib/stgit-completion.bash b/contrib/stgit-completion.bash
index 8c50cbc..d0d716c 100644
--- a/contrib/stgit-completion.bash
+++ b/contrib/stgit-completion.bash
@@ -36,6 +36,7 @@ _stg_commands="
     pop
     pull
     push
+    rebase
     refresh
     rename
     resolved
@@ -90,7 +91,7 @@ _all_other_patches ()
     local b=$(_current_branch)
     local g=$(_gitdir)
     [ "$g" ] && cat "$g/patches/$b/applied" "$g/patches/$b/unapplied" \
-        | grep -v "^$(< $g/patches/$b/current)$"
+        | grep -v "^$(cat $g/patches/$b/current 2> /dev/null)$"
 }
 
 # List the command options
@@ -194,7 +195,7 @@ _stg ()
         export) _stg_patches $command _applied_patches ;;
         files)  _stg_patches $command _all_patches ;;
         log)    _stg_patches $command _all_patches ;;
-        mail)   _stg_patches $command _applied_patches ;;
+        mail)   _stg_patches $command _all_patches ;;
         pick)   _stg_patches $command _unapplied_patches ;;
         refresh)_stg_patches_options $command _applied_patches "-p --patch" ;;
         rename) _stg_patches $command _all_patches ;;