Diff
1diff --git a/lib/directories.zsh b/lib/directories.zsh
2index 56d7a2316db5cb56d6077e08f0b885f9b24b2c7a..bb114f61531a2086ebf16d9266d519dba592c0be 100644
3--- a/lib/directories.zsh
4+++ b/lib/directories.zsh
5@@ -36,5 +36,9 @@ cd () {
6
7 alias md='mkdir -p'
8 alias rd=rmdir
9+alias d='dirs -v'
10
11-alias d='dirs -v'
12+# mkdir & cd to it
13+function mcd() {
14+ mkdir -p "$1" && cd "$1";
15+}
16diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
17index d317d179d8ec7bce0ecf600ec237d5c754f47215..71a62819bbd5decbd8de84a83f14ee98fbc56925 100644
18--- a/plugins/git/git.plugin.zsh
19+++ b/plugins/git/git.plugin.zsh
20@@ -8,6 +8,7 @@ alias gd='git diff | mate'
21 alias gdv='git diff -w "$@" | vim -R -'
22 alias gc='git commit -v'
23 alias gca='git commit -v -a'
24+alias gco='git checkout'
25 alias gb='git branch'
26 alias gba='git branch -a'
27 alias gcount='git shortlog -sn'
28@@ -26,7 +27,7 @@ function current_branch() {
29 echo ${ref#refs/heads/}
30 }
31
32-# these aliases take advangate of the previous function
33+# these aliases take advantage of the previous function
34 alias ggpull='git pull origin $(current_branch)'
35 alias ggpush='git push origin $(current_branch)'
36-alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
37+alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
38diff --git a/plugins/rails3/rails3.plugin.zsh b/plugins/rails3/rails3.plugin.zsh
39new file mode 100644
40index 0000000000000000000000000000000000000000..20ba0408ce8ccd1773282bfec3f87f6df97b418e
41--- /dev/null
42+++ b/plugins/rails3/rails3.plugin.zsh
43@@ -0,0 +1,8 @@
44+alias rs='ruby script/rails server'
45+alias rg='ruby script/rails generate'
46+alias rd='ruby script/rails destroy'
47+alias rp='ruby script/rails plugin'
48+alias rdbm='rake db:migrate db:test:clone'
49+alias rc='ruby script/rails console'
50+alias rd='ruby script/rais server --debugger'
51+alias devlog='tail -f log/development.log'
52diff --git a/themes/fishy.zsh-theme b/themes/fishy.zsh-theme
53new file mode 100644
54index 0000000000000000000000000000000000000000..f22eda868501accc1aed45380a70d634eb8d0435
55--- /dev/null
56+++ b/themes/fishy.zsh-theme
57@@ -0,0 +1,9 @@
58+# ZSH Theme emulating the Fish shell's default prompt.
59+
60+local user_color='green'; [ $UID -eq 0 ] && user_color='red'
61+PROMPT='%n@%m %{$fg[$user_color]%}%~%{$reset_color%}%(!.#.>) '
62+PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
63+RPS1='%(?..%{$fg[red]%}%? ↵%{$reset_color%})$(git_prompt_info)'
64+
65+ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[cyan]%}"
66+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"