Permalink
Browse files

added: Git shortcuts for Kaleidoscope differ.

  • Loading branch information...
1 parent 5b1744c commit 932e9f9a172b588106b68dfc17f701e6623b57d1 @gf3 gf3 committed Nov 4, 2010
Showing with 4 additions and 1 deletion.
  1. +3 −0 .gitconfig
  2. +1 −1 .vimrc
View
@@ -18,6 +18,7 @@
rv = review
sm = show-merges
st = status
+ ksdiff = difftool -y -t Kaleidoscope
[color]
ui = auto
[color "branch"]
@@ -35,3 +36,5 @@
untracked = cyan
[merge]
log = true
+[difftool "Kaleidoscope"]
+ cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\"
View
@@ -72,7 +72,7 @@ set title " Show the filename in the window titlebar.
set ttyfast " Send more characters at a given time.
set ttymouse=xterm " Set mouse type to xterm.
set wildchar=<TAB> " Character for CLI expansion (TAB-completion).
-set wildignore+=*.jpg,*.jpeg,*.gif,*.png,*.gif,*.psd,*.o,*.obj,*.min.js,smarty/**,vendor/**,node_libraries/**,.git,.hg,.svn,.sass-cache,log,tmp,build,_SCRIPTS,_TESTS
+set wildignore+=*.jpg,*.jpeg,*.gif,*.png,*.gif,*.psd,*.o,*.obj,*.min.js,smarty/**,vendor/**,node_libraries/**,.git,.hg,.svn,.sass-cache,log,tmp,build
set wildmenu " Hitting TAB in command mode will show possible completions above command line.
set wildmode=list:longest " Complete only until point of ambiguity.
set wrapscan " Searches wrap around end of file

0 comments on commit 932e9f9

Please sign in to comment.