diff options
| author |  Joey Hess <joey@kitenet.net> | 2010-10-12 13:02:41 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-10-12 13:02:41 -0400 |
| commit | ea5d7fe07a5c40349e66848fc9cd06a9f748b724 (patch) | |
| tree | 5e3ebcaf507b8d29962a57f04bfcf5690222879c /.gitattributes | |
| parent | 31b24348d25f5aec7ff521b7452fab6833a1d051 (diff) | |
add uuid
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
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 |