Cleanup gitconfig

1 files changed, 6 insertions, 10 deletions

diff --git a/.gitconfig b/.gitconfig
index e739b82..6d6183f 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -7,9 +7,6 @@
     pager = less -FMRiX
     quotepath = false
 
-[branch]
-    autosetuprebase = always
-
 [alias]
     purge = clean -d -f
     compact = gc --aggressive --prune
@@ -19,24 +16,17 @@
     unignore = update-index --no-assume-unchanged
     ignored = !git ls-files -v | grep '^[[:lower:]]'
 
-    f = fetch
-    p = pull
-    s = status
-    d = diff
-    c = commit -v
     l = log --graph --abbrev-commit --date=relative
 
     st = status -sb
     ci = commit -v
     co = checkout
-    sm = submodule
     fm = merge --ff-only
     rv = remote -v
 
     in = !"git l ..$(git rev-parse --abbrev-ref --symbolic-full-name @{upstream})"
     out = !"git l $(git rev-parse --abbrev-ref --symbolic-full-name @{upstream}).."
 
-    pr = pull --rebase
     ar = add -A
     rc = rebase --continue
     ri = rebase -i
@@ -88,9 +78,15 @@
 [rerere]
     enabled = true
 
+[pull]
+    rebase = true
+
 [push]
      default = current
 
+[branch]
+    autosetuprebase = always
+
 [status]
     submoduleSummary = true