This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| git config merge.tool vimdiff | |
| git config merge.conflictstyle diff3 | |
| git config mergetool.prompt false | |
| git config --global mergetool.keepBackup false | |
| git mergetool | |
| :diffg RE " get from REMOTE | |
| :diffg BA " get from BASE | |
| :diffg LO " get from LOCAL |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| // convert wav to mp3 | |
| for i in *.wav; do lame -b 320 -h "${i}" "${i%.wav}.mp3"; done | |
| // resize images | |
| sips -Z 1600 *jpg --out=converted/ | |
| // set up git repo | |
| git remote set-url origin [email protected]:username/repo.git |