summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/git-annex.mdwn8
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index e9698c169..65b5dc701 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -935,6 +935,14 @@ Here are all the supported configuration settings.
disk space, but modification made to a file will lose the local (and
possibly only) copy of the old version. So, enable with care.
+ After setting (or unsetting) this, you should run `git annex fix` to
+ fix up the annexed files in the work tree to be hard links (or copies).
+
+ Note that `annex.thin` is not honored when git updates an annexed file
+ in the working tree. So when `git checkout` or `git merge` updates the
+ working tree, a second copy of annexed files will result. You can run
+ `git-annex fix` to fix up the hard links after running such git commands.
+
* `annex.delayadd`
Makes the watch and assistant commands delay for the specified number of