aboutsummaryrefslogtreecommitdiffstats
path: root/git/config
diff options
context:
space:
mode:
authorJohannes Löthberg <johannes@kyriasis.com>2016-10-05 11:18:16 +0200
committerJohannes Löthberg <johannes@kyriasis.com>2017-06-01 18:37:35 +0200
commit151387c3f2815e60d53d569f3a0b7005898bf7c5 (patch)
tree1e6e178ad8e1438391ea0ec4184ba0d7c516b999 /git/config
parent991c9d548867c744af09471f5b98c9caadd5da16 (diff)
downloaddotfiles-151387c3f2815e60d53d569f3a0b7005898bf7c5.tar.xz
git: Update config
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
Diffstat (limited to 'git/config')
-rw-r--r--git/config15
1 files changed, 13 insertions, 2 deletions
diff --git a/git/config b/git/config
index bd33940..a45c404 100644
--- a/git/config
+++ b/git/config
@@ -64,6 +64,7 @@
[diff]
renames = copies
+ compactionHeuristic = true
[diff "gpg"]
textconv = gpg -v
@@ -86,9 +87,10 @@
[log]
decorate = full
+ showSignature = true
[merge]
- tool = vimdiff
+ tool = nvimdiff
conflictStyle = diff3
[push]
@@ -100,6 +102,7 @@
[receive]
denyCurrentBranch = updateInstead
+ fsckobjects = true
[sendemail]
aliasfiletype = mutt
@@ -117,11 +120,19 @@
pushInsteadOf = git://github.com/
pushInsteadOf = https://github.com/
-[url "git@git.kyriasis.com"]
+[url "git@git.kyriasis.com:"]
insteadOf = kyriasis:
+[url "aur@aur.archlinux.org:"]
+ insteadOf = aur:
+
[credential "https://github.com"]
username = kyrias
helper = pass
+
[rerere]
enabled = true
+[transfer]
+ fsckobjects = true
+[fetch]
+ fsckObjects = true