updates

orend · Jan 25, 2017 · 87c8158 · 87c8158
1 parent 143c2d3
commit 87c8158
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.gitconfig b/.gitconfig
@@ -64,7 +64,8 @@
 [mergetool]
 	 keepBackup = false
 [branch]
-	autosetuprebase = never
+        autosetupmerge = true
+	autosetuprebase = always
 [remote "origin"]
 	push = HEAD
 [giggle]
@@ -76,7 +77,7 @@
 	main-window-view = FileView
 [core]
     excludesfile = "/Users/orend/.gitignore"
-	editor = subl -w
+	editor = ~/bin/ec
 [rerere]
 	enabled = 1
 [push]

diff --git a/bash/env b/bash/env
@@ -16,6 +16,9 @@ export HISTCONTROL=ignorespace:erasedups
 export HISTIGNORE="l:ll:pwd"
 export HISTFILESIZE=1000000000
 export HISTSIZE=1000000
+shopt -s histappend # append instead of rewrite
+
+export PROMPT_COMMAND="history -a" # save history after every command
 
 DIR=/Users/odobzinski/dev_exclusions/copy/assistly
 export RUBYLIB="$DIR:$DIR/test:$DIR/lib"