undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i18n: mark checkout --detach messages for translation

Browse Source 
Mark messages added in v1.7.5-rc0~117^2~2 (checkout: introduce
--detach synonym for "git checkout foo^{commit}") by Junio C Hamano
for translation.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2011-04-10 19:34:07 +00:00 committed by Junio C Hamano
parent d3e1ddfd39
commit 20fc73e3b0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/checkout.c
View File

@ -961,9 +961,9 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
die (_("--patch is incompatible with all other options")); die (_("--patch is incompatible with all other options"));
if (opts.force_detach && (opts.new_branch || opts.new_orphan_branch)) if (opts.force_detach && (opts.new_branch || opts.new_orphan_branch))
die("--detach cannot be used with -b/-B/--orphan"); die(_("--detach cannot be used with -b/-B/--orphan"));
if (opts.force_detach && 0 < opts.track) if (opts.force_detach && 0 < opts.track)
die("--detach cannot be used with -t"); die(_("--detach cannot be used with -t"));
/* --track without -b should DWIM */ /* --track without -b should DWIM */
if (0 < opts.track && !opts.new_branch) { if (0 < opts.track && !opts.new_branch) {
@ -1043,7 +1043,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
} }
if (opts.force_detach) if (opts.force_detach)
die("git checkout: --detach does not take a path argument"); die(_("git checkout: --detach does not take a path argument"));
if (1 < !!opts.writeout_stage + !!opts.force + !!opts.merge) if (1 < !!opts.writeout_stage + !!opts.force + !!opts.merge)
die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\nchecking out of the index.")); die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\nchecking out of the index."));