A few merge options for git.

2024-06-17 12:38:39 -04:00
parent 0a97d0b8ff
commit 7c8a3ac56d
1 changed files with 5 additions and 0 deletions
--- a/git/gitconfig
+++ b/git/gitconfig
@ -34,6 +34,11 @@
 	mergetool = vimdiff
 	tool = vimdiff

+	# Merge commit setup
+	log = 50
+	branchdesc = true
+	suppressDest=
+
 [push]
 	default = upstream