Updates

.gitconfig

@@ -32,16 +32,19 @@
 
 [difftool "default-difftool"]
     cmd = code --wait --diff $LOCAL $REMOTE
+[difftool "Kaleidoscope"]
+  cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
 
 [alias]
     fancy-log = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(cyan)<%an>%Creset' --abbrev-commit --date=relative
-    branches = for-each-ref --sort='-authordate:iso8601' --format=' %(color:green)%(authordate:relative) %09%(color:white)%(objectname:short) %(color:yellow)%(refname:short) %09%(color:white)%(upstream:track) %(contents:subject)' refs/heads --no-merged
+    branches = for-each-ref --count=30 --sort='-authordate:iso8601' --format=' %(color:green)%(authordate:relative) %09%(color:white)%(objectname:short) %(color:yellow)%(refname:short) %09%(color:white)%(upstream:track) %(contents:subject)' refs/heads --no-merged
     timesheet = log --pretty=format:"%C(yellow)%h%Creset  %C(green)%ad%Creset  %C(cyan)%s" --author="`git config --get user.name`" --since='6am'
     edit-conflicted = ! git diff --name-only | uniq | xargs code
     history = log -p --
 	pushf = push --force-with-lease
     pullall = ! git pull && git submodule update --init --recursive --remote
     publish = ! git push -u origin `git rev-parse --abbrev-ref HEAD`
+    diverged = ! git log --graph --date=relative --oneline `git rev-parse --abbrev-ref HEAD` origin/`git rev-parse --abbrev-ref HEAD`
 
 [core]
 	editor = vim

.rc.d/aliases.sh

@@ -13,3 +13,6 @@ if [[ "$(uname -s)" = 'Darwin' ]]; then
   alias get-buffer="$HOME/dotfiles/bin/get-iterm2-buffer"
   alias chrome-tabs="$HOME/dotfiles/bin/chrome-tabs"
 fi
+
+# display docker statuses
+alias dockerps="docker ps --format 'table {{.Names}}\t{{.Image}}\t{{.Status}}'"

.zshrc.d/history.zsh

@@ -2,6 +2,9 @@ HISTFILE=~/.zsh_history
 HISTSIZE=30000
 SAVEHIST=25000
 
+# TODO: see this gist <https://gist.github.com/matthewmccullough/787142>
+
+
 # ignore duplicates (on find and on history file save)
 setopt HIST_FIND_NO_DUPS
 setopt HIST_SAVE_NO_DUPS

.zshrc.d/iterm.zsh

@@ -1,2 +1,6 @@
 # iterm2
 test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"
+
+function set-title {
+  echo -ne "\033]0;"$*"\007"
+}