sync, merge: Added --allow-unrelated-histories option
authorJoey Hess <joeyh@joeyh.name>
Mon, 19 Jul 2021 16:08:24 +0000 (12:08 -0400)
committerJoey Hess <joeyh@joeyh.name>
Mon, 19 Jul 2021 16:14:26 +0000 (12:14 -0400)
commit3d50b47dede6e4e94232718f4c460cd19147dcfb
tree31379d7efb33ade47c66fd71fe2a9eb87391348d
parentb6bea0d3f2c9095e91879d2c0c1d5f8393e59735
sync, merge: Added --allow-unrelated-histories option

Which is the same as the git merge option.

After last commit, this turns out to be needed in the test suite, and when
doing git-annex import from special remote, followed by a git-annex merge.

Sponsored-by: Svenne Krap on Patreon
CHANGELOG
Command/Merge.hs
Command/Sync.hs
Test.hs
doc/git-annex-import.mdwn
doc/git-annex-merge.mdwn
doc/git-annex-sync.mdwn