Skip to content

Instantly share code, notes, and snippets.

@pestophagous
Created September 14, 2015 21:42
Show Gist options
  • Save pestophagous/7703c3573e548a7b8c50 to your computer and use it in GitHub Desktop.
Save pestophagous/7703c3573e548a7b8c50 to your computer and use it in GitHub Desktop.
[user]
email = pestophagous@users.noreply.github.com
name = pestophagous
[color]
ui = auto
[color "diff"]
new = blue
commit = blue
[color "status"]
added = black bold
[alias]
fs = status -uno --ignore-submodules
[diff]
tool = manually_added_in_config
[difftool "manually_added_in_config"]
cmd = /Applications/DiffMerge.app/CommandLine/diffmerge.sh \"$LOCAL\" \"$REMOTE\"
# win32 cmd --> cmd = "\"G:/Extra Programs/diffmerge/DiffMerge.exe\"" "\"$LOCAL\"" "\"$REMOTE\""
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment