add hub

Author: rkh

.bashrc

@@ -214,9 +214,10 @@ alias sl='ls'
 alias gti='git'
 alias lg='log'
 
-#if which hub > /dev/null; then
-#  alias git=hub
-#fi
+if which hub > /dev/null; then
+  alias nohub=$(which git)
+  alias git=hub
+fi
 
 #alias et='$EDITOR $(ls -A)'
 function et() {

.git_completion

@@ -45,6 +45,8 @@
 #       [email protected]
 #
 
+GIT=`which git`
+
 __gitdir ()
 {
 	if [ -z "$1" ]; then
@@ -64,7 +66,7 @@ __gitdir ()
 
 __git_ps1 ()
 {
-	local g="$(git rev-parse --git-dir 2>/dev/null)"
+	local g="$($GIT rev-parse --git-dir 2>/dev/null)"
 	if [ -n "$g" ]; then
 		local r
 		local b
@@ -79,7 +81,7 @@ __git_ps1 ()
 			else
 				r="|AM/REBASE"
 			fi
-			b="$(git symbolic-ref HEAD 2>/dev/null)"
+			b="$($GIT symbolic-ref HEAD 2>/dev/null)"
 		elif [ -f "$g/.dotest-merge/interactive" ]
 		then
 			r="|REBASE-i"
@@ -91,15 +93,15 @@ __git_ps1 ()
 		elif [ -f "$g/MERGE_HEAD" ]
 		then
 			r="|MERGING"
-			b="$(git symbolic-ref HEAD 2>/dev/null)"
+			b="$($GIT symbolic-ref HEAD 2>/dev/null)"
 		else
 			if [ -f "$g/BISECT_LOG" ]
 			then
 				r="|BISECTING"
 			fi
-			if ! b="$(git symbolic-ref HEAD 2>/dev/null)"
+			if ! b="$($GIT symbolic-ref HEAD 2>/dev/null)"
 			then
-				if ! b="$(git describe --exact-match HEAD 2>/dev/null)"
+				if ! b="$($GIT describe --exact-match HEAD 2>/dev/null)"
 				then
 					b="$(cut -c1-7 "$g/HEAD")..."
 				fi
@@ -145,7 +147,7 @@ __git_heads ()
 {
 	local cmd i is_hash=y dir="$(__gitdir "$1")"
 	if [ -d "$dir" ]; then
-		for i in $(git --git-dir="$dir" \
+		for i in $($GIT --git-dir="$dir" \
 			for-each-ref --format='%(refname)' \
 			refs/heads ); do
 			echo "${i#refs/heads/}"
@@ -166,7 +168,7 @@ __git_tags ()
 {
 	local cmd i is_hash=y dir="$(__gitdir "$1")"
 	if [ -d "$dir" ]; then
-		for i in $(git --git-dir="$dir" \
+		for i in $($GIT --git-dir="$dir" \
 			for-each-ref --format='%(refname)' \
 			refs/tags ); do
 			echo "${i#refs/tags/}"
@@ -188,7 +190,7 @@ __git_refs ()
 	local cmd i is_hash=y dir="$(__gitdir "$1")"
 	if [ -d "$dir" ]; then
 		if [ -e "$dir/HEAD" ]; then echo HEAD; fi
-		for i in $(git --git-dir="$dir" \
+		for i in $($GIT --git-dir="$dir" \
 			for-each-ref --format='%(refname)' \
 			refs/tags refs/heads refs/remotes); do
 			case "$i" in
@@ -246,7 +248,7 @@ __git_remotes ()
 		echo ${i#$d/remotes/}
 	done
 	[ "$ngoff" ] && shopt -u nullglob
-	for i in $(git --git-dir="$d" config --list); do
+	for i in $($GIT --git-dir="$d" config --list); do
 		case "$i" in
 		remote.*.url=*)
 			i="${i#remote.}"
@@ -267,7 +269,7 @@ __git_merge_strategies ()
 		s/'//
 		p
 		q
-		}" "$(git --exec-path)/git-merge"
+		}" "$($GIT --exec-path)/git-merge"
 }
 __git_merge_strategylist=
 __git_merge_strategylist="$(__git_merge_strategies 2>/dev/null)"
@@ -291,7 +293,7 @@ __git_complete_file ()
 			;;
 	    esac
 		COMPREPLY=($(compgen -P "$pfx" \
-			-W "$(git --git-dir="$(__gitdir)" ls-tree "$ls" \
+			-W "$($GIT --git-dir="$(__gitdir)" ls-tree "$ls" \
 				| sed '/^100... blob /s,^.*	,,
 				       /^040000 tree /{
 				           s,^.*	,,
@@ -336,7 +338,7 @@ __git_commands ()
 		return
 	fi
 	local i IFS=" "$'\n'
-	for i in $(git help -a|egrep '^ ')
+	for i in $($GIT help -a|egrep '^ ')
 	do
 		case $i in
 		*--*)             : helper pattern;;
@@ -413,7 +415,7 @@ __git_commandlist="$(__git_commands 2>/dev/null)"
 __git_aliases ()
 {
 	local i IFS=$'\n'
-	for i in $(git --git-dir="$(__gitdir)" config --list); do
+	for i in $($GIT --git-dir="$(__gitdir)" config --list); do
 		case "$i" in
 		alias.*)
 			i="${i#alias.}"
@@ -425,7 +427,7 @@ __git_aliases ()
 
 __git_aliased_command ()
 {
-	local word cmdline=$(git --git-dir="$(__gitdir)" \
+	local word cmdline=$($GIT --git-dir="$(__gitdir)" \
 		config --get "alias.$1")
 	for word in $cmdline; do
 		if [ "${word##-*}" ]; then
@@ -897,7 +899,7 @@ _git_config ()
 	remote.*.push)
 		local remote="${prv#remote.}"
 		remote="${remote%.push}"
-		__gitcomp "$(git --git-dir="$(__gitdir)" \
+		__gitcomp "$($GIT --git-dir="$(__gitdir)" \
 			for-each-ref --format='%(refname):%(refname)' \
 			refs/heads)"
 		return
@@ -1062,7 +1064,7 @@ _git_remote ()
 		;;
 	update)
 		local i c='' IFS=$'\n'
-		for i in $(git --git-dir="$(__gitdir)" config --list); do
+		for i in $($GIT --git-dir="$(__gitdir)" config --list); do
 			case "$i" in
 			remotes.*)
 				i="${i#remotes.}"