a75d0ba8d7b256fa2c21b0c8f04cbcab6b9289f2

Message

Fixing merge

Diff

This diff is truncated to protect this page.

  1diff --git a/lib/aliases.zsh b/lib/aliases.zsh
  2index da61685069748a08877dfefe02964f100a9fd53b..9e2087728156bad43a46030fa5c2be75a4da6685 100644
  3--- a/lib/aliases.zsh
  4+++ b/lib/aliases.zsh
  5@@ -4,12 +4,17 @@
  6 alias pu='pushd'
  7 alias po='popd'
  8 
  9-# Ruby related
 10 alias ss='thin --stats "/thin/stats" start'
 11+alias sg='ruby script/generate'
 12+alias sd='ruby script/destroy'
 13+alias sp='ruby script/plugin'
 14+alias ssp='ruby script/spec'
 15+alias rdbm='rake db:migrate'
 16 
 17 # Basic directory operations
 18 alias .='pwd'
 19 alias ...='cd ../..'
 20+alias -- -='cd -'
 21 
 22 # Super user
 23 alias _='sudo'
 24@@ -21,12 +26,17 @@ alias ss='sudo su -'
 25 alias g='git'
 26 alias gst='git status'
 27 alias gl='git pull'
 28+alias gup='git fetch && git rebase'
 29 alias gp='git push'
 30 alias gd='git diff | mate'
 31+alias gdv='git diff -w "$@" | vim -R -'
 32 alias gc='git commit -v'
 33 alias gca='git commit -v -a'
 34 alias gb='git branch'
 35 alias gba='git branch -a'
 36+alias gdb='git branch -d'
 37+alias gcount='git shortlog -sn'
 38+alias gcp='git cherry-pick'
 39 
 40 # Show history
 41 alias history='fc -l 1'
 42@@ -41,6 +51,7 @@ alias sgem='sudo gem'
 43 
 44 # Find ruby file
 45 alias rfind='find . -name *.rb | xargs grep -n'
 46+alias afind='ack-grep -il'
 47 
 48 # Git and svn mix
 49 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
 50@@ -59,5 +70,3 @@ alias sd='ruby script/server --debugger'
 51 # Editor Ruby file in TextMate
 52 alias mr='mate CHANGELOG app config db lib public script spec test'
 53 
 54-
 55-
 56diff --git a/lib/misc.zsh b/lib/misc.zsh
 57index 8d6727251a73ae3456600195a71eeb29aebdef2f..a01627d9e7fa43ed0391a252a79709a83a36ba93 100644
 58--- a/lib/misc.zsh
 59+++ b/lib/misc.zsh
 60@@ -7,11 +7,3 @@ bindkey "^[m" copy-prev-shell-word
 61 
 62 ## jobs
 63 setopt long_list_jobs
 64-
 65-# Check for updates on initial load...
 66-if [ "$DISABLE_AUTO_UPDATE" = "true" ]
 67-then
 68-  return
 69-else
 70-  /bin/sh $ZSH/tools/check_for_upgrade.sh
 71-fi
 72diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
 73index dd6ffec06ce7c1483d94cbe2a102dd6ed2da741a..4b5959625b5ac095b7505bf6126a35ab7737c2d4 100644
 74--- a/oh-my-zsh.sh
 75+++ b/oh-my-zsh.sh
 76@@ -7,5 +7,10 @@ for config_file ($ZSH/lib/*.zsh) source $config_file
 77 # Load all of your custom configurations from custom/
 78 for config_file ($ZSH/custom/*.zsh) source $config_file
 79 
 80-
 81-export PATH=~/bin:/opt/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/local/sbin:/opt/local/lib/postgresql83/bin
 82+# Check for updates on initial load...
 83+if [ "$DISABLE_AUTO_UPDATE" = "true" ]
 84+then
 85+  return
 86+else
 87+  /bin/sh $ZSH/tools/check_for_upgrade.sh
 88+fi
 89diff --git a/themes/cypher.zsh-theme b/themes/cypher.zsh-theme
 90new file mode 100644
 91index 0000000000000000000000000000000000000000..45df53d22fb3544a5767e5935dcce713a5216548
 92--- /dev/null
 93+++ b/themes/cypher.zsh-theme
 94@@ -0,0 +1,4 @@
 95+# Based on evan's prompt
 96+# Shows the exit status of the last command if non-zero
 97+# Uses "#" instead of "»" when running with elevated privileges
 98+PROMPT="%m %{${fg_bold[red]}%}:: %{${fg[green]}%}%3~%(0?. . ${fg[red]}%? )%{${fg[blue]}%}»%{${reset_color}%} "
 99diff --git a/themes/wezm.zsh-theme b/themes/wezm.zsh-theme
100new file mode 100644
101index 0000000000000000000000000000000000000000..1881343b0d13dc914d3707a0b6c99916a5679f2f
102--- /dev/null
103+++ b/themes/wezm.zsh-theme
104@@ -0,0 +1,7 @@
105+PROMPT='$(git_prompt_info)%(?,,%{${fg_bold[white]}%}[%?]%{$reset_color%} )%{$fg[yellow]%}%#%{$reset_color%} '
106+RPROMPT='%{$fg[green]%}%~%{$reset_color%}'
107+
108+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[blue]%}("
109+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
110+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%})%{$fg[red]%}⚡%{$reset_color%}"
111+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})"
112diff --git a/themes/xiong-chiamiov.zsh-theme b/themes/xiong-chiamiov.zsh-theme
113new file mode 100644
114index 0000000000000000000000000000000000000000..7c4c2e4f8aafdbe84c80819f7f35d3fdc9b6330f
115--- /dev/null
116+++ b/themes/xiong-chiamiov.zsh-theme
117@@ -0,0 +1,6 @@
118+# user, host, full path, and time/date
119+# on two lines for easier vgrepping
120+# entry in a nice long thread on the Arch Linux forums: http://bbs.archlinux.org/viewtopic.php?pid=521888#p521888
121diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
122index feb999aff75a1d6e8418667868164dfd36868f81..5c212b6fa377b61c0baf76e7e68df1092088059e 100644
123--- a/tools/check_for_upgrade.sh
124+++ b/tools/check_for_upgrade.sh
125@@ -4,7 +4,7 @@ current_epoch=$(($(date +%s) / 60 / 60 / 24))
126 
127 if [ -f ~/.zsh-update ]
128 then
129-  source ~/.zsh-update
130+  . ~/.zsh-update
131   epoch_diff=$(($current_epoch - $LAST_EPOCH))
132   if [ $epoch_diff -gt 6 ]
133   then