X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=.gitconfig;h=bd5925d817edf22e18b78c884253df117a732418;hb=853a0c1f76ed7cb7e9bd6619b9e58b38cca1a1f0;hp=59a744845cb68c4a0c4ed6fb625deee4ce625060;hpb=e95edddeb2d4cf03d278edcf41b701fba2ff6099;p=home.git

diff --git a/.gitconfig b/.gitconfig
index 59a7448..bd5925d 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -33,6 +33,10 @@
 #	log  = diff-highlight | less
 #	show = diff-highlight | less
 
+[protocol]
+	# https://opensource.googleblog.com/2018/05/introducing-git-protocol-version-2.html
+	version = 2
+
 [push]
 	default = current
 
@@ -59,7 +63,7 @@
 	g    = grep
 	h    = help
 	l    = log
-	m    = merge
+	m    = merge --log
 	rb   = rebase
 	rb-d = rebase --committer-date-is-author-date
 	rb-a = rebase --abort