diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-02-09 12:41:45 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-02-09 12:41:45 -0400 |
| commit | d95b6e14ecbb1e4200196b24b51dfa56c924cab5 (patch) | |
| tree | 6eaeb88c1f65862892455e7522f11f39f91d91d1 /doc/design | |
| parent | c8775e294cddd42c31714954e7c2bde7b4e08018 (diff) | |
stacking filters
Diffstat (limited to 'doc/design')
| -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. |