Julian Prein
7158abd611
Bring all blocks together and place shorter alias variants behind longer ones - ignore the shorter ones in the sorting. Remove the comment above `autosquash` because the command is fairly descriptive and it is the only comment and I don't really know how to format the block then (since the comment is at the very top it looks like it is for the whole block and I don't want to put a newline behind `autofixup`).
117 lines
3.0 KiB
Plaintext
117 lines
3.0 KiB
Plaintext
# vim: set ft=gitconfig:
|
|
|
|
[advice]
|
|
addIgnoredFile = off
|
|
detachedHead = off
|
|
[alias]
|
|
autosquash = -c sequence.editor=/bin/true rebase -i --autosquash
|
|
autofixup= autosquash
|
|
c = commit
|
|
changes = flog HEAD...FETCH_HEAD
|
|
checkout-worktree = "!\"${XDG_CONFIG_HOME:-$HOME/.config}/zsh/autoload/git/git-checkout-worktree\""
|
|
cow = checkout-worktree
|
|
co = checkout
|
|
commit-last-msg = "!\"${XDG_CONFIG_HOME:-$HOME/.config}/zsh/autoload/git/git-commit-last-msg\""
|
|
clm = commit-last-msg
|
|
last-msg = commit-last-msg
|
|
recommit = commit-last-msg --no-edit
|
|
f = fetch
|
|
fetch-tags-only = fetch origin "refs/tags/*:refs/tags/*"
|
|
ft = fetch-tags-only
|
|
filter-repo = !git-filter-repo
|
|
fixes = log -1 --pretty=fixes
|
|
glog = "!\"${XDG_CONFIG_HOME:-$HOME/.config}/zsh/autoload/git/glog\""
|
|
https-and-ssh = "!\"${XDG_CONFIG_HOME:-$HOME/.config}/zsh/autoload/git/git-https-and-ssh\""
|
|
ssh-and-https = https-and-ssh
|
|
l = log
|
|
last-changed = "!cd \"$GIT_PREFIX\"; \"${XDG_CONFIG_HOME:-$HOME/.config}/zsh/autoload/git/git-last-changed\""
|
|
make-fork = "!\"${XDG_CONFIG_HOME:-$HOME/.config}/zsh/autoload/git/git-make-fork\""
|
|
p = push
|
|
perm-stash = "!\"${XDG_CONFIG_HOME:-$HOME/.config}/zsh/autoload/git/git-perm-stash\""
|
|
root = rev-parse --show-toplevel
|
|
signoff = rebase --signoff
|
|
ss = stash
|
|
ssync = "!\"${XDG_CONFIG_HOME:-$HOME/.config}/zsh/autoload/git/git-ssync\""
|
|
submodule-rm = "!\"${XDG_CONFIG_HOME:-$HOME/.config}/zsh/autoload/git/git-submodule-rm\""
|
|
track = "!\"${XDG_CONFIG_HOME:-$HOME/.config}/zsh/autoload/git/git-track\""
|
|
branches = track
|
|
[blame]
|
|
date = short
|
|
[branch]
|
|
autosetuprebase = always
|
|
sort = -committerdate
|
|
[color "status"]
|
|
added = 076
|
|
untracked = 014
|
|
[column]
|
|
ui = auto,column,dense
|
|
[commit]
|
|
gpgsign = true
|
|
verbose = true
|
|
[core]
|
|
abbrev = 12
|
|
#pager = delta
|
|
pager = diff-so-fancy \
|
|
| less --tabs=8 --RAW-CONTROL-CHARS --quit-if-one-screen
|
|
whitespace = trailing-spaces,space-before-tab,indent-with-non-tab
|
|
[delta]
|
|
navigate = true
|
|
commit-decoration-style = bold yellow box
|
|
file-style = bold yellow ul
|
|
file-decoration-style = none
|
|
hunk-header-decoration-style =
|
|
[diff]
|
|
# Color moved lines differently
|
|
colorMoved = default
|
|
colorMovedWS = ignore-all-space
|
|
# No rename limit, propagates to merge. and status.renameLimit too
|
|
renameLimit = 0
|
|
|
|
submodule = log
|
|
tool = nvimdiff
|
|
[difftool "meld"]
|
|
path = /usr/bin/meld
|
|
[fetch]
|
|
output = compact
|
|
prune = true
|
|
pruneTags = false
|
|
parallel = 0
|
|
[gpg]
|
|
program = gpg.loopback
|
|
[init]
|
|
defaultBranch = main
|
|
[interactive]
|
|
#diffFilter = delta --color-only
|
|
# Might need a `sudo cpan Term::ReadKey`
|
|
singleKey = true
|
|
[log]
|
|
follow = true
|
|
[merge]
|
|
conflictstyle = diff3
|
|
log = true
|
|
suppressDest = *
|
|
[pretty]
|
|
fixes = Fixes: %h (\"%s\")
|
|
[pull]
|
|
ff = yes
|
|
rebase = true
|
|
[push]
|
|
default = current
|
|
[rebase]
|
|
autostash = true
|
|
[rerere]
|
|
enabled = true
|
|
[status]
|
|
submodulesummary = true
|
|
[submodule]
|
|
fetchJobs = 0
|
|
[trailer]
|
|
where = end
|
|
[user]
|
|
email = julian@druck.dev
|
|
name = Julian Prein
|
|
signingkey = C0A44F69F2E29F6586C86B96CA6B3A516FAC2555
|
|
|
|
[include]
|
|
path = user.config
|