eryn/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Unstash work-local changes and merge

Browse source 
- Fix gitconfig to use Kaleidoscope
- Toggle solarized background with <F10>
This commit is contained in:
Eryn Wells 2013-01-24 16:30:53 -08:00
parent 059a9fa8cf
commit 2e04bc2433
3 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
env
View file

@ -12,7 +12,7 @@
export SYS=`uname -s | tr A-Z a-z` export SYS=`uname -s | tr A-Z a-z`
# Set this to a non-zero integer to see startup messages # Set this to a non-zero integer to see startup messages
export NOISY=0 export NOISY=20
print_heading -l 1 'Initializing environment' print_heading -l 1 'Initializing environment'

2
gitconfig
View file

@ -51,6 +51,8 @@
f = fetch f = fetch
[ui] [ui]
color = true color = true
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[diff] [diff]
tool = Kaleidoscope tool = Kaleidoscope
[mergetool] [mergetool]

2
vimrc
View file

@ -126,6 +126,8 @@ endif
set bg=dark set bg=dark
call togglebg#map("<F10>")
" use solarized colorscheme if the terminal can support it (or we're in a GUI) " use solarized colorscheme if the terminal can support it (or we're in a GUI)
let g:solarized_termtrans = 1 let g:solarized_termtrans = 1
let g:solarized_visibility = 'low' let g:solarized_visibility = 'low'