mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

stacking filters

Browse source
This commit is contained in:
Joey Hess 2016-02-09 12:41:45 -04:00
parent aeb6b4d2c0
commit 09400f7bfb
Failed to extract signature
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/design/adjusted_branches.mdwn
View file

@ -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.