Permalink
Browse files

g dt was failing when comparing with other branches. reverted

  • Loading branch information...
1 parent efd6d27 commit e64a27e481106ba418efa4eaac168fb1299f64e2 @orefalo committed Oct 9, 2012
Showing with 3 additions and 24 deletions.
  1. +1 −0 README.md
  2. +0 −18 cmds/g2-dt.sh
  3. +0 −4 g2-completion.sh
  4. +1 −0 g2-config.sh
  5. +1 −2 g2.sh
View
@@ -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
View
@@ -1,18 +0,0 @@
-#!/bin/bash
-#
-
-# substitute "upstream" with real upstream name
-declare -a v=("$@")
-declare i=0
-for a in "${v[@]}"
-do
- [[ "$a" = "upstream" ]] && {
- remote=$("$GIT_EXE" g2getremote)
- [[ -z $remote ]] && echo "fatal: upstream not found, please setup tracking for this branch, ie. <g track remote/branch>" && exit 1
- set -- "${@:1:$i}" "origin/master" "${@:($i+2)}";
- } && break
- let i++
-done
-
-
-"$GIT_EXE" difftool "$@"
View
@@ -860,10 +860,6 @@ _git_dt ()
--tool="
return
;;
- u*)
- __gitcomp "upstream"
- return
- ;;
esac
__git_complete_file
}
View
@@ -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
View
3 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"

0 comments on commit e64a27e

Please sign in to comment.