From 51bc0982daab1e5b6670bec8f797147dbb4164c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Sat, 3 Sep 2016 16:00:25 +0200
Subject: git remove restriction to FF pull and change email name

---
 gitconfig | 2 --
 1 file changed, 2 deletions(-)

(limited to 'gitconfig')

diff --git a/gitconfig b/gitconfig
index 2836cb8..cd7a5ec 100644
--- a/gitconfig
+++ b/gitconfig
@@ -10,7 +10,5 @@
 	gpgsign = true
 [merge]
 	tool = vimdiff
-[pull]
-	ff = only
 [commit]
 	gpgSign = true
-- 
cgit v1.2.3