Permalink
Browse files

add kaleidoscope and shorten post-commit photo wait time

  • Loading branch information...
1 parent b5e0ee2 commit 17c79f71645ade2b00b1da24afdba56cf3405ea1 @ranman committed Apr 5, 2013
Showing with 14 additions and 1 deletion.
  1. +13 −0 .gitconfig
  2. +1 −1 post-commit
View
@@ -12,3 +12,16 @@
default = simple
[alias]
co = checkout
+[difftool "Kaleidoscope"]
+ cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
+[diff]
+ tool = Kaleidoscope
+[difftool]
+ prompt = false
+[mergetool "Kaleidoscope"]
+ cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
+ trustExitCode = true
+[mergetool]
+ prompt = false
+[merge]
+ tool = Kaleidoscope
View
@@ -2,6 +2,6 @@
file="~/.gitshots/#{Time.now.to_i}.jpg"
unless File.directory?(File.expand_path("../../rebase-merge", __FILE__))
puts "Taking capture into #{file}!"
- system "imagesnap -q -w 3 #{file} &"
+ system "imagesnap -q -w 1 #{file} &"
end
exit 0

0 comments on commit 17c79f7

Please sign in to comment.