moved edt files into software for sorting

-* [vim](/edt/vim)

-* [git](/edt/git)

-* [tmux](/edt/tmux)

-* [more](/tech-index#everyday-tools)...

-* [more](/tech-index#programming)...

-# git

-

-undo merge that hasn't been pushed

-```zsh

-git reset --merge HEAD~1

-```

-

-roll back hard

-```

-git reset --hard <commit/tag>

-```

-

-force push of a previous commit

-```

-git push -f origin <commit_id>:<branch>

-```

-

-delete remote branch

-```

-git push --delete origin <branch>

-```

-

-reset local branch after a forced-update (above)

-```

-git fetch

-git reset origin/<branch> --hard

-```

-

-renaming branch and updating remote

-```

-git branch -m old-name new-name

-git push origin --set-upstream new-name

-git push origin :old-name

-```

-

-set username for [single repo][]

-```

-git config user.username 'name'

-```

-

-set signing key for local repo

-```

-git config user.signingkey <id>

-```

-

-[signing][] commits

-```

-git commit -S -m 'msg'

-```

-

-compare diff between two commits

-```

-git diff <commit>...<commit>

-```

-

-stash

-```

-git stash

-git stash show

-```

-

-unstash

-```

-git stash pop

-```

-

-add remote origin

-```

-git remote add origin git@gitserver/path/to/repo

-```

-

-add multiple push repos

-```

-git remote set-url --add --push origin git@gitserver/original/repo

-git remote set-url --add --push origin https://gitserver/another/repo

-```

-

-archive branch

-```

-git archive --format zip --outpu /path/to/output.zip <branch>

-```

-

-## using `hub`

-### pull requests

-```

-hub pr list

-hub pr checkout <num>

-```

-

-## helpful links

-

-[making a pull request][]

-

-[branching and rebasing][]

-

-[branching model][]

-

-[merging and rebasing][]

-

-[making a pull request]: https://www.atlassian.com/git/tutorials/making-a-pull-request

-[branching and rebasing]: https://git-scm.com/book/en/v2/Git-Branching-Rebasing

-[branching model]: https://nvie.com/posts/a-successful-git-branching-model/

-[single repo]: https://help.github.com/articles/setting-your-username-in-git/

-[merging and rebasing]: https://www.atlassian.com/git/tutorials/merging-vs-rebasing

-[signing]: https://git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work

-# irc

-

-[mode list][]

-

-## freenode

-use the following to search channels

-```

-/msg alis LIST *searchterm*

-```

-

-## irc.highway.net #ebooks

-```

-@search Author/Title

-/dcc get Search

-```

-

-locate correct file

-```

-!user filename

-/dcc get username

-```

-

-## ssl port

-```

-/connect -tls <irc_server> <port>

-```

-

-## irc.c

-* `j <chan>` - join channel

-* `l <chan>` - leave channel

-* `m <user>` - private message

-* `ctrl-n` - next window

-* `ctrl-p` - previous window

-* `r <cmd>` - send raw

- * `r names`

- * `r whois`

-

-### testing

-* miniircd (lxc container)

- * get ip (10.0.3.133)

-* ircc (lxc container)

- * `./irc -n guest -u guest -s 10.0.3.133`

-

-## irssi

-### colour table

-

-use 256 color tables 1-7 preceded with `x` (bg) or `X` foreground, and then a,b,c etc. i.e `%x7g`

-

-[mode list]: https://madirc.net/irc-channelmodes.html

-```

-mail

-```

-* `+` open next mail

-* `-` open prev mail

-* `d` delete mail

- * `d 6 9` delete mail 6 & 9

- * `d 4-40` delete mails 4 to 40

- * `d*` delete all

-* `reply`

-* `h` print messages

-

-use csv list in ~/.forward to forward mails to external addr. or check /etc/aliases ([stackexchange][])

-

-[stackexchange]: https://unix.stackexchange.com/a/26670

-# mutt

-

-search, limit and tagging [patterns][]

-* limit new (unread) messages using `~U`

-* limit messages either to: or cc: using ~C (useful for mailing lists)

-

-## index format

-default index format is (taken from [muttrc man][])

-```

-"%4C %Z %{%b %d} %-15.15L (%?l?%4l&%4c?) %s"

-```

-

-current format is

-```

-"%Z %-30.30L %M %s"

-```

-_message status, sender, hidden msgs (in thread), subject_

-

-## threads

-collapse threads using `Esc-v`

-

-[rebind collapse-thread][] to '-'

-```

-bind index - collapse-thread

-```

-

-configure threads to be collapsed when mailbox opened ([thread_ref][])

-```

-folder-hook . "push <collapse-all>\n"

-```

-

-## attachments

-download directory macro ([macro source][])

-```

-macro attach W "<save-entry><bol>~/tmp/<eol>"

-```

-

-pipe pdf

-```

-| zathura -

-```

-

-[patterns]: http://www.mutt.org/doc/manual/#patterns

-[muttrc man]: https://linux.die.net/man/5/muttrc

-[rebind collapse-thread]: https://heipei.net/2009/09/10/mutt-threading-like-a-pro/

-[thread_ref]: http://compgroups.net/comp.mail.mutt/collapsing-threads-by-default/2550437

-[macro source]: https://superuser.com/questions/695541/where-does-mutt-save-attachment

-# tmux

-

-all commands used with `prefix`

-

-| command | description |

-| --- | --- |

-| `s` | switch tmux sessions |

-| `r` | reload config |

-| `$` | rename session |

-

-

-

-# vim

-

-## copy contents to/from files

-to copy the contents into a file

- ```

- :r <filename>

- ```

-or

- ```

- :"qY # yank out of first file

- :"qP # put into second file

- ```

-or read range of lines

- ```

- :r! sed -n <n>,<m>p /path/to/file.md

- ```

-

-to copy the contents to a new file

- ```

- :<n>,<m> w <filename>

- ```

- where `<n>` and `<m>` are numbers or symbols that designate range of lines

-

-

-## text wrap

-(wrap to column)

-wrap current line

-```

-gqq

-```

-

-wrap entire file

-```

-gqG

-```

-

-wrap paragraph using visual selection

-```

-V}gq

-```

-

-also use visual or visual block with `gq`

-

-## spell

-[using_spellcheck][]

-check spelling

-```

-Spell

-```

-

-move to word

-```

-]s [s

-```

-

-and see results

-```

-z=

-```

-

-turn off highlighting

-```

-set nospell

-```

-

-## buffers

-- buffer [faq][]

-- using [vanilla vim][]

-- [buffers over tabs][]

-- open buffer

- ```

- :e <filename>

- :new

- ```

-- view buffers

- ```

- :ls

- ```

-- switch buffers

- ```

- :buffer <num>

- ```

-- unload buffer

- ```

- :bd <num>

- ```

-

-## incrementing numbers

-post on [reddit][]

-

-select several lines containing '0' and type `g<C-a>`

-

-## split

-- movement

- ```

- <Ctrl>-w [h,j,k,l]

- <Ctrl>-w w

- ```

-- rotate

- ```

- <Ctrl>-w r

- ```

-- orientate

- ```

- <Ctrl>-w J

- <Ctrl>-w L

- ```

-- sizing

- ```

- <Ctrl>-w - # decrease height by 1 line

- <Ctrl>-w + # increase height by 1 line

- <Ctrl>-w < # change width by 1 line to the left

- <Ctrl>-w > # change width by 1 line to the right

- <Ctrl>-w 10 - # decrease height by 10 lines, etc...

- ```

-

-## diff

-```

-:windo diffthis

-:windo diffoff

-```

-

-## list recent doc

-```

-:ol[dfiles]

-```

-

-## replace

-- change inner word

- ```

- ciw

- ```

-

-## delete

-- until but not <char>

- ```

- dt <char>

- ```

-- until and <char>

- ```

- df <char>

- ```

-

-## visual

-- visual select to end of line excluding whitespace

-```

-vg_

-```

-

-## using the shell

-[vim and the shell][]

-

-- run current buffer as script

-```bash

-:!./%

-```

-

-- in script, highlight line and switch to command mode by pressing `:`

-```bash

-:'<,'>w !bash -

-```

-

-```python

-:'<,'>w !python -

-```

-

-## directory of current buffer

-open new file in dir of current buffer

-```

-:e %:h/filename

-```

-

-save file as new file in dir of current buffer

-```

-:sav %:h/filename

-```

-

-## substitute on multiple lines

-https://stackoverflow.com/a/19996145

-```

-:6,10s/<search_string>/<replace_string>/g | 14,18&&

-```

-

-## reverse substitute

-* adds a tab to the beginning of all lines that don't start with `Pattern`

-```

-:%v/^Pattern/s/^/\t/

-```

-

-## sort visual block

-https://vim.fandom.com/wiki/How_to_sort_using_visual_blocks

-```

-:'<,'>sort /\ze\%V/

-```

-

-## move current line (scroll-cursor)

-`z<enter>` or `zt` - move to top of buffer

-`z.` or `zz` - move to centre of buffer

-`z-` or `zb` - move to bottom of buffer

-

-(zEnter, z., and z- puts the cursor in the first non blank column. zt, zz, and zb leaves the cursor in the current column)

-

-```

-:help scroll-cursor

-```

-

-## yanking into a register

-`"qp` paste the contents of the register to the current cursor position

-`i` enter insert mode at the begging of the pasted line

-`^` add the missing motion to return to the front of the line

-`<escape>` return to visual mode

-`"qyy` yank this new modified macro back into the q register

-`dd` delete the pasted register from the file your editing

-

-## editing the register visually

-`:let @q='` open the q register

-`<cntl-r><cntl-r>q` paste the contents of the q register into the buffer

-`^` add the missing motion to return to the front of the line

-`'` add a closing quote

-`<enter>` finish editing the macro

-

-[using_spellcheck]: https://www.linux.com/learn/using-spell-checking-vim

-[faq]: http://vim.wikia.com/wiki/Vim_buffer_FAQ

-[vanilla vim]: https://stackoverflow.com/questions/16082991/vim-switching-between-files-rapidly-using-vanilla-vim-no-plugins

-[buffers over tabs]: https://stackoverflow.com/questions/26708822/why-do-vim-experts-prefer-buffers-over-tabs

-[reddit]: https://www.reddit.com/r/vim/comments/a1lvb1/til_gca_for_creating_a_column_of_incrementing/

-[vim and the shell]: https://vimways.org/2019/vim-and-the-shell/

-# vimwiki

-

-## commands

-| command | description |

-| --- | --- |

-| `=` | increase header |

-| `-` | decrease header |

-| `C-space` | check todo box |

-| `glh` | step down list |

-| `gll` | step up list |

-| `glr` | refresh numbered list |

-| `\w\t` | day diary in new tab |

-| `\w\i` | on diary index generate new links |

-| `\wt` | open wiki index in tab (only after mapping `nmap <Leader>wt <Plug>VimwikiTabnewLink`) |

-| `\wi` | open diary index |

-

-## syntax highlighting

-```bash

-echo hello friend

-```

-

-## convert to html

-pandoc -s -f markdown -t html -o uofu/azure_ad_requirements.html uofu/azure_ad_requirements.md && firefox uofu/azure_ad_requirements

-.html

-

-## anchors

- use [title] (#anchor#subanchor)

- i'm using :tags: under a #ref header to jump to links in page

- - switch to [pandoc markdown][]

-

-[pandoc markdown]: http://pandoc.org/MANUAL.html#pandocs-markdown

-* [vim](/edt/vim)

-* [git](/edt/git)

-* [tmux](/edt/tmux)

-* [mutt](/edt/mutt)

-* [vimwiki](/edt/vimwiki)

-* [irc](/edt/irc)

-* [mail](/edt/mail)