mirror of
https://github.com/dcarrillo/prezto.git
synced 2024-12-22 23:08:00 +00:00
Fixing merge conflicts 886d97f41e72b8662232a2c6b196fb60508e4f67
This commit is contained in:
commit
d540b24263
@ -42,7 +42,8 @@ alias gcp='git cherry-pick'
|
|||||||
alias history='fc -l 1'
|
alias history='fc -l 1'
|
||||||
|
|
||||||
# List direcory contents
|
# 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 l='ls -la'
|
||||||
alias ll='ls -alr'
|
alias ll='ls -alr'
|
||||||
alias sl=ls # often screw this up
|
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 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 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 &'
|
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 related
|
||||||
# Ruby scripts
|
# Ruby scripts
|
||||||
@ -70,3 +73,4 @@ alias sd='ruby script/server --debugger'
|
|||||||
# Editor Ruby file in TextMate
|
# Editor Ruby file in TextMate
|
||||||
alias mr='mate CHANGELOG app config db lib public script spec test'
|
alias mr='mate CHANGELOG app config db lib public script spec test'
|
||||||
|
|
||||||
|
>>>>>>> 886d97f41e72b8662232a2c6b196fb60508e4f67:lib/aliases.zsh
|
||||||
|
@ -14,7 +14,12 @@ compinit
|
|||||||
zmodload -i zsh/complist
|
zmodload -i zsh/complist
|
||||||
|
|
||||||
## case-insensitive (all),partial-word and then substring completion
|
## 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:*' list-colors ''
|
||||||
zstyle ':completion:*' hosts $( sed 's/[, ].*$//' $HOME/.ssh/known_hosts )
|
zstyle ':completion:*' hosts $( sed 's/[, ].*$//' $HOME/.ssh/known_hosts )
|
||||||
|
@ -5,6 +5,9 @@ export ZSH=$HOME/.oh-my-zsh
|
|||||||
# Look in ~/.oh-my-zsh/themes/
|
# Look in ~/.oh-my-zsh/themes/
|
||||||
export ZSH_THEME="robbyrussell"
|
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
|
# Comment this out to disable weekly auto-update checks
|
||||||
# export DISABLE_AUTO_UPDATE="false"
|
# export DISABLE_AUTO_UPDATE="false"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user