From 67bd7e445463cfb7be5788c531da808dceb3879d Mon Sep 17 00:00:00 2001
From: Michael Campagnaro <mikecampo@protonmail.com>
Date: Sun, 19 May 2024 17:28:23 -0400
Subject: [PATCH] Update git aliases

---
 .aliases | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.aliases b/.aliases
index eae1cb3..170a93a 100644
--- a/.aliases
+++ b/.aliases
@@ -1166,6 +1166,11 @@ if [[ '${platform,,}' == *'ming'* ]]; then
     alias git="PATH=/usr/bin git"
 fi
 
+# Performs a commit amend with the nocheckin prehook disabled.
+git_amend_nocheckin() {
+    eval "DISABLE_NOCHECKIN=1 git commit --amend"
+}
+
 git_cmd_wrapper() {
     # If no args are provided then run `git status -s`
     if [[ $# > 0 ]]; then
@@ -1191,6 +1196,7 @@ git_commit_signed() {
     eval "$cmd"
 }
 
+# Performs a commit amend to the head with the nocheckin prehook disabled.
 git_fix_nocheckin() {
     eval "DISABLE_NOCHECKIN=1 git commit --amend -C HEAD"
 }
@@ -1212,10 +1218,9 @@ git_create_stash_patch() {
 }
 
 alias am='git commit --amend'
+alias amno='git_amend_nocheckin'
 alias ama='git commit --amend -C head --author'
 alias ams='git commit -S --amend' # signed
-alias ammend='echo "use am instead"'
-alias amend='echo "use am instead"'
 alias g='git_cmd_wrapper'
 alias ga='git add -A'
 alias gaa='git add -A; gdcc'
@@ -1321,6 +1326,7 @@ alias gsd='git stash drop'
 alias gsl='git stash list'
 alias gsi='git stash -p'
 alias gsp='git stash pop'
+alias gspm='git stash pop --merge'
 alias gsp0='git stash pop stash@{0}'
 alias gsp1='git stash pop stash@{1}'
 alias gsp2='git stash pop stash@{2}'