Merge branch 'ss/pull-rebase-preserve'

diff --git a/revision.c b/revision.c
index 66520c671ee1141b1c0edb7ab776dd9d9df04726..6399a0412cc9005875e282a139200a4f918743f5 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -2339,9 +2339,14 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
 
        if (revs->reflog_info && revs->graph)
                die("cannot combine --walk-reflogs with --graph");
+       if (revs->no_walk && revs->graph)
+               die("cannot combine --no-walk with --graph");
        if (!revs->reflog_info && revs->grep_filter.use_reflog_filter)
                die("cannot use --grep-reflog without --walk-reflogs");
 
+       if (revs->first_parent_only && revs->bisect)
+               die(_("--first-parent is incompatible with --bisect"));
+
        return left;
 }