summaryrefslogtreecommitdiff
path: root/.gitconfig
diff options
context:
space:
mode:
Diffstat (limited to '.gitconfig')
-rw-r--r--.gitconfig12
1 files changed, 8 insertions, 4 deletions
diff --git a/.gitconfig b/.gitconfig
index 5330848..9d0ffe2 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -29,7 +29,7 @@
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
@@ -52,7 +52,7 @@
[fetch]
prune = true
[push]
- default = matching
+ default = nothing
[pull]
ff = only
[merge]
@@ -74,20 +74,24 @@
[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"]