adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update aliases after merge of #3990

Khas'Mek 2015-06-12 10:39:50 -06:00
parent 8edde3bc6b
commit 8cae4ccf35
1 changed files with 122 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

245
Plugin:git.md

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