Create a gist now

Instantly share code, notes, and snippets.

What would you like to do?
Various ways to spread team-wide git-goodness in /etc/gitconfig.ini.Note that this explicitly allows for an additional included system-wide configuration, and is overridden in the usual fashion by the user's "global" ~/.gitconfig and the repository's own .git/config.
; this is... /etc/gitconfig!
;
; local system-wide changes should be made by editing:
; /etc/gitconfig.local
;
; See http://wps.io/2014/02/useful-git-defaults-systemwide/
[color]
ui = auto
[push]
default = upstream
[branch]
autosetuprebase = always
autosetupmerge = true
[rerere]
enabled = true
autoupdate = true
[rebase]
stat = true
autostash = true
autosquash = false
[diff]
algorithm = patience
[format]
pretty = fuller
[merge]
log = true
defaultToUpstream = true
[notes]
displayRef = refs/notes/*
[http]
sslVerify = true
[alias]
lol = log --graph --decorate --pretty=oneline --abbrev-commit
; very useful during merge conflicts and you know that one file wins over the other
ours = checkout --ours --
theirs = checkout --theirs --
; allow for local system-wide config if needed
[include]
path = /etc/gitconfig.local
; GistID: 7327544
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment