diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-03-03 16:19:09 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-03 16:19:09 -0400 |
| commit | ce7e52101cda2715bc4ca0a758884d67fb40669e (patch) | |
| tree | 50bc8d47e2c218783b555a896ddfd68b580fce10 /doc/design/adjusted_branches.mdwn | |
| parent | 3d9a971e66e3485da1da7895c4003f044bee65fd (diff) | |
working toward adjusted commit propigation
Diffstat (limited to 'doc/design/adjusted_branches.mdwn')
| -rw-r--r-- | doc/design/adjusted_branches.mdwn | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/design/adjusted_branches.mdwn b/doc/design/adjusted_branches.mdwn index 9213158f4..63af16972 100644 --- a/doc/design/adjusted_branches.mdwn +++ b/doc/design/adjusted_branches.mdwn @@ -351,3 +351,5 @@ like this, at its most simple: * Entering an adjusted branch can race with commits to the current branch, and so the assistant should not be running, or at least should have commits disabled when entering it. +* When the adjusted branch unlocks files, behave as if annex.addunlocked is + set, so git annex add will add files unlocked. |