# vim:ft=gitconfig [user] name = Julia Ryan email = juliaryan3.14@gmail.com signingkey = ~/.ssh/id_ed25519.pub [alias] b = branch s = status c = commit --verbose ca = commit -a --verbose can = commit --amend --no-edit cm = commit -m cam = commit -a -m caam = commit -a --amend caan = commit -a --amend --no-edit d = diff dd = diff --no-ext-diff f = fetch --all ls = ls-files sw = switch new = switch -c pu = push -u fp = push --force-with-lease rc = rebase --continue ll = "!log() { GIT_PAGER='less -+X' git log --pretty=\ format:\"%C(yellow)%h %Cred%ad %Cblue%>(14,mtrunc)%an%Cgreen%d \ %Creset%<|(-1,trunc)%s\" $@; } ; log" l = ll -n 20 vi = "!vi() { git diff ${@:-HEAD^} --diff-filter=d --name-only | xargs hx; } ; vi" changed = diff --stat HEAD~1 [diff] external = difft --display inline [difftool "difftastic"] # See `man git-difftool` for a description of MERGED, LOCAL and REMOTE. cmd = difft "$MERGED" "$LOCAL" "abcdef1" "100644" "$REMOTE" "abcdef2" "100644" [diff "age"] textconv = "rage -di ~/.ssh/id_ed25519" [diff "image"] textconv = "exiftool -ImageSize -FileSize -FileType -TimeCreated -CreatorTool -Duration -FileModifyDate" cachetextconv = true [merge] tool = nvimdiff conflictstyle = diff3 # zdiff3 works poorly with mergiraf [merge "mergiraf"] name = mergiraf driver = mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P -l %L [mergetool] keepBackup = false prompt = true [mergetool "nvimdiff"] layout = "LOCAL,BASE,REMOTE / MERGED + BASE,LOCAL + \ BASE,REMOTE + (LOCAL/BASE/REMOTE),MERGED"