Merge branch 'mm/maint-hint-failed-merge' into maint

* mm/maint-hint-failed-merge:
user-manual: Document that "git merge" doesn't like uncommited changes.
merge-recursive: point the user to commit when file would be overwritten.

diff --combined Documentation/config.txt
index 35e72e4a380496b20d4c606a69f8fa5ad2766b10,0b550dc4905a2deb54c1f4756fa975039c6a3570..35e26972e9da3951be99bbcd175fd57cd70651be
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -126,6 -126,10 +126,10 @@@ advice.*:
                Directions on how to stage/unstage/add shown in the
                output of linkgit:git-status[1] and the template shown
                when writing commit messages. Default: true.
+       commitBeforeMerge::
+               Advice shown when linkgit:git-merge[1] refuses to
+               merge to avoid overwritting local changes.
+               Default: true.
  --
  
  core.fileMode::
@@@ -169,10 -173,9 +173,10 @@@ core.autocrlf:
        writing to the filesystem.  The variable can be set to
        'input', in which case the conversion happens only while
        reading from the filesystem but files are written out with
 -      `LF` at the end of lines.  Currently, which paths to consider
 -      "text" (i.e. be subjected to the autocrlf mechanism) is
 -      decided purely based on the contents.
 +      `LF` at the end of lines.  A file is considered
 +      "text" (i.e. be subjected to the autocrlf mechanism) based on
 +      the file's `crlf` attribute, or if `crlf` is unspecified,
 +      based on the file's contents.  See linkgit:gitattributes[5].
  
  core.safecrlf::
        If true, makes git check if converting `CRLF` as controlled by
@@@ -381,9 -384,8 +385,9 @@@ Common unit suffixes of 'k', 'm', or 'g
  core.excludesfile::
        In addition to '.gitignore' (per-directory) and
        '.git/info/exclude', git looks into this file for patterns
 -      of files which are not meant to be tracked.  See
 -      linkgit:gitignore[5].
 +      of files which are not meant to be tracked.  "{tilde}/" is expanded
 +      to the value of `$HOME` and "{tilde}user/" to the specified user's
 +      home directory.  See linkgit:gitignore[5].
  
  core.editor::
        Commands such as `commit` and `tag` that lets you edit
@@@ -418,17 -420,13 +422,17 @@@ core.whitespace:
        consider them as errors.  You can prefix `-` to disable
        any of them (e.g. `-trailing-space`):
  +
 -* `trailing-space` treats trailing whitespaces at the end of the line
 +* `blank-at-eol` treats trailing whitespaces at the end of the line
    as an error (enabled by default).
  * `space-before-tab` treats a space character that appears immediately
    before a tab character in the initial indent part of the line as an
    error (enabled by default).
  * `indent-with-non-tab` treats a line that is indented with 8 or more
    space characters as an error (not enabled by default).
 +* `blank-at-eof` treats blank lines added at the end of file as an error
 +  (enabled by default).
 +* `trailing-space` is a short-hand to cover both `blank-at-eol` and
 +  `blank-at-eof`.
  * `cr-at-eol` treats a carriage-return at the end of line as
    part of the line terminator, i.e. with it, `trailing-space`
    does not trigger if the character before such a carriage-return
@@@ -672,8 -670,6 +676,8 @@@ color.ui:
  
  commit.template::
        Specify a file to use as the template for new commit messages.
 +      "{tilde}/" is expanded to the value of `$HOME` and "{tilde}user/" to the
 +      specified user's home directory.
  
  diff.autorefreshindex::
        When using 'git-diff' to compare with work tree
@@@ -1328,11 -1324,6 +1332,11 @@@ rebase.stat:
        Whether to show a diffstat of what changed upstream since the last
        rebase. False by default.
  
 +receive.autogc::
 +      By default, git-receive-pack will run "git-gc --auto" after
 +      receiving data from git-push and updating refs.  You can stop
 +      it by setting this variable to false.
 +
  receive.fsckObjects::
        If it is set to true, git-receive-pack will check all received
        objects. It will abort in the case of a malformed object or a
@@@ -1368,10 -1359,6 +1372,10 @@@ receive.denyNonFastForwards:
        even if that push is forced. This configuration variable is
        set when initializing a shared repository.
  
 +receive.updateserverinfo::
 +      If set to true, git-receive-pack will run git-update-server-info
 +      after receiving data from git-push and updating refs.
 +
  remote.<name>.url::
        The URL of a remote repository.  See linkgit:git-fetch[1] or
        linkgit:git-push[1].