summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
diff options
context:
space:
mode:
authorAlex Henrie <alexhenrie24@gmail.com>2015-01-13 07:44:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-01-14 17:32:04 (GMT)
commit9c9b4f2f8b7f27f3984e80d053106d5d41cbb03b (patch)
tree635c9244cd702da3188103e55bd969c68c8b5f63 /builtin/merge-file.c
parentaddfb21a94fb4e6b9d07b270f7bb3748767a8f38 (diff)
downloadgit-9c9b4f2f8b7f27f3984e80d053106d5d41cbb03b.zip
git-9c9b4f2f8b7f27f3984e80d053106d5d41cbb03b.tar.gz
git-9c9b4f2f8b7f27f3984e80d053106d5d41cbb03b.tar.bz2
standardize usage info string format
This patch puts the usage info strings that were not already in docopt- like format into docopt-like format, which will be a litle easier for end users and a lot easier for translators. Changes include: - Placing angle brackets around fill-in-the-blank parameters - Putting dashes in multiword parameter names - Adding spaces to [-f|--foobar] to make [-f | --foobar] - Replacing <foobar>* with [<foobar>...] Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-file.c')
-rw-r--r--builtin/merge-file.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/merge-file.c b/builtin/merge-file.c
index 844f84f..131edc2 100644
--- a/builtin/merge-file.c
+++ b/builtin/merge-file.c
@@ -5,7 +5,7 @@
#include "parse-options.h"
static const char *const merge_file_usage[] = {
- N_("git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file file2"),
+ N_("git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> <orig-file> <file2>"),
NULL
};
@@ -42,7 +42,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
N_("for conflicts, use this marker size")),
OPT__QUIET(&quiet, N_("do not warn about conflicts")),
OPT_CALLBACK('L', NULL, names, N_("name"),
- N_("set labels for file1/orig_file/file2"), &label_cb),
+ N_("set labels for file1/orig-file/file2"), &label_cb),
OPT_END(),
};