aboutsummaryrefslogtreecommitdiffstats
path: root/git/config
diff options
context:
space:
mode:
authorJohannes Löthberg <johannes@kyriasis.com>2018-01-21 15:31:23 +0100
committerJohannes Löthberg <johannes@kyriasis.com>2018-01-21 15:36:56 +0100
commit91c6ed0d7b8c1c2fbaaffe3bce9a8e990e209a1a (patch)
tree2eadd2bc783ceb2248f58e450f8ee820f06d5d18 /git/config
parent48ad3329c798dee9c1f00f04bb511d8fc85dda3f (diff)
downloaddotfiles-91c6ed0d7b8c1c2fbaaffe3bce9a8e990e209a1a.tar.xz
git: Reorder some options
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
Diffstat (limited to 'git/config')
-rw-r--r--git/config22
1 files changed, 13 insertions, 9 deletions
diff --git a/git/config b/git/config
index d9bc2fd..31e5161 100644
--- a/git/config
+++ b/git/config
@@ -64,14 +64,13 @@
[diff "ldif"]
xfuncname = "^(dn: .+)$"
+[format]
+ signOff = true
+
[gc]
reflogExpire = 365 days
reflogExpireUnreachable = 365 days
-[github]
- user = kyrias
- password = !pass show web/github.com | head -1
-
[grep]
lineNumber = true
extendedRegexp = true
@@ -80,6 +79,9 @@
decorate = full
showSignature = true
+[status]
+ showuntrackedfiles = no
+
[merge]
tool = nvimdiff
conflictStyle = diff3
@@ -93,6 +95,9 @@
[receive]
denyCurrentBranch = updateInstead
+[rerere]
+ enabled = true
+
[sendemail]
aliasfiletype = mutt
aliasesfile = /home/kyrias/.config/git/aliases
@@ -102,9 +107,6 @@
smtpserveroption = "/home/kyrias/.config/msmtprc"
supresscc = self
-[status]
- showuntrackedfiles = no
-
[url "git@github.com:"]
pushInsteadOf = git://github.com/
pushInsteadOf = https://github.com/
@@ -119,8 +121,10 @@
username = kyrias
helper = pass
-[rerere]
- enabled = true
+[github]
+ user = kyrias
+ password = !pass show web/github.com | head -1
+
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f