# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1353531177 18000
# Node ID a4e75d5bbcb074e9faf2963e8135554b3f9fa450
# Parent  86976421465f281fc828a6b9d9eb63f9d63837b7
more

diff -r 86976421465f -r a4e75d5bbcb0 dotcss/github.com.css
--- a/dotcss/github.com.css	Mon Nov 19 13:28:03 2012 -0500
+++ b/dotcss/github.com.css	Wed Nov 21 15:52:57 2012 -0500
@@ -15,3 +15,6 @@
 div.recently-touched-branches-wrapper { display: none; }
 p.last-commit { display: none; }
 pre, code, tt { font-family: Menlo; }
+.header a.notification-indicator { display: none; }
+.header .divider-vertical { display: none; }
+.header .header-logo-blacktocat { margin-right: 7px; }
diff -r 86976421465f -r a4e75d5bbcb0 fish/config.fish
--- a/fish/config.fish	Mon Nov 19 13:28:03 2012 -0500
+++ b/fish/config.fish	Wed Nov 21 15:52:57 2012 -0500
@@ -113,7 +113,7 @@
 # }}}
 # Bind Keys {{{
 
-function fish_user_keybindings
+function fish_user_key_bindings
     bind \cn accept-autosuggestion
 
     # Ignore iterm2 escape sequences.  Vim will handle them if needed.
@@ -299,10 +299,5 @@
 end
 
 # }}}
-# Fortune {{{
 
-if status --is-interactive
-    command fortune -s | cowsay -n | lolcat
-end
-
-# }}}
+true
diff -r 86976421465f -r a4e75d5bbcb0 gitconfig
--- a/gitconfig	Mon Nov 19 13:28:03 2012 -0500
+++ b/gitconfig	Wed Nov 21 15:52:57 2012 -0500
@@ -29,6 +29,8 @@
 
     discard-merge = reset --hard HEAD
 
+    ack = log --color=always --all --topo-order --pretty='format:%Cgreen%h%Creset %s%Cred%d%Creset %C(black bold)(by %an)%Creset' --full-history -S 
+
     ci = commit
     cm = commit -m
 
@@ -65,6 +67,9 @@
     addremove = !git add . && git add -u
     addrem = !git addremove
 
+    ksdiff = difftool -y -t Kaleidoscope
+    ksshow = "!sh -c 'git ksdiff $1^..$1;' -"
+
 [push]
     default = current
 
@@ -75,7 +80,7 @@
     status = auto
 
 [difftool "Kaleidoscope"]
-    cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\"
+    cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
 
 [difftool]
     prompt = false
@@ -84,11 +89,14 @@
     tool = Kaleidoscope
 
 [merge]
-    tool = splice
+    tool = Kaleidoscope
 
 [mergetool "splice"]
     cmd = "mvim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
     trustExitCode = true
 
+[mergetool "Kaleidoscope"]
+    cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
+
 [web]
     browser = open
diff -r 86976421465f -r a4e75d5bbcb0 hgrc
--- a/hgrc	Mon Nov 19 13:28:03 2012 -0500
+++ b/hgrc	Wed Nov 21 15:52:57 2012 -0500
@@ -50,12 +50,10 @@
 unified = 5
 
 [extdiff]
-cmd.vd = mvim
-opts.vd = -c 'set lines=70' -c 'set columns=240' -f '+next' '+execute "DirDiff" argv(0) argv(1)'
-cmd.ksdiff = /usr/local/bin/ksdiff-wrapper
-opts.ksdiff = hg
-cmd.dd = diffuse
-opts.dd = 
+cmd.vd = vim
+opts.vd = -c 'set lines=70' -c 'set columns=240' '+next' '+execute "DirDiff" argv(0) argv(1)'
+cmd.ksdiff = /usr/local/bin/ksdiff
+opts.ksdiff = --changeset --wait --filelist
 
 [merge-tools]
 splice.executable = vim
@@ -71,6 +69,9 @@
 keepthis.args = -c 'cp "$other" "$output.incoming" && cp "$local" "$output"'
 keepthis.premerge = True
 
+kal.executable = /usr/local/bin/ksdiff
+kal.args = --merge --output $output --base $base -- $local $other
+
 [email]
 method = smtp
 from = Steve Losh <steve@stevelosh.com>
diff -r 86976421465f -r a4e75d5bbcb0 vim/vimrc
--- a/vim/vimrc	Mon Nov 19 13:28:03 2012 -0500
+++ b/vim/vimrc	Wed Nov 21 15:52:57 2012 -0500
@@ -948,11 +948,6 @@
     " override this in a normal way, could you?
     au FileType python if exists("python_space_error_highlight") | unlet python_space_error_highlight | endif
 
-    " Jesus, Python.  Five characters of punctuation for a damn string?
-    au FileType python inoremap <buffer> <c-g> _(u'')<left><left>
-
-    au FileType python inoremap <buffer> <c-b> """"""<left><left><left>
-
     au FileType python iabbrev <buffer> afo assert False, "Okay"
 augroup END