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 --cc Documentation/config.txt
Simple merge

diff --cc 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 --cc 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, ...);