From 10703dc817e6ddaf9bd15d8007a8ffa48601def3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 16 Nov 2016 16:03:23 -0400 Subject: [PATCH] improve comment --- Command/Sync.hs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Command/Sync.hs b/Command/Sync.hs index acc5fbbc94..85f1f2f2ca 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 ]