f44d403572ad17b857b9d0bd5b87b636772fc8db

Author
Robby Russell <robby@planetargon.com>
Committer
Robby Russell <robby@planetargon.com>
Date

Message

Resolving conflict with merge of #1058

Diff

 1diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
 2index d6b2632b3188af092315a484e0972e211bba2e94..6c016aa6be1146cd61e23315e5343783cd44899c 100644
 3--- a/plugins/git/git.plugin.zsh
 4+++ b/plugins/git/git.plugin.zsh
 5@@ -52,6 +52,8 @@ alias glgg='git log --graph --max-count=5'
 6 compdef _git glgg=git-log
 7 alias glgga='git log --graph --decorate --all'
 8 compdef _git glgga=git-log
 9+alias glo='git log --oneline'
10+compdef _git glo=git-log
11 alias gss='git status -s'
12 compdef _git gss=git-status
13 alias ga='git add'
14@@ -97,3 +99,12 @@ alias ggpush='git push origin $(current_branch)'
15 compdef ggpush=git
16 alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
17 compdef ggpnp=git
18+
19+# Pretty log messages
20+function _git_log_prettily(){
21+  if ! [ -z $1 ]; then
22+    git log --pretty=$1
23+  fi
24+}
25+alias glp="_git_log_prettily"
26+compdef _git glp=git-log