Merge branch 'tr/do-not-call-submodules-subprojects'
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Jul 2013 18:23:30 +0000 (11:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Jul 2013 18:23:30 +0000 (11:23 -0700)
* tr/do-not-call-submodules-subprojects:
  show-branch: fix description of --date-order
  apply, entry: speak of submodules instead of subprojects

1  2 
builtin/apply.c
builtin/show-branch.c

diff --cc builtin/apply.c
Simple merge
@@@ -673,9 -672,8 +673,9 @@@ int cmd_show_branch(int ac, const char 
                OPT_SET_INT(0, "sparse", &dense,
                            N_("show merges reachable from only one tip"), 0),
                OPT_SET_INT(0, "date-order", &sort_order,
-                           N_("show commits where no parent comes before its "
-                              "children"),
+                           N_("topologically sort, maintaining date order "
 -                             "where possible"), 0),
++                             "where possible"),
 +                          REV_SORT_BY_COMMIT_DATE),
                { OPTION_CALLBACK, 'g', "reflog", &reflog_base, N_("<n>[,<base>]"),
                            N_("show <n> most recent ref-log entries starting at "
                               "base"),