summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-03-11 16:00:14 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-03-11 16:05:06 -0400
commit92e8a321090bb45e0ae37e4298160f56652b1f1f (patch)
treed59562279f36267414cdd63d756ce74caeeb15e6 /doc
parente082d72b6a1afa651ddb5384f0b768ed26298536 (diff)
improve propigation of commits from adjusted branches
Only reverse adjust the changes in the commit, which means that adjustments do not need to be generally cleanly reversable. For example, an adjustment can unlock all locked files, but does not need to worry about files that were originally unlocked when reversing, because it will only ever be run on files that have been changed. So, it's ok if it locks all files when reversed, or even leaves all files as-is when reversed.
Diffstat (limited to 'doc')
-rw-r--r--doc/design/adjusted_branches.mdwn2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/design/adjusted_branches.mdwn b/doc/design/adjusted_branches.mdwn
index a031fef92..7216fcbc4 100644
--- a/doc/design/adjusted_branches.mdwn
+++ b/doc/design/adjusted_branches.mdwn
@@ -67,7 +67,7 @@ and updates the branches. And/or `git-annex sync` could do it.
There may be multiple commits made to the adjusted branch before any get
applied back to the original branch. This is handled by reverse filtering
-one at a time and rebasing the others on top.
+commits one at a time and rebasing the others on top.
master adjusted/master
A