sync: Pass --allow-unrelated-histories to git merge when used with git git 2.9.0...
authorJoey Hess <joeyh@joeyh.name>
Tue, 15 Nov 2016 22:26:17 +0000 (18:26 -0400)
committerJoey Hess <joeyh@joeyh.name>
Tue, 15 Nov 2016 22:26:17 +0000 (18:26 -0400)
commit556b2ded2ba8270846fa207255b4c2def6ef5d8a
tree9f25fc44c8c70241c1838a00a2e12a44a7046104
parent6416ae9c09f54c062c05cc686ade35c2e08c1434
sync: Pass --allow-unrelated-histories to git merge when used with git git 2.9.0 or newer.

This makes merging a remote into a freshly created direct mode repository
work the same as it works in indirect mode.

The git-annex branches would get merged in any case by a sync,
since that doesn't use git merge.

This might need to be revisited later to better mirror git's behavior.
Assistant/Sync.hs
Assistant/Threads/Merger.hs
CHANGELOG
Command/Sync.hs