summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-01-06 18:12:52 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-01-06 18:12:52 -0400
commite15385c339ca8bf1d9896b542a866736b6dca924 (patch)
treecf160a5ab52e965dd3360d887a260eed62af4520 /.gitattributes
parentf936be30c36420072557a80a4baf1fabbeeb7b46 (diff)
git-annex setup
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..b98b07d7d
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+.git-annex/*.log merge=union