diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/git/README.md | 6 | ||||
| -rw-r--r-- | plugins/git/git.plugin.zsh | 7 |
2 files changed, 13 insertions, 0 deletions
diff --git a/plugins/git/README.md b/plugins/git/README.md index 7406dde27..650a4505b 100644 --- a/plugins/git/README.md +++ b/plugins/git/README.md @@ -19,6 +19,7 @@ plugins=(... git) | gau | git add --update | | gav | git add --verbose | | gap | git apply | +| gapt | git apply --3way | | gb | git branch | | gba | git branch -a | | gbd | git branch -d | @@ -171,6 +172,11 @@ plugins=(... git) | glum | git pull upstream master | | gwch | git whatchanged -p --abbrev-commit --pretty=medium | | gwip | git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign -m "--wip-- [skip ci]" | +| gam | git am | +| gamc | git am --continue | +| gams | git am --skip | +| gama | git am --abort | +| gamscp | git am --show-current-patch | ### Deprecated aliases diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 32c720c6f..855a746b4 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -38,6 +38,7 @@ alias gapa='git add --patch' alias gau='git add --update' alias gav='git add --verbose' alias gap='git apply' +alias gapt='git apply --3way' alias gb='git branch' alias gba='git branch -a' @@ -257,6 +258,12 @@ alias glum='git pull upstream master' alias gwch='git whatchanged -p --abbrev-commit --pretty=medium' alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign -m "--wip-- [skip ci]"' +alias gam='git am' +alias gamc='git am --continue' +alias gams='git am --skip' +alias gama='git am --abort' +alias gamscp='git am --show-current-patch' + function grename() { if [[ -z "$1" || -z "$2" ]]; then echo "Usage: $0 old_branch new_branch" |