From 2ce68edc65c8859ec922f37081bd49eb135ea64a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20P=C5=82azie=C5=84ski?= <nivertius@gmail.com>
Date: Tue, 7 Mar 2017 12:11:02 +0100
Subject: [PATCH] Require pull to perform only ff and rebase

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

diff --git a/.gitconfig b/.gitconfig
index 4154c72..4eaba0f 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -14,6 +14,9 @@
 	whitespace = trailing-space space-before-tab
 [push]
 	default = simple
+[pull]
+	rebase = true
+	ff = only
 [alias]
 	st = status -s -b