Added a git testmerge hack function to .zsh_functions

2020-03-11 12:55:15 -04:00
parent fce9f2d4d9
commit aca64811f5
1 changed files with 9 additions and 0 deletions
--- a/.zsh_functions
+++ b/.zsh_functions
@@ -93,3 +93,12 @@ fi
 f() {
      find . -iname "*${1}*"
  }
+
+# git testmerge
+testmerge() {
+    echo "git merge --no-commit --no-ff $1"
+    git merge --no-commit --no-ff $1
+    echo "git diff --cached"
+    git diff --cached
+    echo "'git merge --abort' when done"
+}