summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorRobby Russell <robby@planetargon.com>2013-04-23 21:20:00 -0700
committerRobby Russell <robby@planetargon.com>2013-04-23 21:20:00 -0700
commitf44d403572ad17b857b9d0bd5b87b636772fc8db (patch)
tree7ef469da35ab913606c200591844fb2351d0eb12 /plugins
parent6637c29b1ec1859740bc649172a2c97b65b7014c (diff)
parent9b05a44387f84ae0b24e24023286534d0bbdf65f (diff)
downloadzsh-f44d403572ad17b857b9d0bd5b87b636772fc8db.tar.gz
zsh-f44d403572ad17b857b9d0bd5b87b636772fc8db.tar.bz2
zsh-f44d403572ad17b857b9d0bd5b87b636772fc8db.zip
Resolving conflict with merge of #1058
Diffstat (limited to 'plugins')
-rw-r--r--plugins/git/git.plugin.zsh11
1 files changed, 11 insertions, 0 deletions
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index d6b2632b3..6c016aa6b 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -52,6 +52,8 @@ alias glgg='git log --graph --max-count=5'
compdef _git glgg=git-log
alias glgga='git log --graph --decorate --all'
compdef _git glgga=git-log
+alias glo='git log --oneline'
+compdef _git glo=git-log
alias gss='git status -s'
compdef _git gss=git-status
alias ga='git add'
@@ -97,3 +99,12 @@ alias ggpush='git push origin $(current_branch)'
compdef ggpush=git
alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
compdef ggpnp=git
+
+# Pretty log messages
+function _git_log_prettily(){
+ if ! [ -z $1 ]; then
+ git log --pretty=$1
+ fi
+}
+alias glp="_git_log_prettily"
+compdef _git glp=git-log