From c658f89b563cc5703ed4fcea7cd4b83689a9f9e8 Mon Sep 17 00:00:00 2001
From: Tobias Schmidl <tobias@schmidl.cc>
Date: Wed, 7 Dec 2016 17:01:55 +0100
Subject: [PATCH] update of git configs

---
 git-author       |  2 ++
 gitattributes    | 10 ++++++++++
 gitconfig        | 40 ++++++++++++++++++++++++++++++++++++++++
 gitconfig.client | 41 -----------------------------------------
 4 files changed, 52 insertions(+), 41 deletions(-)
 create mode 100644 gitattributes
 create mode 100644 gitconfig
 delete mode 100644 gitconfig.client

diff --git a/git-author b/git-author
index 7ccbfd5..aa61f67 100755
--- a/git-author
+++ b/git-author
@@ -1,3 +1,5 @@
 #! /bin/sh
 # greps all authors and presents them in descending commit order
 git log --all --format='%aN <%aE>' | awk '{arr[$0]++} END{for (i in arr){print arr[i], i;}}' | sort -rn;
+#git log --all --format='%aN' | awk '{arr[$0]++} END{for (i in arr){print arr[i], i;}}' | sort -rn;
+
diff --git a/gitattributes b/gitattributes
new file mode 100644
index 0000000..cff93a7
--- /dev/null
+++ b/gitattributes
@@ -0,0 +1,10 @@
+*.c diff=cpp text eol=lf filter=uncrustify_cpp
+*.cpp diff=cpp text eol=lf filter=uncrustify_cpp
+*.css text eol=auto diff=css
+*.gif diff=image
+*.h diff=cpp text eol=lf filter=uncrustify_cpp
+*.hpp diff=cpp text eol=lf filter=uncrustify_cpp
+*.html text eol=auto diff=html
+*.jpg diff=image
+*.png diff=image
+*.py text eol=auto diff=python
diff --git a/gitconfig b/gitconfig
new file mode 100644
index 0000000..b543385
--- /dev/null
+++ b/gitconfig
@@ -0,0 +1,40 @@
+[color]
+	ui = auto
+[credential]
+	helper = store
+
+[rebase]
+	autoStash = true
+	autoSquash = true
+
+[push]
+	default = upstream
+
+[diff]
+	renames = copies
+	renameLimit = 65536
+
+[branch "master"]
+	rebase = true
+
+[pull]
+	rebase = true
+
+[http]
+	sslCAPath = /etc/ssl/certs
+	sslVerify = true
+
+[core]
+	preloadindex = 1
+	attributesfile = ~/.gitattributes
+
+[merge]
+	renormalize = true
+	conflictstyle = diff3
+
+[pack]
+	threads = 0
+
+[filter "uncrustify_cpp"]
+	clean = /usr/bin/uncrustify -c /home/schtobia/.config/uncrustify/cpp.cfg -l cpp
+	
diff --git a/gitconfig.client b/gitconfig.client
deleted file mode 100644
index 01a51a2..0000000
--- a/gitconfig.client
+++ /dev/null
@@ -1,41 +0,0 @@
-[alias]
-	st = status
-	ci = commit
-	di = diff
-	wdi = diff --color-words
-	co = checkout
-	up = fetch --all
-	hg = !git-hg
-
-[color]
-	ui = auto
-
-[gui]
-	fontdiff = -family \"Droid Sans Mono\" -size 8 -weight normal -slant roman -underline 0 -overstrike 0
-	fontui = -family \"DejaVu Sans\" -size 9 -weight normal -slant roman -underline 0 -overstrike 0
-	spellingdictionary = en
-
-# recognize file copies
-
-[diff]
-	renames = copies
-	renameLimit = 65536
-
-[push]
-	default = upstream
-
-[branch "master"]
-	rebase = true
-
-[pull]
-	rebase = true
-
-[http]
-	sslCAPath = /etc/ssl/certs
-	sslVerify = true
-
-[commit]
-	gpgsign = true
-
-[core]
-	preloadindex = 1