--- /tmp/stgit-0.19-1gnm_0b4m/debian/stgit_0.19-1_all.deb
+++ stgit_0.19-1_all.deb
├── file list
│ @@ -1,3 +1,3 @@
│  -rw-r--r--   0        0        0        4 2019-10-03 12:38:18.000000 debian-binary
│  -rw-r--r--   0        0        0     3264 2019-10-03 12:38:18.000000 control.tar.xz
│ --rw-r--r--   0        0        0   103200 2019-10-03 12:38:18.000000 data.tar.xz
│ +-rw-r--r--   0        0        0   103176 2019-10-03 12:38:18.000000 data.tar.xz
├── control.tar.xz
│ ├── control.tar
│ │ ├── ./md5sums
│ │ │ ├── ./md5sums
│ │ │ │┄ Files differ
├── data.tar.xz
│ ├── data.tar
│ │ ├── ./usr/lib/python3/dist-packages/stgit/commands/cmdlist.py
│ │ │┄ Ordering differences only
│ │ │ @@ -1,214 +1,214 @@
│ │ │  from __future__ import unicode_literals
│ │ │  
│ │ │  command_list = {
│ │ │ -    'unhide': (
│ │ │ -        'unhide',
│ │ │ +    'repair': (
│ │ │ +        'repair',
│ │ │          'Stack (branch) commands',
│ │ │ -        'Unhide a hidden patch',
│ │ │ +        'Fix StGit metadata if branch was modified with git commands',
│ │ │      ),
│ │ │ -    'undo': (
│ │ │ -        'undo',
│ │ │ +    'pop': (
│ │ │ +        'pop',
│ │ │          'Stack (branch) commands',
│ │ │ -        'Undo the last operation',
│ │ │ +        'Pop one or more patches from the stack',
│ │ │      ),
│ │ │ -    'uncommit': (
│ │ │ -        'uncommit',
│ │ │ +    'log': (
│ │ │ +        'log',
│ │ │          'Stack (branch) commands',
│ │ │ -        'Turn regular git commits into StGit patches',
│ │ │ +        'Display the patch changelog',
│ │ │      ),
│ │ │ -    'top': (
│ │ │ -        'top',
│ │ │ +    'float': (
│ │ │ +        'float',
│ │ │          'Stack (branch) commands',
│ │ │ -        'Print the name of the top patch',
│ │ │ -    ),
│ │ │ -    'sync': (
│ │ │ -        'sync',
│ │ │ -        'Patch commands',
│ │ │ -        'Synchronise patches with a branch or a series',
│ │ │ +        'Push patches to the top, even if applied',
│ │ │      ),
│ │ │ -    'squash': (
│ │ │ -        'squash',
│ │ │ +    'rebase': (
│ │ │ +        'rebase',
│ │ │          'Stack (branch) commands',
│ │ │ -        'Squash two or more patches into one',
│ │ │ +        'Move the stack base to another point in history',
│ │ │      ),
│ │ │ -    'sink': (
│ │ │ -        'sink',
│ │ │ +    'hide': (
│ │ │ +        'hide',
│ │ │          'Stack (branch) commands',
│ │ │ -        'Send patches deeper down the stack',
│ │ │ +        'Hide a patch in the series',
│ │ │ +    ),
│ │ │ +    'id': (
│ │ │ +        'id',
│ │ │ +        'Repository commands',
│ │ │ +        'Print the git hash value of a StGit reference',
│ │ │      ),
│ │ │      'show': (
│ │ │          'show',
│ │ │          'Patch commands',
│ │ │          'Show the commit corresponding to a patch',
│ │ │      ),
│ │ │ -    'series': (
│ │ │ -        'series',
│ │ │ +    'unhide': (
│ │ │ +        'unhide',
│ │ │          'Stack (branch) commands',
│ │ │ -        'Print the patch series',
│ │ │ +        'Unhide a hidden patch',
│ │ │      ),
│ │ │ -    'reset': (
│ │ │ -        'reset',
│ │ │ +    'clone': (
│ │ │ +        'clone',
│ │ │ +        'Repository commands',
│ │ │ +        'Make a local clone of a remote repository',
│ │ │ +    ),
│ │ │ +    'commit': (
│ │ │ +        'commit',
│ │ │          'Stack (branch) commands',
│ │ │ -        'Reset the patch stack to an earlier state',
│ │ │ +        'Permanently store the applied patches into the stack base',
│ │ │      ),
│ │ │ -    'repair': (
│ │ │ -        'repair',
│ │ │ +    'export': (
│ │ │ +        'export',
│ │ │ +        'Patch commands',
│ │ │ +        'Export patches to a directory',
│ │ │ +    ),
│ │ │ +    'uncommit': (
│ │ │ +        'uncommit',
│ │ │          'Stack (branch) commands',
│ │ │ -        'Fix StGit metadata if branch was modified with git commands',
│ │ │ +        'Turn regular git commits into StGit patches',
│ │ │ +    ),
│ │ │ +    'squash': (
│ │ │ +        'squash',
│ │ │ +        'Stack (branch) commands',
│ │ │ +        'Squash two or more patches into one',
│ │ │ +    ),
│ │ │ +    'edit': (
│ │ │ +        'edit',
│ │ │ +        'Patch commands',
│ │ │ +        'Edit a patch description or diff',
│ │ │ +    ),
│ │ │ +    'goto': (
│ │ │ +        'goto',
│ │ │ +        'Stack (branch) commands',
│ │ │ +        'Push or pop patches to the given one',
│ │ │      ),
│ │ │      'rename': (
│ │ │          'rename',
│ │ │          'Patch commands',
│ │ │          'Rename a patch',
│ │ │      ),
│ │ │ -    'refresh': (
│ │ │ -        'refresh',
│ │ │ +    'top': (
│ │ │ +        'top',
│ │ │ +        'Stack (branch) commands',
│ │ │ +        'Print the name of the top patch',
│ │ │ +    ),
│ │ │ +    'pick': (
│ │ │ +        'pick',
│ │ │          'Patch commands',
│ │ │ -        'Generate a new commit for the current patch',
│ │ │ +        'Import a patch from a different branch or a commit object',
│ │ │      ),
│ │ │ -    'redo': (
│ │ │ -        'redo',
│ │ │ +    'next': (
│ │ │ +        'next',
│ │ │          'Stack (branch) commands',
│ │ │ -        'Undo the last undo operation',
│ │ │ +        'Print the name of the next patch',
│ │ │      ),
│ │ │ -    'rebase': (
│ │ │ -        'rebase',
│ │ │ -        'Stack (branch) commands',
│ │ │ -        'Move the stack base to another point in history',
│ │ │ +    'mail': (
│ │ │ +        'mail',
│ │ │ +        'Patch commands',
│ │ │ +        'Send a patch or series of patches by e-mail',
│ │ │      ),
│ │ │ -    'push': (
│ │ │ -        'push',
│ │ │ +    'delete': (
│ │ │ +        'delete',
│ │ │ +        'Patch commands',
│ │ │ +        'Delete patches',
│ │ │ +    ),
│ │ │ +    'refresh': (
│ │ │ +        'refresh',
│ │ │ +        'Patch commands',
│ │ │ +        'Generate a new commit for the current patch',
│ │ │ +    ),
│ │ │ +    'patches': (
│ │ │ +        'patches',
│ │ │          'Stack (branch) commands',
│ │ │ -        'Push one or more patches onto the stack',
│ │ │ +        'Show the applied patches modifying a file',
│ │ │      ),
│ │ │ -    'pull': (
│ │ │ -        'pull',
│ │ │ +    'undo': (
│ │ │ +        'undo',
│ │ │          'Stack (branch) commands',
│ │ │ -        'Pull changes from a remote repository',
│ │ │ +        'Undo the last operation',
│ │ │      ),
│ │ │ -    'publish': (
│ │ │ -        'publish',
│ │ │ +    'series': (
│ │ │ +        'series',
│ │ │          'Stack (branch) commands',
│ │ │ -        'Push the stack changes to a merge-friendly branch',
│ │ │ +        'Print the patch series',
│ │ │      ),
│ │ │      'prev': (
│ │ │          'prev',
│ │ │          'Stack (branch) commands',
│ │ │          'Print the name of the previous patch',
│ │ │      ),
│ │ │ -    'pop': (
│ │ │ -        'pop',
│ │ │ +    'clean': (
│ │ │ +        'clean',
│ │ │          'Stack (branch) commands',
│ │ │ -        'Pop one or more patches from the stack',
│ │ │ +        'Delete the empty patches in the series',
│ │ │      ),
│ │ │ -    'pick': (
│ │ │ -        'pick',
│ │ │ -        'Patch commands',
│ │ │ -        'Import a patch from a different branch or a commit object',
│ │ │ +    'publish': (
│ │ │ +        'publish',
│ │ │ +        'Stack (branch) commands',
│ │ │ +        'Push the stack changes to a merge-friendly branch',
│ │ │      ),
│ │ │ -    'patches': (
│ │ │ -        'patches',
│ │ │ +    'branch': (
│ │ │ +        'branch',
│ │ │          'Stack (branch) commands',
│ │ │ -        'Show the applied patches modifying a file',
│ │ │ +        'Branch operations: switch, list, create, rename, delete, ...',
│ │ │      ),
│ │ │ -    'next': (
│ │ │ -        'next',
│ │ │ +    'push': (
│ │ │ +        'push',
│ │ │          'Stack (branch) commands',
│ │ │ -        'Print the name of the next patch',
│ │ │ +        'Push one or more patches onto the stack',
│ │ │      ),
│ │ │      'new': (
│ │ │          'new',
│ │ │          'Patch commands',
│ │ │          'Create a new, empty patch',
│ │ │      ),
│ │ │ -    'mail': (
│ │ │ -        'mail',
│ │ │ -        'Patch commands',
│ │ │ -        'Send a patch or series of patches by e-mail',
│ │ │ -    ),
│ │ │ -    'log': (
│ │ │ -        'log',
│ │ │ +    'pull': (
│ │ │ +        'pull',
│ │ │          'Stack (branch) commands',
│ │ │ -        'Display the patch changelog',
│ │ │ +        'Pull changes from a remote repository',
│ │ │      ),
│ │ │      'init': (
│ │ │          'init',
│ │ │          'Stack (branch) commands',
│ │ │          'Initialise the current branch for use with StGIT',
│ │ │      ),
│ │ │ -    'import': (
│ │ │ -        'imprt',
│ │ │ -        'Patch commands',
│ │ │ -        'Import a GNU diff file as a new patch',
│ │ │ -    ),
│ │ │ -    'id': (
│ │ │ -        'id',
│ │ │ -        'Repository commands',
│ │ │ -        'Print the git hash value of a StGit reference',
│ │ │ -    ),
│ │ │ -    'hide': (
│ │ │ -        'hide',
│ │ │ -        'Stack (branch) commands',
│ │ │ -        'Hide a patch in the series',
│ │ │ -    ),
│ │ │ -    'goto': (
│ │ │ -        'goto',
│ │ │ +    'reset': (
│ │ │ +        'reset',
│ │ │          'Stack (branch) commands',
│ │ │ -        'Push or pop patches to the given one',
│ │ │ +        'Reset the patch stack to an earlier state',
│ │ │      ),
│ │ │      'fold': (
│ │ │          'fold',
│ │ │          'Patch commands',
│ │ │          'Integrate a GNU diff patch into the current patch',
│ │ │      ),
│ │ │ -    'float': (
│ │ │ -        'float',
│ │ │ -        'Stack (branch) commands',
│ │ │ -        'Push patches to the top, even if applied',
│ │ │ -    ),
│ │ │      'files': (
│ │ │          'files',
│ │ │          'Patch commands',
│ │ │          'Show the files modified by a patch (or the current patch)',
│ │ │      ),
│ │ │ -    'export': (
│ │ │ -        'export',
│ │ │ +    'redo': (
│ │ │ +        'redo',
│ │ │ +        'Stack (branch) commands',
│ │ │ +        'Undo the last undo operation',
│ │ │ +    ),
│ │ │ +    'import': (
│ │ │ +        'imprt',
│ │ │          'Patch commands',
│ │ │ -        'Export patches to a directory',
│ │ │ +        'Import a GNU diff file as a new patch',
│ │ │      ),
│ │ │ -    'edit': (
│ │ │ -        'edit',
│ │ │ +    'sync': (
│ │ │ +        'sync',
│ │ │          'Patch commands',
│ │ │ -        'Edit a patch description or diff',
│ │ │ +        'Synchronise patches with a branch or a series',
│ │ │ +    ),
│ │ │ +    'sink': (
│ │ │ +        'sink',
│ │ │ +        'Stack (branch) commands',
│ │ │ +        'Send patches deeper down the stack',
│ │ │      ),
│ │ │      'diff': (
│ │ │          'diff',
│ │ │          'Index/worktree commands',
│ │ │          'Show the tree diff',
│ │ │      ),
│ │ │ -    'delete': (
│ │ │ -        'delete',
│ │ │ -        'Patch commands',
│ │ │ -        'Delete patches',
│ │ │ -    ),
│ │ │ -    'commit': (
│ │ │ -        'commit',
│ │ │ -        'Stack (branch) commands',
│ │ │ -        'Permanently store the applied patches into the stack base',
│ │ │ -    ),
│ │ │ -    'clone': (
│ │ │ -        'clone',
│ │ │ -        'Repository commands',
│ │ │ -        'Make a local clone of a remote repository',
│ │ │ -    ),
│ │ │ -    'clean': (
│ │ │ -        'clean',
│ │ │ -        'Stack (branch) commands',
│ │ │ -        'Delete the empty patches in the series',
│ │ │ -    ),
│ │ │ -    'branch': (
│ │ │ -        'branch',
│ │ │ -        'Stack (branch) commands',
│ │ │ -        'Branch operations: switch, list, create, rename, delete, ...',
│ │ │ -    ),
│ │ │  }
│ │ ├── ./usr/share/bash-completion/completions/stg
│ │ │ @@ -152,38 +152,38 @@
│ │ │  _stg_commit ()
│ │ │  {
│ │ │      local flags="--all --help --number"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │          -n|--number) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_unapplied_patches) $(_applied_patches)" "$cur")" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$(_patch_range "$(_unapplied_patches) $(_applied_patches)" "$cur") $flags" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_delete ()
│ │ │  {
│ │ │      local flags="--branch --help --spill --top"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │          -b|--branch) COMPREPLY=($(compgen -W "$(_stg_branches)" -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_unapplied_patches) $(_applied_patches)" "$cur")" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$(_patch_range "$(_unapplied_patches) $(_applied_patches)" "$cur") $flags" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_diff ()
│ │ │  {
│ │ │      local flags="--diff-opts --help --range --stat"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │ -        -r|--range) COMPREPLY=($(compgen -W "$(_patch_range "$(_hidden_patches) $(_unapplied_patches) $(_applied_patches)" "$cur")" -- "$cur")) ;;
│ │ │ +        -r|--range) COMPREPLY=($(compgen -W "$(_patch_range "$(_unapplied_patches) $(_applied_patches) $(_hidden_patches)" "$cur")" -- "$cur")) ;;
│ │ │          -O|--diff-opts) COMPREPLY=($(compgen -W "-M -C" -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$flags $(_known_files) $(_dirty_files)" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$(_dirty_files) $flags $(_known_files)" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_edit ()
│ │ │  {
│ │ │      local flags="--ack --authdate --authemail --authname --author --diff --diff-opts --edit --file --help --message --no-verify --review --save-template --set-tree --sign"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │ @@ -194,52 +194,52 @@
│ │ │          --save-template) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          --author) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          --authname) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          --authemail) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          --authdate) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          -O|--diff-opts) COMPREPLY=($(compgen -W "-M -C" -- "$cur")) ;;
│ │ │          -t|--set-tree) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$(_hidden_patches) $(_unapplied_patches) $flags $(_applied_patches)" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$(_unapplied_patches) $flags $(_applied_patches) $(_hidden_patches)" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_export ()
│ │ │  {
│ │ │      local flags="--branch --diff-opts --dir --extension --help --numbered --patch --stdout --template"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │          -d|--dir) COMPREPLY=($(compgen -A directory -- "$cur")) ;;
│ │ │          -e|--extension) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          -t|--template) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          -b|--branch) COMPREPLY=($(compgen -W "$(_stg_branches)" -- "$cur")) ;;
│ │ │          -O|--diff-opts) COMPREPLY=($(compgen -W "-M -C" -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_hidden_patches) $(_unapplied_patches) $(_applied_patches)" "$cur")" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_unapplied_patches) $(_applied_patches) $(_hidden_patches)" "$cur")" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_files ()
│ │ │  {
│ │ │      local flags="--bare --diff-opts --help --stat"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │          -O|--diff-opts) COMPREPLY=($(compgen -W "-M -C" -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$(_hidden_patches) $(_unapplied_patches) $flags $(_applied_patches)" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$(_unapplied_patches) $flags $(_applied_patches) $(_hidden_patches)" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_float ()
│ │ │  {
│ │ │      local flags="--help --keep --series"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │          -s|--series) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_unapplied_patches) $(_applied_patches)" "$cur")" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$(_patch_range "$(_unapplied_patches) $(_applied_patches)" "$cur") $flags" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_fold ()
│ │ │  {
│ │ │      local flags="--base --help --reject --strip --threeway"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │ @@ -253,36 +253,36 @@
│ │ │  
│ │ │  _stg_goto ()
│ │ │  {
│ │ │      local flags="--help --keep --merged"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │ -        *) COMPREPLY=($(compgen -W "$(_other_applied_patches) $(_unapplied_patches) $flags" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$(_unapplied_patches) $(_other_applied_patches) $flags" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_hide ()
│ │ │  {
│ │ │      local flags="--branch --help"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │          -b|--branch) COMPREPLY=($(compgen -W "$(_stg_branches)" -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_unapplied_patches) $(_applied_patches)" "$cur")" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$(_patch_range "$(_unapplied_patches) $(_applied_patches)" "$cur") $flags" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_id ()
│ │ │  {
│ │ │      local flags="--help"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │ -        *) COMPREPLY=($(compgen -W "$(_hidden_patches) $(_unapplied_patches) $flags $(_applied_patches)" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$(_unapplied_patches) $flags $(_applied_patches) $(_hidden_patches)" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_import ()
│ │ │  {
│ │ │      local flags="--ack --authdate --authemail --authname --author --base --edit --help --ignore --mail --mbox --name --reject --replace --review --series --showdiff --sign --strip --stripname --url"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │ @@ -313,15 +313,15 @@
│ │ │  {
│ │ │      local flags="--branch --clear --diff --full --graphical --help --number"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │          -b|--branch) COMPREPLY=($(compgen -W "$(_stg_branches)" -- "$cur")) ;;
│ │ │          -n|--number) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_hidden_patches) $(_unapplied_patches) $(_applied_patches)" "$cur")" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_unapplied_patches) $(_applied_patches) $(_hidden_patches)" "$cur")" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_mail ()
│ │ │  {
│ │ │      local flags="--all --attach --attach-inline --auto --bcc --branch --cc --cover --diff-opts --edit-cover --edit-patches --git --help --in-reply-to --mbox --no-thread --prefix --sleep --smtp-password --smtp-server --smtp-tls --smtp-user --template --to --unrelated --version"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │ @@ -337,15 +337,15 @@
│ │ │          -s|--sleep) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          --in-reply-to) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          --smtp-server) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          -u|--smtp-user) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          -p|--smtp-password) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          -b|--branch) COMPREPLY=($(compgen -W "$(_stg_branches)" -- "$cur")) ;;
│ │ │          -O|--diff-opts) COMPREPLY=($(compgen -W "-M -C" -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_hidden_patches) $(_unapplied_patches) $(_applied_patches)" "$cur")" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_unapplied_patches) $(_applied_patches) $(_hidden_patches)" "$cur")" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_new ()
│ │ │  {
│ │ │      local flags="--ack --authdate --authemail --authname --author --file --help --message --no-verify --review --save-template --sign"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │ @@ -390,26 +390,26 @@
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │          -n|--name) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          -B|--ref-branch) COMPREPLY=($(compgen -W "$(_stg_branches)" -- "$cur")) ;;
│ │ │          -p|--parent) COMPREPLY=($(compgen -W "$(_all_branches) $(_tags) $(_remotes)" -- "$cur")) ;;
│ │ │          -f|--file) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_hidden_patches) $(_unapplied_patches) $(_applied_patches)" "$cur")" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_unapplied_patches) $(_applied_patches) $(_hidden_patches)" "$cur")" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_pop ()
│ │ │  {
│ │ │      local flags="--all --help --keep --number --spill"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │          -n|--number) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_applied_patches)" "$cur")" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$(_patch_range "$(_applied_patches)" "$cur") $flags" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_prev ()
│ │ │  {
│ │ │      local flags="--branch --help"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │ @@ -450,15 +450,15 @@
│ │ │  _stg_push ()
│ │ │  {
│ │ │      local flags="--all --help --keep --merged --number --reverse --set-tree"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │          -n|--number) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$(_patch_range "$(_unapplied_patches)" "$cur") $flags" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_unapplied_patches)" "$cur")" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_rebase ()
│ │ │  {
│ │ │      local flags="--help --merged --nopush"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │ @@ -481,34 +481,34 @@
│ │ │  
│ │ │  _stg_refresh ()
│ │ │  {
│ │ │      local flags="--ack --annotate --authdate --authemail --authname --author --edit --file --force --help --index --message --no-submodules --no-verify --patch --review --sign --submodules --update"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │ -        -p|--patch) COMPREPLY=($(compgen -W "$(_other_applied_patches) $(_unapplied_patches)" -- "$cur")) ;;
│ │ │ +        -p|--patch) COMPREPLY=($(compgen -W "$(_unapplied_patches) $(_other_applied_patches)" -- "$cur")) ;;
│ │ │          -a|--annotate) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          -m|--message) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          -f|--file) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          --author) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          --authname) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          --authemail) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          --authdate) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$flags $(_dirty_files)" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$(_dirty_files) $flags" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_rename ()
│ │ │  {
│ │ │      local flags="--branch --help"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │          -b|--branch) COMPREPLY=($(compgen -W "$(_stg_branches)" -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$(_hidden_patches) $(_unapplied_patches) $flags $(_applied_patches)" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$(_unapplied_patches) $flags $(_applied_patches) $(_hidden_patches)" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_repair ()
│ │ │  {
│ │ │      local flags="--help"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │ @@ -520,76 +520,76 @@
│ │ │  
│ │ │  _stg_reset ()
│ │ │  {
│ │ │      local flags="--hard --help"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │ -        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_hidden_patches) $(_unapplied_patches) $(_applied_patches)" "$cur")" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_unapplied_patches) $(_applied_patches) $(_hidden_patches)" "$cur")" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_series ()
│ │ │  {
│ │ │      local flags="--all --applied --author --branch --count --description --empty --help --hidden --missing --noprefix --short --showbranch --unapplied"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │          -b|--branch) COMPREPLY=($(compgen -W "$(_stg_branches)" -- "$cur")) ;;
│ │ │          -m|--missing) COMPREPLY=($(compgen -W "$(_stg_branches)" -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_hidden_patches) $(_unapplied_patches) $(_applied_patches)" "$cur")" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_unapplied_patches) $(_applied_patches) $(_hidden_patches)" "$cur")" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_show ()
│ │ │  {
│ │ │      local flags="--applied --branch --diff-opts --help --stat --unapplied"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │          -b|--branch) COMPREPLY=($(compgen -W "$(_stg_branches)" -- "$cur")) ;;
│ │ │          -O|--diff-opts) COMPREPLY=($(compgen -W "-M -C" -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_hidden_patches) $(_unapplied_patches) $(_applied_patches)" "$cur")" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_unapplied_patches) $(_applied_patches) $(_hidden_patches)" "$cur")" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_sink ()
│ │ │  {
│ │ │      local flags="--help --keep --nopush --to"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │          -t|--to) COMPREPLY=($(compgen -W "$(_applied_patches)" -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_unapplied_patches) $(_applied_patches)" "$cur")" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$(_patch_range "$(_unapplied_patches) $(_applied_patches)" "$cur") $flags" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_squash ()
│ │ │  {
│ │ │      local flags="--file --help --message --name --no-verify --save-template"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │          -n|--name) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          -m|--message) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          -f|--file) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          --save-template) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_unapplied_patches) $(_applied_patches)" "$cur")" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$(_patch_range "$(_unapplied_patches) $(_applied_patches)" "$cur") $flags" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_sync ()
│ │ │  {
│ │ │      local flags="--all --help --ref-branch --series"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │          -B|--ref-branch) COMPREPLY=($(compgen -W "$(_stg_branches)" -- "$cur")) ;;
│ │ │          -s|--series) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_unapplied_patches) $(_applied_patches)" "$cur")" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$(_patch_range "$(_unapplied_patches) $(_applied_patches)" "$cur") $flags" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_top ()
│ │ │  {
│ │ │      local flags="--branch --help"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │ @@ -626,15 +626,15 @@
│ │ │  _stg_unhide ()
│ │ │  {
│ │ │      local flags="--branch --help"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │          -b|--branch) COMPREPLY=($(compgen -W "$(_stg_branches)" -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$(_patch_range "$(_hidden_patches)" "$cur") $flags" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_hidden_patches)" "$cur")" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg ()
│ │ │  {
│ │ │      local i
│ │ │      local c=1
│ │ ├── ./usr/share/stgit/completion/stgit-completion.bash
│ │ │ @@ -152,38 +152,38 @@
│ │ │  _stg_commit ()
│ │ │  {
│ │ │      local flags="--all --help --number"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │          -n|--number) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_unapplied_patches) $(_applied_patches)" "$cur")" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$(_patch_range "$(_unapplied_patches) $(_applied_patches)" "$cur") $flags" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_delete ()
│ │ │  {
│ │ │      local flags="--branch --help --spill --top"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │          -b|--branch) COMPREPLY=($(compgen -W "$(_stg_branches)" -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_unapplied_patches) $(_applied_patches)" "$cur")" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$(_patch_range "$(_unapplied_patches) $(_applied_patches)" "$cur") $flags" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_diff ()
│ │ │  {
│ │ │      local flags="--diff-opts --help --range --stat"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │ -        -r|--range) COMPREPLY=($(compgen -W "$(_patch_range "$(_hidden_patches) $(_unapplied_patches) $(_applied_patches)" "$cur")" -- "$cur")) ;;
│ │ │ +        -r|--range) COMPREPLY=($(compgen -W "$(_patch_range "$(_unapplied_patches) $(_applied_patches) $(_hidden_patches)" "$cur")" -- "$cur")) ;;
│ │ │          -O|--diff-opts) COMPREPLY=($(compgen -W "-M -C" -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$flags $(_known_files) $(_dirty_files)" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$(_dirty_files) $flags $(_known_files)" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_edit ()
│ │ │  {
│ │ │      local flags="--ack --authdate --authemail --authname --author --diff --diff-opts --edit --file --help --message --no-verify --review --save-template --set-tree --sign"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │ @@ -194,52 +194,52 @@
│ │ │          --save-template) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          --author) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          --authname) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          --authemail) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          --authdate) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          -O|--diff-opts) COMPREPLY=($(compgen -W "-M -C" -- "$cur")) ;;
│ │ │          -t|--set-tree) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$(_hidden_patches) $(_unapplied_patches) $flags $(_applied_patches)" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$(_unapplied_patches) $flags $(_applied_patches) $(_hidden_patches)" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_export ()
│ │ │  {
│ │ │      local flags="--branch --diff-opts --dir --extension --help --numbered --patch --stdout --template"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │          -d|--dir) COMPREPLY=($(compgen -A directory -- "$cur")) ;;
│ │ │          -e|--extension) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          -t|--template) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          -b|--branch) COMPREPLY=($(compgen -W "$(_stg_branches)" -- "$cur")) ;;
│ │ │          -O|--diff-opts) COMPREPLY=($(compgen -W "-M -C" -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_hidden_patches) $(_unapplied_patches) $(_applied_patches)" "$cur")" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_unapplied_patches) $(_applied_patches) $(_hidden_patches)" "$cur")" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_files ()
│ │ │  {
│ │ │      local flags="--bare --diff-opts --help --stat"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │          -O|--diff-opts) COMPREPLY=($(compgen -W "-M -C" -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$(_hidden_patches) $(_unapplied_patches) $flags $(_applied_patches)" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$(_unapplied_patches) $flags $(_applied_patches) $(_hidden_patches)" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_float ()
│ │ │  {
│ │ │      local flags="--help --keep --series"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │          -s|--series) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_unapplied_patches) $(_applied_patches)" "$cur")" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$(_patch_range "$(_unapplied_patches) $(_applied_patches)" "$cur") $flags" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_fold ()
│ │ │  {
│ │ │      local flags="--base --help --reject --strip --threeway"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │ @@ -253,36 +253,36 @@
│ │ │  
│ │ │  _stg_goto ()
│ │ │  {
│ │ │      local flags="--help --keep --merged"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │ -        *) COMPREPLY=($(compgen -W "$(_other_applied_patches) $(_unapplied_patches) $flags" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$(_unapplied_patches) $(_other_applied_patches) $flags" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_hide ()
│ │ │  {
│ │ │      local flags="--branch --help"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │          -b|--branch) COMPREPLY=($(compgen -W "$(_stg_branches)" -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_unapplied_patches) $(_applied_patches)" "$cur")" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$(_patch_range "$(_unapplied_patches) $(_applied_patches)" "$cur") $flags" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_id ()
│ │ │  {
│ │ │      local flags="--help"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │ -        *) COMPREPLY=($(compgen -W "$(_hidden_patches) $(_unapplied_patches) $flags $(_applied_patches)" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$(_unapplied_patches) $flags $(_applied_patches) $(_hidden_patches)" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_import ()
│ │ │  {
│ │ │      local flags="--ack --authdate --authemail --authname --author --base --edit --help --ignore --mail --mbox --name --reject --replace --review --series --showdiff --sign --strip --stripname --url"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │ @@ -313,15 +313,15 @@
│ │ │  {
│ │ │      local flags="--branch --clear --diff --full --graphical --help --number"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │          -b|--branch) COMPREPLY=($(compgen -W "$(_stg_branches)" -- "$cur")) ;;
│ │ │          -n|--number) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_hidden_patches) $(_unapplied_patches) $(_applied_patches)" "$cur")" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_unapplied_patches) $(_applied_patches) $(_hidden_patches)" "$cur")" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_mail ()
│ │ │  {
│ │ │      local flags="--all --attach --attach-inline --auto --bcc --branch --cc --cover --diff-opts --edit-cover --edit-patches --git --help --in-reply-to --mbox --no-thread --prefix --sleep --smtp-password --smtp-server --smtp-tls --smtp-user --template --to --unrelated --version"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │ @@ -337,15 +337,15 @@
│ │ │          -s|--sleep) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          --in-reply-to) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          --smtp-server) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          -u|--smtp-user) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          -p|--smtp-password) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          -b|--branch) COMPREPLY=($(compgen -W "$(_stg_branches)" -- "$cur")) ;;
│ │ │          -O|--diff-opts) COMPREPLY=($(compgen -W "-M -C" -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_hidden_patches) $(_unapplied_patches) $(_applied_patches)" "$cur")" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_unapplied_patches) $(_applied_patches) $(_hidden_patches)" "$cur")" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_new ()
│ │ │  {
│ │ │      local flags="--ack --authdate --authemail --authname --author --file --help --message --no-verify --review --save-template --sign"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │ @@ -390,26 +390,26 @@
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │          -n|--name) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          -B|--ref-branch) COMPREPLY=($(compgen -W "$(_stg_branches)" -- "$cur")) ;;
│ │ │          -p|--parent) COMPREPLY=($(compgen -W "$(_all_branches) $(_tags) $(_remotes)" -- "$cur")) ;;
│ │ │          -f|--file) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_hidden_patches) $(_unapplied_patches) $(_applied_patches)" "$cur")" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_unapplied_patches) $(_applied_patches) $(_hidden_patches)" "$cur")" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_pop ()
│ │ │  {
│ │ │      local flags="--all --help --keep --number --spill"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │          -n|--number) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_applied_patches)" "$cur")" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$(_patch_range "$(_applied_patches)" "$cur") $flags" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_prev ()
│ │ │  {
│ │ │      local flags="--branch --help"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │ @@ -450,15 +450,15 @@
│ │ │  _stg_push ()
│ │ │  {
│ │ │      local flags="--all --help --keep --merged --number --reverse --set-tree"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │          -n|--number) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$(_patch_range "$(_unapplied_patches)" "$cur") $flags" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_unapplied_patches)" "$cur")" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_rebase ()
│ │ │  {
│ │ │      local flags="--help --merged --nopush"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │ @@ -481,34 +481,34 @@
│ │ │  
│ │ │  _stg_refresh ()
│ │ │  {
│ │ │      local flags="--ack --annotate --authdate --authemail --authname --author --edit --file --force --help --index --message --no-submodules --no-verify --patch --review --sign --submodules --update"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │ -        -p|--patch) COMPREPLY=($(compgen -W "$(_other_applied_patches) $(_unapplied_patches)" -- "$cur")) ;;
│ │ │ +        -p|--patch) COMPREPLY=($(compgen -W "$(_unapplied_patches) $(_other_applied_patches)" -- "$cur")) ;;
│ │ │          -a|--annotate) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          -m|--message) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          -f|--file) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          --author) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          --authname) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          --authemail) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          --authdate) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$flags $(_dirty_files)" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$(_dirty_files) $flags" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_rename ()
│ │ │  {
│ │ │      local flags="--branch --help"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │          -b|--branch) COMPREPLY=($(compgen -W "$(_stg_branches)" -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$(_hidden_patches) $(_unapplied_patches) $flags $(_applied_patches)" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$(_unapplied_patches) $flags $(_applied_patches) $(_hidden_patches)" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_repair ()
│ │ │  {
│ │ │      local flags="--help"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │ @@ -520,76 +520,76 @@
│ │ │  
│ │ │  _stg_reset ()
│ │ │  {
│ │ │      local flags="--hard --help"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │ -        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_hidden_patches) $(_unapplied_patches) $(_applied_patches)" "$cur")" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_unapplied_patches) $(_applied_patches) $(_hidden_patches)" "$cur")" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_series ()
│ │ │  {
│ │ │      local flags="--all --applied --author --branch --count --description --empty --help --hidden --missing --noprefix --short --showbranch --unapplied"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │          -b|--branch) COMPREPLY=($(compgen -W "$(_stg_branches)" -- "$cur")) ;;
│ │ │          -m|--missing) COMPREPLY=($(compgen -W "$(_stg_branches)" -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_hidden_patches) $(_unapplied_patches) $(_applied_patches)" "$cur")" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_unapplied_patches) $(_applied_patches) $(_hidden_patches)" "$cur")" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_show ()
│ │ │  {
│ │ │      local flags="--applied --branch --diff-opts --help --stat --unapplied"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │          -b|--branch) COMPREPLY=($(compgen -W "$(_stg_branches)" -- "$cur")) ;;
│ │ │          -O|--diff-opts) COMPREPLY=($(compgen -W "-M -C" -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_hidden_patches) $(_unapplied_patches) $(_applied_patches)" "$cur")" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_unapplied_patches) $(_applied_patches) $(_hidden_patches)" "$cur")" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_sink ()
│ │ │  {
│ │ │      local flags="--help --keep --nopush --to"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │          -t|--to) COMPREPLY=($(compgen -W "$(_applied_patches)" -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_unapplied_patches) $(_applied_patches)" "$cur")" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$(_patch_range "$(_unapplied_patches) $(_applied_patches)" "$cur") $flags" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_squash ()
│ │ │  {
│ │ │      local flags="--file --help --message --name --no-verify --save-template"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │          -n|--name) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          -m|--message) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          -f|--file) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │          --save-template) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_unapplied_patches) $(_applied_patches)" "$cur")" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$(_patch_range "$(_unapplied_patches) $(_applied_patches)" "$cur") $flags" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_sync ()
│ │ │  {
│ │ │      local flags="--all --help --ref-branch --series"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │          -B|--ref-branch) COMPREPLY=($(compgen -W "$(_stg_branches)" -- "$cur")) ;;
│ │ │          -s|--series) COMPREPLY=($(compgen -A file -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_unapplied_patches) $(_applied_patches)" "$cur")" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$(_patch_range "$(_unapplied_patches) $(_applied_patches)" "$cur") $flags" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg_top ()
│ │ │  {
│ │ │      local flags="--branch --help"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │ @@ -626,15 +626,15 @@
│ │ │  _stg_unhide ()
│ │ │  {
│ │ │      local flags="--branch --help"
│ │ │      local prev="${COMP_WORDS[COMP_CWORD-1]}"
│ │ │      local cur="${COMP_WORDS[COMP_CWORD]}"
│ │ │      case "$prev" in
│ │ │          -b|--branch) COMPREPLY=($(compgen -W "$(_stg_branches)" -- "$cur")) ;;
│ │ │ -        *) COMPREPLY=($(compgen -W "$(_patch_range "$(_hidden_patches)" "$cur") $flags" -- "$cur")) ;;
│ │ │ +        *) COMPREPLY=($(compgen -W "$flags $(_patch_range "$(_hidden_patches)" "$cur")" -- "$cur")) ;;
│ │ │      esac
│ │ │  }
│ │ │  
│ │ │  _stg ()
│ │ │  {
│ │ │      local i
│ │ │      local c=1