From 2c2212b50d8482d27003383f5d595041ec762821 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Thu, 8 Jun 2017 15:06:20 +0200
Subject: [PATCH] Update git aliases; signoff commit aliases

---
 shell/+fzf/aliases.zsh |  2 +-
 vcs/+git/aliases.zsh   | 20 +++++++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/shell/+fzf/aliases.zsh b/shell/+fzf/aliases.zsh
index 4dd688e5..8c59ed67 100644
--- a/shell/+fzf/aliases.zsh
+++ b/shell/+fzf/aliases.zsh
@@ -1,4 +1,4 @@
-alias fgcf='noglob git commit --fixup `fzf-git-sha`'
+alias fgcf='noglob git commit -S --fixup `fzf-git-sha`'
 alias fgl='fzf-git-log'
 
 alias bm='fzf-bookmarks'
diff --git a/vcs/+git/aliases.zsh b/vcs/+git/aliases.zsh
index 7db6cf6d..be3b6bf1 100644
--- a/vcs/+git/aliases.zsh
+++ b/vcs/+git/aliases.zsh
@@ -9,15 +9,22 @@ alias gbr='git browse'
 alias gi='git init'
 alias gf='git fetch'
 alias gs='git status'
+alias gst='git stash'
+alias gstp='git stash pop'
 alias gsu='git submodule'
 alias grb='git rebase --autostash -i'
 alias gco='git checkout'
 alias gcoo='git checkout --'
-alias gc='git commit'
+alias gc='git commit -S'
+alias gcm='noglob git commit -S -m'
+alias gcma='noglob git commit --amend -S -m'
+alias gcf='noglob git commit -S --fixup'
+alias gC='git commit'
+alias gCm='noglob git commit -m'
+alias gCma='noglob git commit --amend -m'
+alias gCf='noglob git commit --fixup'
 alias gcl='git clone'
-alias gcm='noglob git commit -m'
-alias gcma='noglob git commit --amend -m'
-alias gcf='noglob git commit --fixup'
+alias gcp='git cherry-pick -S'
 alias gd='git diff'
 alias gp='git push'
 alias gpb='git push origin'
@@ -26,11 +33,14 @@ alias gpl='git pull --rebase --autostash'
 alias ga='git add'
 alias gau='git add -u'
 alias gb='git branch'
+alias gbo'git orphan'
 alias gbd='git branch -D'
+alias gbl='git blame'
 alias gap='git add --patch'
 alias gr='git reset HEAD'
 alias gt='git tag'
 alias gtd='git tag -d'
 alias gta='git tag -a'
-alias gl='git log --oneline --decorate'
+alias gl='git log --oneline --decorate --graph'
+alias gls='git log --oneline --decorate --graph --stat'