diff options
| -rw-r--r-- | .config/git/cilium.io | 4 | ||||
| -rw-r--r-- | .config/git/golang.org | 4 | ||||
| -rwxr-xr-x | .config/git/hooks/with-signoff/prepare-commit-msg | 18 | ||||
| -rw-r--r-- | .config/git/isovalent.com | 6 | ||||
| -rw-r--r-- | .config/git/with-signoff-hook | 2 | ||||
| -rw-r--r-- | .gitconfig | 79 |
6 files changed, 92 insertions, 21 deletions
diff --git a/.config/git/cilium.io b/.config/git/cilium.io new file mode 100644 index 0000000..1f6f5f7 --- /dev/null +++ b/.config/git/cilium.io @@ -0,0 +1,4 @@ +[user] + email = tobias@cilium.io +[include] + path = ~/.config/git/with-signoff-hook diff --git a/.config/git/golang.org b/.config/git/golang.org new file mode 100644 index 0000000..a37c999 --- /dev/null +++ b/.config/git/golang.org @@ -0,0 +1,4 @@ +[commit] + gpgsign = false +[tag] + gpgsign = false diff --git a/.config/git/hooks/with-signoff/prepare-commit-msg b/.config/git/hooks/with-signoff/prepare-commit-msg new file mode 100755 index 0000000..fd76931 --- /dev/null +++ b/.config/git/hooks/with-signoff/prepare-commit-msg @@ -0,0 +1,18 @@ +#!/bin/sh + +NAME=$(git config user.name) +EMAIL=$(git config user.email) + +if [ -z "$NAME" ]; then + echo "empty git config user.name" + exit 1 +fi + +if [ -z "$EMAIL" ]; then + echo "empty git config user.email" + exit 1 +fi + +git interpret-trailers --if-exists doNothing --trailer \ + "Signed-off-by: $NAME <$EMAIL>" \ + --in-place "$1" diff --git a/.config/git/isovalent.com b/.config/git/isovalent.com new file mode 100644 index 0000000..deb9435 --- /dev/null +++ b/.config/git/isovalent.com @@ -0,0 +1,6 @@ +[user] + email = tobias@isovalent.com +[include] + path = ~/.config/git/with-signoff-hook +[url "ssh://git@github.com/"] + insteadOf = https://github.com/ diff --git a/.config/git/with-signoff-hook b/.config/git/with-signoff-hook new file mode 100644 index 0000000..244c63c --- /dev/null +++ b/.config/git/with-signoff-hook @@ -0,0 +1,2 @@ +[core] + hooksPath = ~/.config/git/hooks/with-signoff @@ -1,24 +1,35 @@ [user] name = Tobias Klauser email = tklauser@distanz.ch - signingkey = B5510F47 - + signingkey = D1E0DA88E90F7E03B314C5D18A59A09E92628B77 [core] abbrev = 12 whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol - excludesfile = /home/tobiask/.gitignore - + excludesfile = ~/.gitignore +[init] + defaultBranch = main [alias] + amend = commit --amend --date=now co = checkout - st = status + ca = commit --amend ci = commit br = branch d = diff + dc = diff --cached + dist = "!git archive --format=tar -v --prefix=$(git describe HEAD)/ $(git describe HEAD) | bzip2 -9v > ../$(git describe HEAD).tar.bz2" ds = diff --stat fixes = show --pretty=fixes -s + ll = log --decorate --graph --pretty=oneline lp = log -p - dist = "!git archive --format=tar -v --prefix=$(git describe HEAD)/ $(git describe HEAD) | bzip2 -9v > ../$(git describe HEAD).tar.bz2" - up = pull --rebase --autostash origin master + ls = ls-files + pr = "!f() { git fetch -fu ${2:-$(git remote |grep ^upstream || echo origin)} refs/pull/$1/head:pr/$1 && git checkout pr/$1; }; f" + pushf = push --force-with-lease + recent = branch --sort=-committerdate --format=\"%(committerdate:relative)%09%(refname:short)\" + ri = rebase --interactive --autosquash + s = status -s + st = status + today = commit --amend --date=now --no-edit + up = pull --rebase --autostash --prune origin main cr = codereview change = codereview change gofmt = codereview gofmt @@ -26,42 +37,68 @@ pending = codereview pending submit = codereview submit sync = codereview sync - today = commit --amend --date=now --no-edit - [pretty] fixes = Fixes: %h (\"%s\") commit = %h (\"%s\") - [color] ui = true diff = auto branch = auto status = auto - [color "diff"] whitespace = red reverse - +[commit] + gpgsign = true +[fetch] + prune = true [push] - default = matching - + default = nothing +[pull] + ff = only [merge] tool = vimdiff - [grep] lineNumber = true - [sendemail] - smtpserver = mail.zhinst.com suppresscc = self bcc = Tobias Klauser <tklauser@distanz.ch> - [stash] showPatch = true - [tag] + gpgsign = true sort = version:refname - [versionsort] prereleaseSuffix = -rc [http] - cookiefile = /home/tobiask/.gitcookies + cookiefile = ~/.gitcookies +[advice] + statusHints = false + skippedCherryPicks = false +[rerere] + enabled = true + +[remote "origin"] + prune = true + +[includeIf "gitdir:**/cilium/*/"] + path = ~/.config/git/cilium.io +[includeIf "gitdir:**/cilium.io/.git"] + path = ~/.config/git/cilium.io +[includeIf "gitdir:**/cncf/*/"] + path = ~/.config/git/cilium.io +[includeIf "gitdir:**/ebpf.io/.git"] + path = ~/.config/git/cilium.io +[includeIf "gitdir:**/isovalent/*/"] + path = ~/.config/git/isovalent.com +[includeIf "gitdir:**/covalentio/*/"] + path = ~/.config/git/isovalent.com +[includeIf "gitdir:**/golang.org/x/*/"] + path = ~/.config/git/golang.org +[includeIf "gitdir:**/go/.git"] + path = ~/.config/git/golang.org +[includeIf "gitdir:**/linux/.git"] + path = ~/.config/git/with-signoff-hook +[includeIf "gitdir:**/mold/.git"] + path = ~/.config/git/with-signoff-hook +[includeIf "gitdir:**/netsniff-ng/.git"] + path = ~/.config/git/with-signoff-hook |