Merge branch 'gr/rebase-i-drop-warn' into maint

diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index c0b4b53652a39049ec06ba69f2dfc50a8c0873f7..d80d1ed35944144aa0aeeeb1b0e08c9efdec6523 100644 (file)
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -350,6 +350,9 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
            revs.diff)
                usage(rev_list_usage);
 
+       if (revs.show_notes)
+               die(_("rev-list does not support display of notes"));
+
        save_commit_buffer = (revs.verbose_header ||
                              revs.grep_filter.pattern_list ||
                              revs.grep_filter.header_list);