Merge pull request #924 from nickjer/simple-git-diff

Simplify the `git diff` alias - closes #921
pull/927/head
Nils Winkler 2017-03-22 08:39:26 +01:00 committed by GitHub
commit 1b462d58b5
1 changed files with 1 additions and 16 deletions

View File

@ -33,6 +33,7 @@ alias gpom='git push origin master'
alias gr='git remote' alias gr='git remote'
alias grv='git remote -v' alias grv='git remote -v'
alias gra='git remote add' alias gra='git remote add'
alias gd='git diff'
alias gdv='git diff -w "$@" | vim -R -' alias gdv='git diff -w "$@" | vim -R -'
alias gc='git commit -v' alias gc='git commit -v'
alias gca='git commit -v -a' alias gca='git commit -v -a'
@ -80,19 +81,3 @@ case $OSTYPE in
alias gtls='git tag -l | sort -V' alias gtls='git tag -l | sort -V'
;; ;;
esac esac
if [ -z "$EDITOR" ]; then
case $OSTYPE in
linux*)
alias gd='git diff | vim -R -'
;;
darwin*)
alias gd='git diff | mate'
;;
*)
alias gd='git diff'
;;
esac
else
alias gd="git diff | $EDITOR"
fi