Alex Henrie <alexhenrie24@xxxxxxxxx> writes: > On Thu, Apr 29, 2021 at 10:35 AM Sergey Organov <sorganov@xxxxxxxxx> wrote: >> >> Alex Henrie <alexhenrie24@xxxxxxxxx> writes: >> >> > On Thu, Apr 29, 2021 at 6:38 AM Sergey Organov <sorganov@xxxxxxxxx> wrote: >> >> >> >> As the final purpose of all this is to have -m as user-friendly short >> >> option, I'd incline to finally let it imply -p, as --diff-merges=m now >> >> covers another side of the coin. >> >> >> >> What do you think? >> > >> > I am 100% in favor of that proposal, and I can work on the code this >> > weekend. >> >> No need to bother. If we agree, I'll send a patch atop of my recent >> changes that make -m format configurable. > > Great, thank you! > >> Alternatively, we can add a configuration option, or let -m imply -p >> only when -m format is explicitly configured by the user. > > Since the goal here is simple, easily understandable, and > user-friendly behavior, I think -m should imply -p all the time, or at > least imply -p by default. The less I have to explain to new Git > users, the better. Yep, but OTOH -m never implied -p before, and it'll take time for the change get to release and then to reach distributions... So the actual question here is if anybody cares enough about backward compatibility in this particular case to complicate transition? -- Sergey Organov
