Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

revert the diff command, it doesn't behave like the original and the …

…customization provides little benefits
  • Loading branch information...
commit 443ca6336b55b22142f6f721c0646b20b2813ce6 1 parent d908b46
@orefalo authored
Showing with 5 additions and 25 deletions.
  1. +0 −18 cmds/g2-g2diff.sh
  2. +0 −4 g2-completion.sh
  3. +2 −1  g2-config.sh
  4. +3 −2 g2.sh
View
18 cmds/g2-g2diff.sh
@@ -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" diff "$@"
View
4 g2-completion.sh
@@ -827,10 +827,6 @@ _git_df ()
"
return
;;
- u*)
- __gitcomp "upstream"
- return
- ;;
esac
__git_complete_revlist_file
}
View
3  g2-config.sh
@@ -62,8 +62,9 @@ $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.df diff
"$GIT_EXE" config --global alias.mt mergetool
+"$GIT_EXE" config --global alias.ls ls-files
"$GIT_EXE" config --global alias.bs bisect
"$GIT_EXE" config --global alias.gp grep
"$GIT_EXE" config --global alias.tg tag
View
5 g2.sh
@@ -92,9 +92,10 @@ function __g2_eval() {
"checkout" "co"
"cp" ""
"cherry-pick" "cp"
- "df" "g2diff"
- "diff" "g2diff"
+ "df" ""
+ "diff" ""
"dt" ""
+ "difftool" ""
"fetch" ""
"freeze" ""
"gc" "g2gc"

0 comments on commit 443ca63

Please sign in to comment.
Something went wrong with that request. Please try again.