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

Merge branch 'master' into adjustedbranch

Browse source
This commit is contained in:
Joey Hess 2016-03-11 12:21:26 -04:00
commit 97e97dccda
Failed to extract signature
69 changed files with 901 additions and 1080 deletions
Download patch file Download diff file Expand all files Collapse all files

6
doc/design/adjusted_branches.mdwn
View file

@ -231,6 +231,12 @@ which to not delete when reversing it?
So, a reverse filter may need some state that was collected when running
the filter forwards, in order to decide what to do.
Alternatively, instead of reverse filtering the whole adjusted tree,
look at just the new commit that's being propigated back from the
adjusted to master branch. Get the diff from it to the previous
commit; the changes that were made. Then de-adjust those changes,
and apply the changes to the master branch.
## push
The new master branch can then be pushed out to remotes. The