alias gmu='git fetch origin -v; git fetch upstream -v; git merge upstream/master'
alias gll='git log --graph --pretty=oneline --abbrev-commit'
-case $OSTYPE in
- linux*)
- alias gd='git diff | vim -R -'
- ;;
- darwin*)
- alias gd='git diff | mate'
- ;;
- *)
- alias gd='git diff'
- ;;
-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