Adding gitconfig

diff --git a/.etckeeper b/.etckeeper
index efca095fe537b8608f05191ddb65b1da045bb44f..cc29f64fed54fcff7d96e359e0d675581a7bdcf9 100755 (executable)
--- 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 (file)
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