about summary refs log tree commit diff
path: root/dev
diff options
context:
space:
mode:
Diffstat (limited to 'dev')
-rw-r--r--dev/.drirc5
-rw-r--r--dev/.gitconfig2
2 files changed, 7 insertions, 0 deletions
diff --git a/dev/.drirc b/dev/.drirc
new file mode 100644
index 0000000..7cf47a1
--- /dev/null
+++ b/dev/.drirc
@@ -0,0 +1,5 @@
+<device screen="0" driver="dri2">
+  <application name="Default">
+    <option name="vblank_mode" value="0"/>
+  </application>
+</device>
diff --git a/dev/.gitconfig b/dev/.gitconfig
index 46a58ed..8dbc3af 100644
--- a/dev/.gitconfig
+++ b/dev/.gitconfig
@@ -14,3 +14,5 @@
 	required = true
 [color]
 	ui = auto
+[pull]
+	rebase = true