diff options
-rw-r--r-- | doc/design/adjusted_branches.mdwn | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/design/adjusted_branches.mdwn b/doc/design/adjusted_branches.mdwn index 9ea93ee72..03dfad177 100644 --- a/doc/design/adjusted_branches.mdwn +++ b/doc/design/adjusted_branches.mdwn @@ -12,7 +12,8 @@ eg `adjusted/master`. There would be a filter function. For #1 above it would simply convert all annex symlinks to annex file pointers. For #2 above it would omit files -whose content is not currently in the annex. +whose content is not currently in the annex. Sometimes, both #1 and #2 would +be wanted. When merging changes from a remote, apply the filter to the head of the remote branch, and merge the result. |