Force git mergetool GUI mode on Windows

jawilson · Apr 4, 2024 · 04c7091 · 04c7091
1 parent 61dcfee
commit 04c7091
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/gitconfig b/gitconfig
@@ -53,11 +53,13 @@
 [web]
 	browser = chrome
 
+[includeIf "gitdir/i:C:/"]
+	path = .gitconfig-windows.inc
 [includeIf "hasconfig:remote.*.url:[email protected]:blinemedical/**"]
-	path = .gitconfig-work
+	path = .gitconfig-work.inc
 [includeIf "hasconfig:remote.*.url:https://github.com/blinemedical/**"]
-	path = .gitconfig-work
+	path = .gitconfig-work.inc
 [includeIf "hasconfig:remote.*.url:[email protected]:laerdallabs/**"]
-	path = .gitconfig-work
+	path = .gitconfig-work.inc
 [includeIf "hasconfig:remote.*.url:https://github.com/laerdallabs/**"]
-	path = .gitconfig-work
+	path = .gitconfig-work.inc
diff --git a/gitconfig-windows.inc b/gitconfig-windows.inc
@@ -0,0 +1,2 @@
+[mergetool]
+	guiDefault = true
diff --git a/gitconfig-work → gitconfig-work.inc b/gitconfig-work → gitconfig-work.inc