diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-04-07 14:59:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-04-07 14:59:28 -0700 |
| commit | 6c9fbf4fcd2d8ac0d8764a68bf81ea11f3794481 (patch) | |
| tree | 753f91e87f12a9b47beffde21e65af8221091446 | |
| parent | f1743ad69a492d1ca3773bfdddf7f5ffd278c19b (diff) | |
| parent | 26b9946dd756a2efc29f898e53327676a22adc3e (diff) | |
| download | git-6c9fbf4fcd2d8ac0d8764a68bf81ea11f3794481.tar.xz | |
Merge branch 'rs/history-short-help-fix'
Glitches in "git history -h" have been corrected.
* rs/history-short-help-fix:
history: fix short help for argument of --update-refs
| -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 568dc75ee7..9526938085 100644 --- a/builtin/history.c +++ b/builtin/history.c @@ -437,8 +437,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, "update-refs", &action, N_("<action>"), - N_("control which refs should be updated (branches|head)"), + OPT_CALLBACK_F(0, "update-refs", &action, "(branches|head)", + N_("control which refs should be updated"), PARSE_OPT_NONEG, parse_ref_action), OPT_BOOL('n', "dry-run", &dry_run, N_("perform a dry-run without updating any refs")), @@ -666,8 +666,8 @@ static int cmd_history_split(int argc, enum ref_action action = REF_ACTION_DEFAULT; int dry_run = 0; struct option options[] = { - OPT_CALLBACK_F(0, "update-refs", &action, N_("<refs>"), - N_("control ref update behavior (branches|head|print)"), + OPT_CALLBACK_F(0, "update-refs", &action, "(branches|head)", + N_("control ref update behavior"), PARSE_OPT_NONEG, parse_ref_action), OPT_BOOL('n', "dry-run", &dry_run, N_("perform a dry-run without updating any refs")), |