Update history

glejeune · Mar 2, 2016 · e1aa158 · e1aa158
1 parent 1935593
commit e1aa158
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/_gitconfig b/_gitconfig
@@ -6,3 +6,5 @@
 [mergetool "splice"]
   cmd = "vim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
   trustExitCode = true
+[pull]
+	rebase = true
diff --git a/_muttrc b/_muttrc
@@ -147,4 +147,4 @@ color index     red            default  ~D      # Deleted
 # - GPG
 
 source ~/.dotrc/mutt-gpg.rc
-#source ~/.mutt/muttrc.local
+source ~/.mutt/muttrc.local
diff --git a/_zsh/rc/alias b/_zsh/rc/alias
@@ -35,8 +35,8 @@ alias gco='git checkout'
 #compdef gco=git
 
 alias gst='git status'
-
 alias gls='git ls-files'
+gdf() { git diff --color $@ | diff-so-fancy }
 
 alias mci='mvn clean install'
 alias mcit='mvn clean install -DskipTests'

diff --git a/_zsh/rc/history b/_zsh/rc/history
@@ -1,6 +1,9 @@
 ## Set up history
 zshrc_load_status History
 
+setopt inc_append_history
+setopt share_history
+
 HISTSIZE=1000
 HISTFILE="$HOME/.zsh_history"
 SAVEHIST=1000