diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-04-06 19:23:32 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-04-06 19:23:32 -0400 |
| commit | 308a2c631c9b3b629fe2f2827ee42509248636fb (patch) | |
| tree | 458a140ec22f4c6f4199c88c6b9bf1e0430fbed4 | |
| parent | 86201c4a1815405e77108f6a4f3ae7cc2ab8854e (diff) | |
one little bug..
| -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 e94439d66..2b2e37a27 100644 --- a/doc/design/adjusted_branches.mdwn +++ b/doc/design/adjusted_branches.mdwn @@ -286,3 +286,5 @@ 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. |