zsh/aliases/git.zsh

   1 # Aliases
   2 alias g='git'
   3
   4 alias gst='git status'
   5 alias gsts='git status -s'
   6
   7 alias gl='git pull'
   8 alias gup='git pull --rebase'
   9
  10 alias gp='git push'
  11
  12 alias gd='git diff'
  13 alias gdc='git diff --cached'
  14 function gdm { gd "${1:-origin}".. }
  15 compdef _git gdm=git-diff
  16
  17 alias gc='git commit -v'
  18 alias gcs='git commit -v --squash'
  19 alias gcf='git commit -v --fixup'
  20 alias gca='git commit -v -a'
  21
  22 alias gco='git checkout'
  23 alias gcm='git checkout master'
  24
  25 alias gs='git stash save'
  26 alias gsa='git stash apply'
  27 alias gsp='git stash pop'
  28 alias gsd='git stash drop'
  29 alias gsl='git --no-pager stash list'
  30 alias gss='git stash show --patch'
  31
  32 alias gr='git remote'
  33 alias grv='git remote -v'
  34 alias grmv='git remote rename'
  35 alias grrm='git remote remove'
  36 alias grset='git remote set-url'
  37 alias grup='git remote update'
  38
  39 alias gb='git branch -vv'
  40 alias gba='git branch -a'
  41 alias gbm='git branch --merged'
  42 alias gbdm='git branch --merged | grep -ve "\*" -e "master" | xargs git branch -d'
  43
  44 alias gcl='git config --list'
  45 alias gcp='git cherry-pick'
  46
  47 alias gcount='git shortlog -sn'
  48 alias glg='git --no-pager log --oneline --graph --max-count=20 --decorate'
  49 alias glg='git --no-pager log --graph --max-count=20 --pretty=tformat:"%Cblue%cd %C(auto)%h%d %s" --date=short'
  50 function glm { glg "${1:-origin}".. }
  51 compdef _git glm=git-log
  52 alias glgl='git log --graph --pretty=tformat:"%Cblue%cd %C(auto)%h%d %s" --date=short'
  53 alias glgg='git log --stat --graph --max-count=20 --decorate'
  54 alias glgga='git log --stat --graph --decorate --all'
  55
  56 alias ga='git add'
  57
  58 alias gm='git merge'
  59
  60 alias grh='git reset HEAD'
  61 alias grhh='git reset HEAD --hard'
  62
  63 alias gwc='git whatchanged -p --abbrev-commit --pretty=medium'
  64
  65 alias gf='git ls-files | grep'
  66
  67 alias gpoat='git push origin --all && git push origin --tags'
  68
  69 # cd into the top of the current repository
  70 # or submodule.
  71 alias grt='cd $(git rev-parse --show-toplevel || echo ".")'
  72
  73 # Git and svn mix
  74 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
  75
  76 alias gsr='git svn rebase'
  77 alias gsd='git svn dcommit'
  78
  79 # return the current branch name
  80 # Usage example: git pull origin $(current_branch)
  81 function current_branch() {
  82   ref=$(git symbolic-ref HEAD 2> /dev/null) || \
  83   ref=$(git rev-parse --short HEAD 2> /dev/null) || return
  84   echo ${ref#refs/heads/}
  85 }
  86
  87 function current_repository() {
  88   ref=$(git symbolic-ref HEAD 2> /dev/null) || \
  89   ref=$(git rev-parse --short HEAD 2> /dev/null) || return
  90   echo $(git remote -v | cut -d':' -f 2)
  91 }
  92
  93 # these aliases take advantage of the previous function
  94 alias ggpull='git pull origin $(current_branch)'
  95 alias ggpush='git push origin $(current_branch)'
  96 alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'