[PATCH v5 6/7] replace: allow long option names
From: Christian Couder <hidden>
Date: 2016-06-15 22:58:39
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
It is now standard practice in Git to have both short and long option names. So let's give a long option name to the git replace options too. Signed-off-by: Christian Couder <redacted> --- Documentation/git-replace.txt | 3 +++ builtin/replace.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt
index a2bd2ee..414000e 100644
--- a/Documentation/git-replace.txt
+++ b/Documentation/git-replace.txt@@ -54,13 +54,16 @@ achieve the same effect as the `--no-replace-objects` option. OPTIONS ------- -f:: +--force:: If an existing replace ref for the same object exists, it will be overwritten (instead of failing). -d:: +--delete:: Delete existing replace refs for the given objects. -l <pattern>:: +--list <pattern>:: List replace refs for objects that match the given pattern (or all if no pattern is given). Typing "git replace" without arguments, also lists all replace
diff --git a/builtin/replace.c b/builtin/replace.c
index 95736d9..d4d1b75 100644
--- a/builtin/replace.c
+++ b/builtin/replace.c@@ -128,9 +128,9 @@ int cmd_replace(int argc, const char **argv, const char *prefix) { int list = 0, delete = 0, force = 0; struct option options[] = { - OPT_BOOLEAN('l', NULL, &list, N_("list replace refs")), - OPT_BOOLEAN('d', NULL, &delete, N_("delete replace refs")), - OPT_BOOLEAN('f', NULL, &force, N_("replace the ref if it exists")), + OPT_BOOLEAN('l', "list", &list, N_("list replace refs")), + OPT_BOOLEAN('d', "delete", &delete, N_("delete replace refs")), + OPT_BOOLEAN('f', "force", &force, N_("replace the ref if it exists")), OPT_END() };
--
1.8.4.rc1.28.ge2684af