summaryrefslogtreecommitdiff
path: root/builtin/branch.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-02-11 13:44:19 -0800
committerJunio C Hamano <gitster@pobox.com>2015-02-11 13:44:20 -0800
commitbb831db6774aaa733199360dc7af6f3ce375fc20 (patch)
tree4d4befdb8dfc6b9ddafec4550a6e44aaacd89dd9 /builtin/branch.c
parentafa3ccbf44cb47cf988c6f40ce3ddb10829a9e7b (diff)
parent9c9b4f2f8b7f27f3984e80d053106d5d41cbb03b (diff)
downloadgit-bb831db6774aaa733199360dc7af6f3ce375fc20.tar.gz
Merge branch 'ah/usage-strings'
* ah/usage-strings: standardize usage info string format
Diffstat (limited to 'builtin/branch.c')
-rw-r--r--builtin/branch.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin/branch.c b/builtin/branch.c
index dc6f0b266c..6a25957e9f 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -21,10 +21,10 @@
#include "wt-status.h"
static const char * const builtin_branch_usage[] = {
- N_("git branch [options] [-r | -a] [--merged | --no-merged]"),
- N_("git branch [options] [-l] [-f] <branchname> [<start-point>]"),
- N_("git branch [options] [-r] (-d | -D) <branchname>..."),
- N_("git branch [options] (-m | -M) [<oldbranch>] <newbranch>"),
+ N_("git branch [<options>] [-r | -a] [--merged | --no-merged]"),
+ N_("git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"),
+ N_("git branch [<options>] [-r] (-d | -D) <branch-name>..."),
+ N_("git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"),
NULL
};