mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

improve comment

Browse source
This commit is contained in:
Joey Hess 2016-11-16 16:03:23 -04:00
parent 2577f1c0a2
commit 10703dc817
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Command/Sync.hs
View file

@ -172,7 +172,10 @@ mergeConfig :: [Git.Merge.MergeConfig]
mergeConfig =
[ Git.Merge.MergeNonInteractive
-- In several situations, unrelated histories should be merged
-- together. This includes pairing in the assistant etc.
-- together. This includes pairing in the assistant, and merging
-- from a remote into a newly created direct mode repo.
-- (Once direct mode is removed, this could be changed, so only
-- the assistant uses it.)
, Git.Merge.MergeUnrelatedHistories
]