From 1da55a29c401c73411887ca0c6524ea1a181168e Mon Sep 17 00:00:00 2001
From: Joe Groocock <jgroocock@cloudflare.com>
Date: Thu, 11 Apr 2024 14:54:32 +0000
Subject: [PATCH] aliases: git: Add -v to `git commit`

Shows full patch in the commit message editor. Very handy, yes

Signed-off-by: Joe Groocock <jgroocock@cloudflare.com>
---
 aliases | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/aliases b/aliases
index ed3ee47..a97f9c9 100644
--- a/aliases
+++ b/aliases
@@ -110,9 +110,20 @@ alias ginit='git init'
 alias gignore='$EDITOR .gitignore'
 alias gitc='$EDITOR $XDG_CONFIG_HOME/git/config'
 alias ggignore='$EDITOR $XDG_CONFIG_HOME/git/gitignore'
-alias gcl="git clone --recursive"
+
 alias gco="git checkout"
 alias gcom="git checkout \"\$(git defbranch)\""
+alias gsw="git switch"
+alias gswm="git switch \"\$(git defbranch)\""
+alias gbr="git branch"
+alias gtg="git tag"
+alias gbl="git blame"
+alias gt="git tag"
+alias gst="git status"
+alias grl="git reflog"
+alias gfp="git format-patch"
+alias gcl="git clone --recursive"
+
 alias ga="git add"
 alias gap="git add -p"
 alias gau="git add -u"
@@ -120,19 +131,17 @@ alias gaN="git add -N"
 alias gaa="ga -A"
 alias grm="git rm"
 alias gmv="git mv"
-alias gc="git commit -s"
-alias gcm="git commit -s -em"
-alias gca="git commit -s --amend --date=\"\$(date -R)\""
-alias gcn="git commit -s --no-edit"
-alias gcan="gca -s --no-edit"
-alias gcam="gca -s -m"
-alias gt="git tag"
-alias gst="git status"
-alias grl="git reflog"
-alias gfp="git format-patch"
+
+alias gc="git commit -sv"
+alias gcm="git commit -sv -em"
+alias gca="git commit -sv --amend --date=\"\$(date -R)\""
+alias gcn="git commit -sv --no-edit"
+alias gcan="gca --no-edit"
+alias gcam="gca -m"
 
 alias gm="git merge"
 alias gma="git merge --abort"
+alias gmc="git merge --continue"
 
 alias grb="git rebase"
 alias grbi="grb -i"
@@ -180,10 +189,8 @@ alias grst="git reset"
 alias gundo="git reset --keep @~1"
 alias gclean="git clean"
 alias gclm="git cleanmerged"
-alias gbr="git branch"
 alias gbrl="git for-each-ref --sort=committerdate refs/heads/ --format=\"%(refname:short)\" | fzf -x --ansi --multi --preview-window=right:70% --preview=\"git log --format=fuller --stat --color=always {} | head -n\$((\$(tput lines)*10))\""
-alias gtg="git tag"
-alias gbl="git blame"
+
 alias gr="git remote"
 alias gra="gr add"
 alias grr="gr rm"