Browse files

update

  • Loading branch information...
1 parent 61a9784 commit 0d6889e1937d9827a69db3f4cf9bf63115d8dc9f @plukevdh committed May 15, 2013
Showing with 12 additions and 20 deletions.
  1. +7 −1 home/.gitconfig
  2. +5 −19 home/.zshrc
View
8 home/.gitconfig
@@ -17,7 +17,7 @@
[diff]
tool = Kaleidoscope
[core]
- excludesfile = ~/.gitignore_global
+ excludesfile = /Users/lvanderhoeven/.gitignore_global
editor = subl -w
autocrlf = false
ignorecase = true
@@ -37,3 +37,9 @@
tool = Kaleidoscope
[credential]
helper = osxkeychain
+[difftool "sourcetree"]
+ cmd = /usr/local/bin/ksdiff -w \"$LOCAL\" \"$REMOTE\"
+ path =
+[mergetool "sourcetree"]
+ cmd = /usr/local/bin/ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
+ trustExitCode = true
View
24 home/.zshrc
@@ -5,14 +5,15 @@ plugins=(rails3 bundler git passenger)
source $ZSH/oh-my-zsh.sh
# Set/unset shell options
-unsetopt correct correctall
+unsetopt correct correctall auto_name_dirs
setopt histnostore histignoredups auto_cd
bindkey -e
COMPLETION_WAITING_DOTS=true
JRUBY_INVOCATION="$(readlink "$(which celerity_jruby)")"
JRUBY_OPTS="--1.9"
+RBXOPT=-X19
PATH="$HOME/.rbenv/bin:$HOME/bin:/usr/local/bin:/usr/local/sbin/:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/share/npm/bin:$PATH"
TZ="America/New_York"
HISTFILE=$HOME/.zhistory
@@ -35,24 +36,6 @@ LC_ALL='en_US.UTF-8'
LANG='en_US.UTF-8'
LC_CTYPE='en_US.UTF-8'
-FLEX_HOME='~/Code/Flex/flex_sdk_3.4.1'
-
-# zstyle ':completion:*' auto-description 'specify: %d'
-# zstyle ':completion:*' completer _expand _complete _correct _approximate
-# zstyle ':completion:*' format 'Completing %d'
-# zstyle ':completion:*' group-name ''
-# zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS}
-# zstyle ':completion:*' list-colors ''
-# zstyle ':completion:*' list-prompt %SAt %p: Hit TAB for more, or the character to insert%s
-# zstyle ':completion:*' matcher-list '' 'm:{a-z}={A-Z}' 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=* l:|=*'
-# zstyle ':completion:*' menu select=long
-# zstyle ':completion:*' select-prompt %SScrolling active: current selection at %p%s
-# zstyle ':completion:*' use-compctl false
-# zstyle ':completion:*' verbose true
-
-# zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#)*=0=01;31'
-# zstyle ':completion:*:kill:*' command 'ps -u $USER -o pid,%cpu,tty,cputime,cmd'
-
fpath=(/usr/local/share/zsh-completions $fpath)
[[ -s "$HOME/.nvm/nvm.sh" ]] && . "$HOME/.nvm/nvm.sh"
eval "$(hub alias -s)"
@@ -61,3 +44,6 @@ eval "$(hub alias -s)"
export PATH="/usr/local/heroku/bin:$PATH"
PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting
+
+[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
+__rvm_project_rvmrc

0 comments on commit 0d6889e

Please sign in to comment.