From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Jul 2013 18:23:30 +0000 (-0700)
Subject: Merge branch 'tr/do-not-call-submodules-subprojects'
X-Git-Tag: v1.8.4-rc0~31
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4ca8ae712c1bf73bf41247aed119a44acc01de03

Merge branch 'tr/do-not-call-submodules-subprojects'

* tr/do-not-call-submodules-subprojects:
show-branch: fix description of --date-order
apply, entry: speak of submodules instead of subprojects
---

4ca8ae712c1bf73bf41247aed119a44acc01de03
diff --cc builtin/show-branch.c
index 99ec4af224,427aa39b1b..9788eb115b
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@@ -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"),