summaryrefslogtreecommitdiff
path: root/user:hugues
diff options
context:
space:
mode:
Diffstat (limited to 'user:hugues')
-rw-r--r--user:hugues/Aliases.zsh3
-rw-r--r--user:hugues/KeyBindings.zsh8
2 files changed, 4 insertions, 7 deletions
diff --git a/user:hugues/Aliases.zsh b/user:hugues/Aliases.zsh
index 435daa9..4a2322b 100644
--- a/user:hugues/Aliases.zsh
+++ b/user:hugues/Aliases.zsh
@@ -72,6 +72,9 @@ a lc='ls -c'
a l1='\ls -1'
a gitk='\gitk --date-order'
+a gm='\git mergetool'
+a grc='\git rebase --continue'
+a gra='\git rebase --abort'
__cmd_exists dict && a definition='dict -h dict.org'
__cmd_exists dict && a traduction='dict -h hiegel.fr -P-'
diff --git a/user:hugues/KeyBindings.zsh b/user:hugues/KeyBindings.zsh
index 1c4a693..fb241f4 100644
--- a/user:hugues/KeyBindings.zsh
+++ b/user:hugues/KeyBindings.zsh
@@ -164,15 +164,9 @@ bindkey -v
# This setup may change the `ESC' keybinding to `C-d'. That defeats the
# possibility to exit zsh by pressing `C-d' (which usually sends EOF).
# With this widget, you can type `:q<RET>' to exit the shell from vicmd.
-if [ $( _process_tree | grep -o zsh | wc -l ) -gt 1 ]
-then
- CONFIRM_EXIT=""
-else
- CONFIRM_EXIT="confirm "
-fi
function ft-zshexit {
[[ -o hist_ignore_space ]] && BUFFER=' '
- BUFFER="${BUFFER}${CONFIRM_EXIT}exit"
+ BUFFER="${BUFFER}exit"
zle .accept-line
}
zle -N q ft-zshexit