diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-03-19 18:56:36 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-03-19 18:56:36 -0400 |
| commit | 91d1d935dd034850c152455bfab8f9df227a682f (patch) | |
| tree | 77262236b6974bc52dededffa1fb009d5cc20888 /.gitattributes | |
| parent | 6a2a17658c1d508cec022132768e9bc1957098d9 (diff) | |
git-annex setup
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 5d425843f..b83edcae0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,3 @@ debian/changelog merge=dpkg-mergechangelogs +.git-annex/*.log merge=union +.git-annex/*/*/*.log merge=union |