Merge branch 'maint'

* maint:
Rename diff.suppress-blank-empty to diff.suppressBlankEmpty

diff --combined Documentation/config.txt
index 6b3ac5aa90757cde33f6a5d442c570aee06d2f0b,26551ea6e1bba817bc272243368e082fecaca2f1..290cb48eb9dc959c380de94a787650c7d8b64436
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -635,7 -635,7 +635,7 @@@ diff.renames:
        will enable basic rename detection.  If set to "copies" or
        "copy", it will detect copies, as well.
  
- diff.suppress-blank-empty::
+ diff.suppressBlankEmpty::
        A boolean to inhibit the standard behavior of printing a space
        before each empty output line. Defaults to false.
  
@@@ -702,9 -702,7 +702,9 @@@ gc.packrefs:
  
  gc.pruneexpire::
        When 'git-gc' is run, it will call 'prune --expire 2.weeks.ago'.
 -      Override the grace period with this config variable.
 +      Override the grace period with this config variable.  The value
 +      "now" may be used to disable this  grace period and always prune
 +      unreachable objects immediately.
  
  gc.reflogexpire::
        'git-reflog expire' removes reflog entries older than
@@@ -725,10 -723,6 +725,10 @@@ gc.rerereunresolved:
        kept for this many days when 'git-rerere gc' is run.
        The default is 15 days.  See linkgit:git-rerere[1].
  
 +gitcvs.commitmsgannotation::
 +      Append this string to each commit message. Set to empty string
 +      to disable this feature. Defaults to "via git-CVS emulator".
 +
  gitcvs.enabled::
        Whether the CVS server interface is enabled for this repository.
        See linkgit:git-cvsserver[1].
@@@ -1050,16 -1044,6 +1050,16 @@@ mergetool.keepBackup:
        is set to `false` then this file is not preserved.  Defaults to
        `true` (i.e. keep the backup files).
  
 +mergetool.keepTemporaries::
 +      When invoking a custom merge tool, git uses a set of temporary
 +      files to pass to the tool. If the tool returns an error and this
 +      variable is set to `true`, then these temporary files will be
 +      preserved, otherwise they will be removed after the tool has
 +      exited. Defaults to `false`.
 +
 +mergetool.prompt::
 +      Prompt before each invocation of the merge resolution program.
 +
  pack.window::
        The size of the window used by linkgit:git-pack-objects[1] when no
        window size is given on the command line. Defaults to 10.

diff --combined diff.c
index d23548292ad319defd691655409098f824ec9e94,5b85b4077a1d3e333d6af86127bf9473b295c837..073131316041fa25790c1da27c0a526d1c1b3d66
--- 1/diff.c
--- 2/diff.c
+++ b/diff.c
@@@ -118,7 -118,9 +118,9 @@@ int git_diff_basic_config(const char *v
        }
  
        /* like GNU diff's --suppress-blank-empty option  */
-       if (!strcmp(var, "diff.suppress-blank-empty")) {
+       if (!strcmp(var, "diff.suppressblankempty") ||
+                       /* for backwards compatibility */
+                       !strcmp(var, "diff.suppress-blank-empty")) {
                diff_suppress_blank_empty = git_config_bool(var, value);
                return 0;
        }
@@@ -1469,7 -1471,6 +1471,7 @@@ static void builtin_diff(const char *na
                ecbdata.file = o->file;
                xpp.flags = XDF_NEED_MINIMAL | o->xdl_opts;
                xecfg.ctxlen = o->context;
 +              xecfg.interhunkctxlen = o->interhunkcontext;
                xecfg.flags = XDL_EMIT_FUNCNAMES;
                if (pe)
                        xdiff_set_find_func(&xecfg, pe->pattern, pe->cflags);
@@@ -2040,7 -2041,7 +2042,7 @@@ static void diff_fill_sha1_info(struct 
                        if (lstat(one->path, &st) < 0)
                                die("stat %s", one->path);
                        if (index_path(one->sha1, one->path, &st, 0))
 -                              die("cannot hash %s\n", one->path);
 +                              die("cannot hash %s", one->path);
                }
        }
        else
@@@ -2539,9 -2540,6 +2541,9 @@@ int diff_opt_parse(struct diff_options 
                options->b_prefix = arg + 13;
        else if (!strcmp(arg, "--no-prefix"))
                options->a_prefix = options->b_prefix = "";
 +      else if (opt_arg(arg, '\0', "inter-hunk-context",
 +                       &options->interhunkcontext))
 +              ;
        else if (!prefixcmp(arg, "--output=")) {
                options->file = fopen(arg + strlen("--output="), "w");
                options->close_file = 1;