ed85147e6e6cee9d030fd32f7643e5323a707cfc

 1diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
 2index 4536e191a808d9d21b2ec013c2e8892f5e4aadb3..fa0c06500d5565945a65e17786fee85c3eadb40b 100644
 3--- a/plugins/git/git.plugin.zsh
 4+++ b/plugins/git/git.plugin.zsh
 5@@ -44,6 +44,7 @@ alias ga='git add'
 6 alias gaa='git add --all'
 7 alias gapa='git add --patch'
 8 alias gau='git add --update'
 9+alias gap='git apply'
10 
11 alias gb='git branch'
12 alias gba='git branch -a'
13@@ -191,6 +192,7 @@ alias gmom='git merge origin/master'
14 alias gmt='git mergetool --no-prompt'
15 alias gmtvim='git mergetool --no-prompt --tool=vimdiff'
16 alias gmum='git merge upstream/master'
17+alias gma='git merge --abort'
18 
19 alias gp='git push'
20 alias gpd='git push --dry-run'
21diff --git a/plugins/ubuntu/ubuntu.plugin.zsh b/plugins/ubuntu/ubuntu.plugin.zsh
22index eab2da40916a261ce6620bbfc2e2bb8bfebfcc5b..ba7143687f1d8c2a6d0dccd6ffa61e5584f511e2 100644
23--- a/plugins/ubuntu/ubuntu.plugin.zsh
24+++ b/plugins/ubuntu/ubuntu.plugin.zsh
25@@ -28,7 +28,7 @@ compdef _afu afu='sudo apt-file update'
26 alias ppap='sudo ppa-purge'
27 compdef _ppap ppap='sudo ppa-purge'
28 
29-alias ag='sudo apt-get'            # age - but without sudo
30+alias apg='sudo apt-get'            # age - but without sudo
31 alias aga='sudo apt-get autoclean' # aac
32 alias agb='sudo apt-get build-dep' # abd
33 alias agc='sudo apt-get clean'     # adc
34@@ -42,7 +42,7 @@ alias agug='sudo apt-get upgrade' # ag
35 alias aguu='sudo apt-get update && sudo apt-get upgrade'      #adg
36 alias agar='sudo apt-get autoremove'
37 
38-compdef _ag ag='sudo apt-get'
39+compdef _ag apg='sudo apt-get'
40 compdef _aga aga='sudo apt-get autoclean'
41 compdef _agb agb='sudo apt-get build-dep'
42 compdef _agc agc='sudo apt-get clean'