Describe various forms of "be quiet" using OPT__QUIET
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder committed
Nov 8, 2010 at 13:54 UTC
8c83968385e1e742e188435fd2fe5ebf57565e49
10 files changed
+14
-11
builtin/checkout-index.c
+2
-1
@@ -218,7 +218,8 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)
218
OPT_BOOLEAN('a', "all", &all,
219
"checks out all files in the index"),
220
OPT__FORCE(&force, "forces overwrite of existing files"),
221
- OPT__QUIET(&quiet, "be quiet"),
221
+ OPT__QUIET(&quiet,
222
+ "no warning for existing files and files not in index"),
223
OPT_BOOLEAN('n', "no-create", ¬_new,
224
"don't checkout new files"),
225
{ OPTION_CALLBACK, 'u', "index", &newfd, NULL,
builtin/checkout.c
+1
-1
@@ -686,7 +686,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
686
int patch_mode = 0;
687
int dwim_new_local_branch = 1;
688
struct option options[] = {
689
- OPT__QUIET(&opts.quiet, "be quiet"),
689
+ OPT__QUIET(&opts.quiet, "suppress progress reporting"),
690
OPT_STRING('b', NULL, &opts.new_branch, "branch",
691
"create and checkout a new branch"),
692
OPT_STRING('B', NULL, &opts.new_branch_force, "branch",
builtin/clean.c
+1
-1
@@ -48,7 +48,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
48
const char *qname;
49
char *seen = NULL;
50
struct option options[] = {
51
- OPT__QUIET(&quiet, "be quiet"),
51
+ OPT__QUIET(&quiet, "do not print names of files removed"),
52
OPT__DRY_RUN(&show_only, "dry run"),
53
OPT__FORCE(&force, "force"),
54
OPT_BOOLEAN('d', NULL, &remove_directories,
builtin/commit.c
+2
-2
@@ -114,8 +114,8 @@ static int opt_parse_m(const struct option *opt, const char *arg, int unset)
114
}
115
116
static struct option builtin_commit_options[] = {
117
- OPT__QUIET(&quiet, "be quiet"),
118
- OPT__VERBOSE(&verbose, "be verbose"),
117
+ OPT__QUIET(&quiet, "suppress summary after successful commit"),
118
+ OPT__VERBOSE(&verbose, "show diff in commit message template"),
119
120
OPT_GROUP("Commit message options"),
121
OPT_FILENAME('F', "file", &logfile, "read log from file"),
builtin/gc.c
+1
-1
@@ -180,7 +180,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
180
char buf[80];
181
182
struct option builtin_gc_options[] = {
183
- OPT__QUIET(&quiet, "be quiet"),
183
+ OPT__QUIET(&quiet, "suppress progress reporting"),
184
{ OPTION_STRING, 0, "prune", &prune_expire, "date",
185
"prune unreferenced objects",
186
PARSE_OPT_OPTARG, NULL, (intptr_t)prune_expire },
builtin/merge-file.c
+1
-1
@@ -39,7 +39,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
39
XDL_MERGE_FAVOR_UNION),
40
OPT_INTEGER(0, "marker-size", &xmp.marker_size,
41
"for conflicts, use this marker size"),
42
- OPT__QUIET(&quiet, "be quiet"),
42
+ OPT__QUIET(&quiet, "do not warn about conflicts"),
43
OPT_CALLBACK('L', NULL, names, "name",
44
"set labels for file1/orig_file/file2", &label_cb),
45
OPT_END(),
builtin/reset.c
+1
-1
@@ -243,7 +243,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
243
struct commit *commit;
244
char *reflog_action, msg[1024];
245
const struct option options[] = {
246
- OPT__QUIET(&quiet, "be quiet"),
246
+ OPT__QUIET(&quiet, "be quiet, only report errors"),
247
OPT_SET_INT(0, "mixed", &reset_type,
248
"reset HEAD and index", MIXED),
249
OPT_SET_INT(0, "soft", &reset_type, "reset only HEAD", SOFT),
builtin/rm.c
+1
-1
@@ -140,7 +140,7 @@ static int ignore_unmatch = 0;
140
141
static struct option builtin_rm_options[] = {
142
OPT__DRY_RUN(&show_only, "dry run"),
143
- OPT__QUIET(&quiet, "be quiet"),
143
+ OPT__QUIET(&quiet, "do not list removed files"),
144
OPT_BOOLEAN( 0 , "cached", &index_only, "only remove from the index"),
145
OPT__FORCE(&force, "override the up-to-date check"),
146
OPT_BOOLEAN('r', NULL, &recursive, "allow recursive removal"),
builtin/show-ref.c
+2
-1
@@ -193,7 +193,8 @@ static const struct option show_ref_options[] = {
193
"only show SHA1 hash using <n> digits",
194
PARSE_OPT_OPTARG, &hash_callback },
195
OPT__ABBREV(&abbrev),
196
- OPT__QUIET(&quiet, "be quiet"),
196
+ OPT__QUIET(&quiet,
197
+ "do not print results to stdout (useful with --verify)"),
198
{ OPTION_CALLBACK, 0, "exclude-existing", &exclude_existing_arg,
199
"pattern", "show refs from stdin that aren't in local repository",
200
PARSE_OPT_OPTARG | PARSE_OPT_NONEG, exclude_existing_callback },
builtin/symbolic-ref.c
+2
-1
@@ -30,7 +30,8 @@ int cmd_symbolic_ref(int argc, const char **argv, const char *prefix)
30
int quiet = 0;
31
const char *msg = NULL;
32
struct option options[] = {
33
- OPT__QUIET(&quiet, "be quiet"),
33
+ OPT__QUIET(&quiet,
34
+ "suppress error message for non-symbolic (detached) refs"),
35
OPT_STRING('m', NULL, &msg, "reason", "reason of the update"),
36
OPT_END(),
37
};