diff options
| author | René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2010-11-08 18:06:54 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-15 17:58:13 (GMT) |
| commit | d52ee6e6131f65bb4360743ebea2e7b400b544e4 (patch) | |
| tree | e91aa57d99acb554c2fd7e48e70a886e2fd216a4 /builtin/merge-file.c | |
| parent | e21adb8c100cd2859cff1d74f7d0e622ac640085 (diff) | |
| download | git-d52ee6e6131f65bb4360743ebea2e7b400b544e4.zip git-d52ee6e6131f65bb4360743ebea2e7b400b544e4.tar.gz git-d52ee6e6131f65bb4360743ebea2e7b400b544e4.tar.bz2 | |
add description parameter to OPT__QUIET
Allows better help text to be defined than "be quiet". Also make use
of the macro in a place that already had a different description. No
object code changes intended.
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-file.c')
| -rw-r--r-- | builtin/merge-file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge-file.c b/builtin/merge-file.c index b6664d4..58e4731 100644 --- a/builtin/merge-file.c +++ b/builtin/merge-file.c @@ -39,7 +39,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, "be quiet"), OPT_CALLBACK('L', NULL, names, "name", "set labels for file1/orig_file/file2", &label_cb), OPT_END(), |