Skip to content

Commit

Permalink
i18n: mark checkout --detach messages for translation
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ævar Arnfjörð Bjarmason authored and Junio C Hamano committed Apr 12, 2011
1 parent d3e1ddf commit 20fc73e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions builtin/checkout.c
Original file line number Diff line number Diff line change
Expand Up @@ -961,9 +961,9 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
die (_("--patch is incompatible with all other options"));

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)
die("--detach cannot be used with -t");
die(_("--detach cannot be used with -t"));

/* --track without -b should DWIM */
if (0 < opts.track && !opts.new_branch) {
Expand Down Expand Up @@ -1043,7 +1043,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
}

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)
die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\nchecking out of the index."));
Expand Down

0 comments on commit 20fc73e

Please sign in to comment.