# TODO: check out merge tool suggestions here

# https://vimways.org/2018/vim-and-git/

[user]

email = aaron.franks@gmail.com

name = Aaron Franks

[color]

diff = auto

ui = true

[color "branch"]

current = yellow reverse

local = yellow

remote = green

[color "diff"]

commit = 227 bold

frag = magenta bold

meta = 227

new = green bold

old = red bold

whitespace = red reverse

[color "diff-highlight"]

newHighlight = green bold 22

newNormal = green bold

oldHighlight = red bold 52

oldNormal = red bold

[color "status"]

added = yellow

changed = cyan

untracked = green

[alias]

br = branch

co = checkout

ci = commit

cp = cherry-pick

changed = !git --no-pager diff --name-only

d = diff

hash = rev-parse HEAD

latest = for-each-ref --sort=-committerdate refs/heads --format='%(committerdate:short) %(refname:short)'

ls = ls-files

mvhead = branch -f

resume = !git --no-pager show --pretty="format:" --name-only # List files changed in a given commit (default: HEAD)

s = status

undo = reset --soft HEAD^

unstage = reset HEAD

trim = !sh -c 'git fetch --prune && git branch --merged | grep -v master | grep -v dev | xargs -n 1 git branch -d'

[branch]

autosetupmerge = true

[core]

editor = nvim

excludesfile = ~/.gitignore_global

pager = diff-so-fancy | less --tabs=4 -RFX

[push]

default = current

[pull]

ff = only

[url "git@github.com:"]

insteadOf = https://github.com/

[commit]

verbose = true

[init]

defaultBranch = main