summaryrefslogtreecommitdiff
path: root/builtin/merge-base.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-base.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-base.c')
-rw-r--r--builtin/merge-base.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/merge-base.c b/builtin/merge-base.c
index fdebef6..08a8217 100644
--- a/builtin/merge-base.c
+++ b/builtin/merge-base.c
@@ -26,8 +26,8 @@ static int show_merge_base(struct commit **rev, int rev_nr, int show_all)
}
static const char * const merge_base_usage[] = {
- N_("git merge-base [-a|--all] <commit> <commit>..."),
- N_("git merge-base [-a|--all] --octopus <commit>..."),
+ N_("git merge-base [-a | --all] <commit> <commit>..."),
+ N_("git merge-base [-a | --all] --octopus <commit>..."),
N_("git merge-base --independent <commit>..."),
N_("git merge-base --is-ancestor <commit> <commit>"),
N_("git merge-base --fork-point <ref> [<commit>]"),