From: Thomas Rast Date: Thu, 18 Jul 2013 12:26:56 +0000 (+0200) Subject: show-branch: fix description of --date-order X-Git-Tag: v1.8.4-rc0~31^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=465cf8ce453dc3e266171ece2ea886acd8c7d714;p=thirdparty%2Fgit.git show-branch: fix description of --date-order The existing description reads as if it somehow applies a filter. Change it to explain that it is merely about the ordering. Message-proposed-by: Jonathan Nieder Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano --- diff --git a/builtin/show-branch.c b/builtin/show-branch.c index 90fc6b1b9d..427aa39b1b 100644 --- a/builtin/show-branch.c +++ b/builtin/show-branch.c @@ -671,9 +671,9 @@ int cmd_show_branch(int ac, const char **av, const char *prefix) N_("show only commits not on the first branch")), OPT_SET_INT(0, "sparse", &dense, N_("show merges reachable from only one tip"), 0), - OPT_SET_INT(0, "date-order", &lifo, - N_("show commits where no parent comes before its " - "children"), 0), + OPT_SET_INT(0, "date-order", &sort_order, + N_("topologically sort, maintaining date order " + "where possible"), 0), { OPTION_CALLBACK, 'g', "reflog", &reflog_base, N_("[,]"), N_("show most recent ref-log entries starting at " "base"),