|
1.
|
|
|
hint: %.*s
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
подсказка: %.*s
|
|
Translated and reviewed by
☠Jay ZDLin☠
|
|
|
|
Located in
advice.c:62
|
|
2.
|
|
|
Fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution and make a commit.
|
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
Исправьте их в рабочем каталоге, затем запустите «git add/rm <файл>»,
чтобы пометить исправление и сделайте коммит.
|
|
Translated by
Dimitriy Ryazantcev
|
|
|
|
Located in
advice.c:182
|
|
3.
|
|
|
You have not concluded your merge (MERGE_HEAD exists).
|
|
|
|
Вы не завершили слияние (присутствует файл MERGE_HEAD).
|
|
Translated by
Dimitriy Ryazantcev
|
|
|
|
Located in
advice.c:195 builtin/merge.c:1332
|
|
4.
|
|
|
Please, commit your changes before merging.
|
|
|
|
Перед слиянием, выполните коммит ваших изменений.
|
|
Translated by
Dimitriy Ryazantcev
|
|
|
|
Located in
advice.c:197
|
|
5.
|
|
|
Exiting because of unfinished merge.
|
|
|
|
Выход из-за незавершенного слияния.
|
|
Translated by
Dimitriy Ryazantcev
|
|
|
|
Located in
advice.c:198
|
|
6.
|
|
|
git archive [<options>] <tree-ish> [<path>...]
|
|
|
|
git archive [<опции>] <указатель-дерева> [<путь>…]
|
|
Translated by
Dimitriy Ryazantcev
|
|
|
|
Located in
archive.c:14
|
|
7.
|
|
|
git archive --list
|
|
|
|
git archive --list
|
|
Translated by
Aleksey Kabanov
|
|
|
|
Located in
archive.c:15
|
|
8.
|
|
|
git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]
|
|
|
|
git archive --remote <репозиторий> [--exec <команда>] [<опции>] <указатель-дерева> [<путь>…]
|
|
Translated by
Dimitriy Ryazantcev
|
|
|
|
Located in
archive.c:16
|
|
9.
|
|
|
git archive --remote <repo> [--exec <cmd>] --list
|
|
|
|
git archive --remote <репозиторий> [--exec <команда>] --list
|
|
Translated by
Dimitriy Ryazantcev
|
|
|
|
Located in
archive.c:17
|
|
10.
|
|
|
pathspec '%s ' did not match any files
|
|
|
|
спецификатор пути «%s » не соответствует ни одному файлу
|
|
Translated by
Dimitriy Ryazantcev
|
|
|
|
Located in
archive.c:372 builtin/add.c:180 builtin/add.c:555 builtin/rm.c:299
|