Merge branch 'master' of https://github.com/Z-Shang/oh-my-zsh
This commit is contained in:
commit
bf4937270a
|
@ -23,7 +23,6 @@ env_default 'LESS' '-R'
|
|||
|
||||
## super user alias
|
||||
alias _='sudo'
|
||||
alias please='sudo'
|
||||
|
||||
## more intelligent acking for ubuntu users
|
||||
if which ack-grep &> /dev/null; then
|
||||
|
|
|
@ -155,10 +155,10 @@ compdef _git ggu=git-checkout
|
|||
alias ggpur='ggu'
|
||||
compdef _git ggpur=git-checkout
|
||||
|
||||
alias ggpull='git pull origin $(git_current_branch)'
|
||||
alias ggpull='git pull origin "$(git_current_branch)"'
|
||||
compdef _git ggpull=git-checkout
|
||||
|
||||
alias ggpush='git push origin $(git_current_branch)'
|
||||
alias ggpush='git push origin "$(git_current_branch)"'
|
||||
compdef _git ggpush=git-checkout
|
||||
|
||||
alias ggsup='git branch --set-upstream-to=origin/$(git_current_branch)'
|
||||
|
|
|
@ -21,6 +21,16 @@ function _add_identities() {
|
|||
return
|
||||
fi
|
||||
|
||||
# add default keys if no identities were set up via zstyle
|
||||
# this is to mimic the call to ssh-add with no identities
|
||||
if [[ ${#identities} -eq 0 ]]; then
|
||||
# key list found on `ssh-add` man page's DESCRIPTION section
|
||||
for id in id_rsa id_dsa id_ecdsa id_ed25519 identity; do
|
||||
# check if file exists
|
||||
[[ -f "$HOME/.ssh/$id" ]] && identities+=$id
|
||||
done
|
||||
fi
|
||||
|
||||
# get list of loaded identities' signatures
|
||||
for line in ${(f)"$(ssh-add -l)"}; do loaded+=${${(z)line}[2]}; done
|
||||
|
||||
|
@ -36,7 +46,7 @@ function _add_identities() {
|
|||
[[ ${loaded[(I)$sig]} -le 0 ]] && not_loaded+="$HOME/.ssh/$id"
|
||||
done
|
||||
|
||||
if [[ -n "$not_loaded" ]] && ssh-add ${^not_loaded}
|
||||
[[ -n "$not_loaded" ]] && ssh-add ${^not_loaded}
|
||||
}
|
||||
|
||||
# Get the filename to store/lookup the environment from
|
||||
|
|
|
@ -62,9 +62,7 @@ ZSH_THEME="robbyrussell"
|
|||
# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
|
||||
# Example format: plugins=(rails git textmate ruby lighthouse)
|
||||
# Add wisely, as too many plugins slow down shell startup.
|
||||
plugins=(
|
||||
git
|
||||
)
|
||||
plugins=(git)
|
||||
|
||||
source $ZSH/oh-my-zsh.sh
|
||||
|
||||
|
|
Loading…
Reference in New Issue