adding bash-completion script from git source code and enabling git-a…

…ware prompt

.bash_profile

@@ -7,6 +7,7 @@ export CDPATH=.:~:~/dev
 export PATH=$HOME/bin${PATH:+:$PATH}
 
 
+[[ -r ~/.git-completion.bash ]] && . ~/.git-completion.bash
 [[ -r ~/.functionrc ]] && . ~/.functionrc
 [[ -r ~/.bashrc ]] && . ~/.bashrc
 

.bashrc

@@ -5,9 +5,9 @@ if [[ $- = *i* ]]; then
   # TODO: make conditional based on editing-mode (note: when changing modes from .inputrc $SHELLOPTS does not recognize it)
   # bind -x '"\C-\M-w":kill -WINCH $$';; # can't use -x on .inputrc
 
-  if [[ -r ~/.gitsh ]]; then
+  # detect git-aware prompt function
+  if [[ $(type -t __git_ps1) = function ]]; then
     gitps1='$(__git_ps1)'
-    . ~/.gitsh
   fi
 
   # monochrome