Merge branch 'rr/rebase-reflog-message-reword'

diff --git a/builtin/rm.c b/builtin/rm.c
index 5d0c0683dafd3db409b95df7f2291af947da3d2e..06025a2e751fbc2b2de3b024919c381cd2176c51 100644 (file)
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -51,7 +51,8 @@ static void print_error_files(struct string_list *files_list,
                        strbuf_addf(&err_msg,
                                    "\n    %s",
                                    files_list->items[i].string);
-               strbuf_addstr(&err_msg, hints_msg);
+               if (advice_rm_hints)
+                       strbuf_addstr(&err_msg, hints_msg);
                *errs = error("%s", err_msg.buf);
                strbuf_release(&err_msg);
        }