Skip to content

Instantly share code, notes, and snippets.

@jimmynotjim
Last active December 29, 2016 15:55
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 1 You must be signed in to fork a gist
  • Save jimmynotjim/7622492 to your computer and use it in GitHub Desktop.
Save jimmynotjim/7622492 to your computer and use it in GitHub Desktop.
Base .gitconfig
[apply]
whitespace = fix
[color]
# Use colors in Git commands that are capable of colored output when outputting to the terminal
ui = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
whitespace = white reverse
[color "status"]
added = yellow
changed = green
untracked = cyan
branch = magenta
[url "git://github.com/"]
insteadOf = "github:"
[url "git@github.com:"]
insteadOf = "gh:"
pushInsteadOf = "github:"
pushInsteadOf = "git://github.com/"
[url "git@github.com:jimmynotjim/"]
insteadOf = "jnj:"
[push]
default = matching
[merge]
# Include summaries of merged commits in newly created merge commit messages
log = true
[mergetool]
keepBackup = true
[mergetool "diffmerge"]
cmd = diffmerge --merge --result="$MERGED" "$LOCAL" "$(if test -f "$BASE"; then echo "$BASE"; else echo "$LOCAL"; fi)" "$REMOTE"
trustExitCode = true
[diff]
tool = diffmerge
[difftool "diffmerge"]
cmd = diffmerge $LOCAL $REMOTE
[core]
excludesfile = ~/.gitignore_global
editor = /usr/bin/sublimetext
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment