diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-22 18:23:30 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-22 18:23:30 (GMT) |
| commit | 4ca8ae712c1bf73bf41247aed119a44acc01de03 (patch) | |
| tree | a31a86941bf1d33c3230bf299fe5458d3f6c0515 /builtin | |
| parent | e2ecd252b5e3c90c211075ba9d1017379782708b (diff) | |
| parent | 465cf8ce453dc3e266171ece2ea886acd8c7d714 (diff) | |
| download | git-4ca8ae712c1bf73bf41247aed119a44acc01de03.zip git-4ca8ae712c1bf73bf41247aed119a44acc01de03.tar.gz git-4ca8ae712c1bf73bf41247aed119a44acc01de03.tar.bz2 | |
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
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/apply.c | 2 | ||||
| -rw-r--r-- | builtin/show-branch.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/builtin/apply.c b/builtin/apply.c index ff01ebf..240a05c 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -3847,7 +3847,7 @@ static void add_index_file(const char *path, unsigned mode, void *buf, unsigned const char *s = buf; if (get_sha1_hex(s + strlen("Subproject commit "), ce->sha1)) - die(_("corrupt patch for subproject %s"), path); + die(_("corrupt patch for submodule %s"), path); } else { if (!cached) { if (lstat(path, &st) < 0) diff --git a/builtin/show-branch.c b/builtin/show-branch.c index 99ec4af..9788eb1 100644 --- a/builtin/show-branch.c +++ b/builtin/show-branch.c @@ -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 " |