diff options
| -rw-r--r-- | .config/git/golang.org | 4 | ||||
| -rw-r--r-- | .config/git/isovalent.com | 2 | ||||
| -rw-r--r-- | .gitconfig | 53 |
3 files changed, 35 insertions, 24 deletions
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/isovalent.com b/.config/git/isovalent.com index 80ea416..deb9435 100644 --- a/.config/git/isovalent.com +++ b/.config/git/isovalent.com @@ -2,3 +2,5 @@ email = tobias@isovalent.com [include] path = ~/.config/git/with-signoff-hook +[url "ssh://git@github.com/"] + insteadOf = https://github.com/ @@ -1,15 +1,15 @@ [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 = ~/.gitignore - +[init] + defaultBranch = main [alias] - amend = commit --amend + amend = commit --amend --date=now co = checkout ca = commit --amend ci = commit @@ -24,76 +24,81 @@ 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 master + up = pull --rebase --autostash --prune origin main cr = codereview change = codereview change gofmt = codereview gofmt - mail = codereview mail -trust + mail = codereview mail pending = codereview pending submit = codereview submit sync = codereview sync - [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 - -[remote "origin"] - prune = true - [sendemail] suppresscc = self bcc = Tobias Klauser <tklauser@distanz.ch> - [stash] showPatch = true - [tag] + gpgsign = true sort = version:refname - [versionsort] prereleaseSuffix = -rc [http] 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:**/cilium/*/"] - path = ~/.config/git/cilium.io +[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 |