From: Mark Jamsek Subject: Re: allow log -x to accept keywords and fix diffstat duplicates To: Stefan Sperling Cc: Omar Polo , gameoftrees@openbsd.org Date: Tue, 08 Aug 2023 20:03:33 +1000 Stefan Sperling wrote: > On Tue, Aug 08, 2023 at 05:44:20PM +1000, Mark Jamsek wrote: > > If anything, purely for the sake of less options, I'd probably lean more > > toward dropping -d (or -P because 'd' is easier to type), and showing > > the diffstat by default if -P (or -d) is specified. But that means we're > > computing the diff when the user may just want the path list, and on > > slower machines that cost may be noticeable. > > I propose we declare diff -dP to be equivalent to diff -d and otherwise > leave things as they are now. Yes, good idea! I think this is best. ok > diff /home/stsp/src/got > commit - 0778bf802f073bf7f785d53ab5ea4d8e6a8f0a59 > path + /home/stsp/src/got > blob - 10a6aa7aa384b8d8773e28516972143fd0c7c93a > file + got/got.1 > --- got/got.1 > +++ got/got.1 > @@ -974,10 +974,13 @@ option. > .It Fl d > Display diffstat of changes introduced in each commit. > Cannot be used with the > .Fl s > option. > +Implies the > +.Fl P > +option (diffstat displays a list of changed paths). > .It Fl l Ar N > Limit history traversal to a given number of commits. > If this option is not specified, a default limit value of zero is used, > which is treated as an unbounded limit. > The -- Mark Jamsek GPG: F2FF 13DE 6A06 C471 CA80 E6E2 2930 DC66 86EE CF68