diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-04-08 14:24:00 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-04-08 14:24:00 -0400 |
| commit | fdfd56c647d685ad5618917341db0b7c97e1b63a (patch) | |
| tree | a287e49f51af48f27a23711abb346134c218977d /doc/design | |
| parent | 6f4b9f2df58684d4b8e2099be59283be97f1318e (diff) | |
avoid withWorkTreeRelated affecting annex symlink calculation
Diffstat (limited to 'doc/design')
| -rw-r--r-- | doc/design/adjusted_branches.mdwn | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/doc/design/adjusted_branches.mdwn b/doc/design/adjusted_branches.mdwn index 2b2e37a27..e94439d66 100644 --- a/doc/design/adjusted_branches.mdwn +++ b/doc/design/adjusted_branches.mdwn @@ -286,5 +286,3 @@ into adjusted view worktrees.] have already been handled by updateAdjustedBranch. But, if another remote pushed a new master at just the right time, the adjusted branch could be rebased on top of a master that it doesn't incorporate, which is wrong. -* Annex symlinks generated in merging into an adjusted branch are badly - formed to point to the temp git dir's annex object dir. |