From ed85147e6e6cee9d030fd32f7643e5323a707cfc Mon Sep 17 00:00:00 2001
From: Mahmoud Hossam <mahmoudhossam@users.noreply.github.com>
Date: Tue, 7 Nov 2017 18:06:42 +0200
Subject: [PATCH] Rename clashing ag alias (#5849)

* Fix ubuntu ag alias clashing with the silver searcher

* Add aliases for git apply and git merge --abort
---
 plugins/git/git.plugin.zsh       | 2 ++
 plugins/ubuntu/ubuntu.plugin.zsh | 4 ++--
 2 files changed, 4 insertions(+), 2 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'
diff --git a/plugins/ubuntu/ubuntu.plugin.zsh b/plugins/ubuntu/ubuntu.plugin.zsh
index eab2da409..ba7143687 100644
--- a/plugins/ubuntu/ubuntu.plugin.zsh
+++ b/plugins/ubuntu/ubuntu.plugin.zsh
@@ -28,7 +28,7 @@ compdef _afu afu='sudo apt-file update'
 alias ppap='sudo ppa-purge'
 compdef _ppap ppap='sudo ppa-purge'
 
-alias ag='sudo apt-get'            # age - but without sudo
+alias apg='sudo apt-get'            # age - but without sudo
 alias aga='sudo apt-get autoclean' # aac
 alias agb='sudo apt-get build-dep' # abd
 alias agc='sudo apt-get clean'     # adc
@@ -42,7 +42,7 @@ alias agug='sudo apt-get upgrade' # ag
 alias aguu='sudo apt-get update && sudo apt-get upgrade'      #adg
 alias agar='sudo apt-get autoremove'
 
-compdef _ag ag='sudo apt-get'
+compdef _ag apg='sudo apt-get'
 compdef _aga aga='sudo apt-get autoclean'
 compdef _agb agb='sudo apt-get build-dep'
 compdef _agc agc='sudo apt-get clean'