summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-02-09 12:36:22 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-02-09 12:36:22 -0400
commit9d861414a3168f471300a1d8b01a12c1e951aa0e (patch)
treedbd6288815a3fb9d7f4affb2165a4e4ea3851fe4
parentac0b21824a69f25d520f15de80e95485eac041f6 (diff)
pointer
-rw-r--r--doc/todo/smudge.mdwn2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/todo/smudge.mdwn b/doc/todo/smudge.mdwn
index 8ddf337b7..973a299b9 100644
--- a/doc/todo/smudge.mdwn
+++ b/doc/todo/smudge.mdwn
@@ -27,7 +27,7 @@ git-annex should use smudge/clean filters.
Note that this presents problems when dealing with merge conflicts and
when pushing changes committed in such a repo. Ideally, should avoid
committing implicit unlocks, or should prevent such commits leaking out
- in pushes.
+ in pushes. See [[design/adjusted_branches]].
* Eventually (but not yet), make v6 the default for new repositories.
Note that the assistant forces repos into direct mode; that will need to