X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=revision.c;h=34f9ab98d1872770ef4d54014c31ece6eb7c8c39;hb=ef0065034a68edfc0ffed9965bb895073ad710db;hp=a8a3c3a4bdf5bd9287cb820330e73e8c28b88564;hpb=7d0dafe3945408aeef9c2e5256ac926976170e54;p=git.git diff --git a/revision.c b/revision.c index a8a3c3a4b..34f9ab98d 100644 --- a/revision.c +++ b/revision.c @@ -1161,13 +1161,22 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg revs->verbose_header = 1; } else if (!strcmp(arg, "--pretty")) { revs->verbose_header = 1; + revs->pretty_given = 1; get_commit_format(arg+8, revs); } else if (!prefixcmp(arg, "--pretty=") || !prefixcmp(arg, "--format=")) { revs->verbose_header = 1; + revs->pretty_given = 1; get_commit_format(arg+9, revs); + } else if (!strcmp(arg, "--show-notes")) { + revs->show_notes = 1; + revs->show_notes_given = 1; + } else if (!strcmp(arg, "--no-notes")) { + revs->show_notes = 0; + revs->show_notes_given = 1; } else if (!strcmp(arg, "--oneline")) { revs->verbose_header = 1; get_commit_format("oneline", revs); + revs->pretty_given = 1; revs->abbrev_commit = 1; } else if (!strcmp(arg, "--graph")) { revs->topo_order = 1;