Example Git configuration

.gitconfig

; Aliases lets you define shortcuts for common git commands,
; so you can type "git st" instead of "git status", for example.
[alias]
    st = status
    ci = commit --verbose
    br = branch
    co = checkout
; IMPORTANT! Please specify the same email address here as the one
; you use on GitHub!
[user]
    name  = <Your name>
    email = <Your e-mail>
; Get colors in diffs:
[color]
    branch      = auto
    diff        = auto
    interactive = auto
    status      = auto
; You don't HAVE to use Vim ;)
[core]
    editor = vim
; These settings are used to configure a tool for handling conflicts.
; If you have OSX and the P4 suite these commands might work out of
; the box. Otherwise you may have to do some configuration.
; NB: If you're using a graphical client you probably won't need
; these settings
[merge]
    keepBackup = false
    tool = p4mergetool
[mergetool]
    prompt = false
    keepBackup = false
[mergetool "p4mergetool"]
    cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge $PWD/$BASE $PWD/$REMOTE $PWD/$LOCAL $PWD/$MERGED
    trustExitCode = false