From c3d40b8e9a340e2dc515eb7d5e695c649be48a74 Mon Sep 17 00:00:00 2001
From: Lucas Larson <LucasLarson@riseup.net>
Date: Fri, 31 May 2024 12:23:26 -0400
Subject: [PATCH] refactor: set Git merge verbosity once

Signed-off-by: Lucas Larson <LucasLarson@riseup.net>
---
 .zshenv            |  3 +++
 custom/aliases.zsh | 10 +++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.zshenv b/.zshenv
index 54a1257080..6bf9de13d1 100644
--- a/.zshenv
+++ b/.zshenv
@@ -38,6 +38,9 @@ command mkdir -p -- "${TMPDIR:-/tmp}"'/xdg_runtime_dir-'"${LOGNAME:-${USER-}}" &
 ## $CDPATH
 export CDPATH="${CDPATH:+${CDPATH-}:}${HOME%/}"
 
+## Git
+export GIT_MERGE_VERBOSITY=4
+
 ## GitHub
 export GITHUB_ORG="${LOGNAME:-${USER-}}"
 
diff --git a/custom/aliases.zsh b/custom/aliases.zsh
index b6f1da9749..c7f19297b4 100644
--- a/custom/aliases.zsh
+++ b/custom/aliases.zsh
@@ -1154,18 +1154,14 @@ alias glog='command git log --graph --branches --remotes --tags --format=format:
 unalias -- 'gm' 2>/dev/null
 gm() {
   # https://news.ycombinator.com/item?id=5512864
-  GIT_MERGE_VERBOSITY='4' command git merge --log --overwrite-ignore --progress --rerere-autoupdate --strategy-option patience
+  command git merge --log --overwrite-ignore --progress --rerere-autoupdate --strategy-option patience
 }
 alias gma='command git merge --abort'
-alias gmc='GIT_MERGE_VERBOSITY=4 command git merge --continue'
+alias gmc='command git merge --continue'
 
 # git merge with default branch
 gmm() {
-  # set Git merge verbosity environment variable
-  # 4 “shows all paths as they are processed” but
-  # 5 is “show detailed debugging information”
-  # https://github.com/progit/progit2/commit/aea93a7
-  GIT_MERGE_VERBOSITY='4' command git merge --log --verbose --progress --rerere-autoupdate --strategy-option patience "$(git-default-branch)"
+  command git merge --log --verbose --progress --rerere-autoupdate --strategy-option patience "$(git-default-branch)"
 }
 
 # git move