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

Merge branch 'maint-1.8.1' into maint

2013-03-25T20:46:42Z

* maint-1.8.1: bundle: Add colons to list headings in "verify" bundle: Fix "verify" output if history is complete Documentation: filter-branch env-filter example git-filter-branch.txt: clarify ident variables usage git-compat-util.h: Provide missing netdb.h definitions describe: Document --match pattern format Documentation/githooks: Explain pre-rebase parameters update-index: list supported idx versions and their features diff-options: unconfuse description of --color read-cache.c: use INDEX_FORMAT_{LB,UB} in verify_hdr() index-format.txt: mention of v4 is missing in some places

Merge branch 'jc/color-diff-doc' into maint-1.8.1

2013-03-25T20:44:53Z

The "--color=" argument to the commands in the diff family was described poorly. * jc/color-diff-doc: diff-options: unconfuse description of --color

diff-options: unconfuse description of --color

2013-02-23T06:24:10Z

It said "by default it is off" while it also said "the default is always", which confused everybody who read it only once. It wanted to say (1) if you do not say --color, it is not enabled, and (2) if you say --color but do not say when to enable it, it will always be enabled". Rephrase to clarify by using "default" only once. Signed-off-by: Junio C Hamano

Merge branch 'mp/diff-algo-config'

2013-02-17T23:25:52Z

Add diff.algorithm configuration so that the user does not type "diff --histogram". * mp/diff-algo-config: diff: Introduce --diff-algorithm command line option config: Introduce diff.algorithm variable git-completion.bash: Autocomplete --minimal and --histogram for git-diff

Documentation: the name of the system is 'Git', not 'git'

2013-02-01T21:53:33Z

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

diff: Introduce --diff-algorithm command line option

2013-01-16T17:41:18Z

Since command line options have higher priority than config file variables and taking previous commit into account, we need a way how to specify myers algorithm on command line. However, inventing `--myers` is not the right answer. We need far more general option, and that is `--diff-algorithm`. Signed-off-by: Michal Privoznik Signed-off-by: Junio C Hamano

Sync with 'maint'

2012-12-18T18:51:22Z

clarify -M without % symbol in diff-options

2012-12-18T16:46:15Z

Signed-off-by: Sitaram Chamarty Signed-off-by: Junio C Hamano

diff: introduce diff.submodule configuration variable

2012-11-19T03:18:13Z

Introduce a diff.submodule configuration variable corresponding to the '--submodule' command-line option of 'git diff'. Signed-off-by: Ramkumar Ramachandra Acked-by: Jeff King Signed-off-by: Junio C Hamano

Documentation: Fix misspellings

2012-06-22T21:25:04Z

Signed-off-by: Leila Muhtasib Signed-off-by: Junio C Hamano