git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 2/4] Documentation: Add diff.<driver>.* to config

From
Ramkumar Ramachandra <artagnon@gmail.com>
Date
Apr 7, 2011, 03:03 UTC
Message-ID
<20110407030341.GA28334@kytes>
In-Reply-To
<7vwrj7i2je.fsf@alter.siamese.dyndns.org>
Hi Junio,
Junio C Hamano writes:
Show 23 quoted lines
> Ramkumar Ramachandra <artagnon@gmail.com> writes:
> 
> > +diff.<driver>.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.<driver>.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.<driver>.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

Right. I was a little confused about these two, but yeah- I see now that dependence on `diff.<driver>.command` is equivalent to saying that an option applies to a "custom" diff driver. Please amend to lose the "custom".

Thanks.
-- Ram
Previous: Junio C HamanoNext: Ramkumar Ramachandra
Message 29 of 33 in “Documentation: Document diff.<tool>.* and filter.<driver>.* in config”
  1. Documentation: Document diff.<tool>.* and filter.<driver>.* in configRamkumar Ramachandra, Apr 1, 2011
  2. Jakub NarebskiApr 1, 2011
  3. Documentation: Document diff.<tool>.* and filter.<driver>.* in configRamkumar Ramachandra, Apr 1, 2011
  4. Jakub NarebskiApr 1, 2011
  5. Michael J GruberApr 1, 2011
  6. 0/3 Document diff and filter drivers in configRamkumar Ramachandra, Apr 3, 2011
  7. 1/3 Documentation: Add filter.<driver>.* to configRamkumar Ramachandra, Apr 3, 2011
  8. Michael J GruberApr 4, 2011
  9. 2/3 Documentation: Add diff.<driver>.* to configRamkumar Ramachandra, Apr 3, 2011
  10. Michael J GruberApr 4, 2011
  11. Junio C HamanoApr 4, 2011
  12. 3/3 Documentation: Allow custom diff tools to be specified in 'diff.tool'Ramkumar Ramachandra, Apr 3, 2011
  13. Michael J GruberApr 4, 2011
  14. 0/4 Document diff and filter drivers in configRamkumar Ramachandra, Apr 6, 2011
  15. 1/4 Documentation: Add filter.<driver>.* to configRamkumar Ramachandra, Apr 6, 2011
  16. Michael J GruberApr 6, 2011
  17. Ramkumar RamachandraApr 6, 2011
  18. Junio C HamanoApr 6, 2011
  19. Ramkumar RamachandraApr 6, 2011
  20. Michael J GruberApr 7, 2011
  21. Ramkumar RamachandraApr 7, 2011
  22. 2/4 Documentation: Add diff.<driver>.* to configRamkumar Ramachandra, Apr 6, 2011
  23. 3/4 Documentation: Allow custom diff tools to be specified in 'diff.tool'Ramkumar Ramachandra, Apr 6, 2011
  24. 4/4 Documentation: Minor language improvements to merge-configRamkumar Ramachandra, Apr 6, 2011
  25. 0/4 Document diff and filter drivers in configRamkumar Ramachandra, Apr 6, 2011
  26. 1/4 Documentation: Add filter.<driver>.* to configRamkumar Ramachandra, Apr 6, 2011
  27. 2/4 Documentation: Add diff.<driver>.* to configRamkumar Ramachandra, Apr 6, 2011
  28. Junio C HamanoApr 6, 2011
  29. Ramkumar RamachandraApr 7, 2011
  30. 3/4 Documentation: Allow custom diff tools to be specified in 'diff.tool'Ramkumar Ramachandra, Apr 6, 2011
  31. 4/4 Documentation: Minor language improvements to merge-configRamkumar Ramachandra, Apr 6, 2011
  32. Michael J GruberApr 7, 2011
  33. Michael J GruberApr 7, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.