Browse code

Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh

SuprDewd authored on 10/01/2011 at 17:56:38
Showing 4 changed files
... ...
@@ -36,5 +36,9 @@ cd () {
36 36
 
37 37
 alias md='mkdir -p'
38 38
 alias rd=rmdir
39
+alias d='dirs -v'
39 40
 
40
-alias d='dirs -v'
41 41
\ No newline at end of file
42
+# mkdir & cd to it
43
+function mcd() { 
44
+  mkdir -p "$1" && cd "$1"; 
45
+}
42 46
\ No newline at end of file
... ...
@@ -8,6 +8,7 @@ alias gd='git diff | mate'
8 8
 alias gdv='git diff -w "$@" | vim -R -'
9 9
 alias gc='git commit -v'
10 10
 alias gca='git commit -v -a'
11
+alias gco='git checkout'
11 12
 alias gb='git branch'
12 13
 alias gba='git branch -a'
13 14
 alias gcount='git shortlog -sn'
... ...
@@ -26,7 +27,7 @@ function current_branch() {
26 26
   echo ${ref#refs/heads/}
27 27
 }
28 28
 
29
-# these aliases take advangate of the previous function
29
+# these aliases take advantage of the previous function
30 30
 alias ggpull='git pull origin $(current_branch)'
31 31
 alias ggpush='git push origin $(current_branch)'
32
-alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
33 32
\ No newline at end of file
33
+alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
34 34
new file mode 100644
... ...
@@ -0,0 +1,8 @@
0
+alias rs='ruby script/rails server'
1
+alias rg='ruby script/rails generate'
2
+alias rd='ruby script/rails destroy'
3
+alias rp='ruby script/rails plugin'
4
+alias rdbm='rake db:migrate db:test:clone'
5
+alias rc='ruby script/rails console'
6
+alias rd='ruby script/rais server --debugger'
7
+alias devlog='tail -f log/development.log'
0 8
new file mode 100644
... ...
@@ -0,0 +1,9 @@
0
+# ZSH Theme emulating the Fish shell's default prompt.
1
+
2
+local user_color='green'; [ $UID -eq 0 ] && user_color='red'
3
+PROMPT='%n@%m %{$fg[$user_color]%}%~%{$reset_color%}%(!.#.>) '
4
+PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
5
+RPS1='%(?..%{$fg[red]%}%? ↵%{$reset_color%})$(git_prompt_info)'
6
+
7
+ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[cyan]%}"
8
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"