From fa6877f1eae8fa581fa3266cfc5774a642fb9873 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 22 Apr 2016 14:35:48 -0400 Subject: refactor --- doc/todo/support_--allow-unrelated-histories_in_git_2.8.1pre.mdwn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'doc/todo/support_--allow-unrelated-histories_in_git_2.8.1pre.mdwn') 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]] -- cgit v1.2.3