aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2016-09-03 16:00:25 +0200
committerKarel Kočí <cynerd@email.cz>2016-09-03 16:00:25 +0200
commit51bc0982daab1e5b6670bec8f797147dbb4164c3 (patch)
tree70e26e6e6ff62ec87d8f36b783267e83c917376f
parentaf73156bb1d79a5f09b391337872d05c61dbf2dc (diff)
downloadmyconfigs-51bc0982daab1e5b6670bec8f797147dbb4164c3.tar.gz
myconfigs-51bc0982daab1e5b6670bec8f797147dbb4164c3.tar.bz2
myconfigs-51bc0982daab1e5b6670bec8f797147dbb4164c3.zip
git remove restriction to FF pull and change email name
-rw-r--r--gitconfig2
-rw-r--r--mutt/muttemail2
2 files changed, 1 insertions, 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>"