.gitconfig: use `git var GIT_EDITOR`

[dotfiles.git] / .shellrc

diff --git a/.shellrc b/.shellrc
index bd1228e0d3a2caa4ec101307e34917d40c51ead5..544e298fcf4099338c61bad2130e12d58a228320 100644 (file)
--- a/.shellrc
+++ b/.shellrc
@@ -172,8 +172,17 @@ if test -x /usr/bin/git >/dev/null 2>&1; then
    }
 
    if test -n "$BASH_VERSION"; then
+      # completion for global aliases in .gitconfig
+      # fixup rbi rbia rbiap rbip - delegate to git-rebase completion
+
+      _git_fixup() { _git_rebase ; }
+      _git_rbi() { _git_rebase ; }
+      _git_rbia() { _git_rebase ; }
+      _git_rbiap() { _git_rebase ; }
+      _git_rbip() { _git_rebase ; }
+
       # list remotes with URLs matching a regexp
-      list_remotes() {
+      _list_remotes() {
          GIT_REMOTES=""
          local remote
          for remote in `git remote`; do
@@ -186,7 +195,7 @@ if test -x /usr/bin/git >/dev/null 2>&1; then
       # completion for cdremote - list remotes with directories as URLs
       _cdremote_complete() {
          local cur="${COMP_WORDS[COMP_CWORD]}";
-         list_remotes '^\(/\|\.\./\)' # (/ or ../ at the beginning)
+         _list_remotes '^\(/\|\.\./\)' # (/ or ../ at the beginning)
          COMPREPLY=(`compgen -W "$GIT_REMOTES" -- "$cur"`)
          unset GIT_REMOTES
       }
@@ -196,7 +205,7 @@ if test -x /usr/bin/git >/dev/null 2>&1; then
       # completion for git-open - list remotes with http(s) URLs
       _git_open() {
          local cur="${COMP_WORDS[COMP_CWORD]}";
-         list_remotes '^http\(s\)\?://'
+         _list_remotes '^http\(s\)\?://'
          COMPREPLY=(`compgen -W "$GIT_REMOTES" -- "$cur"`)
          unset GIT_REMOTES
       }