druckdev
f11be2c1a9
This fixes the deletion/filtering of branches if there were multiple local branches tracking the same remote branch.
43 lines
1.2 KiB
Plaintext
43 lines
1.2 KiB
Plaintext
[user]
|
|
email = druckdev@protonmail.com
|
|
name = druckdev
|
|
signingkey = C0A44F69F2E29F6586C86B96CA6B3A516FAC2555
|
|
[commit]
|
|
gpgsign = true
|
|
verbose = true
|
|
[difftool "meld"]
|
|
path = /usr/bin/meld
|
|
[color "status"]
|
|
added = 076
|
|
untracked = 014
|
|
[core]
|
|
pager = diff-so-fancy | less --tabs=8 -Rg -+FX -p'^(commit|added|deleted|modified|renamed|tag|(Submodule .* [a-f0-9]+[.]+[a-f0-9]+)|(stash@{[0-9]+}))[: ]'
|
|
excludesfile = ~/.config/git/ignore
|
|
[alias]
|
|
root = rev-parse --show-toplevel
|
|
spull = "!__git_spull() { git pull \"$@\" && git submodule sync --recursive && git submodule update --init --recursive; }; __git_spull"
|
|
track = "!track() { git for-each-ref --format='%(upstream)%(if)%(upstream)%(then),%(end)%(refname)' refs/heads refs/remotes | sort | sed -Ez 's:(refs/remotes/[^\\n]*)\\n\\1:\\1:g' | sed -E 's/(.*),(.*)/\\2,\\1/; s:(heads/[^,]*)$:\\1,:; s:^refs/remotes/:,:; s:refs/[^/]*/::g' | column -ts,; }; track"
|
|
[status]
|
|
submodulesummary = true
|
|
[diff]
|
|
submodule = log
|
|
tool = nvimdiff
|
|
[rebase]
|
|
autostash = true
|
|
[include]
|
|
path = user.config
|
|
[pull]
|
|
rebase = true
|
|
ff = yes
|
|
[merge]
|
|
log = true
|
|
tool = nvimdiff
|
|
suppressDest = *
|
|
[init]
|
|
defaultBranch = main
|
|
[push]
|
|
default = current
|
|
[advice]
|
|
detachedHead = off
|
|
addIgnoredFile = off
|