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