diff options
| author | Alex Henrie <alexhenrie24@gmail.com> | 2015-01-13 07:44:47 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-01-14 17:32:04 (GMT) |
| commit | 9c9b4f2f8b7f27f3984e80d053106d5d41cbb03b (patch) | |
| tree | 635c9244cd702da3188103e55bd969c68c8b5f63 /builtin/fmt-merge-msg.c | |
| parent | addfb21a94fb4e6b9d07b270f7bb3748767a8f38 (diff) | |
| download | git-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/fmt-merge-msg.c')
| -rw-r--r-- | builtin/fmt-merge-msg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c index af7919e..1d962dc 100644 --- a/builtin/fmt-merge-msg.c +++ b/builtin/fmt-merge-msg.c @@ -10,7 +10,7 @@ #include "gpg-interface.h" static const char * const fmt_merge_msg_usage[] = { - N_("git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"), + N_("git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"), NULL }; |