On Wed, Apr 11, 2018 at 10:42 PM, Sergey Organov <sorga...@gmail.com> wrote: > Hi Jacob, > > Jacob Keller <jacob.kel...@gmail.com> writes: >> On Wed, Apr 11, 2018 at 6:13 AM, Sergey Organov <sorga...@gmail.com> wrote: >>> It was rather --recreate-merges just a few weeks ago, and I've seen >>> nobody actually commented either in favor or against the >>> --rebase-merges. >>> >>> git rebase --rebase-merges >>> >> >> I'm going to jump in here and say that *I* prefer --rebase-merges, as >> it clearly mentions merge commits (which is the thing that changes). > > OK, thanks, it's fair and the first argument in favor of --rebase-merges > I see. >
I'd be ok with "--keep-merges" also. I don't like the idea of "flatten" as it, to me, means that anyone who wants to understand the option without prior knowledge must immediately read the man page or they will be confused. Something like "--rebase-merges" at least my coworkers got it instantly. The same could be said for "--keep-merges" too, but so far no one I asked said the immediately understood "--no-flatten". Thanks, Jake
