77b409d5c200f993256b5ad4679490d9d1db8e24

 1diff --git a/plugins/git/README.md b/plugins/git/README.md
 2index 7406dde2704043eb7e4226b79a17f6ab873452b2..650a4505bb57f90b6ef76d3fb7393b053ddb4b46 100644
 3--- a/plugins/git/README.md
 4+++ b/plugins/git/README.md
 5@@ -19,6 +19,7 @@ plugins=(... git)
 6 | gau                  | git add --update                                                                                                                 |
 7 | gav                  | git add --verbose                                                                                                                |
 8 | gap                  | git apply                                                                                                                        |
 9+| gapt                 | git apply --3way                                                                                                                 |
10 | gb                   | git branch                                                                                                                       |
11 | gba                  | git branch -a                                                                                                                    |
12 | gbd                  | git branch -d                                                                                                                    |
13@@ -171,6 +172,11 @@ plugins=(... git)
14 | glum                 | git pull upstream master                                                                                                         |
15 | gwch                 | git whatchanged -p --abbrev-commit --pretty=medium                                                                               |
16 | gwip                 | git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign -m "--wip-- [skip ci]"           |
17+| gam                  | git am                                                                                                                           |
18+| gamc                 | git am --continue                                                                                                                |
19+| gams                 | git am --skip                                                                                                                    |
20+| gama                 | git am --abort                                                                                                                   |
21+| gamscp               | git am --show-current-patch                                                                                                      |
22 
23 ### Deprecated aliases
24 
25diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
26index 32c720c6fbadd1b52c9d7b36b01f1100cdfedf26..855a746b47b3e1a3766f7e4a72052086e5598131 100644
27--- a/plugins/git/git.plugin.zsh
28+++ b/plugins/git/git.plugin.zsh
29@@ -38,6 +38,7 @@ alias gapa='git add --patch'
30 alias gau='git add --update'
31 alias gav='git add --verbose'
32 alias gap='git apply'
33+alias gapt='git apply --3way'
34 
35 alias gb='git branch'
36 alias gba='git branch -a'
37@@ -257,6 +258,12 @@ alias glum='git pull upstream master'
38 alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'
39 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]"'
40 
41+alias gam='git am'
42+alias gamc='git am --continue'
43+alias gams='git am --skip'
44+alias gama='git am --abort'
45+alias gamscp='git am --show-current-patch'
46+
47 function grename() {
48   if [[ -z "$1" || -z "$2" ]]; then
49     echo "Usage: $0 old_branch new_branch"