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

diff --git a/.gitconfig b/.gitconfig
index 59a7448..b3201a9 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -33,12 +33,15 @@
 #	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
 
 [alias]
 	a    = add
-	ab   = abandon
 	am-a = am --abort
 	am-c = am --continue
 	ar   = archive
@@ -53,13 +56,13 @@
 	cp-x = cherry-pick -x
 	d    = diff
 	desc = describe
-	dl   = download
 	f    = fetch
 	fp   = format-patch -C -M
 	g    = grep
 	h    = help
 	l    = log
-	m    = merge
+	lf   = log --format= --name-only
+	m    = merge --log=100 --no-stat
 	rb   = rebase
 	rb-d = rebase --committer-date-is-author-date
 	rb-a = rebase --abort
@@ -71,7 +74,6 @@
 	sm   = submodule
 	st   = status
 	t    = tag
-	up   = upload
 
 [tag]
 	sort = version:refname