From 2aac458ce1fd2b12854385d833394ec0480bce1c Mon Sep 17 00:00:00 2001
From: Jannik ZANDER <jannikz@gmail.com>
Date: Thu, 12 Jul 2018 21:25:53 +0200
Subject: [PATCH] Fix git lol

---
 .config/git/config | 77 ++++++++++++++++++++++------------------------
 .profile           |  2 +-
 2 files changed, 38 insertions(+), 41 deletions(-)

diff --git a/.config/git/config b/.config/git/config
index 22791d4..bd71d62 100644
--- 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 5113237..d8d1e1b 100644
--- 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'
-- 
2.43.0