Fix git lol

diff --git a/.config/git/config b/.config/git/config
index 22791d49b90e38e75f6a26b26b853a7230a3e1d8..bd71d62358078371516d78465c6a43e3c950484d 100644 (file)
--- a/.config/git/config
+++ b/.config/git/config
@@ -1,3 +1,39 @@
+[help]
+       autocorrect = 10
+[branch]
+       autosetupmerge = always
+       autosetuprebase = always
+[rebase]
+       autosquash = true
+       autostash = true
+[pull]
+       rebase = true
+[push]
+       default = simple
+[diff]
+       tool = vimdiff
+[merge]
+       tool = vimdiff
+[difftool "vimdiff"]
+       prompt = false
+       conflictstyle = diff3
+[mergetool "vimdiff"]
+       prompt = false
+[difftool "bc"]
+       path = bcompare
+       trustExitCode = false
+[mergetool "bc"]
+       path = bcompare
+       trustExitCode = false
+[init]
+       templatedir = ~/.config/git/templates
+[core]
+       editor = vim
+       pager = less
+[filter "lfs"]
+       clean = git-lfs clean %f
+       smudge = git-lfs smudge %f
+       required = true
 [alias]
        a = add
        una = reset HEAD --
@@ -62,44 +98,5 @@
 #      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"
 
-[help]
-       autocorrect = 10
-[branch]
-       autosetupmerge = always
-       autosetuprebase = always
-[rebase]
-       autosquash = true
-       autostash = true
-[pull]
-       rebase = true
-[push]
-       default = simple
-[diff]
-       tool = vimdiff
-#      tool = bc
-[merge]
-       tool = vimdiff
-#      tool = bc
-[difftool "vimdiff"]
-       prompt = false
-       conflictstyle = diff3
-[mergetool "vimdiff"]
-       prompt = false
-[difftool "bc"]
-       path = bcompare
-       trustExitCode = false
-[mergetool "bc"]
-       path = bcompare
-       trustExitCode = false
-[init]
-       templatedir = ~/.config/git/templates
-[core]
-       editor = vim
-[filter "lfs"]
-       clean = git-lfs clean %f
-       smudge = git-lfs smudge %f
-       required = true
-[gitweb]
-       owner= Jannik Zander
 [include]
-       path = ~/.config/git/config_local
+       path = ~/.config/git/config.local

diff --git a/.profile b/.profile
index 5113237a440372fc40177378be6d019530bef8e7..d8d1e1b26e04194791a068ec76d56f5798ac08e8 100644 (file)
--- a/.profile
+++ b/.profile
@@ -39,7 +39,7 @@ if [[ -f /mingw64/bin/src-hilite-lesspipe.sh ]]; then
 elif [[ -f /usr/share/source-highlight/src-hilite-lesspipe.sh ]]; then
   export LESSOPEN="| /usr/share/source-highlight/src-hilite-lesspipe.sh %s"
 fi
-export LESS=" -R "
+export LESS=" -R -X --SILENT "
 
 # colored GCC warnings and errors
 export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'