diff options
Diffstat (limited to '.config/git')
| -rw-r--r-- | .config/git/authorized_keys | 15 | ||||
| -rw-r--r-- | .config/git/config | 64 | ||||
| -rw-r--r-- | .config/git/config-xxllnc | 2 | ||||
| -rw-r--r-- | .config/git/ignore | 8 |
4 files changed, 63 insertions, 26 deletions
diff --git a/.config/git/authorized_keys b/.config/git/authorized_keys new file mode 100644 index 0000000..51b7d92 --- /dev/null +++ b/.config/git/authorized_keys @@ -0,0 +1,15 @@ +# Personal keys +p.spek@tyil.nl ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMtUkeSiwk+1UnMfy8Z53cQkKTlBBFZXUuDiXfPcalHj tyil@anoia.tyil.net +p.spek@tyil.nl ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILQp0puZEEADKgUF1XYtLPzcYLTGNdDj0WCTf37adaZ2 tyil@caeghi.tyil.net +p.spek@tyil.nl ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHiNIpe2QCOk22YYU/mY7QA2rq0E07wetzj5R1wtWxeC tyil@edephas.tyil.net +p.spek@tyil.nl ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCiQJhuTvL0vZoOAu1L0sU81VV2qH1l4U73bL9RYfrW tyil@faiwoo.tyil.net +p.spek@tyil.nl ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ94ffGPvEb/Hi2B2XSaYjKpMiV93fzGLe0QUlXRJb1L tyil@gaeru.tyil.net +p.spek@tyil.nl ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINRprF4gE0pGiMNSxR8Z0fFsBikoifsm7HpdbHkBsmDg tyil@hurzak.tyil.net +p.spek@tyil.nl ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIVPGs2LkDvdkMzwR1Crk8OblMQD2snClUuIcYgUYcu4 tyil@ludifah.tyil.net +p.spek@tyil.nl ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFqLhjoIYRZmkD9sv1l1c03x6EpkadjfrGJ+4gqgkmp5 tyil@mieshu.tyil.net +p.spek@tyil.nl ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILNztf75LVF+UvoIDyduHfynZupdC+9g7RaIs6cGgmCa tyil@nouki.tyil.net +p.spek@tyil.nl ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJkjrJ6agLK5Bdg2Y5B+88XDbP5UsQyvdUbd3LrOVmjI tyil@oolah.tyil.net +p.spek@tyil.nl ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ7XKD3KxXTe5GlM4w4xdap3VAPvYCi4EowD88ymInFR tyil@plarabe.tyil.net + +# xxllnc +patrick.spek@xxllnc.nl ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ7XKD3KxXTe5GlM4w4xdap3VAPvYCi4EowD88ymInFR diff --git a/.config/git/config b/.config/git/config index 63ea101..434c4ba 100644 --- a/.config/git/config +++ b/.config/git/config @@ -1,26 +1,27 @@ [alias] - a = add - b = branch - bc = branch-cleanup - c = commit - ca = commit --amend --reset-author - co = checkout - cob = checkout -b - ct = tag -s - d = diff - fo = fetch origin - l = log --date=format:'%Y-%m-%d %H:%M:%S' --pretty=format:'%C(6)%ad %C(3)%h%Creset %s %C(7)by %C(2)%ae%C(7):%C(5)%G?' - lg = log --graph --abbrev-commit --decorate --date=relative --all + a = add + b = branch + bc = branch-cleanup + c = commit + ca = commit --amend --reset-author + co = checkout + cob = checkout -b + ct = tag -s + d = diff + fo = fetch origin + l = log --date=format:'%Y-%m-%d %H:%M:%S' --pretty=format:'%C(6)%ad %C(3)%h%Creset %s %C(7)by %C(2)%ae%C(7):%C(5)%G?' + lg = log --graph --abbrev-commit --decorate --date=relative --all mirror-add = ! git remote set-url --add --push origin - p = push - pa = push-all - prev = ! git show "HEAD:$1" - r = rebase --rebase-merges -i - ra = commit --amend --no-edit -a - rc = rebase --continue - s = status -s - t = tag --sort=-v:refname - tr = for-each-ref --sort=taggerdate --format '%(tag)' refs/tags + p = push + pa = push-all + prev = ! git show "HEAD:$1" + r = rebase --rebase-merges -i + ra = commit --amend --no-edit -a + rc = rebase --continue + s = status -s + squash-all = "!f(){ git reset $(git commit-tree HEAD^{tree} \"$@\");};f" + t = tag --sort=-v:refname + tr = for-each-ref --sort=taggerdate --format '%(tag)' refs/tags [commit] gpgsign = true @@ -39,6 +40,12 @@ [difftool] prompt = false +[gpg] + format = ssh + +[gpg "ssh"] + allowedSignersFile = ~/.config/git/authorized_keys + [init] defaultBranch = master @@ -53,7 +60,16 @@ default = current followTags = true +[safe] + directory = * + +[tag] + gpgsign = true + [user] - email = p.spek@tyil.nl - name = Patrick Spek - signingkey = 1660F6A2DFA75347322A4DC07A6AC285E2D98827 + email = p.spek@tyil.nl + name = Patrick Spek + signingKey = ~/.config/git/signingkey # Symlink to the SSH key to be used + +[includeIf "gitdir:**/projects/xxllnc/**/.git"] + path = ~/.config/git/config-xxllnc diff --git a/.config/git/config-xxllnc b/.config/git/config-xxllnc new file mode 100644 index 0000000..e6ae439 --- /dev/null +++ b/.config/git/config-xxllnc @@ -0,0 +1,2 @@ +[user] + email = patrick.spek@xxllnc.nl diff --git a/.config/git/ignore b/.config/git/ignore index b84abd4..b283dac 100644 --- a/.config/git/ignore +++ b/.config/git/ignore @@ -1,8 +1,12 @@ # -# Misc +# Language specific cruft # -# Perl 6 precompilation files +# Python +.venv +__pycache__ + +# Raku .precomp # |