diff options
| author | Patrick Steinhardt <ps@pks.im> | 2026-02-16 07:45:47 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-02-17 08:37:51 -0800 |
| commit | 060e602dcb4ce94cd57ccdc4256a136fc36d9c40 (patch) | |
| tree | a2974169f00ed4a3c8603013fd31dbce49810edf /builtin/history.c | |
| parent | 1073fa14e14ae119d6025298eafcb3f1c12bd7df (diff) | |
| download | git-060e602dcb4ce94cd57ccdc4256a136fc36d9c40.tar.xz | |
builtin/history: rename "--ref-action=" to "--update-refs="
With the preceding commit we have changed "--ref-action=" to only
control which refs are supposed to be updated, not what happens with
them. As a consequence, the option is now somewhat misnamed, as we don't
control the action itself anymore.
Rename it to "--update-refs=" to better align it with its new use.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/history.c')
| -rw-r--r-- | builtin/history.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin/history.c b/builtin/history.c index c135361c67..1cf6c668cf 100644 --- a/builtin/history.c +++ b/builtin/history.c @@ -18,7 +18,7 @@ #include "wt-status.h" #define GIT_HISTORY_REWORD_USAGE \ - N_("git history reword <commit> [--dry-run] [--ref-action=(branches|head)]") + N_("git history reword <commit> [--dry-run] [--update-refs=(branches|head)]") static void change_data_free(void *util, const char *str UNUSED) { @@ -258,7 +258,7 @@ static int setup_revwalk(struct repository *repo, goto out; } else if (!ret) { ret = error(_("rewritten commit must be an ancestor " - "of HEAD when using --ref-action=head")); + "of HEAD when using --update-refs=head")); goto out; } @@ -416,8 +416,8 @@ static int cmd_history_reword(int argc, enum ref_action action = REF_ACTION_DEFAULT; int dry_run = 0; struct option options[] = { - OPT_CALLBACK_F(0, "ref-action", &action, N_("<action>"), - N_("control ref update behavior (branches|head)"), + OPT_CALLBACK_F(0, "update-refs", &action, N_("<action>"), + N_("control which refs should be updated (branches|head)"), PARSE_OPT_NONEG, parse_ref_action), OPT_BOOL('n', "dry-run", &dry_run, N_("perform a dry-run without updating any refs")), |