From: Junio C Hamano Date: Wed, 06 Apr 2011 19:48:53 GMT Subject: Re: [PATCH 2/4] Documentation: Add diff..* to config Message-ID: <7vwrj7i2je.fsf@alter.siamese.dyndns.org> In-Reply-To: <1302115611-1950-3-git-send-email-artagnon@gmail.com> Ramkumar Ramachandra writes: > +diff..command:: > + The custom diff driver command. See linkgit:gitattributes[5] > + for details. This is about "custom", but I thought it was pointed out that ... > +diff..xfuncname:: > + The regular expression that the custom diff driver should use > + to recognize the hunk header. A built-in pattern may also be > + used. See linkgit:gitattributes[5] for details. > + > +diff..binary:: > + Set this option to true to make the custom diff driver treat > + files as binary. See linkgit:gitattributes[5] for details. ... these two don't have much to do with "custom". You seem to have dropped "custom" from the remaining three, and I think their description without "custom" makes more sense. It is not a problem for me to just amend these two and lose "custom" when I apply this patch (if there is no other glitch in it, of course), but I am wondering if these are intentional. > +diff..textconv:: > +diff..wordregex:: > +diff..cachetextconv::