.gitconfig

[include]
    path = ~/.gituserconfig
[push]
    default = simple
[merge]
    tool = mymeld
    conflictstyle = diff3
[rebase]
    pull = preserve
	autoStash = true
[mergetool "kdiff3NoAuto"]
    cmd = kdiff3 --L1 \"$MERGED (Base)\" --L2 \"$MERGED (Local)\" --L3 \"$MERGED (Remote)\" -o \"$MERGED\" \"$BASE\" \"$LOCAL\" \"$REMOTE\"
[mergetool "mymeld"]
    cmd = meld --diff $BASE $LOCAL --diff $BASE $REMOTE --diff $LOCAL $BASE $REMOTE --output $MERGED
[branch]
    autosetuprebase = always
[core]
    editor = vim
    excludesfile = ~/.gitignore
# [color "diff"]
#     whitespace = red reverse
[alias]
    lg1 = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)'
    lg2 = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
    lg3 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
    lg = !"git lg1"
    hist = log --pretty=format:\"%C(yellow)%h%C(reset) %C(green)%ad%C(reset) %C(red)|%C(reset) %s %C(bold blue)[%an]%C(reset)%C(yellow)%d%C(reset)\" --graph --date=short
    dt = difftool

[status]
    showUntrackedFiles = normal

[color "status"]
    added = green
    changed = yellow bold
    untracked = red bold

# icdiff is a better diff tool.
# http://www.jefftk.com/icdiff
# https://github.com/jeffkaufman/icdiff
[diff]
  tool = icdiff
	algorithm = patience
    indentHeuristic = on
[difftool]
  prompt = false
[difftool "icdiff"]
  cmd = icdiff --line-numbers $LOCAL $REMOTE

[pager]
    log = ~/third-party/diff-highlight | less
    show = ~/third-party/diff-highlight | less
    diff = ~/third-party/diff-highlight | less
    difftool = less -r
[stash]
    showPatch = true
[log]
    decorate = full
[commit]
    verbose = true
[color]
	ui = auto
[filter "lfs"]
	clean = git-lfs clean -- %f
	smudge = git-lfs smudge -- %f
	process = git-lfs filter-process
	required = true
[icdiff]
	options = --highlight --line-numbers --color-map=description:white_bold,separator:white_bold