X-Git-Url: https://git.wh0rd.org/?p=home.git;a=blobdiff_plain;f=.gitconfig;h=8edb1270a4844cc8eed31c39f09ebe35e2cd6f6e;hp=61f69994a51fa3033adfeaee13aba1c2b83cccf3;hb=64d0ce9befaa14e1a217aba00909fb46f8104b50;hpb=df8cd7430f504d403d303b142540e55fffc0f9c4

diff --git a/.gitconfig b/.gitconfig
index 61f6999..8edb127 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,6 +52,7 @@
 	bi   = bisect
 	cfg  = config
 	ci   = commit
+	ciam = commit --amend
 	co   = checkout
 	cp   = cherry-pick --ff
 	cp-a = cherry-pick --abort