From c998495127d8b017c0a2a938c181cd83b7934a1c Mon Sep 17 00:00:00 2001
From: Chris Coley <chris@codingallnight.com>
Date: Thu, 10 Mar 2022 19:14:14 -0800
Subject: [PATCH] Add a 'git pf' alias for 'git pull --ff-only'

---
 gitconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gitconfig b/gitconfig
index 1ade61b..48ba934 100644
--- a/gitconfig
+++ b/gitconfig
@@ -31,6 +31,7 @@
     sti = status --ignored
     unstage = reset HEAD --
     fs = !git fetch && git status
+    pf = pull --ff-only
 [diff "ansible-vault"]
     textconv = PAGER=cat ansible-vault view
     cachetextconv = false
-- 
GitLab