From 1a1895d65872ec646456bcaa6131c5dcbd9e1c9f Mon Sep 17 00:00:00 2001
From: Felix Van der Jeugt <felix.vanderjeugt@posteo.net>
Date: Thu, 20 Aug 2020 15:51:39 +0200
Subject: [PATCH] Specify upstream in ff

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

diff --git a/gitconfig b/gitconfig
index e1e339f..161619b 100644
--- a/gitconfig
+++ b/gitconfig
@@ -18,7 +18,7 @@
 [alias]
 	pf = push --force-with-lease
 	lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
-	ff = merge --ff-only
+	ff = merge --ff-only @{upstream}
 	co = checkout
 	jn = merge --no-ff --log --edit