diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-05-21 18:44:03 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-05-21 11:57:16 -0700 |
| commit | b9b9c22f6db3e3c089098ba04fbc885e2cb4f4dd (patch) | |
| tree | 21e698dfd7cc58dbdf333e607cb0629b7c15b891 /Documentation/git-merge.txt | |
| parent | i18n: git-submodule $update_module say + die messages (diff) | |
| download | tgif-b9b9c22f6db3e3c089098ba04fbc885e2cb4f4dd.tar.xz | |
i18n: git-submodule "cached cannot be used" message
Gettextize the "--cached cannot be used with --files" message. Since
this message starts with "--" we have to pass "--" as the first
argument. This works with both GNU gettext 0.18.1 (as expected), and
the gettext(1) on Solaris 10.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions