Skip to content
This repository was archived by the owner on Feb 26, 2025. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 <Esc>
* `,,` - switch between last open file and current file

#### Search/Code Navigation

Expand Down
1 change: 1 addition & 0 deletions git/gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions vim/settings/yadr-keymap.vim
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,14 @@ noremap ,hl :set hlsearch! hlsearch?<CR>
nnoremap ' `
nnoremap ` '

" Adds jump back to previous file
nnoremap <leader><leader> <c-^>

" Adds jj as optional esc. Reduces need to go to top of the keyboard to get out
" of insert mode

imap jj <Esc>

" 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#")<CR>

Expand Down