git-reset to remove "$GIT_DIR/MERGE_MSG"

diff --git a/builtin-rev-list.c b/builtin-rev-list.c
index 1f3333da38c77a07840a8dfad052c301dbae9392..fb7fc92145b6a8baec340176abf40c6b37f45a8e 100644 (file)
--- a/builtin-rev-list.c
+++ b/builtin-rev-list.c
@@ -269,7 +269,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
            revs.diff)
                usage(rev_list_usage);
 
-       save_commit_buffer = revs.verbose_header;
+       save_commit_buffer = revs.verbose_header || revs.grep_filter;
        track_object_refs = 0;
        if (bisect_list)
                revs.limited = 1;