2016-10-10 16:23:16 +02:00
|
|
|
|
[alias]
|
|
|
|
|
b = branch -va
|
2021-12-20 12:07:04 +01:00
|
|
|
|
cl = clone --filter=blob:none
|
2024-04-06 12:03:43 +02:00
|
|
|
|
co = checkout
|
2023-07-01 16:46:07 +02:00
|
|
|
|
d = diff --stat -p -C --color-words
|
|
|
|
|
ds = diff --staged --stat -p -C --color-words
|
2022-03-29 14:45:38 +02:00
|
|
|
|
dt = difftool
|
2017-02-23 18:04:14 +01:00
|
|
|
|
patch = !git --no-pager diff --no-color
|
2024-04-06 12:03:43 +02:00
|
|
|
|
pullr = pull --rebase --autostash
|
2024-04-06 23:43:14 +02:00
|
|
|
|
sh = show --stat -p -C --color-words --show-signature
|
2016-10-10 16:23:16 +02:00
|
|
|
|
st = status -sb
|
2023-05-19 21:12:51 +02:00
|
|
|
|
t = tag --sort=-v:refname --format='%(color:bold italic)%(objectname:short)%(color:noitalic) %(refname:short)'
|
2016-10-10 16:23:16 +02:00
|
|
|
|
|
2024-04-06 12:03:43 +02:00
|
|
|
|
new = !git fetch -u origin main:main && git branchless switch -d origin/main
|
2022-09-10 10:53:41 +02:00
|
|
|
|
sl = branchless smartlog
|
|
|
|
|
sync = branchless sync
|
2022-11-20 14:15:18 +01:00
|
|
|
|
sw = branchless switch
|
2023-05-26 14:13:02 +02:00
|
|
|
|
s = branchless switch -i
|
2024-04-06 12:03:43 +02:00
|
|
|
|
|
2024-03-30 13:55:08 +01:00
|
|
|
|
copr = "!f() { \
|
|
|
|
|
pr=$1 \
|
|
|
|
|
&& test -n \"$pr\" || pr=`tea pr list -o simple | fzf --bind 'enter:become(echo {+1})'` \
|
|
|
|
|
&& git fetch origin refs/pull/$pr/head \
|
|
|
|
|
&& git checkout --detach FETCH_HEAD \
|
|
|
|
|
;};f"
|
2023-12-26 21:18:49 +01:00
|
|
|
|
|
2024-04-06 23:43:14 +02:00
|
|
|
|
g = graph -S -m simple -s round
|
2024-04-10 17:36:06 +02:00
|
|
|
|
ll = "log --first-parent --topo-order --pretty='format:%Creset%x1B[1;3;38:2:127:114:88m%h %G? ┼%x1B[0;38:2:154:234:255m%d%Creset %x1B[3;38:2:194:203:226m%s %x1B[38:2:93:112:164m᠁᠁᠁ %x1B[38:2:74:119:163m%al %x1B[2;38:2:93:112:164m%ah'"
|
2024-04-06 23:43:14 +02:00
|
|
|
|
lla = "log --graph --all --topo-order --pretty='format:%x1B[38:2:233:218:190m%h%x1B[38:2:154:234:255m%d%Creset %x1B[1;3;38:2:194:203:226m%s %x1B[38:2:93:112:164m᠁ %x1B[38:2:74:119:163m%al %x1B[2;38:2:93:112:164m%ah'"
|
2016-10-10 16:23:16 +02:00
|
|
|
|
|
|
|
|
|
guilt = "!f(){ git log --pretty='format:%an <%ae>' $@ | sort | uniq -c | sort -rn; }; f"
|
2020-09-27 13:56:54 +02:00
|
|
|
|
serve = daemon --verbose --export-all --base-path=.git --reuseaddr --strict-paths .git/
|
2016-10-10 16:23:16 +02:00
|
|
|
|
|
2024-04-06 12:03:43 +02:00
|
|
|
|
[apply]
|
|
|
|
|
whitespace = nowarn
|
|
|
|
|
|
|
|
|
|
[blame]
|
|
|
|
|
date = relative
|
|
|
|
|
|
|
|
|
|
[branch "main"]
|
|
|
|
|
rebase = true
|
|
|
|
|
|
|
|
|
|
[branch "master"]
|
|
|
|
|
rebase = true
|
2022-06-07 09:50:37 +02:00
|
|
|
|
|
2016-10-10 16:23:16 +02:00
|
|
|
|
[color]
|
|
|
|
|
branch = auto
|
|
|
|
|
diff = auto
|
|
|
|
|
status = auto
|
2024-04-06 12:03:43 +02:00
|
|
|
|
ui = auto
|
2016-10-10 16:23:16 +02:00
|
|
|
|
|
2024-04-06 12:03:43 +02:00
|
|
|
|
[column]
|
|
|
|
|
ui = auto
|
2016-10-10 16:23:16 +02:00
|
|
|
|
|
2024-04-06 12:03:43 +02:00
|
|
|
|
[core]
|
|
|
|
|
compression = 3
|
|
|
|
|
excludesfile = "~/.gitignore"
|
|
|
|
|
looseCompression = 3
|
|
|
|
|
pager = delta
|
2016-10-10 16:23:16 +02:00
|
|
|
|
|
2020-09-27 16:38:35 +02:00
|
|
|
|
[delta]
|
2023-07-01 16:46:07 +02:00
|
|
|
|
; # syntax-theme = GitHub
|
2024-05-09 11:16:28 +02:00
|
|
|
|
file-added-label = " ➕ ══"
|
2024-04-06 12:03:43 +02:00
|
|
|
|
file-decoration-style=none
|
2024-05-09 11:16:28 +02:00
|
|
|
|
file-modified-label = " ▲ ══"
|
|
|
|
|
file-removed-label = " ➖══"
|
|
|
|
|
file-renamed-label = " ➞ ══"
|
2024-04-06 12:03:43 +02:00
|
|
|
|
file-style = bold "#ffff66" "#333300"
|
|
|
|
|
file-transformation = "s/$/ ══ /"
|
|
|
|
|
hunk-header-decoration-style=none
|
|
|
|
|
hunk-header-file-style = bold "#66ddff"
|
|
|
|
|
hunk-header-line-number-style = bold "#66ccff"
|
|
|
|
|
hunk-header-style = line-number bold "#99eeff" "#001133"
|
2024-05-09 11:16:28 +02:00
|
|
|
|
hunk-label = "⯁"
|
2024-04-06 12:03:43 +02:00
|
|
|
|
hunk-label-style = bold "#66ccff"
|
|
|
|
|
line-numbers = true
|
|
|
|
|
max-line-distance = 0.9
|
2024-03-26 00:41:11 +01:00
|
|
|
|
|
2024-04-06 12:03:43 +02:00
|
|
|
|
[http]
|
|
|
|
|
cookiefile = /home/dln/.gitcookies
|
2024-03-26 00:41:11 +01:00
|
|
|
|
|
2017-06-13 09:24:58 +02:00
|
|
|
|
[hub]
|
2020-09-27 13:56:54 +02:00
|
|
|
|
protocol = git
|
|
|
|
|
|
2020-09-27 16:38:35 +02:00
|
|
|
|
[interactive]
|
2022-05-07 16:31:05 +02:00
|
|
|
|
diffFilter = delta --color-only --features=interactive
|
2020-09-27 16:38:35 +02:00
|
|
|
|
|
2024-04-06 12:03:43 +02:00
|
|
|
|
[commit]
|
|
|
|
|
gpgsign = true
|
|
|
|
|
verbose = true
|
|
|
|
|
|
2019-07-04 17:15:47 +02:00
|
|
|
|
[credential]
|
2020-09-27 13:56:54 +02:00
|
|
|
|
helper = store
|
|
|
|
|
|
2024-04-06 12:03:43 +02:00
|
|
|
|
[diff]
|
|
|
|
|
algorithm = histogram
|
|
|
|
|
tool = difft
|
|
|
|
|
|
|
|
|
|
[difftool]
|
|
|
|
|
prompt = false
|
|
|
|
|
|
|
|
|
|
[difftool "difft"]
|
|
|
|
|
cmd = difft --color=always --display inline "$LOCAL" "$REMOTE" | bat
|
|
|
|
|
|
|
|
|
|
[fetch]
|
|
|
|
|
prune = true
|
|
|
|
|
prunetags = true
|
|
|
|
|
showForcedUpdates = true
|
|
|
|
|
|
|
|
|
|
[filter "lfs"]
|
|
|
|
|
clean = git-lfs clean -- %f
|
|
|
|
|
process = git-lfs filter-process
|
|
|
|
|
required = true
|
|
|
|
|
smudge = git-lfs smudge -- %f
|
2024-04-04 21:48:45 +02:00
|
|
|
|
|
|
|
|
|
[gpg]
|
|
|
|
|
format = ssh
|
|
|
|
|
|
|
|
|
|
[gpg "ssh"]
|
|
|
|
|
allowedSignersFile = ~/.config/git/allowed_signers
|
2024-04-04 22:55:35 +02:00
|
|
|
|
defaultKeyCommand = /home/dln/.config/git/signing-key.sh
|
2020-09-27 13:56:54 +02:00
|
|
|
|
|
2020-10-14 11:16:51 +02:00
|
|
|
|
[init]
|
2021-01-12 19:39:21 +01:00
|
|
|
|
defaultBranch = main
|
2021-07-22 10:32:46 +02:00
|
|
|
|
|
2022-02-11 09:40:22 +01:00
|
|
|
|
[lfs]
|
|
|
|
|
concurrenttransfers = 32
|
2022-03-29 14:39:18 +02:00
|
|
|
|
|
2024-04-06 12:03:43 +02:00
|
|
|
|
[merge]
|
|
|
|
|
conflictstyle = zdiff3
|
2022-03-29 14:39:18 +02:00
|
|
|
|
|
2024-04-06 12:03:43 +02:00
|
|
|
|
[pack]
|
|
|
|
|
compression = 3
|
|
|
|
|
threads = 0
|
2022-03-29 14:39:18 +02:00
|
|
|
|
|
2024-04-06 12:03:43 +02:00
|
|
|
|
[push]
|
|
|
|
|
default = tracking
|
|
|
|
|
|
|
|
|
|
[rebase]
|
|
|
|
|
autosquash = true
|
|
|
|
|
|
|
|
|
|
[rerere]
|
|
|
|
|
enabled = true
|
2022-03-29 14:39:18 +02:00
|
|
|
|
|
2023-05-19 21:12:51 +02:00
|
|
|
|
[tag]
|
2024-04-06 12:03:43 +02:00
|
|
|
|
sort = -v:refname
|
|
|
|
|
|
|
|
|
|
[user]
|
|
|
|
|
email = dln@arity.se
|
|
|
|
|
name = Daniel Lundin
|
|
|
|
|
useConfigOnly = true
|