diff --git a/bin/mk-git-aliases b/bin/mk-git-aliases
index e0f349a1..ecce3d30 100755
--- a/bin/mk-git-aliases
+++ b/bin/mk-git-aliases
@@ -4,12 +4,14 @@ set -euxo pipefail
 tgt=$HOME/dotfiles/zsh/git_aliases.zsh
 
 echo "# Generated by ../bin/mk-git-aliases; do not edit" > $tgt
+
+for c in $(git --help -a | grep '^   [a-z]' | grep -v grep | awk '{print $1}'); do
+    echo "alias g$c=\"git $c\"" | tee -a $tgt
+done
+
 git la | grep -Ev '^g' | cut -d'=' -f1 | grep -v '-' | xargs -I{} echo 'alias g{}="git {}"' | tee -a $tgt
 
+echo 'alias gg="git grep"' | tee -a $tgt
 echo 'alias ggi="git grep -i"' | tee -a $tgt
 echo 'alias gprs="git prs"' | tee -a $tgt
 echo 'alias grf="git rf"' | tee -a $tgt
-
-for c in $(git --help -a | grep '^   [a-z]' | awk '{print $1}'); do
-    echo "alias g$c=\"git $c\"" | tee -a $tgt
-done
diff --git a/zsh/git_aliases.zsh b/zsh/git_aliases.zsh
index d4dfc91a..241a433e 100644
--- a/zsh/git_aliases.zsh
+++ b/zsh/git_aliases.zsh
@@ -1,73 +1,4 @@
 # Generated by ../bin/mk-git-aliases; do not edit
-alias gama="git ama"
-alias gauthors="git authors"
-alias gblobs="git blobs"
-alias gbi="git bi"
-alias gbib="git bib"
-alias gbig="git big"
-alias gbir="git bir"
-alias gbis="git bis"
-alias gbr="git br"
-alias gbra="git bra"
-alias gca="git ca"
-alias gcae="git cae"
-alias gci="git ci"
-alias gciam="git ciam"
-alias gcin="git cin"
-alias gcl="git cl"
-alias gco="git co"
-alias gcob="git cob"
-alias gcop="git cop"
-alias gcp="git cp"
-alias gcpa="git cpa"
-alias gcpc="git cpc"
-alias gdf="git df"
-alias gdfc="git dfc"
-alias gdfh="git dfh"
-alias gdfs="git dfs"
-alias gdod="git dod"
-alias gdods="git dods"
-alias gdom="git dom"
-alias gdoms="git doms"
-alias gf="git f"
-alias gfa="git fa"
-alias gl="git l"
-alias gld="git ld"
-alias glg="git lg"
-alias glogdog="git logdog"
-alias glp="git lp"
-alias gls="git ls"
-alias gp="git p"
-alias gpp="git pp"
-alias gpr="git pr"
-alias gpu="git pu"
-alias gpuf="git puf"
-alias grb="git rb"
-alias grba="git rba"
-alias grbc="git rbc"
-alias grbi="git rbi"
-alias grfm="git rfm"
-alias grmt="git rmt"
-alias grod="git rod"
-alias grom="git rom"
-alias gros="git ros"
-alias grot="git rot"
-alias grso="git rso"
-alias gs="git s"
-alias gsb="git sb"
-alias gsed="git sed"
-alias gshows="git shows"
-alias gss="git ss"
-alias gst="git st"
-alias gud="git ud"
-alias gum="git um"
-alias gup="git up"
-alias gus="git us"
-alias gut="git ut"
-alias gla="git la"
-alias ggi="git grep -i"
-alias gprs="git prs"
-alias grf="git rf"
 alias gadd="git add"
 alias gam="git am"
 alias garchive="git archive"
@@ -86,7 +17,6 @@ alias gfetch="git fetch"
 alias gformat-patch="git format-patch"
 alias ggc="git gc"
 alias ggitk="git gitk"
-alias ggrep="git grep"
 alias ggui="git gui"
 alias ginit="git init"
 alias glog="git log"
@@ -126,7 +56,6 @@ alias grepack="git repack"
 alias greplace="git replace"
 alias gannotate="git annotate"
 alias gblame="git blame"
-alias gbugreport="git bugreport"
 alias gcount-objects="git count-objects"
 alias gdiagnose="git diagnose"
 alias gdifftool="git difftool"
@@ -234,19 +163,14 @@ alias gprotocol-common="git protocol-common"
 alias gprotocol-http="git protocol-http"
 alias gprotocol-pack="git protocol-pack"
 alias gprotocol-v2="git protocol-v2"
-alias gadmin="git admin"
-alias gadmin-daemon-app="git admin-daemon-app"
 alias gcredential-libsecret="git credential-libsecret"
 alias gcredential-netrc="git credential-netrc"
 alias gcrypt="git crypt"
 alias gfind-blob="git find-blob"
 alias gjump="git jump"
-alias gprs="git prs"
-alias gpull-request="git pull-request"
-alias grelease="git release"
+alias glfs="git lfs"
 alias grf="git rf"
 alias gunpulled="git unpulled"
-alias gurl="git url"
 alias gama="git ama"
 alias gauthors="git authors"
 alias gbi="git bi"
@@ -283,7 +207,6 @@ alias gfind-merge="git find-merge"
 alias gg="git g"
 alias ggit="git git"
 alias gl="git l"
-alias gla="git la"
 alias gld="git ld"
 alias glg="git lg"
 alias glogdog="git logdog"
@@ -307,7 +230,6 @@ alias gros="git ros"
 alias grot="git rot"
 alias grso="git rso"
 alias gs="git s"
-alias gsb="git sb"
 alias gsed="git sed"
 alias gshow-merge="git show-merge"
 alias gshows="git shows"
@@ -318,3 +240,73 @@ alias gum="git um"
 alias gup="git up"
 alias gus="git us"
 alias gut="git ut"
+alias gama="git ama"
+alias gauthors="git authors"
+alias gblobs="git blobs"
+alias gbi="git bi"
+alias gbib="git bib"
+alias gbig="git big"
+alias gbir="git bir"
+alias gbis="git bis"
+alias gbr="git br"
+alias gbra="git bra"
+alias gca="git ca"
+alias gcae="git cae"
+alias gci="git ci"
+alias gciam="git ciam"
+alias gcin="git cin"
+alias gcl="git cl"
+alias gco="git co"
+alias gcob="git cob"
+alias gcop="git cop"
+alias gcp="git cp"
+alias gcpa="git cpa"
+alias gcpc="git cpc"
+alias gdf="git df"
+alias gdfc="git dfc"
+alias gdfh="git dfh"
+alias gdfs="git dfs"
+alias gdod="git dod"
+alias gdods="git dods"
+alias gdom="git dom"
+alias gdoms="git doms"
+alias gf="git f"
+alias gfa="git fa"
+alias gl="git l"
+alias gld="git ld"
+alias glg="git lg"
+alias glogdog="git logdog"
+alias glp="git lp"
+alias gls="git ls"
+alias gp="git p"
+alias gpp="git pp"
+alias gpr="git pr"
+alias gpu="git pu"
+alias gpuf="git puf"
+alias grb="git rb"
+alias grba="git rba"
+alias grbc="git rbc"
+alias grbi="git rbi"
+alias grfm="git rfm"
+alias grmt="git rmt"
+alias grod="git rod"
+alias grom="git rom"
+alias gros="git ros"
+alias grot="git rot"
+alias grso="git rso"
+alias gs="git s"
+alias gsb="git sb"
+alias gsed="git sed"
+alias gshows="git shows"
+alias gss="git ss"
+alias gst="git st"
+alias gud="git ud"
+alias gum="git um"
+alias gup="git up"
+alias gus="git us"
+alias gut="git ut"
+alias gla="git la"
+alias gg="git grep"
+alias ggi="git grep -i"
+alias gprs="git prs"
+alias grf="git rf"