Cheatsheet

Git

undo commit

 $ git commit -m "Something terribly misguided"
 $ git reset HEAD~
 << edit files as necessary >>
 $ git add ...
 $ git commit -c ORIG_HEAD

find in history

 git log -S'the line from your file' -- path/to/your/file.txt

rename branch

 git branch -m new-name
 git push origin :old-name new-name
 git push origin -u new-name

remove without delete

 git rm --cached somefile.txt

rebase history

 git rebase -i HEAD~3

in rebase, take theirs

 git checkout --theirs [file]

"theirs" is a special flag during a rebase (check this, after I made the note, it looks like it didn't work).

Unstage

 git reset

Grep

 grep -lr --include \*.[EXT] --exclude \*[TAIL] "[SEARCH1]" ./ | xargs grep -n [SEARCH2]

Bash

Kill by port

 lsof -i tcp:${PORT_NUMBER} | awk 'NR!=1 {print $2}' | xargs kill
 lsof -i tcp:8080 | awk 'NR!=1 {print $2}' | xargs kill

To create or update a symlink

 ln -sf /path/to/file /path/to/symlink

Screen

 screen -dRR