diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-09-15 14:11:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-15 14:11:15 -0700 |
| commit | 4fa1251bc24e04dcc78bf93b9fd6344e6fd2a114 (patch) | |
| tree | a88a42952681e906dddbc54abbb5791a4c62988f /unpack-trees.c | |
| parent | 581c08e8020db08140bb0e26a3ade1db0aba5fbb (diff) | |
| parent | a1c8044662947caeefc9d8f5c31dc77548d81cb4 (diff) | |
| download | git-4fa1251bc24e04dcc78bf93b9fd6344e6fd2a114.tar.gz | |
Merge branch 'ah/misc-message-fixes'
Message cleanup.
* ah/misc-message-fixes:
unpack-trees: do not capitalize "working"
git-merge-octopus: do not capitalize "octopus"
git-rebase--interactive: fix English grammar
cat-file: put spaces around pipes in usage string
am: put spaces around pipe in usage string
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index 11c37fbc58..c87a90a08d 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -123,9 +123,9 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, msgs[ERROR_SPARSE_NOT_UPTODATE_FILE] = _("Cannot update sparse checkout: the following entries are not up-to-date:\n%s"); msgs[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN] = - _("The following Working tree files would be overwritten by sparse checkout update:\n%s"); + _("The following working tree files would be overwritten by sparse checkout update:\n%s"); msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] = - _("The following Working tree files would be removed by sparse checkout update:\n%s"); + _("The following working tree files would be removed by sparse checkout update:\n%s"); opts->show_all_errors = 1; /* rejected paths may not have a static buffer */ |