.gitconfig: Add ff and git aliases

[dotfiles.git] / .shellrc

diff --git a/.shellrc b/.shellrc
index 130281854e9d4421e36b12bb425c05ae769e547e..b0ba00f8576537101d93af2989958dd7aa73aec5 100644 (file)
--- a/.shellrc
+++ b/.shellrc
@@ -83,7 +83,7 @@ if test -n "$BASH_VERSION"; then
             . /usr/local/etc/bash_completion.d/*
          fi
       else
-         echo "Unknown OS type, canot source bash_completion" >&2
+         echo "Unknown OS type, cannot source bash_completion" >&2
       fi
    fi
 
@@ -117,27 +117,26 @@ if test -n "$BASH_VERSION"; then
    done
 
    delegate_completion() {
-      local prog completion_f programs
-      prog="$1"
-      completion_f="$2"
-      shift; shift
-      programs="$@"
-      if has_completion "$prog"; then
+      local prog programs
+      prog=$1
+      if has_completion $prog; then
+         shift
+         programs="$@"
          eval "_${prog}_completion_loader() {
             _completion_loader $prog
-            complete -F $completion_f $programs
+            complete -F _$prog $programs
             unset _${prog}_completion_loader
             return 124
          }"
-         complete -F _"$prog"_completion_loader $programs
+         complete -F _${prog}_completion_loader $programs
       fi
    }
 
-   delegate_completion make _make m
-   delegate_completion ping _ping p
-   delegate_completion rsync _rsync r
-   delegate_completion ssh _ssh s
-   delegate_completion wget _wget wget-m wget-wrapper ww
+   delegate_completion make m
+   delegate_completion ping p
+   delegate_completion rsync r
+   delegate_completion ssh s
+   delegate_completion wget wget-m wget-wrapper ww
 
    unset has_completion delegate_completion
 
@@ -161,6 +160,10 @@ if test -n "$BASH_VERSION"; then
 
    source virtualenvwrapper_lazy.sh 2>/dev/null
 
+   #if [ -n "$VIRTUAL_ENV" ]; then
+   #   . "$VIRTUAL_ENV/bin/activate"
+   #fi
+
 elif test -n "$KSH_VERSION" -o -n "$FCEDIT"; then
    back() { cd - "$@"; }
    j() { jobs; }