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