git cheatsheet

gistfile1.txt

//git remove missing files
git rm $(git ls-files --deleted)


//replace master with goodbranch
git checkout goodbranch
git merge -s ours master
git checkout master
git merge goodbranch

git commit -am "add all and commit"

git archive --format zip --output ../filename.zip master

//ignore file system changes
git config core.filemode false


#ignores
example*/bin/data
example*/bin/libs/
example*/bin/*
!example*/bin/data/.gitkeep

//restore deleted file
git checkout HEAD^ OMXAudioDecoder.cpp


//remove any unstaged changes
git clean -df & git checkout .

//NON-GIT
//determine lib architecture
lipo -info opencv.a

REGEX
Any string to extension
.*(?=\.)

Any letter
[a-zA-Z]+