From: Samir Benmendil <me@rmz.io>
Date: Thu, 7 Apr 2016 10:21:48 +0000 (+0100)
Subject: zsh: add `git {diff,log} merge` aliases
X-Git-Url: https://git.rmz.io/dotfiles.git/commitdiff_plain/5ef458f35318f68c065add9ed414b2dd8646021e

zsh: add `git {diff,log} merge` aliases

These should only include commits since the fork from origin.
---

diff --git a/zsh/aliases/git.zsh b/zsh/aliases/git.zsh
index efd03d0..87a708c 100644
--- a/zsh/aliases/git.zsh
+++ b/zsh/aliases/git.zsh
@@ -11,6 +11,8 @@ alias gp='git push'
 
 alias gd='git diff'
 alias gdc='git diff --cached'
+function gdm { gd "${1:-origin}".. }
+compdef _git gdm=git-diff
 
 alias gc='git commit -v'
 alias gcs='git commit -v --squash'
@@ -45,6 +47,8 @@ alias gcp='git cherry-pick'
 alias gcount='git shortlog -sn'
 alias glg='git --no-pager log --oneline --graph --max-count=20 --decorate'
 alias glg='git --no-pager log --graph --max-count=20 --pretty=tformat:"%Cblue%cd %C(auto)%h%d %s" --date=short'
+function glm { glg "${1:-origin}".. }
+compdef _git glm=git-log
 alias glgl='git log --graph --pretty=tformat:"%Cblue%cd %C(auto)%h%d %s" --date=short'
 alias glgg='git log --stat --graph --max-count=20 --decorate'
 alias glgga='git log --stat --graph --decorate --all'