From d306bbd1c240f76b613f1fe4411e948720c30712 Mon Sep 17 00:00:00 2001 From: Travis 'All-Father' Meisenheimer Date: Tue, 29 Jan 2013 03:35:01 -0600 Subject: [PATCH 1/2] merged issue with gcp --- plugins/git/git.plugin.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 154aa6db1..3146336df 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -38,8 +38,8 @@ compdef _git gba=git-branch alias gcount='git shortlog -sn' compdef gcount=git alias gcl='git config --list' -alias gcp='git cherry-pick' -compdef _git gcp=git-cherry-pick +alias gchp='git cherry-pick' +compdef _git gchp=git-cherry-pick alias glg='git log --stat --max-count=5' compdef _git glg=git-log alias glgg='git log --graph --max-count=5' From df80ee3110c5bc4d4c1a253ddab62731fbecdbf5 Mon Sep 17 00:00:00 2001 From: Travis 'All-Father' Meisenheimer Date: Tue, 29 Jan 2013 04:11:14 -0600 Subject: [PATCH 2/2] changed default to vi --- lib/key-bindings.zsh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh index 5f499f3e8..e337eb3fe 100644 --- a/lib/key-bindings.zsh +++ b/lib/key-bindings.zsh @@ -1,6 +1,8 @@ # TODO: Explain what some of this does.. +# For more information on keybindings, see http://zshwiki.org/home/zle/bindkeys -bindkey -e +#bindkey -e +bindkey -v # vi keybindings bindkey '\ew' kill-region bindkey -s '\el' "ls\n" bindkey '^r' history-incremental-search-backward @@ -25,10 +27,11 @@ bindkey "^[[1;5D" backward-word bindkey '^[[Z' reverse-menu-complete # Make the delete key (or Fn + Delete on the Mac) work instead of outputting a ~ +# default keybinding is normal US Keyboard (non-mac) bindkey '^?' backward-delete-char bindkey "^[[3~" delete-char -bindkey "^[3;5~" delete-char -bindkey "\e[3~" delete-char +#bindkey "^[3;5~" delete-char +#bindkey "\e[3~" delete-char # consider emacs keybindings: