Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

updates

  • Loading branch information...
commit 40a722eb57341b7fb439d251c12c282c7e1a0b01 1 parent f14e2a9
@plukevdh authored
View
10 home/.gitconfig
@@ -11,14 +11,14 @@
token = b9433a77479dfbefacf4b65c82a96357
user = plukevdh
[difftool "Kaleidoscope"]
- cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\"
+ cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[difftool]
prompt = false
[diff]
tool = Kaleidoscope
[core]
excludesfile = /Users/hungerandthirst/.gitignore_global
- editor = vim # subl -w
+ editor = subl -w
[color]
ui = true
[alias]
@@ -26,3 +26,9 @@
cleanup = "!source ~/.githelpers && cleanup_git_branches"
[rerere]
enabled = 1
+[mergetool "Kaleidoscope"]
+ cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
+[mergetool]
+ prompt = false
+[merge]
+ tool = Kaleidoscope
View
29 home/.githelpers
@@ -11,10 +11,10 @@ pretty_git_log() {
sed -Ee 's/(^[^<]*) ago)/\1)/' -Ee 's/(^[^<]*), [[:digit:]]+ .*months?)/\1)/' |
column -s '}' -t |
less -FXRS
-<<<<<<< Updated upstream
}
eval "$(hub alias -s)"
+
# hub tab-completion script for zsh.
# This script complements the completion script that ships with git.
#
@@ -26,23 +26,17 @@ _git
fi
if declare -f _git_commands > /dev/null; then
-_hub_commands=(
- 'alias:show shell instructions for wrapping git'
- 'pull-request:open a pull request on GitHub'
- 'fork:fork origin repo on GitHub'
- 'create:create new repo on GitHub for the current project'
- 'browse:browse the project on GitHub'
- 'compare:open GitHub compare view'
- )
-# Extend the '_git_commands' function with hub commands
-eval "$(declare -f _git_commands | sed -e 's/base_commands=(/base_commands=(${_hub_commands} /')"
+ _hub_commands=(
+ 'alias:show shell instructions for wrapping git'
+ 'pull-request:open a pull request on GitHub'
+ 'fork:fork origin repo on GitHub'
+ 'create:create new repo on GitHub for the current project'
+ 'browse:browse the project on GitHub'
+ 'compare:open GitHub compare view'
+ )
+ # Extend the '_git_commands' function with hub commands
+ eval "$(declare -f _git_commands | sed -e 's/base_commands=(/base_commands=(${_hub_commands} /')"
fi
-||||||| merged common ancestors
-}
-=======
-}
-
-alias git=hub
cleanup_git_branches() {
# This has to be run from master
@@ -71,4 +65,3 @@ cleanup_git_branches() {
echo "Done!"
fi
}
->>>>>>> Stashed changes
View
2  home/.gitignore_global
@@ -2,6 +2,8 @@
*.sublime*
.rspec
build/
+.powrc
+.gems
.cookbooks
.chef
2  home/.oh-my-zsh
@@ -1 +1 @@
-Subproject commit 921d2f49ef01acce973980c0aa9c6ffbbd2fbd0b
+Subproject commit c2ae9e09ca1f33ff1e13e629a0b2e6bdd19f83a9
View
16 home/.vim/.netrwhist
@@ -1,11 +1,11 @@
let g:netrw_dirhistmax =10
let g:netrw_dirhist_cnt =9
let g:netrw_dirhist_1='/Users/hungerandthirst/Code/Projects/crunchy/crunch'
-let g:netrw_dirhist_2='/Users/hungerandthirst/Code/Projects/crunchy'
-let g:netrw_dirhist_3='/Users/hungerandthirst/.homesick/repos/plukevdh/dotfiles/home/.vim/bundle'
-let g:netrw_dirhist_4='/Users/hungerandthirst/.homesick/repos/plukevdh/dotfiles/home/.vim/autoload'
-let g:netrw_dirhist_5='/Users/hungerandthirst/.homesick/repos/plukevdh/dotfiles/home/.vim/bundle/Command-T/ruby/command-t'
-let g:netrw_dirhist_6='/Users/hungerandthirst/.homesick/repos/plukevdh/dotfiles/home/.vim/bundle/vim-powerline/fontpatcher'
-let g:netrw_dirhist_7='/Users/hungerandthirst'
-let g:netrw_dirhist_8='/Users/hungerandthirst/.homesick/repos/plukevdh/dotfiles/home/.vim/bundle/vim-powerline/fontpatcher'
-let g:netrw_dirhist_9='/Users/hungerandthirst/Code/src/macvim'
+let g:netrw_dirhist_2='/Users/hungerandthirst/.homesick/repos/plukevdh/dotfiles/home/.vim/bundle/Command-T/ruby/command-t'
+let g:netrw_dirhist_3='/Users/hungerandthirst/Code/src/macvim/src'
+let g:netrw_dirhist_4='/Users/hungerandthirst/.homesick/repos/plukevdh/dotfiles/home/.vim/bundle/Command-T/ruby/command-t'
+let g:netrw_dirhist_5='/Users/hungerandthirst/Code/Projects/crunchy/crunch'
+let g:netrw_dirhist_6='/Users/hungerandthirst/Code/Projects/crunchy/screenshare/ScreenShareOSXClient'
+let g:netrw_dirhist_7='/Users/hungerandthirst/Code/Projects/crunchy/screenshare/ScreenShareOSXClient/ScreenShareClient'
+let g:netrw_dirhist_8='/Users/hungerandthirst/Code/Projects/crunchy/crunch'
+let g:netrw_dirhist_9='/Users/hungerandthirst/.ssh'
View
3,213 home/.vim/ruby/command-t-1.3.1.vba
0 additions, 3,213 deletions not shown
View
22 home/.zshrc
@@ -3,10 +3,8 @@ export ZSH_THEME="sunaku"
plugins=(rails3 bundler git passenger)
source $ZSH/oh-my-zsh.sh
-source ~/.crunch_helpers
# Set/unset shell options
-unsetopt auto_name_dirs # FIX RVM
unsetopt correct correctall
setopt histnostore histignoredups auto_cd
@@ -14,8 +12,8 @@ bindkey -e
COMPLETION_WAITING_DOTS=true
JRUBY_INVOCATION="$(readlink "$(which celerity_jruby)")"
-export JRUBY_OPTS=--1.9
-PATH="~/.rvm/bin:/usr/local/bin:/usr/local/sbin/:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/share/npm/bin:~/.gem/ruby/1.9.1/bin:$PATH"
+export JRUBY_OPTS="--1.9"
+PATH="$HOME/.rbenv/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
HISTSIZE=1000
@@ -23,16 +21,16 @@ SAVEHIST=1000
HOSTNAME="`hostname`"
PAGER='less'
-# alias edit=subl
-# export EDITOR="subl -w"
+alias edit=subl
+export EDITOR="subl -w"
-alias edit=vim
-export EDITOR=edit
+# alias edit=vim
+# export EDITOR=edit
#LANGUAGE=
LC_ALL='en_US.UTF-8'
LANG='en_US.UTF-8'
-LC_CTYPE=C
+LC_CTYPE='en_US.UTF-8'
FLEX_HOME='~/Code/Flex/flex_sdk_3.4.1'
@@ -52,5 +50,7 @@ FLEX_HOME='~/Code/Flex/flex_sdk_3.4.1'
# 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'
-[[ -s "$HOME/.nvm/nvm.sh" ]] && . "$HOME/.nvm/nvm.sh" # This loads RVM into a shell session.
-[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm" # This loads RVM into a shell session.
+fpath=(/usr/local/share/zsh-completions $fpath)
+[[ -s "$HOME/.nvm/nvm.sh" ]] && . "$HOME/.nvm/nvm.sh"
+
+eval "$(rbenv init -)"
Please sign in to comment.
Something went wrong with that request. Please try again.