bashrc: add an alias for git diff
emacs: add a keybinding for zap-up-to-char
.bashrc: a bit less ugly MY_HISTORY_CMD
.bashrc: replace MY_HISTORY_CMD with a function; strip useless history entry number
Merge branch 'master' into ae