From: Junio C Hamano Date: Tue, 03 Mar 2009 18:24:28 GMT Subject: Re: [PATCH] doc: clarify how -S works Message-ID: <7veixebh2b.fsf@gitster.siamese.dyndns.org> In-Reply-To: <43d8ce650903030939u73f09171uf4041b6d9824b698@mail.gmail.com> John Tapsell writes: > 2009/3/3 Jeff King : >> On Tue, Mar 03, 2009 at 08:42:12AM -0800, Junio C Hamano wrote: >> >>> In retrospect, because --pickaxe was designed primarily for Porcelain use, >>> it was a mistake for it to have taken a short-and-sweet -S synonym. >> >> Hmm. I actually like the pickaxe behavior and find it useful for >> searching. IOW, I consider it a porcelain feature, just perhaps not the >> one that some people are expecting. >> >>> >  -S:: >>> > -   Look for differences that contain the change in . >>> > +   Look for differences that introduce or remove an instance of >>> > +   . Note that this is different than the string simply >>> > +   appearing in diff output; see the 'pickaxe' entry in >>> > +   linkgit:gitdiffcore[7] for more details. >>> >>> Look for differences that change the number of occurrences of ? >> >> Yes, that is technically correct. I was trying to find a wording that >> was a little less "this is literally what it does" and more "this is >> what you might find it useful for". > > Is there any way to have an option to also match any line containing > the string? Patches welcome. I've already outlined what you need to do. I think it can be called -G (short for --grep-diff), if --search cannot be used because "-s" is unavailable.