From 0cc4a179cfed5c2be516186dd134c6d208b7f2a9 Mon Sep 17 00:00:00 2001
From: Hsieh Chin Fan <pham@topo.tw>
Date: Fri, 25 Oct 2024 11:58:32 +0800
Subject: Update

---
 gitconfig | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gitconfig')

diff --git a/gitconfig b/gitconfig
index 1700dfb..a006560 100644
--- a/gitconfig
+++ b/gitconfig
@@ -20,6 +20,7 @@
                    git stash show -p | git apply -R && \
                    git stash drop stash@{1}
     swapprotocol = !swap-protocol.bash
+    mergethis = "!f() { git commit-tree HEAD: -p $1 -p HEAD -m \"Merge branch $(git branch --show-current)\" | xargs git branch --force $1; }; f"
 
 [merge]
     tool = vimdiff
-- 
cgit v1.2.3-70-g09d2