summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-11-24 23:55:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-11-24 23:55:19 (GMT)
commit20f84c8f56519b49fa91bb6cef8f8978c2ab4e09 (patch)
tree506b6dc0c798465251dc065479158b045239a106 /builtin/merge-file.c
parentcbcf0a6981687b31635d806f45e77188c54b7cfc (diff)
parent6e565345e87cf9b8da093e11492fe3a025007230 (diff)
downloadgit-20f84c8f56519b49fa91bb6cef8f8978c2ab4e09.zip
git-20f84c8f56519b49fa91bb6cef8f8978c2ab4e09.tar.gz
git-20f84c8f56519b49fa91bb6cef8f8978c2ab4e09.tar.bz2
Merge branch 'rs/opt-help-text'
* rs/opt-help-text: verify-tag: document --verbose branch: improve --verbose description archive: improve --verbose description Describe various forms of "be quiet" using OPT__QUIET add OPT__FORCE add description parameter to OPT__QUIET add description parameter to OPT__DRY_RUN add description parameter to OPT__VERBOSE
Diffstat (limited to 'builtin/merge-file.c')
-rw-r--r--builtin/merge-file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge-file.c b/builtin/merge-file.c
index 6c4afb5..237abd3 100644
--- a/builtin/merge-file.c
+++ b/builtin/merge-file.c
@@ -40,7 +40,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
XDL_MERGE_FAVOR_UNION),
OPT_INTEGER(0, "marker-size", &xmp.marker_size,
"for conflicts, use this marker size"),
- OPT__QUIET(&quiet),
+ OPT__QUIET(&quiet, "do not warn about conflicts"),
OPT_CALLBACK('L', NULL, names, "name",
"set labels for file1/orig_file/file2", &label_cb),
OPT_END(),