gitconfig

[user]
    name = Adam Miller
    email = admiller@redhat.com
    #email = maxamillion@fedoraproject.org

[color]
    diff = auto
    status = auto
    branch = auto
    interactive = auto
    ui = auto

[merge]
    summary=true
    tool = vimdiff
[gc]
    auto=1
[push]
    default = simple
[alias]
    hist = log --all --pretty=format:\"%h %cd %s (%an)\"
    ci = commit -v
    ch = cherry-pick -x
    co = checkout
    br = branch -v
    st = status
    tag = tag -a
    log1 = log --oneline
    lol = log --graph --decorate --pretty=oneline --abbrev-commit
    lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
    diffc = diff --cached
    diffst = diff --stat
    dg = difftool -y -g

[checkout]
    defaultRemote = origin

[branch]
    autosetuprebase = always
[diff]
    guitool = meld

[tig "bind"]
#   The --trust-exit-code option is useful when you are viewing a diff with lots of
#   files and you want to quit part of the way through: just exit vim with :cq (instead
#   of the normal :qa), and it will return an error code, triggering git difftool to
#   exit without showing any more files.
#   https://github.com/jonas/tig/issues/26#issuecomment-212007755
    generic = D !git difftool --tool=vimdiff --no-prompt --no-prompt --trust-exit-code %(commit)^!