From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Philip Oakley <philipoakley@iee.org>,
Thomas Rast <trast@inf.ethz.ch>, Johannes Sixt <j6t@kdbg.org>,
Eric Sunshine <sunshine@sunshineco.com>,
Jonathan Nieder <jrnieder@gmail.com>
Subject: [PATCH v5 6/7] replace: allow long option names
Date: Fri, 06 Sep 2013 07:10:58 +0200 [thread overview]
Message-ID: <20130906051100.6657.18553.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20130906050702.6657.25651.chriscool@tuxfamily.org>
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 <chriscool@tuxfamily.org>
---
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
next prev parent reply other threads:[~2013-09-06 5:12 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-06 5:10 [PATCH v5 0/7] Check replacement object type and minor updates Christian Couder
2013-09-06 5:10 ` [PATCH v5 1/7] replace: forbid replacing an object with one of a different type Christian Couder
2013-09-06 20:29 ` Junio C Hamano
2013-09-06 21:34 ` Junio C Hamano
2013-09-06 5:10 ` [PATCH v5 2/7] Documentation/replace: state that objects must be of the same type Christian Couder
2013-09-06 5:10 ` [PATCH v5 3/7] t6050-replace: test that objects are " Christian Couder
2013-09-06 5:10 ` [PATCH v5 4/7] t6050-replace: add test to clean up all the replace refs Christian Couder
2013-09-06 5:10 ` [PATCH v5 5/7] Documentation/replace: add Creating Replacement Objects section Christian Couder
2013-09-06 5:10 ` Christian Couder [this message]
2013-09-06 5:10 ` [PATCH v5 7/7] t6050-replace: use some long option names Christian Couder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130906051100.6657.18553.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=jrnieder@gmail.com \
--cc=philipoakley@iee.org \
--cc=sunshine@sunshineco.com \
--cc=trast@inf.ethz.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).