zsh: add --cherry-mark and --boundary flags to `glgl`

[dotfiles.git] / zsh / aliases / git.zsh

diff --git a/zsh/aliases/git.zsh b/zsh/aliases/git.zsh
index d487d6167ce2b0292b3f42dc33b72a41abe48050..9046d080a620bc9e0b3b10bdeec3ab8f0df8d008 100644 (file)
--- a/zsh/aliases/git.zsh
+++ b/zsh/aliases/git.zsh
@@ -1,97 +1,86 @@
 # Aliases
 alias g='git'
 # Aliases
 alias g='git'

-compdef g=git
+

 alias gst='git status'
 alias gst='git status'

-compdef _git gst=git-status

 alias gsts='git status -s'
 alias gsts='git status -s'

-compdef _git gsts=git-status
+

 alias gl='git pull'
 alias gl='git pull'

-compdef _git gl=git-pull

 alias gup='git pull --rebase'
 alias gup='git pull --rebase'

-compdef _git gup=git-fetch
+

 alias gp='git push'
 alias gp='git push'

-compdef _git gp=git-push
+alias gpf='git push --force-with-lease'
+

 alias gd='git diff'
 alias gdc='git diff --cached'
 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 gc='git commit -v'

-compdef _git gc=git-commit

 alias gcs='git commit -v --squash'
 alias gcs='git commit -v --squash'

-compdef _git gcs=git-commit

 alias gcf='git commit -v --fixup'
 alias gcf='git commit -v --fixup'

-compdef _git gcf=git-commit

 alias gca='git commit -v -a'
 alias gca='git commit -v -a'

-compdef _git gca=git-commit
+alias gcaf='git commit -v -a --fixup'
+

 alias gco='git checkout'
 alias gco='git checkout'

-compdef _git gco=git-checkout

 alias gcm='git checkout master'
 alias gcm='git checkout master'

+

 alias gs='git stash save'
 alias gs='git stash save'

-compdef _git gs=git-stash

 alias gsa='git stash apply'
 alias gsa='git stash apply'

-compdef _git gsa=git-stash

 alias gsp='git stash pop'
 alias gsp='git stash pop'

-compdef _git gsp=git-stash

 alias gsd='git stash drop'
 alias gsd='git stash drop'

-compdef _git gsd=git-stash

 alias gsl='git --no-pager stash list'
 alias gsl='git --no-pager stash list'

-compdef _git gsl=git-stash

 alias gss='git stash show --patch'
 alias gss='git stash show --patch'

-compdef _git gss=git-stash
+

 alias gr='git remote'
 alias gr='git remote'

-compdef _git gr=git-remote

 alias grv='git remote -v'
 alias grv='git remote -v'

-compdef _git grv=git-remote

 alias grmv='git remote rename'
 alias grmv='git remote rename'

-compdef _git grmv=git-remote

 alias grrm='git remote remove'
 alias grrm='git remote remove'

-compdef _git grrm=git-remote

 alias grset='git remote set-url'
 alias grset='git remote set-url'

-compdef _git grset=git-remote

 alias grup='git remote update'
 alias grup='git remote update'

-compdef _git grset=git-remote
-alias gb='git branch'
-compdef _git gb=git-branch
+
+alias gb='git branch -vv'

 alias gba='git branch -a'
 alias gba='git branch -a'

-compdef _git gba=git-branch

 alias gbm='git branch --merged'
 alias gbm='git branch --merged'

-alias gbdm='git branch --merged | grep -ve "\*" -e "master" | xargs -n 1 git branch -d'
-alias gcount='git shortlog -sn'
-compdef gcount=git
+alias gbdm='git branch --merged | grep -ve "\*" -e "master" | xargs git branch -d'
+

 alias gcl='git config --list'
 alias gcp='git cherry-pick'
 alias gcl='git config --list'
 alias gcp='git cherry-pick'

-compdef _git gcp=git-cherry-pick
-alias glg='git --no-pager log --oneline --graph --max-count=20 --decorate'
+
+alias gcount='git shortlog -sn'

 alias glg='git --no-pager log --graph --max-count=20 --pretty=tformat:"%Cblue%cd %C(auto)%h%d %s" --date=short'
 alias glg='git --no-pager log --graph --max-count=20 --pretty=tformat:"%Cblue%cd %C(auto)%h%d %s" --date=short'

-compdef _git glg=git-log
-alias glgl='git log --graph --pretty=tformat:"%Cblue%cd %C(auto)%h%d %s" --date=short'
-compdef _git glgl=git-log
+function glm { glg "${1:-origin}".. }
+compdef _git glm=git-log
+alias glgl='git log --graph --cherry-mark --boundary --pretty=tformat:"%Cblue%cd %C(auto)%h%d %s" --date=short'

 alias glgg='git log --stat --graph --max-count=20 --decorate'
 alias glgg='git log --stat --graph --max-count=20 --decorate'

-compdef _git glgg=git-log

 alias glgga='git log --stat --graph --decorate --all'
 alias glgga='git log --stat --graph --decorate --all'

-compdef _git glgga=git-log
+
+alias grl='git --no-pager reflog --max-count=20'
+

 alias ga='git add'
 alias ga='git add'

-compdef _git ga=git-add
+

 alias gm='git merge'
 alias gm='git merge'

-compdef _git gm=git-merge
+

 alias grh='git reset HEAD'
 alias grhh='git reset HEAD --hard'
 alias grh='git reset HEAD'
 alias grhh='git reset HEAD --hard'

+

 alias gwc='git whatchanged -p --abbrev-commit --pretty=medium'
 alias gwc='git whatchanged -p --abbrev-commit --pretty=medium'

+

 alias gf='git ls-files | grep'
 alias gf='git ls-files | grep'

+

 alias gpoat='git push origin --all && git push origin --tags'
 
 alias gpoat='git push origin --all && git push origin --tags'
 

-# Will cd into the top of the current repository
+# cd into the top of the current repository

 # or submodule.
 # or submodule.

-alias grt='cd $(git rev-parse --show-toplevel || echo ".")'
+alias cdr='cd $(git rev-parse --show-toplevel || echo ".")'

 
 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
 
 # Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'

-compdef git-svn-dcommit-push=git

 
 alias gsr='git svn rebase'
 alias gsd='git svn dcommit'
 
 alias gsr='git svn rebase'
 alias gsd='git svn dcommit'

-#
-# Will return the current branch name
+
+# return the current branch name

 # Usage example: git pull origin $(current_branch)
 # Usage example: git pull origin $(current_branch)

-#

 function current_branch() {
   ref=$(git symbolic-ref HEAD 2> /dev/null) || \
   ref=$(git rev-parse --short HEAD 2> /dev/null) || return
 function current_branch() {
   ref=$(git symbolic-ref HEAD 2> /dev/null) || \
   ref=$(git rev-parse --short HEAD 2> /dev/null) || return


@@ -106,8 +95,5 @@ function current_repository() {
 
 # these aliases take advantage of the previous function
 alias ggpull='git pull origin $(current_branch)'
 
 # these aliases take advantage of the previous function
 alias ggpull='git pull origin $(current_branch)'

-compdef ggpull=git

 alias ggpush='git push origin $(current_branch)'
 alias ggpush='git push origin $(current_branch)'

-compdef ggpush=git

 alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
 alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'

-compdef ggpnp=git