diff --git a/vimrc b/vimrc index 1ab3f95..333e67e 100644 --- a/vimrc +++ b/vimrc @@ -106,7 +106,6 @@ map gw :!git add . && git commit -m 'WIP' && git push map nn :sp ~/Dropbox/notes/programming-notes map p :set pasteo"*]p:set nopaste map pn :sp ~/Dropbox/notes/project-notes -map rf :CommandTFlush " Remove trailing whitespace on save all files. au BufWritePre * :%s/\s\+$//e @@ -143,8 +142,8 @@ imap end imap => " Mapping ESC in insert mode and command mode to double i -imap ii -cmap ii +" imap ii +"" cmap ii " suspend process nmap z @@ -158,6 +157,8 @@ nmap w :w nmap q :q nmap Q :q! nmap x :x +:ca Wa wa +:ca WA wa :ca WQ wq :ca Wq wq :ca W w @@ -181,7 +182,6 @@ map mm :split map gg :topleft 100 :split Gemfile map gr :topleft 100 :split config/routes.rb -map sd :topleft 100 :split app/models/contests/seed_data.rb " Clear the search buffer (highlighting) when hitting return function! MapCR() diff --git a/zsh/aliases b/zsh/aliases index 443abfc..6b5fa28 100644 --- a/zsh/aliases +++ b/zsh/aliases @@ -98,6 +98,7 @@ alias gr='git reset' alias grbm='git rebase master' alias grc='git rebase --continue' alias gre='git remote' +alias grev='git remote -v' alias grm='git rm' alias gsnapshot='git stash save "snapshot: $(date)" && git stash apply "stash@{0}"' alias gst='git status'