summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d3e1ddf)
raw | patch | inline | side by side (parent: d3e1ddf)
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | |
Sun, 10 Apr 2011 19:34:07 +0000 (19:34 +0000) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 12 Apr 2011 07:12:53 +0000 (00:12 -0700) |
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>
--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>
builtin/checkout.c | patch | blob | history |
diff --git a/builtin/checkout.c b/builtin/checkout.c
index eece5d6ac0f48ae76dc76c0f2ebda633cc0ded58..0b65edde264c629c905e461902b99972051359d5 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
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) {
}
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."));