Signed-off-by: Nguyễn Thái Ngọc Duy <pclo...@gmail.com>
---
 builtin/merge-base.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/builtin/merge-base.c b/builtin/merge-base.c
index 4f30f1b..2f223a6 100644
--- a/builtin/merge-base.c
+++ b/builtin/merge-base.c
@@ -23,9 +23,9 @@ static int show_merge_base(struct commit **rev, int rev_nr, 
int show_all)
 }
 
 static const char * const merge_base_usage[] = {
-       "git merge-base [-a|--all] <commit> <commit>...",
-       "git merge-base [-a|--all] --octopus <commit>...",
-       "git merge-base --independent <commit>...",
+       N_("git merge-base [-a|--all] <commit> <commit>..."),
+       N_("git merge-base [-a|--all] --octopus <commit>..."),
+       N_("git merge-base --independent <commit>..."),
        NULL
 };
 
@@ -79,9 +79,9 @@ int cmd_merge_base(int argc, const char **argv, const char 
*prefix)
        int reduce = 0;
 
        struct option options[] = {
-               OPT_BOOLEAN('a', "all", &show_all, "output all common 
ancestors"),
-               OPT_BOOLEAN(0, "octopus", &octopus, "find ancestors for a 
single n-way merge"),
-               OPT_BOOLEAN(0, "independent", &reduce, "list revs not reachable 
from others"),
+               OPT_BOOLEAN('a', "all", &show_all, N_("output all common 
ancestors")),
+               OPT_BOOLEAN(0, "octopus", &octopus, N_("find ancestors for a 
single n-way merge")),
+               OPT_BOOLEAN(0, "independent", &reduce, N_("list revs not 
reachable from others")),
                OPT_END()
        };
 
-- 
1.7.12.rc2.18.g61b472e

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to