|
|
|
@ -35,7 +35,7 @@ static const char * const builtin_commit_usage[] = {
@@ -35,7 +35,7 @@ static const char * const builtin_commit_usage[] = {
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
static const char * const builtin_status_usage[] = { |
|
|
|
|
"git status [options] [--] <filepattern>...", |
|
|
|
|
N_("git status [options] [--] <filepattern>..."), |
|
|
|
|
NULL |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
@ -1169,24 +1169,24 @@ int cmd_status(int argc, const char **argv, const char *prefix)
@@ -1169,24 +1169,24 @@ int cmd_status(int argc, const char **argv, const char *prefix)
|
|
|
|
|
int fd; |
|
|
|
|
unsigned char sha1[20]; |
|
|
|
|
static struct option builtin_status_options[] = { |
|
|
|
|
OPT__VERBOSE(&verbose, "be verbose"), |
|
|
|
|
OPT__VERBOSE(&verbose, N_("be verbose")), |
|
|
|
|
OPT_SET_INT('s', "short", &status_format, |
|
|
|
|
"show status concisely", STATUS_FORMAT_SHORT), |
|
|
|
|
N_("show status concisely"), STATUS_FORMAT_SHORT), |
|
|
|
|
OPT_BOOLEAN('b', "branch", &s.show_branch, |
|
|
|
|
"show branch information"), |
|
|
|
|
N_("show branch information")), |
|
|
|
|
OPT_SET_INT(0, "porcelain", &status_format, |
|
|
|
|
"machine-readable output", |
|
|
|
|
N_("machine-readable output"), |
|
|
|
|
STATUS_FORMAT_PORCELAIN), |
|
|
|
|
OPT_BOOLEAN('z', "null", &s.null_termination, |
|
|
|
|
"terminate entries with NUL"), |
|
|
|
|
N_("terminate entries with NUL")), |
|
|
|
|
{ OPTION_STRING, 'u', "untracked-files", &untracked_files_arg, |
|
|
|
|
"mode", |
|
|
|
|
"show untracked files, optional modes: all, normal, no. (Default: all)", |
|
|
|
|
N_("mode"), |
|
|
|
|
N_("show untracked files, optional modes: all, normal, no. (Default: all)"), |
|
|
|
|
PARSE_OPT_OPTARG, NULL, (intptr_t)"all" }, |
|
|
|
|
OPT_BOOLEAN(0, "ignored", &show_ignored_in_status, |
|
|
|
|
"show ignored files"), |
|
|
|
|
{ OPTION_STRING, 0, "ignore-submodules", &ignore_submodule_arg, "when", |
|
|
|
|
"ignore changes to submodules, optional when: all, dirty, untracked. (Default: all)", |
|
|
|
|
N_("show ignored files")), |
|
|
|
|
{ OPTION_STRING, 0, "ignore-submodules", &ignore_submodule_arg, N_("when"), |
|
|
|
|
N_("ignore changes to submodules, optional when: all, dirty, untracked. (Default: all)"), |
|
|
|
|
PARSE_OPT_OPTARG, NULL, (intptr_t)"all" }, |
|
|
|
|
OPT_COLUMN(0, "column", &s.colopts, N_("list untracked files in columns")), |
|
|
|
|
OPT_END(), |
|
|
|
|