git/Documentation/diff-options.txt, branch v1.6.3

doc: clarify how -S works

2009-03-19T09:47:40Z

The existing text was very vague about what exactly it means for difference to "contain" a change. This seems to cause confusion on the mailing list every month or two. To fix it we: 1. use "introduce or remove an instance of" instead of "contain" 2. point the user to gitdiffcore(7), which contains a more complete explanation Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'js/diff-color-words'

2009-01-26T01:13:29Z

* js/diff-color-words: Change the spelling of "wordregex". color-words: Support diff.wordregex config option color-words: make regex configurable via attributes color-words: expand docs with precise semantics color-words: enable REG_NEWLINE to help user color-words: take an optional regular expression describing words color-words: change algorithm to allow for 0-character word boundaries color-words: refactor word splitting and use ALLOC_GROW() Add color_fwrite_lines(), a function coloring each line individually

diff-options.txt: Fix asciidoc markup issue

2009-01-26T01:09:58Z

Must be "--patience::", not "--patience:". Signed-off-by: Teemu Likonen Signed-off-by: Junio C Hamano

Merge branch 'js/patience-diff'

2009-01-24T05:51:38Z

* js/patience-diff: bash completions: Add the --patience option Introduce the diff option '--patience' Implement the patience diff algorithm Conflicts: contrib/completion/git-completion.bash

color-words: Support diff.wordregex config option

2009-01-21T08:51:12Z

When diff is invoked with --color-words (w/o =regex), use the regular expression the user has configured as diff.wordregex. diff drivers configured via attributes take precedence over the diff.wordregex-words setting. If the user wants to change them, they have their own configuration variables. Signed-off-by: Boyd Stephen Smith Jr Signed-off-by: Junio C Hamano

color-words: make regex configurable via attributes

2009-01-17T18:44:21Z

Make the --color-words splitting regular expression configurable via the diff driver's 'wordregex' attribute. The user can then set the driver on a file in .gitattributes. If a regex is given on the command line, it overrides the driver's setting. We also provide built-in regexes for the languages that already had funcname patterns, and add an appropriate diff driver entry for C/++. (The patterns are designed to run UTF-8 sequences into a single chunk to make sure they remain readable.) Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano

color-words: expand docs with precise semantics

2009-01-17T18:44:13Z

Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano

color-words: take an optional regular expression describing words

2009-01-17T18:43:08Z

In some applications, words are not delimited by white space. To allow for that, you can specify a regular expression describing what makes a word with git diff --color-words='[A-Za-z0-9]+' Note that words cannot contain newline characters. As suggested by Thomas Rast, the words are the exact matches of the regular expression. Note that a regular expression beginning with a '^' will match only a word at the beginning of the hunk, not a word at the beginning of a line, and is probably not what you want. This commit contains a quoting fix by Thomas Rast. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Fix Documentation typos surrounding the word 'handful'.

2009-01-13T08:18:53Z

Some instances replaced by "handful of", others use the word "few", a couple get a slight rewording. Signed-off-by: Jon Loeliger Signed-off-by: Junio C Hamano

Introduce the diff option '--patience'

2009-01-07T21:37:07Z

This commit teaches Git to produce diff output using the patience diff algorithm with the diff option '--patience'. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano