Fixing merge conflicts 886d97f41e

lib/aliases.zsh

@@ -1,9 +1,9 @@
+#!/bin/zsh
+
+# Push and pop directories on directory stack
 alias pu='pushd'
 alias po='popd'
 
-alias sc='ruby script/console'
-alias sdb='ruby script/dbconsole'
-alias ssd='ruby script/server --debugger'
 alias ss='thin --stats "/thin/stats" start'
 alias sg='ruby script/generate'
 alias sd='ruby script/destroy'
@@ -11,16 +11,18 @@ alias sp='ruby script/plugin'
 alias ssp='ruby script/spec'
 alias rdbm='rake db:migrate'
 
-alias mr='mate CHANGELOG app config db lib public script spec test'
+# Basic directory operations
 alias .='pwd'
 alias ...='cd ../..'
 alias -- -='cd -'
 
+# Super user
 alias _='sudo'
 alias ss='sudo su -'
 
 #alias g='grep -in'
 
+# Git related
 alias g='git'
 alias gst='git status'
 alias gl='git pull'
@@ -36,23 +38,39 @@ alias gdb='git branch -d'
 alias gcount='git shortlog -sn'
 alias gcp='git cherry-pick'
 
+# Show history
 alias history='fc -l 1'
 
+# List direcory contents
 alias ls='ls -F'
 alias lsa='ls -lahG'
+alias l='ls -la'
 alias ll='ls -alr'
-alias l='ls'
-alias ll='ls -l'
 alias sl=ls # often screw this up
 
 alias sgem='sudo gem'
 
+# Find ruby file
 alias rfind='find . -name *.rb | xargs grep -n'
 alias afind='ack-grep -il'
 
+# Git and svn mix
 alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
 
+# TextMate
 alias et='mate . &'
 alias ett='mate app config lib db public spec test Rakefile Capfile Todo &'
 alias etp='mate app config lib db public spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'
 alias etts='mate app config lib db public script spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'
+<<<<<<< HEAD:lib/aliases.zsh
+=======
+
+## Ruby related
+# Ruby scripts
+alias sc='ruby script/console'
+alias sd='ruby script/server --debugger'
+
+# Editor Ruby file in TextMate
+alias mr='mate CHANGELOG app config db lib public script spec test'
+
+>>>>>>> 886d97f41e72b8662232a2c6b196fb60508e4f67:lib/aliases.zsh

lib/completion.zsh

@@ -37,8 +37,7 @@ zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-
 zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm -w -w"
 zstyle ':completion:*:*:(ssh|scp):*:*' hosts `sed 's/^\([^ ,]*\).*$/\1/' ~/.ssh/known_hosts`
 
-
+# Complete on history
-#complete on history
 # zstyle ':completion:*:history-words' stop yes
 # zstyle ':completion:*:history-words' remove-all-dups yes
 # zstyle ':completion:*:history-words' list false

tools/install.sh

@@ -2,11 +2,11 @@ if [ -d ~/.oh-my-zsh ]
 then
   echo "You already have Oh My Zsh installed. You'll need to remove ~/.oh-my-zsh if you want to install"
   exit
-else
-  echo "Cloning Oh My Zsh..."
-  /usr/bin/env git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh
 fi
 
+echo "Cloning Oh My Zsh..."
+/usr/bin/env git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh
+
 echo "Looking for an existing zsh config..."
 if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]
 then
@@ -27,4 +27,3 @@ chsh -s /bin/zsh
 echo "Hooray! Oh My Zsh has been installed."
 /bin/zsh
 source ~/.zshrc
-