Skip to content

Instantly share code, notes, and snippets.

@jadient
Last active November 11, 2017 20:52
Show Gist options
  • Save jadient/10921f38b03821773f31790f58e185d3 to your computer and use it in GitHub Desktop.
Save jadient/10921f38b03821773f31790f58e185d3 to your computer and use it in GitHub Desktop.
# use --global or --system options to specify other configuration locations
# -- global is per user, --system is for all users
git config status.showUntrackedFiles no
# https://chodounsky.net/2013/05/01/compare-files-with-git-diff-tool/
git config color.status.added "cyan normal bold"
git config color.status.changed "cyan normal bold"
git config color.status.untracked "cyan normal bold"
git config color.diff.old "red normal bold"
git config color.diff.new "green normal bold"
# https://stackoverflow.com/questions/1881594/use-winmerge-inside-of-git-to-file-diff
git config diff.tool winmerge
git config difftool.winmerge.path /path/to/WinMergeU.exe
git config difftool.prompt false
git config diff.tool p4merge
git config difftool.p4merge.cmd "\"C:/Program Files/Perforce/p4merge.exe\" $LOCAL $REMOTE"
git config difftool.prompt false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment