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

59
Plugin:git.md

@ -10,6 +10,8 @@ Enable it by adding _git_ to the [_plugins array_](https://github.com/robbyrusse
|:---------------------|:------------------------------------------------------------------------------------------------------------------------------------------| |:---------------------|:------------------------------------------------------------------------------------------------------------------------------------------|
| g | git | | g | git |
| ga | git add | | ga | git add |
| gaa | git add --all |
| gapa | git add --patch |
| gb | git branch | | gb | git branch |
| gba | git branch -a | | gba | git branch -a |
| gbda | git branch --merged \| command grep -vE "^(\*\|\s*master\s*$)" \| command xargs -n 1 git branch -d | | gbda | git branch --merged \| command grep -vE "^(\*\|\s*master\s*$)" \| command xargs -n 1 git branch -d |
@ -21,14 +23,11 @@ Enable it by adding _git_ to the [_plugins array_](https://github.com/robbyrusse
| gbsg | git bisect good | | gbsg | git bisect good |
| gbsr | git bisect reset | | gbsr | git bisect reset |
| gbss | git bisect start | | gbss | git bisect start |
| gc | git commit | | gc | git commit -v |
| gc! | git commit --amend | | gc! | git commit -v --amend |
| gca | git commit -a | | gca | git commit -v -a |
| gca! | git commit -a --amend | | gca! | git commit -v -a --amend |
| gcan! | git commit -a -s --no-edit --amend | | gcan! | git commit -v -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 | | gcb | git checkout -b |
| gcf | git config --list | | gcf | git config --list |
| gcl | git clone --recursive | | gcl | git clone --recursive |
@ -39,10 +38,8 @@ Enable it by adding _git_ to the [_plugins array_](https://github.com/robbyrusse
| gcount | git shortlog -sn | | gcount | git shortlog -sn |
| gcp | git cherry-pick | | gcp | git cherry-pick |
| gcs | git commit -S | | gcs | git commit -S |
| gcv | git commit -v |
| gcv! | git commit -v --amend |
| gd | git diff | | gd | git diff |
| gdc | git diff --cached | | gdca | git diff --cached |
| gdt | git diff-tree --no-commit-id --name-only -r | | gdt | git diff-tree --no-commit-id --name-only -r |
| gdw | git diff --word-diff | | gdw | git diff --word-diff |
| gf | git fetch | | gf | git fetch |
@ -50,6 +47,9 @@ Enable it by adding _git_ to the [_plugins array_](https://github.com/robbyrusse
| gfo | git fetch origin | | gfo | git fetch origin |
| gg | git gui citool | | gg | git gui citool |
| gga | git gui citool --amend | | gga | git gui citool --amend |
| ggpull | ggl |
| ggpur | ggu |
| 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:]]" |
@ -64,9 +64,9 @@ Enable it by adding _git_ to the [_plugins array_](https://github.com/robbyrusse
| 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 |
@ -115,27 +115,26 @@ Enable it by adding _git_ to the [_plugins array_](https://github.com/robbyrusse
| 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