mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i18n: merge-base: mark parseopt strings for translation

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2012-08-20 19:32:22 +07:00
committed by Junio C Hamano
parent 373f922174
commit f037dbf49c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
builtin/merge-base.c
View File

@ -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[] = { static const char * const merge_base_usage[] = {
"git merge-base [-a|--all] <commit> <commit>...", N_("git merge-base [-a|--all] <commit> <commit>..."),
"git merge-base [-a|--all] --octopus <commit>...", N_("git merge-base [-a|--all] --octopus <commit>..."),
"git merge-base --independent <commit>...", N_("git merge-base --independent <commit>..."),
NULL NULL
}; };
@ -79,9 +79,9 @@ int cmd_merge_base(int argc, const char **argv, const char *prefix)
int reduce = 0; int reduce = 0;
struct option options[] = { struct option options[] = {
OPT_BOOLEAN('a', "all", &show_all, "output all common ancestors"), OPT_BOOLEAN('a', "all", &show_all, N_("output all common ancestors")),
OPT_BOOLEAN(0, "octopus", &octopus, "find ancestors for a single n-way merge"), OPT_BOOLEAN(0, "octopus", &octopus, N_("find ancestors for a single n-way merge")),
OPT_BOOLEAN(0, "independent", &reduce, "list revs not reachable from others"), OPT_BOOLEAN(0, "independent", &reduce, N_("list revs not reachable from others")),
OPT_END() OPT_END()
}; };