diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-04-22 14:26:44 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-04-22 14:26:44 -0400 |
| commit | c4b2bd9869c4cc1ae036e5be9d1032fb1ee99804 (patch) | |
| tree | 86a1e3cc74561e7dd9c16855e53685a8f001b284 /doc/todo/support_--allow-unrelated-histories_in_git_2.8.1pre.mdwn | |
| parent | b48a044d26bb607da9962b9086e9da2db9e11620 (diff) | |
assistant: Deal with upcoming git's refusal to merge unrelated histories by default
git 2.8.1 (or perhaps 2.9.0) is going to prevent git merge from merging in
unrelated branches. Since the webapp's pairing etc features often combine
together repositories with unrelated histories, work around this behavior
change by setting GIT_MERGE_ALLOW_UNRELATED_HISTORIES when the assistant
merges.
Note though that this is not done for git annex sync's merges, so
it will follow git's default or configured behavior.
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]] |