diff options
| author | Christian Couder <chriscool@tuxfamily.org> | 2013-09-06 07:10:58 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-06 13:32:24 -0700 |
| commit | ed0ff80984d37f9f40b1bf209bc86ea2fa8f3783 (patch) | |
| tree | 435ba64786e9d8dbf55015c9aec28b2b5bc29098 | |
| parent | b8fcce1e7f7baafba8b6ba0b4e9bec2f27893f43 (diff) | |
| download | git-ed0ff80984d37f9f40b1bf209bc86ea2fa8f3783.tar.gz | |
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>
| -rw-r--r-- | Documentation/git-replace.txt | 3 | ||||
| -rw-r--r-- | builtin/replace.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt index a2bd2ee361..414000ef7d 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 95736d98d2..d4d1b75ade 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() }; |