Merge branch 'mp/diff-algo-config'

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

diff --cc Documentation/diff-config.txt
index 7c70c2a2feca88a2c1247794e2ee0fbed767bb4a,b8a8724f6f87fdc820f0d686078e0466adbad204..ac770502553d9b4d3d1176f63ad01791736602a8
--- 1/Documentation/diff-config.txt
--- 2/Documentation/diff-config.txt
+++ b/Documentation/diff-config.txt
@@@ -149,10 -149,26 +149,27 @@@ diff.<driver>.cachetextconv:
        conversion outputs.  See linkgit:gitattributes[5] for details.
  
  diff.tool::
 -      The diff tool to be used by linkgit:git-difftool[1].  This
 -      option overrides `merge.tool`, and has the same valid built-in
 -      values as `merge.tool` minus "tortoisemerge" and plus
 -      "kompare".  Any other value is treated as a custom diff tool,
 -      and there must be a corresponding `difftool.<tool>.cmd`
 -      option.
 +      Controls which diff tool is used by linkgit:git-difftool[1].
 +      This variable overrides the value configured in `merge.tool`.
 +      The list below shows the valid built-in values.
 +      Any other value is treated as a custom diff tool and requires
 +      that a corresponding difftool.<tool>.cmd variable is defined.
 +
 +include::mergetools-diff.txt[]
+ 
+ diff.algorithm::
+       Choose a diff algorithm.  The variants are as follows:
+ +
+ --
+ `default`, `myers`;;
+       The basic greedy diff algorithm. Currently, this is the default.
+ `minimal`;;
+       Spend extra time to make sure the smallest possible diff is
+       produced.
+ `patience`;;
+       Use "patience diff" algorithm when generating patches.
+ `histogram`;;
+       This algorithm extends the patience algorithm to "support
+       low-occurrence common elements".
+ --
+ +

diff --cc Documentation/diff-options.txt
Simple merge

diff --cc contrib/completion/git-completion.bash
Simple merge

diff --cc diff.c
Simple merge

diff --cc diff.h
Simple merge