summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-12-16 16:00:41 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-12-16 16:00:41 -0400
commit67f06bd61bcdb45248bc74ceb48af87b62c6c431 (patch)
treee769401fa6cc9d61d204ad3c43fdabd2f1fbee77
parent1d710fb8112f3c99ea8ec7324d21584024b67b36 (diff)
fix docs
"git -a annex.largefiles=* add" cannot be used.. git does not pass the config along to the smudge filter, sadly.
-rw-r--r--doc/git-annex-smudge.mdwn6
-rw-r--r--doc/upgrades.mdwn9
2 files changed, 6 insertions, 9 deletions
diff --git a/doc/git-annex-smudge.mdwn b/doc/git-annex-smudge.mdwn
index c8e545367..7439c8784 100644
--- a/doc/git-annex-smudge.mdwn
+++ b/doc/git-annex-smudge.mdwn
@@ -14,11 +14,7 @@ of being symlinks.
When adding a file with `git add`, the annex.largefiles config is
consulted to decide if a given file should be added to git as-is,
-or if its content are large enough to need to use git-annex. To force a
-file that would normally be added to the annex to be added to git as-is,
-this can be temporarily overridden. For example:
-
- git -c annex.largefiles='exclude=*' add myfile
+or if its content are large enough to need to use git-annex.
The git configuration to use this command as a filter driver is as follows.
This is normally set up for you by git-annex init, so you should
diff --git a/doc/upgrades.mdwn b/doc/upgrades.mdwn
index 27f22e16e..9d30c2f14 100644
--- a/doc/upgrades.mdwn
+++ b/doc/upgrades.mdwn
@@ -63,10 +63,11 @@ must support symbolic links..)
The behavior of some commands changes in an upgraded repository:
* `git add` will add files to the annex, in unlocked mode, rather than
- adding them directly to the git repository. To bypass that and add a file
- directly to git, use:
-
- git -c annex.largefiles='exclude=*' add myfile
+ adding them directly to the git repository. To cause some files to be
+ added directly to git, you can configure `annex.largefiles`. For
+ example:
+
+ git config annex.largefiles "largerthan=100kb and not (include=*.c or include=*.h)"
* `git annex unlock` and `git annex lock` change how the pointer to
the annexed content is stored in git.