.gitconfig

[user]
	name = Denis Cornehl
	email = denis@cornehl.org

[init]
    defaultBranch = main

[core]
	excludesfile = ~/.gitignore_global
	editor = nvim
	quotepath = false
	trustExitCode = true
	autocrlf = input

[pager]
    diff = delta
    difftool = true
    log = delta
    reflog = delta
    show = delta

[blame]
    date = short

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

[alias]
	d = difftool
    st = status -sb
    ci = commit
    co = checkout
    di = diff
    dc = diff --cached
    puch = push
    amend = commit --amend
    aa = add --all
    ff = merge --ff-only
    pullff = pull --ff-only
    noff = merge --no-ff
    fa = fetch --all
    pom = push origin master
    b = branch
    ds = diff --stat=160,120
    dh1 = diff HEAD~1

    # new aliases based on http://code.joejag.com/2013/everyday-git-aliases/
    purr = pull --rebase
    ready = rebase -i @{u}
    wipe = reset --hard HEAD
    ignored = ls-files --others -i --exclude-standard

    # new aliases based on http://blog.apiaxle.com/post/handy-git-tips-to-stop-you-getting-fired/
    assume   = update-index --assume-unchanged
    unassume = update-index --no-assume-unchanged
    assumed  = "!git ls-files -v | grep ^h | cut -c 3-"

    snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}"

    # merging
    ours   = "!f() { git checkout --ours $@ && git add $@; }; f"
    theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"

    # Fancy logging.
    #   h = head
    #   hp = head with patch
    #   r = recent commits, only current branch
    #   ra = recent commits, all reachable refs
    #   l = all commits, only current branch
    #   la = all commits, all reachable refs
    head = !git l -1
    h = !git head
    hp = "!source ~/.githelpers && show_git_head"
    r = !git l -30
    ra = !git r --all
    l = "!source ~/.githelpers && pretty_git_log"
    la = !git l --all

    graph = log --graph --oneline --all

    # show different commits between branches
    branchdiff = log --graph --left-right --cherry-pick --oneline
	logline = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit

    conflicts = diff --name-only --diff-filter=U

[push]
	default = current
	followtags = true

[merge]
	tool = nvim
    ; conflictstyle = diff3

[diff]
    tool = difftastic
	algorithm = histogram

[filter "lfs"]
	clean = git-lfs clean -- %f
	smudge = git-lfs smudge -- %f
	process = git-lfs filter-process
	required = true

[difftool]
    prompt = false

[difftool "difftastic"]
    cmd = difft "$LOCAL" "$REMOTE"

[pull]
	ff = only

[fetch]
	prune = true
	fsckobjects = true
	; prunetags = true

[rebase]
	updateRefs = true
	missingCommitsCheck = error
[rerere]
	enabled = true

[url "git@github.com:"]
	; insteadOf = "https://github.com/"
	insteadOf = "gh:"
[transfer]
	fsckobjects = true
[receive]
	fsckObjects = true
[branch]
	sort = -committerdate
[tag]
	sort = taggerdate
[log]
	date = iso