From: Nguyễn Thái Ngọc Duy Date: Mon, 20 Aug 2012 12:32:55 +0000 (+0700) Subject: Use imperative form in help usage to describe an action X-Git-Tag: v1.8.0-rc0~95^2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f63cf8c9fbcd86e8ca3bb78917dc280747bb34a8;p=git.git Use imperative form in help usage to describe an action Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- diff --git a/builtin/apply.c b/builtin/apply.c index d453c8337..0ab81e343 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -4297,7 +4297,7 @@ int cmd_apply(int argc, const char **argv, const char *prefix_) OPT_NOOP_NOARG(0, "allow-binary-replacement"), OPT_NOOP_NOARG(0, "binary"), OPT_BOOLEAN(0, "numstat", &numstat, - N_("shows number of added and deleted lines in decimal notation")), + N_("show number of added and deleted lines in decimal notation")), OPT_BOOLEAN(0, "summary", &summary, N_("instead of applying the patch, output a summary for the input")), OPT_BOOLEAN(0, "check", &check, diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c index 86b7d36c2..b1feda7d5 100644 --- a/builtin/checkout-index.c +++ b/builtin/checkout-index.c @@ -184,8 +184,8 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix) int force = 0, quiet = 0, not_new = 0; struct option builtin_checkout_index_options[] = { OPT_BOOLEAN('a', "all", &all, - N_("checks out all files in the index")), - OPT__FORCE(&force, N_("forces overwrite of existing files")), + N_("check out all files in the index")), + OPT__FORCE(&force, N_("force overwrite of existing files")), OPT__QUIET(&quiet, N_("no warning for existing files and files not in index")), OPT_BOOLEAN('n', "no-create", ¬_new, diff --git a/builtin/config.c b/builtin/config.c index 41032ccc8..31e135493 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -59,13 +59,13 @@ static struct option builtin_config_options[] = { OPT_BIT(0, "get-all", &actions, N_("get all values: key [value-regex]"), ACTION_GET_ALL), OPT_BIT(0, "get-regexp", &actions, N_("get values for regexp: name-regex [value-regex]"), ACTION_GET_REGEXP), OPT_BIT(0, "replace-all", &actions, N_("replace all matching variables: name value [value_regex]"), ACTION_REPLACE_ALL), - OPT_BIT(0, "add", &actions, N_("adds a new variable: name value"), ACTION_ADD), - OPT_BIT(0, "unset", &actions, N_("removes a variable: name [value-regex]"), ACTION_UNSET), - OPT_BIT(0, "unset-all", &actions, N_("removes all matches: name [value-regex]"), ACTION_UNSET_ALL), + OPT_BIT(0, "add", &actions, N_("add a new variable: name value"), ACTION_ADD), + OPT_BIT(0, "unset", &actions, N_("remove a variable: name [value-regex]"), ACTION_UNSET), + OPT_BIT(0, "unset-all", &actions, N_("remove all matches: name [value-regex]"), ACTION_UNSET_ALL), OPT_BIT(0, "rename-section", &actions, N_("rename section: old-name new-name"), ACTION_RENAME_SECTION), OPT_BIT(0, "remove-section", &actions, N_("remove a section: name"), ACTION_REMOVE_SECTION), OPT_BIT('l', "list", &actions, N_("list all"), ACTION_LIST), - OPT_BIT('e', "edit", &actions, N_("opens an editor"), ACTION_EDIT), + OPT_BIT('e', "edit", &actions, N_("open an editor"), ACTION_EDIT), OPT_STRING(0, "get-color", &get_color_slot, N_("slot"), N_("find the color configured: [default]")), OPT_STRING(0, "get-colorbool", &get_colorbool_slot, N_("slot"), N_("find the color setting: [stdout-is-tty]")), OPT_GROUP(N_("Type")), diff --git a/builtin/grep.c b/builtin/grep.c index d73841c65..c9a65b372 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -682,7 +682,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix) OPT_BOOLEAN(0, "cached", &cached, N_("search in index instead of in the work tree")), OPT_NEGBIT(0, "no-index", &use_index, - N_("finds in contents not managed by git"), 1), + N_("find in contents not managed by git"), 1), OPT_BOOLEAN(0, "untracked", &untracked, N_("search in both tracked and untracked files")), OPT_SET_INT(0, "exclude-standard", &opt_exclude, diff --git a/builtin/push.c b/builtin/push.c index 4840bc2a8..8686a7a77 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -364,7 +364,7 @@ int cmd_push(int argc, const char **argv, const char *prefix) OPT_BIT( 0, "porcelain", &flags, N_("machine-readable output"), TRANSPORT_PUSH_PORCELAIN), OPT_BIT('f', "force", &flags, N_("force updates"), TRANSPORT_PUSH_FORCE), { OPTION_CALLBACK, 0, "recurse-submodules", &flags, N_("check"), - N_("controls recursive pushing of submodules"), + N_("control recursive pushing of submodules"), PARSE_OPT_OPTARG, option_parse_recurse_submodules }, OPT_BOOLEAN( 0 , "thin", &thin, N_("use thin pack")), OPT_STRING( 0 , "receive-pack", &receivepack, "receive-pack", N_("receive pack program")), diff --git a/builtin/update-ref.c b/builtin/update-ref.c index b30394ff6..51d268485 100644 --- a/builtin/update-ref.c +++ b/builtin/update-ref.c @@ -16,7 +16,7 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix) int delete = 0, no_deref = 0, flags = 0; struct option options[] = { OPT_STRING( 'm', NULL, &msg, N_("reason"), N_("reason of the update")), - OPT_BOOLEAN('d', NULL, &delete, N_("deletes the reference")), + OPT_BOOLEAN('d', NULL, &delete, N_("delete the reference")), OPT_BOOLEAN( 0 , "no-deref", &no_deref, N_("update not the one it points to")), OPT_END(),