From b809601543981fb08fb1e027f32e1b4f44b18dc7 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Sun, 14 Jun 2015 22:09:26 +0200
Subject: [PATCH] updated Git config

---
 .gitattributes |  2 ++
 .gitconfig     | 39 ++++++++++++++++++++++++++++++++++++---
 .gitignore     | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 86 insertions(+), 3 deletions(-)
 create mode 100644 .gitattributes
 create mode 100644 .gitignore

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..59e24f5
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# Diff .t2d files as if they were XML (they are).
+*.t2d diff=xml
diff --git a/.gitconfig b/.gitconfig
index d2958c7..62ba761 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,7 +1,40 @@
 [user]
 	email = post@steffenvogel.de
 	name = Steffen Vogel
-[credential]
-	helper = cache --timeout=3600
+[github]
+	username = stv0g
+[shell]
+	username = stv0g
+
 [color]
-	ui = true
+	ui = auto
+[push]
+	default = simple
+[core]
+	ignorecase = false
+[merge]
+	tool = meld
+[diff]
+	tool = meld
+[rerere]
+	# Store and re-use manual conflict resolution changes.
+	enabled = 1
+[core]
+	# Exclude everything this file. Used for general exclusions.
+	excludesfile = ~/.gitignore
+	# Set attributes on files. Used for general diff improvements.
+	attributesfile = ~/.gitattributes
+[help]
+	# Open Git help pages in the browser as HTML.
+	format = web
+	autocorrect = 1
+
+[difftool "sourcetree"]
+	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
+	path = 
+[mergetool "sourcetree"]
+	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
+	trustExitCode = true
+
+[diff "xml"]
+	  textconv = xmllint --format --recover
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9a6f617
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,48 @@
+# Ignore files generated by Qt.
+moc_*.cpp
+qrc_*.cpp
+ui_*.h
+
+# Ignore files generated by QMake.
+.qmake.*
+qmake/*.d
+.moc/
+.obj/
+
+# Ignore compiler output files.
+config.log
+config.tests/
+*.o
+*.pyc
+
+# Ignore text editor local configuration..
+*.pro.user
+.tm_properties
+*.xcodeproj/project.xcworkspace/
+*.xcodeproj/xcuserdata/
+
+# Ignore temporary generated files.
+*.rej
+*.swp
+*~
+
+# Ignore thumbnails metadata generated by OSX.
+.DS_Store
+
+# Ignore things generated by Bundler.
+.bundle/bin/
+vendor/ruby/
+vendor/*/vendor/ruby/
+
+# Ignore files generated by CMake.
+CMakeFiles/
+CMakeCache.txt
+cmake_install.cmake
+install_manifest.txt
+
+# Ignore build directories.
+b/
+
+# Ignore secrets files
+.env
+