summaryrefslogtreecommitdiff
path: root/doc/design
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-03-29 13:57:48 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-03-29 13:57:48 -0400
commit59eaca60b13a039dff3e918dd6cc7ae47196737b (patch)
treee7f4bc947ef25e66f7c85a4692df996dd4cbc828 /doc/design
parentd3eac61d33603ef2896be9e4b20217e63505a4d6 (diff)
prevent git-annex adjust changing things out from under the daemon
Diffstat (limited to 'doc/design')
-rw-r--r--doc/design/adjusted_branches.mdwn4
1 files changed, 0 insertions, 4 deletions
diff --git a/doc/design/adjusted_branches.mdwn b/doc/design/adjusted_branches.mdwn
index d718cd342..187617f67 100644
--- a/doc/design/adjusted_branches.mdwn
+++ b/doc/design/adjusted_branches.mdwn
@@ -299,7 +299,3 @@ into adjusted view worktrees.]
## TODOs
* Interface in webapp to enable adjustments.
-* Entering an adjusted branch can prevent commits to the current branch
- (locking will cause the commits to fail) and so the assistant
- should not be running, or at least should have commits disabled
- when entering it.