From 151387c3f2815e60d53d569f3a0b7005898bf7c5 Mon Sep 17 00:00:00 2001 From: Johannes Löthberg Date: Wed, 5 Oct 2016 11:18:16 +0200 Subject: git: Update config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Johannes Löthberg --- git/config | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'git') 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 -- cgit v1.2.3-70-g09d2