mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* tr/do-not-call-submodules-subprojects:
  show-branch: fix description of --date-order
  apply, entry: speak of submodules instead of subprojects
This commit is contained in:
Junio C Hamano
2013-07-22 11:23:30 -07:00
parent e2ecd252b5 465cf8ce45
commit 4ca8ae712c
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/show-branch.c
View File

@ -673,8 +673,8 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
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"),
REV_SORT_BY_COMMIT_DATE),
{ OPTION_CALLBACK, 'g', "reflog", &reflog_base, N_("<n>[,<base>]"),
N_("show <n> most recent ref-log entries starting at "