From b6c57222723e3af67afc52ed1ba7c686477e8078 Mon Sep 17 00:00:00 2001
From: Felix Van der Jeugt <felix.vanderjeugt@gmail.com>
Date: Mon, 21 Aug 2017 15:28:46 +0200
Subject: [PATCH] alias for fast-forward

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

diff --git a/gitconfig b/gitconfig
index 8480ec6..fbf339c 100644
--- a/gitconfig
+++ b/gitconfig
@@ -17,3 +17,4 @@
 [alias]
 	pushf = 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