diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-11-16 16:03:23 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-11-16 16:03:23 -0400 |
| commit | 3421cbd14facf5b9826780e4be7ff3a772dd9e95 (patch) | |
| tree | eadc12c48da84a7c3498f9e1b832f83f3baaa71c | |
| parent | edacb971d687c44f2d076e0eff2ba8bb0a1b9019 (diff) | |
improve comment
| -rw-r--r-- | Command/Sync.hs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs index acc5fbbc9..85f1f2f2c 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -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 ] |