From 64d0ce9befaa14e1a217aba00909fb46f8104b50 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 23 Nov 2020 12:53:07 -0500
Subject: [PATCH] gitconfig: more settings

---
 .gitconfig | 4 ++++
 1 file changed, 4 insertions(+)

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
-- 
2.39.2