diff --git a/README.md b/README.md index 3c24aa1a8c..e1ae2c8be6 100644 --- a/README.md +++ b/README.md @@ -107,7 +107,7 @@ It is recommended to use this file to set your user info. Alternately, you can s * `git b` or `gb`- a list of branches with summary of last commit * `git r` - a list of remotes with info * `git t` or `gt`- a list of tags with info - * `git nb` or `gnb`- a (n)ew (b)ranch - like checkout -b + * `git nb` or `gnb` or `cob`- a (n)ew (b)ranch - like checkout -b * `git cp` or `gcp`- cherry-pick -x (showing what was cherrypicked) * `git simple` - a clean format for creating changelogs * `git recent-branches` - if you forgot what you've been working on @@ -154,6 +154,8 @@ of plugins above to learn more. * `Cmd-j` and `Cmd-k` to move up and down roughly by functions * `Ctrl-o` - Old cursor position - this is a standard mapping but very useful, so included here * `Ctrl-i` - opposite of Ctrl-O (again, this is standard) + * `jj` - equal to pressing + * `,,` - switch between last open file and current file #### Search/Code Navigation diff --git a/git/gitconfig b/git/gitconfig index 7191539837..e22fd88bf3 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -36,6 +36,7 @@ # checkout co = checkout # checkout nb = checkout -b # create and switch to a new branch (mnemonic: "git new branch branchname...") + cob = checkout -b # create and switch to a new branch (mnemonic: "git new branch branchname...") # cherry-pick cp = cherry-pick -x # grab a change from a branch diff --git a/vim/settings/yadr-keymap.vim b/vim/settings/yadr-keymap.vim index bf28326f10..7deecf77de 100644 --- a/vim/settings/yadr-keymap.vim +++ b/vim/settings/yadr-keymap.vim @@ -120,6 +120,14 @@ noremap ,hl :set hlsearch! hlsearch? nnoremap ' ` nnoremap ` ' +" Adds jump back to previous file +nnoremap + +" Adds jj as optional esc. Reduces need to go to top of the keyboard to get out +" of insert mode + +imap jj + " Get the current highlight group. Useful for then remapping the color map ,hi :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<' . synIDattr(synID(line("."),col("."),0),"name") . "> lo<" . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">" . " FG:" . synIDattr(synIDtrans(synID(line("."),col("."),1)),"fg#")