summaryrefslogtreecommitdiff
path: root/revision.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-21 22:57:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-21 22:57:41 (GMT)
commit7dccadf363f9d9ff564ad34117266b2d557a2bc8 (patch)
tree8c2eede9c5628b6c8f0fdcb3e756e204c49dea9e /revision.c
parent66b2ed09c2f0f212c5cd5c095c1f1052ecbb9491 (diff)
downloadgit-7dccadf363f9d9ff564ad34117266b2d557a2bc8.zip
git-7dccadf363f9d9ff564ad34117266b2d557a2bc8.tar.gz
git-7dccadf363f9d9ff564ad34117266b2d557a2bc8.tar.bz2
Fix "log --oneline" not to show notes
This option should be treated pretty much the same as --format="%h %s". Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'revision.c')
-rw-r--r--revision.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/revision.c b/revision.c
index 0de78fb..34f9ab9 100644
--- a/revision.c
+++ b/revision.c
@@ -1176,6 +1176,7 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
} 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;