summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Rast <trast@inf.ethz.ch>2013-07-18 12:26:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-07-18 17:57:01 (GMT)
commit465cf8ce453dc3e266171ece2ea886acd8c7d714 (patch)
tree12bc4c5e36c558ed085a793a5d1e30a21ca14c50
parent42063f95a0f285382458f357bd256df252000ef1 (diff)
downloadgit-465cf8ce453dc3e266171ece2ea886acd8c7d714.zip
git-465cf8ce453dc3e266171ece2ea886acd8c7d714.tar.gz
git-465cf8ce453dc3e266171ece2ea886acd8c7d714.tar.bz2
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 <jrnieder@gmail.com> Signed-off-by: Thomas Rast <trast@inf.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/show-branch.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index 90fc6b1..427aa39 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>[,<base>]"),
N_("show <n> most recent ref-log entries starting at "
"base"),