+/config

my dotfiles and nix configuration

git clone https://git.julia.blue/+/config

Julia RyanGet sorcery running correctly62c7d69

main
1.6 KiB52 linesraw
1# vim:ft=gitconfig
2[user]
3    name = Julia Ryan
4    email = juliaryan3.14@gmail.com
5	signingkey = ~/.ssh/id_ed25519.pub
6[alias]
7    b = branch
8    s = status
9    c = commit --verbose
10    ca = commit -a --verbose
11    can = commit --amend --no-edit
12    cm = commit -m
13    cam = commit -a -m
14    caam = commit -a --amend
15    caan = commit -a --amend --no-edit
16    d = diff
17    dd = diff --no-ext-diff
18    f = fetch --all
19    ls = ls-files
20    sw = switch
21    new = switch -c
22    pu = push -u
23    fp = push --force-with-lease
24    rc = rebase --continue
25    ll = "!log() { GIT_PAGER='less -+X' git log --pretty=\
26format:\"%C(yellow)%h %Cred%ad %Cblue%>(14,mtrunc)%an%Cgreen%d \
27%Creset%<|(-1,trunc)%s\" $@; } ; log"
28    l = ll -n 20
29    vi = "!vi() { git diff ${@:-HEAD^} --diff-filter=d --name-only | xargs hx; } ; vi"
30    changed = diff --stat HEAD~1
31[diff]
32    external = difft --display inline
33[difftool "difftastic"]
34    # See `man git-difftool` for a description of MERGED, LOCAL and REMOTE.
35    cmd = difft "$MERGED" "$LOCAL" "abcdef1" "100644" "$REMOTE" "abcdef2" "100644"
36[diff "age"]
37    textconv = "rage -di ~/.ssh/id_ed25519"
38[diff "image"]
39    textconv = "exiftool -ImageSize -FileSize -FileType -TimeCreated -CreatorTool -Duration -FileModifyDate"
40    cachetextconv = true
41[merge]
42    tool = nvimdiff
43    conflictstyle = diff3 # zdiff3 works poorly with mergiraf
44[merge "mergiraf"]
45    name = mergiraf
46    driver = mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P -l %L
47[mergetool]
48    keepBackup = false
49    prompt = true
50[mergetool "nvimdiff"]
51    layout = "LOCAL,BASE,REMOTE / MERGED + BASE,LOCAL + \
52        BASE,REMOTE + (LOCAL/BASE/REMOTE),MERGED"