diff options
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.mdwn | 4 |
1 files changed, 4 insertions, 0 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 3218c3b16..bcbc220d2 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 @@ -13,3 +13,7 @@ be split into a fetch and a merge in order to pass the option to the merge; but AFAICS, git-annex never uses `git pull`) --[[Joey]] + +> [[done]]; used the environment variable +> `GIT_MERGE_ALLOW_UNRELATED_HISTORIES` which will hopefully land in git +> `next` (currently in `pu`) --[[Joey]] |