X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=.gitconfig;h=77d72174644af0173e6720d85f84c27bcc1ec1b4;hb=fb5d2cb632ad05e57c8b257f5a3c85bb75c8ac31;hp=61f69994a51fa3033adfeaee13aba1c2b83cccf3;hpb=284295913b36355da3afb86900d14585b613f6f3;p=home.git

diff --git a/.gitconfig b/.gitconfig
index 61f6999..77d7217 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -37,6 +37,9 @@
 	# https://opensource.googleblog.com/2018/05/introducing-git-protocol-version-2.html
 	version = 2
 
+[pull]
+	ff = only
+
 [push]
 	default = current
 
@@ -49,12 +52,18 @@
 	bi   = bisect
 	cfg  = config
 	ci   = commit
+	cia  = commit -a
+	ciaf = commit -a --fixup
+	ciam = commit --amend
+	ciaam = commit --amend -a
+	cif  = commit --fixup
 	co   = checkout
 	cp   = cherry-pick --ff
 	cp-a = cherry-pick --abort
 	cp-c = cherry-pick --continue
 	cp-x = cherry-pick -x
 	d    = diff
+	dc   = diff --cached
 	desc = describe
 	f    = fetch
 	fp   = format-patch -C -M