summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-04-04 13:51:42 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-04-04 13:51:42 -0400
commitcdddad27e44443177b7878821a057c6eaf16cc05 (patch)
tree8a417dd20a01554e60d7c208d816c7ec8261f0cd /doc
parent2f8436cd9bb2a9f16b0bbbf5a30043b911576317 (diff)
deal with cloning a repo that has an ajdusted branch checked out
Diffstat (limited to 'doc')
-rw-r--r--doc/design/adjusted_branches.mdwn2
1 files changed, 0 insertions, 2 deletions
diff --git a/doc/design/adjusted_branches.mdwn b/doc/design/adjusted_branches.mdwn
index 17c04d254..90f880e64 100644
--- a/doc/design/adjusted_branches.mdwn
+++ b/doc/design/adjusted_branches.mdwn
@@ -351,8 +351,6 @@ into adjusted view worktrees.]
will make copies of the content of annexed files, so this would need
to checkout the adjusted branch some other way. Maybe generalize so this
more efficient checkout is available as a git-annex command?
-* Cloning a repo that has an adjusted branch checked out gets into an ugly
- state.
* There are potentially races in code that assumes a branch like
master is not being changed by someone else. In particular,
propigateAdjustedCommits rebases the adjusted branch on top of master.