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

Re: [PATCH] config: Introduce --patience config variable

From
Jeff King <peff@peff.net>
Date
Mar 6, 2012, 13:30 UTC
Message-ID
<20120306133001.GA22153@sigill.intra.peff.net>
In-Reply-To
<87pqcp6fyh.fsf@thomas.inf.ethz.ch>
On Tue, Mar 06, 2012 at 02:01:42PM +0100, Thomas Rast wrote:
Show 22 quoted lines
> >> --- a/Documentation/diff-config.txt
> >> +++ b/Documentation/diff-config.txt
> >> @@ -86,6 +86,9 @@ diff.mnemonicprefix::
> >>  diff.noprefix::
> >>  	If set, 'git diff' does not show any source or destination prefix.
> >>  
> >> +diff.patience:
> >> +    If set, 'git diff' will use patience algorithm.
> >> +
> >
> > Should this be a boolean? Or should we actually have a diff.algorithm
> > option where you specify the algorithm you want (e.g., "diff.algorithm =
> > patience")? That would free us up later to more easily add new values.
> >
> > In particular, I am thinking about --minimal. It is mutually exclusive
> > with --patience, and is simply ignored if you use patience diff.
> > we perhaps have "diff.algorithm" which can be one of "myers", "minimal"
> > (which is really myers + the minimal flag), and "patience".
> 
> Don't forget "histogram".  I have no idea why it's not documented
> (evidently 8c912eea slipped through the review cracks) but --histogram
> is supported since 1.7.7.

Ah, thanks. I had the vague feeling that we had a third algorithm already, but I didn't see it in the docs. So yeah, I really think this should be diff.algorithm, with a value of "myers", "patience", or "histogram" (and possibly "minimal", depending how we want to treat that).

-Peff
Previous: René ScharfeNext: Michal Privoznik
Message 17 of 23 in “config: Introduce --patience config variable”
  1. config: Introduce --patience config variableMichal Privoznik, Mar 6, 2012
  2. Jeff KingMar 6, 2012
  3. Thomas RastMar 6, 2012
  4. 1/2 perf: compare diff algorithmsThomas Rast, Mar 6, 2012
  5. 2/2 Document the --histogram diff optionThomas Rast, Mar 6, 2012
  6. Junio C HamanoMar 6, 2012
  7. Thomas RastMar 6, 2012
  8. Junio C HamanoMar 6, 2012
  9. Thomas RastMar 6, 2012
  10. Junio C HamanoMar 6, 2012
  11. Jakub NarebskiMar 6, 2012
  12. Thomas RastMar 7, 2012
  13. Junio C HamanoMar 7, 2012
  14. Jakub NarebskiMar 7, 2012
  15. Junio C HamanoMar 7, 2012
  16. René ScharfeMar 10, 2012
  17. Jeff KingMar 6, 2012
  18. Michal PrivoznikMar 6, 2012
  19. Matthieu MoyMar 6, 2012
  20. Jeff KingMar 6, 2012
  21. Junio C HamanoMar 7, 2012
  22. Jeff KingMar 7, 2012
  23. Junio C HamanoMar 7, 2012

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.