44465ef4ce41f0928f6c59573da476a559a809a4
- Author
- Robby Russell <robby@planetargon.com>
- Committer
- Robby Russell <robby@planetargon.com>
- Date
Message
Merge branch 'master' of git://github.com/mwilliams/oh-my-zsh into mwilliams/master
Diff
1diff --git a/aliases.zsh b/aliases.zsh
2index eef321de54ba6d687bf137ded6aee59ee4c02032..253c2ac64f72e67230a3bbc902d7b4be58f7e578 100644
3--- a/aliases.zsh
4+++ b/aliases.zsh
5@@ -12,7 +12,16 @@ alias ...='cd ../..'
6 alias _='sudo'
7
8 #alias g='grep -in'
9+
10 alias g='git'
11+alias gst='git status'
12+alias gl='git pull'
13+alias gp='git push'
14+alias gd='git diff | mate'
15+alias gc='git commit -v'
16+alias gca='git commit -v -a'
17+alias gb='git branch'
18+alias gba='git branch -a'
19
20 alias history='fc -l 1'
21