Fixing merge conflicts 886d97f41e72b8662232a2c6b196fb60508e4f67

lib/aliases.zsh

@@ -42,7 +42,8 @@ alias gcp='git cherry-pick'
 alias history='fc -l 1'
 
 # List direcory contents
-#alias ls='ls -F' # This messes up colors on my linux system
+alias ls='ls -F'
+alias lsa='ls -lahG'
 alias l='ls -la'
 alias ll='ls -alr'
 alias sl=ls # often screw this up
@@ -61,6 +62,8 @@ 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
@@ -70,3 +73,4 @@ 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

@@ -14,7 +14,12 @@ compinit
 zmodload -i zsh/complist
 
 ## case-insensitive (all),partial-word and then substring completion
-#zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
+if [ "x$CASE_SENSITIVE" = "xtrue" ]; then
+  zstyle ':completion:*' matcher-list 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
+  unset CASE_SENSITIVE
+else
+  zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
+fi
 
 zstyle ':completion:*' list-colors ''
 zstyle ':completion:*' hosts $( sed 's/[, ].*$//' $HOME/.ssh/known_hosts )
@@ -36,4 +41,4 @@ zstyle ':completion:*:*:(ssh|scp):*:*' hosts `sed 's/^\([^ ,]*\).*$/\1/' ~/.ssh/
 # zstyle ':completion:*:history-words' stop yes
 # zstyle ':completion:*:history-words' remove-all-dups yes
 # zstyle ':completion:*:history-words' list false
-# zstyle ':completion:*:history-words' menu yes
+# zstyle ':completion:*:history-words' menu yes

templates/zshrc.zsh-template

@@ -5,6 +5,9 @@ export ZSH=$HOME/.oh-my-zsh
 # Look in ~/.oh-my-zsh/themes/
 export ZSH_THEME="robbyrussell"
 
+# Set to this to use case-sensitive completion
+# export CASE_SENSITIVE="true"
+
 # Comment this out to disable weekly auto-update checks
 # export DISABLE_AUTO_UPDATE="false"