X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=.gitconfig;h=b3201a925db28b5845bf0ac0c97440dbb6ded26a;hb=a78ac12120c3d7f88e53e5418f36d3b2f8c65a93;hp=d29de085927a82f4972a2bd509aa4aa195893b77;hpb=64e2994fd8fa22f90bf017c8f5719a6ca7d17b43;p=home.git

diff --git a/.gitconfig b/.gitconfig
index d29de08..b3201a9 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -42,7 +42,6 @@
 
 [alias]
 	a    = add
-	ab   = abandon
 	am-a = am --abort
 	am-c = am --continue
 	ar   = archive
@@ -57,14 +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
 	lf   = log --format= --name-only
-	m    = merge --log=50 --no-stat
+	m    = merge --log=100 --no-stat
 	rb   = rebase
 	rb-d = rebase --committer-date-is-author-date
 	rb-a = rebase --abort
@@ -76,7 +74,6 @@
 	sm   = submodule
 	st   = status
 	t    = tag
-	up   = upload
 
 [tag]
 	sort = version:refname