f8d5fdce3a351390a2aa540eed7e713997b576f4

Author
Marc Cornellà <marc.cornella@live.com>
Committer
Marc Cornellà <marc.cornella@live.com>
Date

Message

git: move documentation from wiki to README

Diff

This diff is truncated to protect this page.

  1diff --git a/plugins/git/README.md b/plugins/git/README.md
  2index 76da2a8aee8a5f4b6f2ac8308faee0f310cf8c75..6cb73c11c26b5e56d310ba987d09ea2538f00cfb 100644
  3--- a/plugins/git/README.md
  4+++ b/plugins/git/README.md
  5@@ -1,10 +1,206 @@
  6-## git
  7+# git plugin
  8 
  9-**Maintainer:** [@ncanceill](https://github.com/ncanceill)
 10+The git plugin provides many [aliases](#aliases) and a few useful [functions](#functions).
 11 
 12-This plugin adds many useful aliases and functions.
 13+To use it, add `git` to the plugins array in your zshrc file:
 14 
 15-### Usage
 16+```zsh
 17+plugins=(... git)
 18+```
 19 
 20-See the [wiki](https://github.com/robbyrussell/oh-my-zsh/wiki/Plugin:git) for a list of aliases and functions provided by the plugin.
 21+## Aliases
 22 
 23+| Alias                | Command                                                                                                                       |
 24+|:---------------------|:------------------------------------------------------------------------------------------------------------------------------|
 25+| g                    | git                                                                                                                           |
 26+| ga                   | git add                                                                                                                       |
 27+| gaa                  | git add --all                                                                                                                 |
 28+| gapa                 | git add --patch                                                                                                               |
 29+| gau                  | git add --update                                                                                                              |
 30+| gav                  | git add --verbose                                                                                                             |
 31+| gap                  | git apply                                                                                                                     |
 32+| gb                   | git branch                                                                                                                    |
 33+| gba                  | git branch -a                                                                                                                 |
 34+| gbd                  | git branch -d                                                                                                                 |
 35+| gbda                 | git branch --no-color --merged \| command grep -vE "^(\*\|\s*(master\|develop\|dev)\s*$)" \| command xargs -n 1 git branch -d |
 36+| gbD                  | git branch -D                                                                                                                 |
 37+| gbl                  | git blame -b -w                                                                                                               |
 38+| gbnm                 | git branch --no-merged                                                                                                        |
 39+| gbr                  | git branch --remote                                                                                                           |
 40+| gbs                  | git bisect                                                                                                                    |
 41+| gbsb                 | git bisect bad                                                                                                                |
 42+| gbsg                 | git bisect good                                                                                                               |
 43+| gbsr                 | git bisect reset                                                                                                              |
 44+| gbss                 | git bisect start                                                                                                              |
 45+| gc                   | git commit -v                                                                                                                 |
 46+| gc!                  | git commit -v --amend                                                                                                         |
 47+| gcn!                 | git commit -v --no-edit --amend                                                                                               |
 48+| gca                  | git commit -v -a                                                                                                              |
 49+| gca!                 | git commit -v -a --amend                                                                                                      |
 50+| gcan!                | git commit -v -a --no-edit --amend                                                                                            |
 51+| gcans!               | git commit -v -a -s --no-edit --amend                                                                                         |
 52+| gcam                 | git commit -a -m                                                                                                              |
 53+| gcsm                 | git commit -s -m                                                                                                              |
 54+| gcb                  | git checkout -b                                                                                                               |
 55+| gcf                  | git config --list                                                                                                             |
 56+| gcl                  | git clone --recurse-submodules                                                                                                |
 57+| gclean               | git clean -id                                                                                                                 |
 58+| gpristine            | git reset --hard && git clean -dfx                                                                                            |
 59+| gcm                  | git checkout master                                                                                                           |
 60+| gcd                  | git checkout develop                                                                                                          |
 61+| gcmsg                | git commit -m                                                                                                                 |
 62+| gco                  | git checkout                                                                                                                  |
 63+| gcount               | git shortlog -sn                                                                                                              |
 64+| gcp                  | git cherry-pick                                                                                                               |
 65+| gcpa                 | git cherry-pick --abort                                                                                                       |
 66+| gcpc                 | git cherry-pick --continue                                                                                                    |
 67+| gcs                  | git commit -S                                                                                                                 |
 68+| gd                   | git diff                                                                                                                      |
 69+| gdca                 | git diff --cached                                                                                                             |
 70+| gdcw                 | git diff --cached --word-diff                                                                                                 |
 71+| gdct                 | git describe --tags $(git rev-list --tags --max-count=1)                                                                      |
 72+| gds                  | git diff --staged                                                                                                             |
 73+| gdt                  | git diff-tree --no-commit-id --name-only -r                                                                                   |
 74+| gdv                  | git diff -w $@ \| view -                                                                                                      |
 75+| gdw                  | git diff --word-diff                                                                                                          |
 76+| gf                   | git fetch                                                                                                                     |
 77+| gfa                  | git fetch --all --prune                                                                                                       |
 78+| gfg                  | git ls-files \| grep                                                                                                          |
 79+| gfo                  | git fetch origin                                                                                                              |
 80+| gg                   | git gui citool                                                                                                                |
 81+| gga                  | git gui citool --amend                                                                                                        |
 82+| ggf                  | git push --force origin $(current_branch)                                                                                     |
 83+| ggfl                 | git push --force-with-lease origin $(current_branch)                                                                          |
 84+| ggl                  | git pull origin $(current_branch)                                                                                             |
 85+| ggp                  | git push origin $(current_branch)                                                                                             |
 86+| ggpnp                | ggl && ggp                                                                                                                    |
 87+| ggpull               | git pull origin "$(git_current_branch)"                                                                                       |
 88+| ggpur                | ggu                                                                                                                           |
 89+| ggpush               | git push origin "$(git_current_branch)"                                                                                       |
 90+| ggsup                | git branch --set-upstream-to=origin/$(git_current_branch)                                                                     |
 91+| ggu                  | git pull --rebase origin $(current_branch)                                                                                    |
 92+| gpsup                | git push --set-upstream origin $(git_current_branch)                                                                          |
 93+| ghh                  | git help                                                                                                                      |
 94+| gignore              | git update-index --assume-unchanged                                                                                           |
 95+| gignored             | git ls-files -v \| grep "^[[:lower:]]"                                                                                        |
 96+| git-svn-dcommit-push | git svn dcommit && git push github master:svntrunk                                                                            |
 97+| gk                   | gitk --all --branches                                                                                                         |
 98+| gke                  | gitk --all $(git log -g --pretty=%h)                                                                                          |
 99+| gl                   | git pull                                                                                                                      |
100+| glg                  | git log --stat                                                                                                                |
101+| glgp                 | git log --stat -p                                                                                                             |
102+| glgg                 | git log --graph                                                                                                               |
103+| glgga                | git log --graph --decorate --all                                                                                              |
104+| glgm                 | git log --graph --max-count=10                                                                                                |