Skip to content

Instantly share code, notes, and snippets.

View pocesar's full-sized avatar
🏠
Working from home

Paulo Cesar pocesar

🏠
Working from home
140 followers · 200 following
View GitHub Profile
@WilbertOnGithub
WilbertOnGithub / gitconfig.cmd
Created April 17, 2012 08:43
Configure Git with P4Merge (Windows settings)
git config --global merge.tool p4merge
git config --global mergetool.p4merge.cmd "p4merge.exe \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\""
git config --global diff.tool p4merge
git config --global difftool.p4merge.cmd "p4merge.exe \"$LOCAL\" \"$REMOTE\""
git config --global mergetool.keepBackup false
git config --global mergetool.trustExitcode false
git config --global difftool.prompt false