summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-01-25 13:41:21 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-01-25 13:41:21 -0400
commitc6adeeb1f279f7489ff77392a10ea6b61fcfe9c5 (patch)
tree31f8e26549ac4a618678bfcf556ca7b699848b7b
parentec9d1a3855c636f2829b93178dca9a8ca3481c04 (diff)
document annex.largefiles handling
-rw-r--r--doc/git-annex-addurl.mdwn7
-rw-r--r--doc/git-annex-import.mdwn4
2 files changed, 11 insertions, 0 deletions
diff --git a/doc/git-annex-addurl.mdwn b/doc/git-annex-addurl.mdwn
index 991dc5f99..a08823312 100644
--- a/doc/git-annex-addurl.mdwn
+++ b/doc/git-annex-addurl.mdwn
@@ -88,6 +88,13 @@ be used to get better filenames.
Enable JSON output. This is intended to be parsed by programs that use
git-annex. Each line of output is a JSON object.
+# CAVEATS
+
+If annex.largefiles is configured, and does not match a file, `git annex
+addurl` will add the non-large file directly to the git repository,
+instead of to the annex. However, this is not done when --fast or --relaxed
+is used.
+
# SEE ALSO
[[git-annex]](1)
diff --git a/doc/git-annex-import.mdwn b/doc/git-annex-import.mdwn
index d0ac5e77f..6947b19ba 100644
--- a/doc/git-annex-import.mdwn
+++ b/doc/git-annex-import.mdwn
@@ -81,6 +81,10 @@ Several options can be used to adjust handling of duplicate files.
Note that using `--deduplicate` or `--clean-duplicates` with the WORM
backend does not look at file content, but filename and mtime.
+If annex.largefiles is configured, and does not match a file, `git annex
+import` will add the non-large file directly to the git repository,
+instead of to the annex.
+
# SEE ALSO
[[git-annex]](1)