diff options
| author | Mahmoud Hossam <mahmoudhossam@users.noreply.github.com> | 2017-11-07 18:06:42 +0200 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2017-11-07 08:06:41 -0800 |
| commit | ed85147e6e6cee9d030fd32f7643e5323a707cfc (patch) | |
| tree | 1610474e7b2cb8d15561fafd9a6b3ad08a7c1b8a /plugins/git | |
| parent | 5486aa21eb3e3a6068a814531799063280800c19 (diff) | |
| download | zsh-ed85147e6e6cee9d030fd32f7643e5323a707cfc.tar.gz zsh-ed85147e6e6cee9d030fd32f7643e5323a707cfc.tar.bz2 zsh-ed85147e6e6cee9d030fd32f7643e5323a707cfc.zip | |
Rename clashing ag alias (#5849)
* Fix ubuntu ag alias clashing with the silver searcher
* Add aliases for git apply and git merge --abort
Diffstat (limited to 'plugins/git')
| -rw-r--r-- | plugins/git/git.plugin.zsh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 4536e191a..fa0c06500 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -44,6 +44,7 @@ alias ga='git add' alias gaa='git add --all' alias gapa='git add --patch' alias gau='git add --update' +alias gap='git apply' alias gb='git branch' alias gba='git branch -a' @@ -191,6 +192,7 @@ alias gmom='git merge origin/master' alias gmt='git mergetool --no-prompt' alias gmtvim='git mergetool --no-prompt --tool=vimdiff' alias gmum='git merge upstream/master' +alias gma='git merge --abort' alias gp='git push' alias gpd='git push --dry-run' |