From: Frank Brehm <frank@brehm-online.com>
Date: Mon, 25 Jul 2016 14:36:14 +0000 (+0200)
Subject: Adding gitconfig
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=475c25a538743285ba498aa08588213671c8ffb9;p=config%2Fsarah%2Fetc.git

Adding gitconfig
---

diff --git a/.etckeeper b/.etckeeper
index efca095..cc29f64 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -44,7 +44,7 @@ mkdir -p './tmpfiles.d'
 mkdir -p './udev/hwdb.d'
 maybe chmod 0755 '.'
 maybe chmod 0700 '.etckeeper'
-maybe chmod 0644 '.gitignore'
+maybe chmod 0600 '.gitignore'
 maybe chmod 0755 'X11'
 maybe chmod 0755 'X11/xkb'
 maybe chmod 0755 'acpi'
@@ -501,6 +501,7 @@ maybe chmod 0644 'fonts/conf.d/README'
 maybe chmod 0644 'fonts/fonts.conf'
 maybe chmod 0644 'fstab'
 maybe chmod 0644 'gai.conf'
+maybe chmod 0644 'gitconfig'
 maybe chmod 0755 'groff'
 maybe chmod 0644 'groff/man.local'
 maybe chmod 0644 'groff/mdoc.local'
diff --git a/gitconfig b/gitconfig
new file mode 100644
index 0000000..d9eaaf1
--- /dev/null
+++ b/gitconfig
@@ -0,0 +1,8 @@
+[color]
+	ui = auto
+[http]
+	sslverify = false
+[alias]
+        mergetest = "!f(){ git merge --no-commit --no-ff \"$1\"; git merge --abort; echo \"Merge aborted\"; };f "
+
+# vim: filetype=gitconfig