Diff
1diff --git a/lib/aliases.zsh b/lib/aliases.zsh
2index 855dfeb184f923bed30618a36e358cb9f64dceb8..c4428d405d8c0f906b5ea12f1e9de290bc2e5076 100644
3--- a/lib/aliases.zsh
4+++ b/lib/aliases.zsh
5@@ -1,9 +1,9 @@
6+#!/bin/zsh
7+
8+# Push and pop directories on directory stack
9 alias pu='pushd'
10 alias po='popd'
11
12-alias sc='ruby script/console'
13-alias sdb='ruby script/dbconsole'
14-alias ssd='ruby script/server --debugger'
15 alias ss='thin --stats "/thin/stats" start'
16 alias sg='ruby script/generate'
17 alias sd='ruby script/destroy'
18@@ -11,16 +11,18 @@ alias sp='ruby script/plugin'
19 alias ssp='ruby script/spec'
20 alias rdbm='rake db:migrate'
21
22-alias mr='mate CHANGELOG app config db lib public script spec test'
23+# Basic directory operations
24 alias .='pwd'
25 alias ...='cd ../..'
26 alias -- -='cd -'
27
28+# Super user
29 alias _='sudo'
30 alias ss='sudo su -'
31
32 #alias g='grep -in'
33
34+# Git related
35 alias g='git'
36 alias gst='git status'
37 alias gl='git pull'
38@@ -36,23 +38,39 @@ alias gdb='git branch -d'
39 alias gcount='git shortlog -sn'
40 alias gcp='git cherry-pick'
41
42+# Show history
43 alias history='fc -l 1'
44
45+# List direcory contents
46 alias ls='ls -F'
47 alias lsa='ls -lahG'
48+alias l='ls -la'
49 alias ll='ls -alr'
50-alias l='ls'
51-alias ll='ls -l'
52 alias sl=ls # often screw this up
53
54 alias sgem='sudo gem'
55
56+# Find ruby file
57 alias rfind='find . -name *.rb | xargs grep -n'
58 alias afind='ack-grep -il'
59
60+# Git and svn mix
61 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
62
63+# TextMate
64 alias et='mate . &'
65 alias ett='mate app config lib db public spec test Rakefile Capfile Todo &'
66 alias etp='mate app config lib db public spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'
67 alias etts='mate app config lib db public script spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'
68+<<<<<<< HEAD:lib/aliases.zsh
69+=======
70+
71+## Ruby related
72+# Ruby scripts
73+alias sc='ruby script/console'
74+alias sd='ruby script/server --debugger'
75+
76+# Editor Ruby file in TextMate
77+alias mr='mate CHANGELOG app config db lib public script spec test'
78+
79+>>>>>>> 886d97f41e72b8662232a2c6b196fb60508e4f67:lib/aliases.zsh
80diff --git a/lib/completion.zsh b/lib/completion.zsh
81index 68ca3b4c135fbcf15b03e1bf949e43c4b96ee2d1..deeb52824e8df33653704b67cc28bf431a9e225a 100644
82--- a/lib/completion.zsh
83+++ b/lib/completion.zsh
84@@ -37,8 +37,7 @@ zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-
85 zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm -w -w"
86 zstyle ':completion:*:*:(ssh|scp):*:*' hosts `sed 's/^\([^ ,]*\).*$/\1/' ~/.ssh/known_hosts`
87
88-
89-#complete on history
90+# Complete on history
91 # zstyle ':completion:*:history-words' stop yes
92 # zstyle ':completion:*:history-words' remove-all-dups yes
93 # zstyle ':completion:*:history-words' list false
94diff --git a/tools/install.sh b/tools/install.sh
95old mode 100644
96new mode 100755
97index 5c9f5592a9b7c5fa4c08c72f0142ffefc8b2c62b..5a7c00950a902f79b100d6f9bc1894df9604c201
98--- a/tools/install.sh
99+++ b/tools/install.sh
100@@ -2,11 +2,11 @@ if [ -d ~/.oh-my-zsh ]
101 then
102 echo "You already have Oh My Zsh installed. You'll need to remove ~/.oh-my-zsh if you want to install"
103 exit
104-else
105- echo "Cloning Oh My Zsh..."
106- /usr/bin/env git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh
107 fi
108
109+echo "Cloning Oh My Zsh..."
110+/usr/bin/env git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh
111+
112 echo "Looking for an existing zsh config..."
113 if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]
114 then
115@@ -27,4 +27,3 @@ chsh -s /bin/zsh
116 echo "Hooray! Oh My Zsh has been installed."
117 /bin/zsh
118 source ~/.zshrc
119-