diff --git a/Plugin:git.md b/Plugin:git.md index deba26f..df16fd6 100644 --- a/Plugin:git.md +++ b/Plugin:git.md @@ -6,68 +6,136 @@ Enable it by adding _git_ to the [_plugins array_](https://github.com/robbyrusse ## Aliases -| Alias | Command | -|:---------------------|:-----------------------------------------------------------------------| -| g | git | -| gst | git status | -| gd | git diff | -| gdc | git diff --cached | -| gdv | git diff -w "$@" | view - | -| gl | git pull | -| gup | git pull --rebase | -| gp | git push | -| gc | git commit -v | -| gc! | git commit -v --amend | -| gca | git commit -v -a | -| gca! | git commit -v -a --amend | -| gcmsg | git commit -m | -| gco | git checkout | -| gcm | git checkout master | -| gr | git remote | -| grv | git remote -v | -| grmv | git remote rename | -| grrm | git remote remove | -| grset | git remote set-url | -| grup | git remote update | -| grbi | git rebase -i | -| grbc | git rebase --continue | -| grba | git rebase --abort | -| gb | git branch | -| gba | git branch -a | -| gcount | git shortlog -sn | -| gcl | git config --list | -| gcp | git cherry-pick | -| glg | git log --stat --max-count=10 | -| glgg | git log --graph --max-count=10 | -| glgga | git log --graph --decorate --all | -| glo | git log --oneline --decorate --color | -| glog | git log --oneline --decorate --color --graph | -| gss | git status -s | -| ga | git add | -| gm | git merge | -| grh | git reset HEAD | -| grhh | git reset HEAD --hard | -| gclean | git reset --hard && git clean -dfx | -| gwc | git whatchanged -p --abbrev-commit --pretty=medium | -| gpoat | git push origin --all && git push origin --tags | -| gmt | git mergetool --no-prompt | -| gg | git gui citool | -| gga | git gui citool --amend | -| gk | gitk --all --branches | -| gsts | git stash show --text | -| gsta | git stash | -| gstp | git stash pop | -| gstd | git stash drop | -| grt | cd $(git rev-parse --show-toplevel || echo ".") | -| git-svn-dcommit-push | git svn dcommit && git push github master:svntrunk | -| gsr | git svn rebase | -| gsd | git svn dcommit | -| g | git | -| ggpull | git pull origin $(current_branch) | -| ggpur | git pull --rebase origin $(current_branch) | -| ggpush | git push origin $(current_branch) | -| ggpnp | git pull origin $(current_branch) && git push origin $(current_branch) | -| glp | Prints log with specified [format](http://git-scm.com/docs/git-log) | +| Alias | Command | +|:---------------------|:------------------------------------------------------------------------------------------------------------------------------------------| +| g | git | +| ga | git add | +| gb | git branch | +| gba | git branch -a | +| gbda | git branch --merged \| command grep -vE "^(\*\|\s*master\s*$)" \| command xargs -n 1 git branch -d | +| gbl | git blame -b -w | +| gbnm | git branch --no-merged | +| gbr | git branch --remote | +| gbs | git bisect | +| gbsb | git bisect bad | +| gbsg | git bisect good | +| gbsr | git bisect reset | +| gbss | git bisect start | +| gc | git commit | +| gc! | git commit --amend | +| gca | git commit -a | +| gca! | git commit -a --amend | +| gcan! | git commit -a -s --no-edit --amend | +| gcanv! | git commit -v -a -s --no-edit --amend | +| gcav | git commit -v -a | +| gcav! | git commit -v -a --amend | +| gcb | git checkout -b | +| gcf | git config --list | +| gcl | git clone --recursive | +| gclean | git reset --hard && git clean -dfx | +| gcm | git checkout master | +| gcmsg | git commit -m | +| gco | git checkout | +| gcount | git shortlog -sn | +| gcp | git cherry-pick | +| gcs | git commit -S | +| gcv | git commit -v | +| gcv! | git commit -v --amend | +| gd | git diff | +| gdc | git diff --cached | +| gdt | git diff-tree --no-commit-id --name-only -r | +| gdw | git diff --word-diff | +| gf | git fetch | +| gfa | git fetch --all --prune | +| gfo | git fetch origin | +| gg | git gui citool | +| gga | git gui citool --amend | +| ggsup | git branch --set-upstream-to = origin/$(current_branch) | +| gignore | git update-index --assume-unchanged | +| gignored | git ls-files -v \| grep "^[[:lower:]]" | +| git-svn-dcommit-push | git svn dcommit && git push github master:svntrunk | +| gk | \gitk --all --branches | +| gke | \gitk --all $(git log -g --pretty = format:%h) | +| gl | git pull | +| glg | git log --stat --color | +| glgg | git log --graph --color | +| glgga | git log --graph --decorate --all | +| glgm | git log --graph --max-count = 10 | +| glgp | git log --stat --color -p | +| glo | git log --oneline --decorate --color | +| glog | git log --oneline --decorate --color --graph | +| glol | "git log --graph --pretty = format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit" | +| glola | "git log --graph --pretty = format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --all" | +| glp | "_git_log_prettily" | +| gm | git merge | +| gmom | git merge origin/master | +| gmt | git mergetool --no-prompt | +| gmtvim | git mergetool --no-prompt --tool = vimdiff | +| gmum | git merge upstream/master | +| gp | git push | +| gpd | git push --dry-run | +| gpoat | git push origin --all && git push origin --tags | +| gpu | git push upstream | +| gpv | git push -v | +| gr | git remote | +| gra | git remote add | +| grb | git rebase | +| grba | git rebase --abort | +| grbc | git rebase --continue | +| grbi | git rebase -i | +| grbm | git rebase master | +| grbs | git rebase --skip | +| grh | git reset HEAD | +| grhh | git reset HEAD --hard | +| grmv | git remote rename | +| grrm | git remote remove | +| grset | git remote set-url | +| grt | cd $(git rev-parse --show-toplevel \|\| echo ".") | +| gru | git reset -- | +| grup | git remote update | +| grv | git remote -v | +| gsb | git status -sb | +| gsd | git svn dcommit | +| gsi | git submodule init | +| gsps | git show --pretty = short --show-signature | +| gsr | git svn rebase | +| gss | git status -s | +| gst | git status | +| gsta | git stash | +| gstaa | git stash apply | +| gstd | git stash drop | +| gstl | git stash list | +| gstp | git stash pop | +| gsts | git stash show --text | +| gsu | git submodule update | +| gts | git tag -s | +| gunignore | git update-index --no-assume-unchanged | +| gunwip | git log -n 1 \| grep -q -c "\-\-wip\-\-" && git reset HEAD~1 | +| gup | git pull --rebase | +| gupv | git pull --rebase -v | +| gvt | git verify-tag | +| gwch | git whatchanged -p --abbrev-commit --pretty = medium | +| gwip | git add -A; git rm $(git ls-files --deleted); git commit -m "--wip--" | + +## Deprecated Aliases + +These are aliases that have been removed, renamed, or otherwise modified in a way that may, or may not, receive further support. + +| Alias | Command | +|:-------|:-----------------------------------------------------------------------------------| +| gaa | git add --all | +| gap | git add --patch | +| gcl | git config --list | +| gdt | git difftool | +| ggpnp | git pull origin $(current_branch) && git push origin $(current_branch) | +| ggpull | git pull origin $(current_branch) | +| ggpur | git pull --rebase origin $(current_branch) | +| ggpush | git push origin $(current_branch) | +| gk | gitk --all --branches | +| glg | git log --stat --max-count = 10 | +| glgg | git log --graph --max-count = 10 | +| gwc | git whatchanged -p --abbrev-commit --pretty = medium | +| gwip | git add -A; git ls-files --deleted -z \| xargs -r0 git rm; git commit -m "--wip--" | ## Functions