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 --
 mutt/muttemail | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

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
diff --git a/mutt/muttemail b/mutt/muttemail
index 9218af2..680ff9c 100644
--- a/mutt/muttemail
+++ b/mutt/muttemail
@@ -5,4 +5,4 @@ set spoolfile = "+INBOX"
 set copy = no
 #set record = "+sent"
 set postponed = "+drafts"
-set from = "cynerd@email.cz"
+set from = "Karel Kočí <cynerd@email.cz>"
-- 
cgit v1.2.3