git.plugin.zsh 11 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354
  1. # Git version checking
  2. autoload -Uz is-at-least
  3. git_version="${${(As: :)$(git version 2>/dev/null)}[3]}"
  4. #
  5. # Functions
  6. #
  7. # The name of the current branch
  8. # Back-compatibility wrapper for when this function was defined here in
  9. # the plugin, before being pulled in to core lib/git.zsh as git_current_branch()
  10. # to fix the core -> git plugin dependency.
  11. function current_branch() {
  12. git_current_branch
  13. }
  14. # Pretty log messages
  15. function _git_log_prettily(){
  16. if ! [ -z $1 ]; then
  17. git log --pretty=$1
  18. fi
  19. }
  20. compdef _git _git_log_prettily=git-log
  21. # Warn if the current branch is a WIP
  22. function work_in_progress() {
  23. command git -c log.showSignature=false log -n 1 2>/dev/null | grep -q -- "--wip--" && echo "WIP!!"
  24. }
  25. # Check if main exists and use instead of master
  26. function git_main_branch() {
  27. command git rev-parse --git-dir &>/dev/null || return
  28. local ref
  29. for ref in refs/{heads,remotes/{origin,upstream}}/{main,trunk,mainline,default}; do
  30. if command git show-ref -q --verify $ref; then
  31. echo ${ref:t}
  32. return
  33. fi
  34. done
  35. echo master
  36. }
  37. # Check for develop and similarly named branches
  38. function git_develop_branch() {
  39. command git rev-parse --git-dir &>/dev/null || return
  40. local branch
  41. for branch in dev devel development; do
  42. if command git show-ref -q --verify refs/heads/$branch; then
  43. echo $branch
  44. return
  45. fi
  46. done
  47. echo develop
  48. }
  49. #
  50. # Aliases
  51. # (sorted alphabetically)
  52. #
  53. alias g='git'
  54. alias ga='git add'
  55. alias gaa='git add --all'
  56. alias gapa='git add --patch'
  57. alias gau='git add --update'
  58. alias gav='git add --verbose'
  59. alias gap='git apply'
  60. alias gapt='git apply --3way'
  61. alias gb='git branch'
  62. alias gba='git branch --all'
  63. alias gbd='git branch --delete'
  64. alias gbda='git branch --no-color --merged | command grep -vE "^([+*]|\s*($(git_main_branch)|$(git_develop_branch))\s*$)" | command xargs git branch --delete 2>/dev/null'
  65. alias gbD='git branch --delete --force'
  66. alias gbg='git branch -vv | grep ": gone\]"'
  67. alias gbgd='local res=$(gbg | awk '"'"'{print $1}'"'"') && [[ $res ]] && echo $res | xargs git branch -d'
  68. alias gbgD='local res=$(gbg | awk '"'"'{print $1}'"'"') && [[ $res ]] && echo $res | xargs git branch -D'
  69. alias gbl='git blame -b -w'
  70. alias gbnm='git branch --no-merged'
  71. alias gbr='git branch --remote'
  72. alias gbs='git bisect'
  73. alias gbsb='git bisect bad'
  74. alias gbsg='git bisect good'
  75. alias gbsr='git bisect reset'
  76. alias gbss='git bisect start'
  77. alias gc='git commit --verbose'
  78. alias gc!='git commit --verbose --amend'
  79. alias gcn!='git commit --verbose --no-edit --amend'
  80. alias gca='git commit --verbose --all'
  81. alias gca!='git commit --verbose --all --amend'
  82. alias gcan!='git commit --verbose --all --no-edit --amend'
  83. alias gcans!='git commit --verbose --all --signoff --no-edit --amend'
  84. alias gcam='git commit --all --message'
  85. alias gcsm='git commit --signoff --message'
  86. alias gcas='git commit --all --signoff'
  87. alias gcasm='git commit --all --signoff --message'
  88. alias gcb='git checkout -b'
  89. alias gcf='git config --list'
  90. function gccd() {
  91. command git clone --recurse-submodules "$@"
  92. [[ -d "$_" ]] && cd "$_" || cd "${${_:t}%.git}"
  93. }
  94. compdef _git gccd=git-clone
  95. alias gcl='git clone --recurse-submodules'
  96. alias gclean='git clean --interactive -d'
  97. alias gpristine='git reset --hard && git clean --force -dfx'
  98. alias gcm='git checkout $(git_main_branch)'
  99. alias gcd='git checkout $(git_develop_branch)'
  100. alias gcmsg='git commit --message'
  101. alias gco='git checkout'
  102. alias gcor='git checkout --recurse-submodules'
  103. alias gcount='git shortlog --summary --numbered'
  104. alias gcp='git cherry-pick'
  105. alias gcpa='git cherry-pick --abort'
  106. alias gcpc='git cherry-pick --continue'
  107. alias gcs='git commit --gpg-sign'
  108. alias gcss='git commit --gpg-sign --signoff'
  109. alias gcssm='git commit --gpg-sign --signoff --message'
  110. alias gd='git diff'
  111. alias gdca='git diff --cached'
  112. alias gdcw='git diff --cached --word-diff'
  113. alias gdct='git describe --tags $(git rev-list --tags --max-count=1)'
  114. alias gds='git diff --staged'
  115. alias gdt='git diff-tree --no-commit-id --name-only -r'
  116. alias gdup='git diff @{upstream}'
  117. alias gdw='git diff --word-diff'
  118. function gdnolock() {
  119. git diff "$@" ":(exclude)package-lock.json" ":(exclude)*.lock"
  120. }
  121. compdef _git gdnolock=git-diff
  122. function gdv() { git diff -w "$@" | view - }
  123. compdef _git gdv=git-diff
  124. alias gf='git fetch'
  125. # --jobs=<n> was added in git 2.8
  126. is-at-least 2.8 "$git_version" \
  127. && alias gfa='git fetch --all --prune --jobs=10' \
  128. || alias gfa='git fetch --all --prune'
  129. alias gfo='git fetch origin'
  130. alias gfg='git ls-files | grep'
  131. alias gg='git gui citool'
  132. alias gga='git gui citool --amend'
  133. function ggf() {
  134. [[ "$#" != 1 ]] && local b="$(git_current_branch)"
  135. git push --force origin "${b:=$1}"
  136. }
  137. compdef _git ggf=git-checkout
  138. function ggfl() {
  139. [[ "$#" != 1 ]] && local b="$(git_current_branch)"
  140. git push --force-with-lease origin "${b:=$1}"
  141. }
  142. compdef _git ggfl=git-checkout
  143. function ggl() {
  144. if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then
  145. git pull origin "${*}"
  146. else
  147. [[ "$#" == 0 ]] && local b="$(git_current_branch)"
  148. git pull origin "${b:=$1}"
  149. fi
  150. }
  151. compdef _git ggl=git-checkout
  152. function ggp() {
  153. if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then
  154. git push origin "${*}"
  155. else
  156. [[ "$#" == 0 ]] && local b="$(git_current_branch)"
  157. git push origin "${b:=$1}"
  158. fi
  159. }
  160. compdef _git ggp=git-checkout
  161. function ggpnp() {
  162. if [[ "$#" == 0 ]]; then
  163. ggl && ggp
  164. else
  165. ggl "${*}" && ggp "${*}"
  166. fi
  167. }
  168. compdef _git ggpnp=git-checkout
  169. function ggu() {
  170. [[ "$#" != 1 ]] && local b="$(git_current_branch)"
  171. git pull --rebase origin "${b:=$1}"
  172. }
  173. compdef _git ggu=git-checkout
  174. alias ggpur='ggu'
  175. alias ggpull='git pull origin "$(git_current_branch)"'
  176. alias ggpush='git push origin "$(git_current_branch)"'
  177. alias ggsup='git branch --set-upstream-to=origin/$(git_current_branch)'
  178. alias gpsup='git push --set-upstream origin $(git_current_branch)'
  179. is-at-least 2.30 "$git_version" \
  180. && alias gpsupf='git push --set-upstream origin $(git_current_branch) --force-with-lease --force-if-includes' \
  181. || alias gpsupf='git push --set-upstream origin $(git_current_branch) --force-with-lease'
  182. alias ghh='git help'
  183. alias gignore='git update-index --assume-unchanged'
  184. alias gignored='git ls-files -v | grep "^[[:lower:]]"'
  185. alias git-svn-dcommit-push='git svn dcommit && git push github $(git_main_branch):svntrunk'
  186. alias gk='\gitk --all --branches &!'
  187. alias gke='\gitk --all $(git log --walk-reflogs --pretty=%h) &!'
  188. alias gl='git pull'
  189. alias glg='git log --stat'
  190. alias glgp='git log --stat --patch'
  191. alias glgg='git log --graph'
  192. alias glgga='git log --graph --decorate --all'
  193. alias glgm='git log --graph --max-count=10'
  194. alias glo='git log --oneline --decorate'
  195. alias glol="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'"
  196. alias glols="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --stat"
  197. alias glod="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset'"
  198. alias glods="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' --date=short"
  199. alias glola="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --all"
  200. alias glog='git log --oneline --decorate --graph'
  201. alias gloga='git log --oneline --decorate --graph --all'
  202. alias glp="_git_log_prettily"
  203. alias gm='git merge'
  204. alias gmom='git merge origin/$(git_main_branch)'
  205. alias gmtl='git mergetool --no-prompt'
  206. alias gmtlvim='git mergetool --no-prompt --tool=vimdiff'
  207. alias gmum='git merge upstream/$(git_main_branch)'
  208. alias gma='git merge --abort'
  209. alias gms="git merge --squash"
  210. alias gp='git push'
  211. alias gpd='git push --dry-run'
  212. is-at-least 2.30 "$git_version" \
  213. && alias gpf='git push --force-with-lease --force-if-includes' \
  214. || alias gpf='git push --force-with-lease'
  215. alias gpf!='git push --force'
  216. alias gpoat='git push origin --all && git push origin --tags'
  217. alias gpod='git push origin --delete'
  218. alias gpr='git pull --rebase'
  219. alias gpu='git push upstream'
  220. alias gpv='git push --verbose'
  221. alias gr='git remote'
  222. alias gra='git remote add'
  223. alias grb='git rebase'
  224. alias grba='git rebase --abort'
  225. alias grbc='git rebase --continue'
  226. alias grbd='git rebase $(git_develop_branch)'
  227. alias grbi='git rebase --interactive'
  228. alias grbm='git rebase $(git_main_branch)'
  229. alias grbom='git rebase origin/$(git_main_branch)'
  230. alias grbo='git rebase --onto'
  231. alias grbs='git rebase --skip'
  232. alias grev='git revert'
  233. alias grh='git reset'
  234. alias grhh='git reset --hard'
  235. alias groh='git reset origin/$(git_current_branch) --hard'
  236. alias grm='git rm'
  237. alias grmc='git rm --cached'
  238. alias grmv='git remote rename'
  239. alias grrm='git remote remove'
  240. alias grs='git restore'
  241. alias grset='git remote set-url'
  242. alias grss='git restore --source'
  243. alias grst='git restore --staged'
  244. alias grt='cd "$(git rev-parse --show-toplevel || echo .)"'
  245. alias gru='git reset --'
  246. alias grup='git remote update'
  247. alias grv='git remote --verbose'
  248. alias gsb='git status --short --branch'
  249. alias gsd='git svn dcommit'
  250. alias gsh='git show'
  251. alias gsi='git submodule init'
  252. alias gsps='git show --pretty=short --show-signature'
  253. alias gsr='git svn rebase'
  254. alias gss='git status --short'
  255. alias gst='git status'
  256. # use the default stash push on git 2.13 and newer
  257. is-at-least 2.13 "$git_version" \
  258. && alias gsta='git stash push' \
  259. || alias gsta='git stash save'
  260. alias gstaa='git stash apply'
  261. alias gstc='git stash clear'
  262. alias gstd='git stash drop'
  263. alias gstl='git stash list'
  264. alias gstp='git stash pop'
  265. alias gsts='git stash show --text'
  266. alias gstu='gsta --include-untracked'
  267. alias gstall='git stash --all'
  268. alias gsu='git submodule update'
  269. alias gsw='git switch'
  270. alias gswc='git switch --create'
  271. alias gswm='git switch $(git_main_branch)'
  272. alias gswd='git switch $(git_develop_branch)'
  273. alias gts='git tag --sign'
  274. alias gtv='git tag | sort -V'
  275. alias gtl='gtl(){ git tag --sort=-v:refname -n --list "${1}*" }; noglob gtl'
  276. alias gunignore='git update-index --no-assume-unchanged'
  277. alias gunwip='git rev-list --max-count=1 --format="%s" HEAD | grep -q "\--wip--" && git reset HEAD~1'
  278. alias gup='git pull --rebase'
  279. alias gupv='git pull --rebase --verbose'
  280. alias gupa='git pull --rebase --autostash'
  281. alias gupav='git pull --rebase --autostash --verbose'
  282. alias gupom='git pull --rebase origin $(git_main_branch)'
  283. alias gupomi='git pull --rebase=interactive origin $(git_main_branch)'
  284. alias glum='git pull upstream $(git_main_branch)'
  285. alias gluc='git pull upstream $(git_current_branch)'
  286. alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'
  287. alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign --message "--wip-- [skip ci]"'
  288. alias gwt='git worktree'
  289. alias gwta='git worktree add'
  290. alias gwtls='git worktree list'
  291. alias gwtmv='git worktree move'
  292. alias gwtrm='git worktree remove'
  293. alias gam='git am'
  294. alias gamc='git am --continue'
  295. alias gams='git am --skip'
  296. alias gama='git am --abort'
  297. alias gamscp='git am --show-current-patch'
  298. function grename() {
  299. if [[ -z "$1" || -z "$2" ]]; then
  300. echo "Usage: $0 old_branch new_branch"
  301. return 1
  302. fi
  303. # Rename branch locally
  304. git branch -m "$1" "$2"
  305. # Rename branch in origin remote
  306. if git push origin :"$1"; then
  307. git push --set-upstream origin "$2"
  308. fi
  309. }
  310. unset git_version