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
gitconfig
View file

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