summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-12-12 14:08:37 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-12-12 14:08:37 -0400
commitc78c6083295c621f4140bfb920837b118b4f2ab3 (patch)
tree3a9f384d6d1aab7325355fdad94164f04accccaf
parent23b50a04872952c8147593602a48f659eb8489fc (diff)
update for direct mode guard
-rw-r--r--doc/tips/replacing_Sparkleshare_or_dvcs-autosync_with_the_assistant.mdwn12
1 files changed, 11 insertions, 1 deletions
diff --git a/doc/tips/replacing_Sparkleshare_or_dvcs-autosync_with_the_assistant.mdwn b/doc/tips/replacing_Sparkleshare_or_dvcs-autosync_with_the_assistant.mdwn
index 4363dc85d..893408c2f 100644
--- a/doc/tips/replacing_Sparkleshare_or_dvcs-autosync_with_the_assistant.mdwn
+++ b/doc/tips/replacing_Sparkleshare_or_dvcs-autosync_with_the_assistant.mdwn
@@ -24,10 +24,20 @@ file that is stored in the annex.
git config annex.largefiles "largerthan=100kb and not (include=*.c or include=*.h)"
+----
+
Now if you run `git annex add`, it will only add the large files to the
annex. You can `git add` the small files directly to git.
-Better, if you run `git annex assistant`, it will *automatically*
+Note that in order to use `git add` on the small files, your repository
+needs to be in indirect mode, rather than [[direct mode]]. If it's in
+direct mode, `git add` will fail. You can fix that:
+
+ git annex indirect
+
+----
+
+A less manual option is to run `git annex assistant`. It will *automatically*
add the large files to the annex, and store the small files in git.
It'll notice every time you modify a file, and immediately commit it,
too. And sync it out to other repositories you configure using `git annex