summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.config/git/golang.org4
-rw-r--r--.config/git/isovalent.com2
-rw-r--r--.gitconfig22
3 files changed, 23 insertions, 5 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/
diff --git a/.gitconfig b/.gitconfig
index 2e7dfe1..9d0ffe2 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -6,6 +6,8 @@
abbrev = 12
whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
excludesfile = ~/.gitignore
+[init]
+ defaultBranch = main
[alias]
amend = commit --amend --date=now
co = checkout
@@ -27,11 +29,11 @@
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
@@ -50,7 +52,7 @@
[fetch]
prune = true
[push]
- default = matching
+ default = nothing
[pull]
ff = only
[merge]
@@ -72,21 +74,31 @@
[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