summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitconfig21
1 files changed, 3 insertions, 18 deletions
diff --git a/.gitconfig b/.gitconfig
index 060dbc7..b104045 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -2,12 +2,10 @@
name = Tobias Klauser
email = tklauser@distanz.ch
signingkey = D1E0DA88E90F7E03B314C5D18A59A09E92628B77
-
[core]
abbrev = 12
whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
excludesfile = ~/.gitignore
-
[alias]
amend = commit --amend --date=now
co = checkout
@@ -37,56 +35,43 @@
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
-
[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]
sort = version:refname
-
[versionsort]
prereleaseSuffix = -rc
[http]
cookiefile = ~/.gitcookies
+[remote "origin"]
+ prune = true
+
[includeIf "gitdir:**/cilium.io/.git"]
path = ~/.config/git/cilium.io
[includeIf "gitdir:**/ebpf.io/.git"]