diff --git a/Plugin:git.md b/Plugin:git.md index 019667e..79d66e8 100644 --- a/Plugin:git.md +++ b/Plugin:git.md @@ -1,110 +1,109 @@ -# The `git` plugin - -The `git` [plugin](Plugins#git) provides many [aliases](#Aliases) and a few useful [functions](Functions). - -Enable it by adding `git` to the [`plugins` array](https://github.com/robbyrussell/oh-my-zsh/blob/master/templates/zshrc.zsh-template#L51) before sourcing OMZ. - -## Aliases - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
AliasCommand
g
git
gst
git status
gd
git diff
gdc
git diff --cached
gl
git pull
gup
git pull --rebase
gp
git push
gd
git diff
gdv
git diff -w "$@" | view -
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
- -## Functions - -### Current * - -* `current_branch` -> Returns the name of the current branch -_Example:_ `git pull origin $(current_branch)` - -* `current_repository` -> Returns the names of the current remotes - - - - - - - - -
AliasCommand
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)
- -### Pretty log messages - -* `glp` -> Prints log with specified [format](http://git-scm.com/docs/git-log) -_Example:_ `glp "%h - %an, %ar : %s"` - -* `glp` -> Prints log with specified [format](http://git-scm.com/docs/git-log) -_Example:_ `glp "%h - %an, %ar : %s"` - -### WiP - -These features allow to pause a branch development and switch to another one (_"Work in Progress"_, or wip). When you want to go back to work, just unwip it. - -* `work_in_progress` -> Echoes a warning if the current branch is a wip - -* `gwip` -> Commit wip branch - -* `gunwip` -> Uncommit wip branch - +# The `git` plugin + +The `git` [plugin](Plugins#git) provides many [aliases](#Aliases) and a few useful [functions](Functions). + +Enable it by adding `git` to the [`plugins` array](https://github.com/robbyrussell/oh-my-zsh/blob/master/templates/zshrc.zsh-template#L51) before sourcing OMZ. + +## Aliases + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
AliasCommand
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
+ +## Functions + +### Current * + +* `current_branch` +> Returns the name of the current branch +_Example:_ `git pull origin $(current_branch)` + +* `current_repository` +> Returns the names of the current remotes + + + + + + + + +
AliasCommand
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)
+ +### Pretty log messages + +* `glp` +> Prints log with specified [format](http://git-scm.com/docs/git-log) +_Example:_ `glp "%h - %an, %ar : %s"` + +* `glp` +> Prints log with specified [format](http://git-scm.com/docs/git-log) +_Example:_ `glp "%h - %an, %ar : %s"` + +### WiP + +These features allow to pause a branch development and switch to another one (_"Work in Progress"_, or wip). When you want to go back to work, just unwip it. + +* `work_in_progress` +> Echoes a warning if the current branch is a wip + +* `gwip` +> Commit wip branch + +* `gunwip` +> Uncommit wip branch +