aboutsummaryrefslogtreecommitdiff
path: root/doc/todo/support_--allow-unrelated-histories_in_git_2.8.1pre.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-04-22 14:35:48 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-04-22 14:35:48 -0400
commitfa6877f1eae8fa581fa3266cfc5774a642fb9873 (patch)
treeb24a911b0f483ce618ab396935f4f7f717d3bd43 /doc/todo/support_--allow-unrelated-histories_in_git_2.8.1pre.mdwn
parentc4b2bd9869c4cc1ae036e5be9d1032fb1ee99804 (diff)
refactor
Diffstat (limited to 'doc/todo/support_--allow-unrelated-histories_in_git_2.8.1pre.mdwn')
-rw-r--r--doc/todo/support_--allow-unrelated-histories_in_git_2.8.1pre.mdwn3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/todo/support_--allow-unrelated-histories_in_git_2.8.1pre.mdwn b/doc/todo/support_--allow-unrelated-histories_in_git_2.8.1pre.mdwn
index bcbc220d2..bb8cbd161 100644
--- a/doc/todo/support_--allow-unrelated-histories_in_git_2.8.1pre.mdwn
+++ b/doc/todo/support_--allow-unrelated-histories_in_git_2.8.1pre.mdwn
@@ -16,4 +16,5 @@ but AFAICS, git-annex never uses `git pull`)
> [[done]]; used the environment variable
> `GIT_MERGE_ALLOW_UNRELATED_HISTORIES` which will hopefully land in git
-> `next` (currently in `pu`) --[[Joey]]
+> `next` (currently Junio has posted a patch but not even landed it in `pu`
+> yet) --[[Joey]]