aboutsummaryrefslogtreecommitdiff
path: root/doc/git-annex.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-12-04 15:30:06 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-12-04 15:32:47 -0400
commitde1b6019bb6fc1225a2a02cabba8bc3cf193744b (patch)
tree3780c56e7ca43e1f13e928efe8f65a9c11f90591 /doc/git-annex.mdwn
parent0e9dbe79e9a738cb8e3873214ad66b9c0aa0a8a8 (diff)
merge clean into smudge command
The git filter config can be used to map the single git-annex command to the 2 actions, and this avoids "git annex clean" being used for this thing, it might have a better use for that name later.
Diffstat (limited to 'doc/git-annex.mdwn')
-rw-r--r--doc/git-annex.mdwn8
1 files changed, 5 insertions, 3 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index a8cb73b1b..1a2fd6e67 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -626,11 +626,13 @@ subdirectories).
See [[git-annex-diffdriver]](1) for details.
-* `smudge`, `clean`
+* `smudge`
- These let git-annex be used as a git filter driver.
+ This command lets git-annex be used as a git filter driver, allowing
+ annexed files in the git repository to be unlocked at all times, instead
+ of being symlinks.
- See [[git-annex-smudge]](1) and [[git-annex-clean]](1) for details.
+ See [[git-annex-smudge]](1) for details.
* `remotedaemon`