Last active
June 24, 2023 20:37
-
-
Save sasknot/d938cf4f5c60d9c0845899d3e1823059 to your computer and use it in GitHub Desktop.
This file contains 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
export PATH=~/.npm-global/bin:$PATH | |
export PATH="/Applications/Sublime Text.app/Contents/SharedSupport/bin:$PATH" | |
export PATH="/Applications/Visual Studio Code.app/Contents/Resources/app/bin:$PATH" | |
alias ll='ls -lh' | |
alias dockerps="docker ps -a --format \"table {{.ID}}\t{{.Image}}\t{{.RunningFor}}\t{{.Status}}\t{{.Ports}}\t{{.Names}}\"" | |
eval "$(/opt/homebrew/bin/brew shellenv)" |
This file contains 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
# NPM global packages in local dir | |
mkdir ~/.npm-global | |
npm config set prefix '~/.npm-global' | |
# Git global config | |
git config --global user.name "Rafael Silva" | |
git config --global user.email "rafaelfsilva1@gmail.com" | |
git config --global push.default simple | |
git config --global push.autoSetupRemote true | |
git config --global branch.autosetuprebase always | |
git config --global pull.rebase true | |
git config --global remote.origin.prune true | |
git config --global init.defaultBranch main | |
# DiffMerge as diff/merge tool | |
sudo cp Extras/diffmerge.sh /usr/local/bin/diffmerge | |
sudo chmod 755 /usr/local/bin/diffmerge | |
git config --global diff.tool diffmerge | |
git config --global difftool.diffmerge.cmd "/usr/local/bin/diffmerge \"\$LOCAL\" \"\$REMOTE\"" | |
git config --global merge.tool diffmerge | |
git config --global mergetool.diffmerge.trustExitCode true | |
git config --global mergetool.diffmerge.cmd "/usr/local/bin/diffmerge --merge --result=\"\$MERGED\" \"\$LOCAL\" \"\$BASE\" \"\$REMOTE\"" | |
# VSCode as diff/merge tool | |
git config --global diff.tool vscode | |
git config --global difftool.vscode.cmd 'code --wait --diff $LOCAL $REMOTE' | |
git config --global merge.tool vscode | |
git config --global mergetool.vscode.cmd 'code --wait $MERGED' |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment