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

Grep

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