Less options in .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 64e38f0410ddd31d05d314fd44f22e6db108d2d0..b05b9a44817a4c71742ed8aecef2806ee6b45857 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,3 +1,7 @@
+# ~/.gitconfig
+
+[github]
+       user = jannikz
 [alias]
        aa = add -uv
        unaa = reset --mixed HEAD
@@ -61,15 +65,6 @@
        gtags = "!sh -c '[ -f .git/hooks/gtags ] || git init; .git/hooks/gtags' git-gtags"
        cscope = "!sh -c '[ -f .git/hooks/cscope ] || git init; .git/hooks/cscope' git-cscope"
 
-[color]
-       ui = auto
-       diff = auto
-       status = auto
-       branch = auto
-       interactive = auto
-       grep = auto
-[github]
-       user = jannikz
 [help]
        autocorrect = 10
 [branch]
@@ -83,17 +78,13 @@
        rebase = true
 [push]
        default = tracking
-[apply]
-       whitespace = fix
 [include]
        path = ~/.gitconfig_local
 [init]
        templatedir = ~/.git_template
 [core]
        excludesfile = ~/.gitignore_global
-       editor = vim
-       pager = less
-       whitespace = space-before-tab,-indent-with-non-tab,trailing-space
+       autocrlf = input
 [diff]
        tool = vimdiff
 [difftool]