From: zerobearing2 <david@zerobearing.com>
Date: Thu, 7 Oct 2010 00:51:30 +0000 (-0700)
Subject: Merge branch 'master' of git://github.com/revans/bash-it
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=aa20f4ea9c74be1ef19aad2d0b16c466b287f007;p=common%2Fbash_it.git

Merge branch 'master' of git://github.com/revans/bash-it
---

aa20f4ea9c74be1ef19aad2d0b16c466b287f007
diff --cc plugins/git.plugin.bash
index c3682f5,13ce234..909a90e
--- a/plugins/git.plugin.bash
+++ b/plugins/git.plugin.bash
@@@ -15,9 -14,21 +14,23 @@@ alias gb='git branch
  alias gba='git branch -a'
  alias gcount='git shortlog -sn'
  alias gcp='git cherry-pick'
 +alias gco='git checkout'
 +alias gexport='git archive --format zip --output'
  
+ case $OSTYPE in
+   linux*)
+     alias gd='git diff | vim -R -'
+     ;;
+   darwin*)
+     alias gd='git diff | mate'
+     ;;
+   darwin*)
+     alias gd='git diff'
+     ;;
+ esac
+ 
+ 
+ 
  function git-help() {
    echo "Git Custom Aliases Usage"
    echo