Johannes Schindelin <johannes.schinde...@gmx.de> writes: > Hi, > > On Tue, 13 Feb 2018, Sergey Organov wrote: > >> Johannes Schindelin <johannes.schinde...@gmx.de> writes: >> >> > The wording is poor either way, but you are also not a native speaker so >> > we have to rely on, say, Eric to help us out here. >> >> Likely, but why didn't you keep original wording from --preserve-merges? >> Do you feel it's somehow poor either? > > Yes, I felt it is poor, especially when --recreate-merges is present, that > is indeed why I changed it.
So, how about this (yeah, I noticed the option now got arguments, but please, tweak this to the new implementation yourself): --recreate-merges:: Recreate merge commits instead of flattening the history. Merge conflict resolutions or manual amendments to merge commits are not preserved. -p:: --preserve-merges:: (deprecated) This option is similar to --recreate-merges. It has no proper support for interactive mode and thus is deprecated. Use '--recreate-merges' instead. -- Sergey