g dt was failing when comparing with other branches. reverted

orefalo · Oct 9, 2012 · e64a27e · e64a27e
1 parent efd6d27
commit e64a27e
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -423,6 +423,7 @@ Distributed under the GNU General Public License, version 2.0.
 
 ## FIXED
 
+* `g dt` was failing when comparing with other branches. reverted.
 * non-issue: g2-windows needs a new build - on windows: get freeze .gitignore fails with path issue
 * non-issue: g2-windows needs a new build - on windows: get version fails wth git path issue \program
 * g sync won't update the local branch

diff --git a/cmds/g2-dt.sh b/cmds/g2-dt.sh
diff --git a/g2-completion.sh b/g2-completion.sh
@@ -860,10 +860,6 @@ _git_dt ()
 			--tool="
 		return
 		;;
-	u*)
-               __gitcomp "upstream"
-               return
-               ;;
 	esac
 	__git_complete_file
 }

diff --git a/g2-config.sh b/g2-config.sh
@@ -61,6 +61,7 @@ apply_config
 $GIT_EXE config --global core.excludesfile ~/.gitignore_global
 
 # SHORT ALIASES -----------
+"$GIT_EXE" config --global alias.dt difftool
 "$GIT_EXE" config --global alias.ls ls-files
 "$GIT_EXE" config --global alias.mt mergetool
 "$GIT_EXE" config --global alias.bs bisect

diff --git a/g2.sh b/g2.sh
@@ -38,7 +38,7 @@ Usage:
 	cp <commit> - cherry-pick
 	ci <?params...> - commit
 	clone <url> - clone a remote repository
-	df/dt <?params...> <file> or <upstream> - compares files
+	df/dt <?params...> <file> - compares files
 	fetch - synchronizes remote branches
 	freeze/unfreeze <?-m comment> <?file> - freeze/unfreeze files
 	gc - garbage collects: run fsck & gc
@@ -95,7 +95,6 @@ function __g2_eval() {
     "df" "g2diff"
     "diff" "g2diff"
     "dt" ""
-    "difftool" "dt"
     "fetch" ""
     "freeze" ""
     "gc" "g2gc"