replace: allow long option names

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Christian Couder 2013-09-06 07:10:58 +02:00 committed by Junio C Hamano
parent b8fcce1e7f
commit ed0ff80984
2 changed files with 6 additions and 3 deletions

View File

@ -54,13 +54,16 @@ achieve the same effect as the `--no-replace-objects` option.
OPTIONS OPTIONS
------- -------
-f:: -f::
--force::
If an existing replace ref for the same object exists, it will If an existing replace ref for the same object exists, it will
be overwritten (instead of failing). be overwritten (instead of failing).


-d:: -d::
--delete::
Delete existing replace refs for the given objects. Delete existing replace refs for the given objects.


-l <pattern>:: -l <pattern>::
--list <pattern>::
List replace refs for objects that match the given pattern (or List replace refs for objects that match the given pattern (or
all if no pattern is given). all if no pattern is given).
Typing "git replace" without arguments, also lists all replace Typing "git replace" without arguments, also lists all replace

View File

@ -128,9 +128,9 @@ int cmd_replace(int argc, const char **argv, const char *prefix)
{ {
int list = 0, delete = 0, force = 0; int list = 0, delete = 0, force = 0;
struct option options[] = { struct option options[] = {
OPT_BOOLEAN('l', NULL, &list, N_("list replace refs")), OPT_BOOLEAN('l', "list", &list, N_("list replace refs")),
OPT_BOOLEAN('d', NULL, &delete, N_("delete replace refs")), OPT_BOOLEAN('d', "delete", &delete, N_("delete replace refs")),
OPT_BOOLEAN('f', NULL, &force, N_("replace the ref if it exists")), OPT_BOOLEAN('f', "force", &force, N_("replace the ref if it exists")),
OPT_END() OPT_END()
}; };