2 files changed, 108 insertions, 0 deletions
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 600bf7e..f8cda14 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -5,6 +5,7 @@ in {
     env = name: env: pkgs.buildEnv (env pkgs // { name = "shenv-${name}"; });
   in pkgs.lib.mapAttrs env (util.importAll { root = ../shenvs; });
 
+  git-aliases = callPackage ./git-aliases.nix {};
   scripts = callPackage ./scripts {};
   tmux-lift = callPackage ./tmux-lift {};
 }
diff --git a/pkgs/git-aliases.nix b/pkgs/git-aliases.nix
new file mode 100644
index 0000000..aa72ab1
--- /dev/null
+++ b/pkgs/git-aliases.nix
@@ -0,0 +1,107 @@
+{ writeText, ... }:
+writeText "git-aliases.zsh" ''
+  alias g='git'
+  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'
+  alias gbd='git branch -d'
+  alias gbl='git blame -b -w'
+  alias gbnm='git branch --no-merged'
+  alias gbr='git branch --remote'
+  alias gbs='git bisect'
+  alias gbsb='git bisect bad'
+  alias gbsg='git bisect good'
+  alias gbsr='git bisect reset'
+  alias gbss='git bisect start'
+  alias gc='git commit -v'
+  alias gc!='git commit -v --amend'
+  alias gcn!='git commit -v --no-edit --amend'
+  alias gca='git commit -v -a'
+  alias gca!='git commit -v -a --amend'
+  alias gcan!='git commit -v -a --no-edit --amend'
+  alias gcans!='git commit -v -a -s --no-edit --amend'
+  alias gcam='git commit -a -m'
+  alias gcsm='git commit -s -m'
+  alias gcb='git checkout -b'
+  alias gcf='git config --list'
+  alias gcl='git clone --recursive'
+  alias gclean='git clean -fd'
+  alias gpristine='git reset --hard && git clean -dfx'
+  alias gcm='git checkout master'
+  alias gcd='git checkout develop'
+  alias gcmsg='git commit -m'
+  alias gco='git checkout'
+  alias gcount='git shortlog -sn'
+  alias gcp='git cherry-pick'
+  alias gcpa='git cherry-pick --abort'
+  alias gcpc='git cherry-pick --continue'
+  alias gcs='git commit -S'
+  alias gd='git diff'
+  alias gdca='git diff --cached'
+  alias gdcw='git diff --cached --word-diff'
+  alias gdct='git describe --tags `git rev-list --tags --max-count=1`'
+  alias gdt='git diff-tree --no-commit-id --name-only -r'
+  alias gdw='git diff --word-diff'
+  alias gf='git fetch'
+  alias ghh='git help'
+  alias gl='git pull'
+  alias glg='git log --stat'
+  alias glgp='git log --stat -p'
+  alias glgg='git log --graph'
+  alias glgga='git log --graph --decorate --all'
+  alias glgm='git log --graph --max-count=10'
+  alias glo='git log --oneline --decorate'
+  alias glol="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"
+  alias glola="git log --graph --pretty='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --all"
+  alias glog='git log --oneline --decorate --graph'
+  alias gloga='git log --oneline --decorate --graph --all'
+  alias gm='git merge'
+  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'
+  alias gpu='git push upstream'
+  alias gpv='git push -v'
+  alias gr='git remote'
+  alias gra='git remote add'
+  alias grb='git rebase'
+  alias grba='git rebase --abort'
+  alias grbc='git rebase --continue'
+  alias grbi='git rebase -i'
+  alias grbm='git rebase master'
+  alias grbs='git rebase --skip'
+  alias grh='git reset HEAD'
+  alias grhh='git reset HEAD --hard'
+  alias grmv='git remote rename'
+  alias grrm='git remote remove'
+  alias grset='git remote set-url'
+  alias gru='git reset --'
+  alias grup='git remote update'
+  alias grv='git remote -v'
+  alias gsb='git status -sb'
+  alias gsi='git submodule init'
+  alias gsps='git show --pretty=short --show-signature'
+  alias gss='git status -s'
+  alias gst='git status'
+  alias gsta='git stash save'
+  alias gstaa='git stash apply'
+  alias gstc='git stash clear'
+  alias gstd='git stash drop'
+  alias gstl='git stash list'
+  alias gstp='git stash pop'
+  alias gsts='git stash show --text'
+  alias gsu='git submodule update'
+  alias gts='git tag -s'
+  alias gtv='git tag | sort -V'
+  alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1'
+  alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify -m "--wip-- [skip ci]"'
+
+  alias gmnoff='git merge --no-ff --no-edit'
+''