Set rebase to false on pull from git

[rbdr/dotfiles] / zsh / modules / editor.zsh

diff --git a/zsh/modules/editor.zsh b/zsh/modules/editor.zsh
index 8bc4daeebcf02f03fca8972980dda0c3401dc35d..9f0da4b52a9d677ca9d78d3aa4a9edf5fb5e4afc 100644 (file)
--- a/zsh/modules/editor.zsh
+++ b/zsh/modules/editor.zsh
@@ -131,9 +131,11 @@ bindkey -M vicmd "u" undo
 bindkey -M vicmd "$key_info[Control]R" redo
 
 if (( $+widgets[history-incremental-pattern-search-backward] )); then
 bindkey -M vicmd "$key_info[Control]R" redo
 
 if (( $+widgets[history-incremental-pattern-search-backward] )); then

+  bindkey '^R' history-incremental-pattern-search-backward

   bindkey -M vicmd "?" history-incremental-pattern-search-backward
   bindkey -M vicmd "/" history-incremental-pattern-search-forward
 else
   bindkey -M vicmd "?" history-incremental-pattern-search-backward
   bindkey -M vicmd "/" history-incremental-pattern-search-forward
 else

+  bindkey '^R' history-incremental-search-backward

   bindkey -M vicmd "?" history-incremental-search-backward
   bindkey -M vicmd "/" history-incremental-search-forward
 fi
   bindkey -M vicmd "?" history-incremental-search-backward
   bindkey -M vicmd "/" history-incremental-search-forward
 fi