Merge master

diff --git a/gitconfig b/gitconfig
index d426b5cdf804ba385baef942ae72418ef93ac891..6c30a479313c71b3e73a72d5b1c38738c313744e 100644 (file)
--- a/gitconfig
+++ b/gitconfig
@@ -10,5 +10,3 @@
        default = simple
 [commit]
        gpgsign = true
-[gpg]
-       program = gpg2

diff --git a/tmux.conf b/tmux.conf
index dcf0f26e36e49c047d191294f154761a5a1c3b83..feba8feb1ccb98c104691d3cb90f0bd6aa791ef8 100644 (file)
--- a/tmux.conf
+++ b/tmux.conf
@@ -40,3 +40,4 @@ bind -r l run-shell 'tmux select-pane -R'
 
 # Set color mode.
 set -g default-terminal "xterm-256color"
+set-option -ga terminal-overrides ",xterm-256color:Tc"