From cbef0b1cea234426423507244b2a9f3902c90366 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 15 Mar 2019 21:18:08 +0000
Subject: modules/git: sort config

---
 modules/shell/git/config.in | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'modules/shell')

diff --git a/modules/shell/git/config.in b/modules/shell/git/config.in
index 8ebb86a32910..3988a18d86d5 100644
--- a/modules/shell/git/config.in
+++ b/modules/shell/git/config.in
@@ -1,23 +1,17 @@
-[core]
-    attributesfile = @attributesfile@
-    excludesfile = @ignorefile@
 [alias]
     ignore = "!gi() { curl -L -s https://www.gitignore.io/api/$@ ;}; gi"
     unbranch = "!git branch --sort -HEAD --merged | sed 1d | xargs git branch -d"
-[push]
-    default = current
-[merge]
-    conflictstyle = diff3
-    tool = opendiff
+[branch]
+    autosetuprebase = always
 [color "branch"]
     current = yellow reverse
     local = yellow
     remote = green
 [color "diff"]
-    meta = yellow bold
     frag = magenta bold
-    old = red bold
+    meta = yellow bold
     new = green bold
+    old = red bold
 [color "status"]
     added = yellow
     changed = green
@@ -25,30 +19,36 @@
 [commit]
     gpgsign = true
     verbose = true
-[help]
-    autocorrect = 1
-[filter "lfs"]
-    smudge = git-lfs smudge -- %f
-    required = true
-    clean = git-lfs clean -- %f
+[core]
+    attributesfile = @attributesfile@
+    excludesfile = @ignorefile@
+[credential]
+    helper = osxkeychain
 [diff]
     compactionHeuristic = true
     renameLimit = 0
     wsErrorHighlight = all
-[credential]
-    helper = osxkeychain
-[hub]
-    protocol = ssh
-[branch]
-    autosetuprebase = always
 [diff "json"]
     textconv = @python@/bin/python -m json.tool
 [diff "mozlz4"]
     textconv = @mozlz4_textconv@
 [diff "plist"]
     textconv = /usr/bin/plutil -convert xml1 -o -
+[filter "lfs"]
+    clean = git-lfs clean -- %f
+    required = true
+    smudge = git-lfs smudge -- %f
 [format]
     pretty = format:%Cred%h %C(magenta)%G? %Cgreen(%ar)%Creset -%C(bold red)%d%Creset %s %C(bold blue)<%aN>%Creset
 [grep]
     lineNumber = true
     patternType = perl
+[help]
+    autocorrect = 1
+[hub]
+    protocol = ssh
+[merge]
+    conflictstyle = diff3
+    tool = opendiff
+[push]
+    default = current
-- 
cgit 1.4.1