cl = clone --recurse-submodules -j8
dt = difftool
mt = mergetool
-
- sb = status -sb
- a = add
+ undo = reset --soft HEAD^
+ unci = reset --soft HEAD~
una = reset HEAD --
uha = checkout HEAD --
unaa = reset HEAD
uhaa = reset --hard HEAD
+ sb = status -sb
+ amend = commit --amend
+ a = add
br = branch
brdm = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d"
go = "!f() { git checkout -b \"$1\" 2> /dev/null || git checkout \"$1\"; }; f"
- amend = commit --amend
- unci = reset --soft HEAD~
diff = diff --word-diff
# dont pull without rebase, and dont push without pull (fetch & merge)
p = pull --rebase
# Use vi keybindings for everything that uses readline.
+# Useful stuff for UTF-8
+set meta-flag on
+set input-meta on
+set output-meta on
+set convert-meta off
+
# Adds punctuation as word delimiters
set bind-tty-special-chars off
set editing-mode vi
set keymap vi
+
set show-mode-in-prompt on
set vi-ins-mode-string +
set vi-cmd-mode-string -
+
set keymap vi-command
"gg": beginning-of-history
"G": end-of-history
-"k": history-search-backward
"j": history-search-forward
-
-set keymap vi-insert
-"\e":
-"\C-f": vi-movement-mode
-"jk": vi-movement-mode
-"\C-w": backward-kill-word
+"k": history-search-backward
$if Bash
# do history expansion when space entered
Space: magic-space
$endif
+set keymap vi-insert
+"\e": vi-movement-mode
+"jk": vi-movement-mode
+Tab: complete
+#Tab: menu-complete
+
$if Python
$endif
"\eOR": "stepi\n"
$endif
-"\es": menu-complete
-
-# Useful stuff for UTF-8
-set meta-flag on
-set input-meta on
-set output-meta on
-set convert-meta off
+$if mysql
+ "\C-xs": "show tables like '%%';\e[D\e[D\e[D"
+$endif
# Include system wide settings which is ignored
# by default if one has own .inputrc