update

gitconfig

@@ -1,31 +1,32 @@
-[color]
-	ui = auto
-[credential]
-	helper = store
+[user]
+	name = Tobias Schmidl
+
+[alias]
+	author = !git-author
+	unique-author = !git-unique-author
+	bdiff = !git --no-pager diff
+
+[url "https://"]
+	insteadOf = http://
+
+[diff "image"]
+	command = /home/schtobia/bin/imgdiff
 
 [rebase]
-	autoStash = true
 	autoSquash = true
 
-[push]
-	default = simple
+[credential]
+	helper = store
 
 [diff]
 	renames = copies
 	renameLimit = 65536
 
-[branch "master"]
-	rebase = true
-
-[pull]
-	rebase = true
-
 [http]
 	sslCAPath = /etc/ssl/certs
 	sslVerify = true
-
-[core]
-	preloadindex = 1
+	sslversion = tlsv1.2
+	#sslVersion = tlsv1.2
 
 [merge]
 	renormalize = true
@@ -33,3 +34,26 @@
 
 [pack]
 	threads = 0
+
+[pull]
+	rebase = true
+
+[branch "master"]
+	rebase = true
+
+[core]
+	autocrlf = input
+
+[gitflow "branch"]
+	master = stable
+	develop = master
+
+[gitflow "prefix"]
+	feature = dev/
+
+[branch]
+	autosetuprebase = always
+[tig]
+	line-graphics = utf-8
+	tab-size = 4
+	blob-view = line-number:yes,interval=5 text