Merge branch 'mm/rm-coalesce-errors'

Give a single message followed by list of paths from "git rm" to
report multiple paths that cannot be removed.

* mm/rm-coalesce-errors:
rm: introduce advice.rmHints to shorten messages
rm: better error message on failure for multiple files

diff --combined Documentation/config.txt
index 311fcebaf51034a0788df971749fe80dbc3c8782,eb044798042000758b733cc713dc3d638dff20e1..1153585aa2e2d19dd41f8cf81465e8b6d858a028
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -199,6 -199,9 +199,9 @@@ advice.*:
        amWorkDir::
                Advice that shows the location of the patch file when
                linkgit:git-am[1] fails to apply it.
+       rmHints::
+               In case of failure in the output of linkgit:git-rm[1],
+               show directions on how to proceed from the current state.
  --
  
  core.fileMode::
@@@ -919,12 -922,11 +922,12 @@@ color.ui:
        as `color.diff` and `color.grep` that control the use of color
        per command family. Its scope will expand as more commands learn
        configuration to set a default for the `--color` option.  Set it
 -      to `always` if you want all output not intended for machine
 -      consumption to use color, to `true` or `auto` if you want such
 -      output to use color when written to the terminal, or to `false` or
 -      `never` if you prefer Git commands not to use color unless enabled
 -      explicitly with some other configuration or the `--color` option.
 +      to `false` or `never` if you prefer Git commands not to use
 +      color unless enabled explicitly with some other configuration
 +      or the `--color` option. Set it to `always` if you want all
 +      output not intended for machine consumption to use color, to
 +      `true` or `auto` (this is the default since Git 1.8.4) if you
 +      want such output to use color when written to the terminal.
  
  column.ui::
        Specify whether supported commands should output in columns.
@@@ -1868,14 -1870,6 +1871,14 @@@ rebase.stat:
  rebase.autosquash::
        If set to true enable '--autosquash' option by default.
  
 +rebase.autostash::
 +      When set to true, automatically create a temporary stash
 +      before the operation begins, and apply it after the operation
 +      ends.  This means that you can run rebase on a dirty worktree.
 +      However, use with care: the final stash application after a
 +      successful rebase might result in non-trivial conflicts.
 +      Defaults to false.
 +
  receive.autogc::
        By default, git-receive-pack will run "git-gc --auto" after
        receiving data from git-push and updating refs.  You can stop

diff --combined advice.c
index 54315cbd0a554bdeb1ace160a5df7cf6c485e559,a4c169ca382bd8265965f8fab6a961ffa8e7dcd2..2a52098a29dd1c2192edb6fff8ca6979383e77c6
--- 1/advice.c
--- 2/advice.c
+++ b/advice.c
@@@ -14,7 -14,7 +14,8 @@@ int advice_resolve_conflict = 1
  int advice_implicit_identity = 1;
  int advice_detached_head = 1;
  int advice_set_upstream_failure = 1;
 +int advice_object_name_warning = 1;
+ int advice_rm_hints = 1;
  
  static struct {
        const char *name;
@@@ -34,7 -34,7 +35,8 @@@
        { "implicitidentity", &advice_implicit_identity },
        { "detachedhead", &advice_detached_head },
        { "setupstreamfailure", &advice_set_upstream_failure },
 +      { "object_name_warning", &advice_object_name_warning },
+       { "rmhints", &advice_rm_hints },
  
        /* make this an alias for backward compatibility */
        { "pushnonfastforward", &advice_push_update_rejected }

diff --combined advice.h
index fefe39ac5caf5a1e8b95683a4c8dcc443df16d32,36104c477681436493c7f4c1b2fdc27136d1c0f6..93a7d110ea94b055476644fd5ecbec43bb0aaf92
--- 1/advice.h
--- 2/advice.h
+++ b/advice.h
@@@ -17,7 -17,7 +17,8 @@@ extern int advice_resolve_conflict
  extern int advice_implicit_identity;
  extern int advice_detached_head;
  extern int advice_set_upstream_failure;
 +extern int advice_object_name_warning;
+ extern int advice_rm_hints;
  
  int git_default_advice_config(const char *var, const char *value);
  void advise(const char *advice, ...);