Skip to content

Instantly share code, notes, and snippets.

@fboyer

fboyer/.gitconfig

Last active August 29, 2015 14:11
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save fboyer/16c237e1d7bcb3445320 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save fboyer/16c237e1d7bcb3445320 to your computer and use it in GitHub Desktop.
Download ZIP
Default .gitconfig with Sublime Text/Sublimerge
Raw
.gitconfig
[user]
name = Frédéric Boyer
email = fboyer@gmail.com
[credential]
helper = osxkeychain
[color]
ui = auto
[apply]
whitespace = nowarn
[core]
editor = subl -n -w
[merge]
tool = sublimerge
[mergetool "sublimerge"]
cmd = subl -n --wait \"$REMOTE\" \"$BASE\" \"$LOCAL\" \"$MERGED\" --command \"sublimerge_diff_views\"
trustExitCode = false
[diff]
tool = sublimerge
[difftool "sublimerge"]
cmd = subl -n --wait \"$REMOTE\" \"$LOCAL\" --command \"sublimerge_diff_views {\\\"left_read_only\\\": true, \\\"right_read_only\\\": true}\"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment