diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-02-08 16:22:05 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-02-08 16:22:05 -0800 |
| commit | 173d7746f6c3ee44855be3b6e9aec5457e6174e7 (patch) | |
| tree | 5d476478f82fecd8ff0611e6a8b42eb27125b42f | |
| parent | bcab40f14fbcfc54b2f568862a25d1fdd01804d4 (diff) | |
| parent | cbf498eb534c5a41c2c4fa5681d18e22d93b8fb4 (diff) | |
| download | git-173d7746f6c3ee44855be3b6e9aec5457e6174e7.tar.gz | |
Merge branch 'jb/reflog-expire-delete-dry-run-options' into maint-2.43
Command line parsing fix for "git reflog".
* jb/reflog-expire-delete-dry-run-options:
builtin/reflog.c: fix dry-run option short name
| -rw-r--r-- | builtin/reflog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/reflog.c b/builtin/reflog.c index 6e490f83d5..a5a4099f61 100644 --- a/builtin/reflog.c +++ b/builtin/reflog.c @@ -248,7 +248,7 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix) int verbose = 0; reflog_expiry_should_prune_fn *should_prune_fn = should_expire_reflog_ent; const struct option options[] = { - OPT_BIT(0, "dry-run", &flags, N_("do not actually prune any entries"), + OPT_BIT('n', "dry-run", &flags, N_("do not actually prune any entries"), EXPIRE_REFLOGS_DRY_RUN), OPT_BIT(0, "rewrite", &flags, N_("rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"), @@ -368,7 +368,7 @@ static int cmd_reflog_delete(int argc, const char **argv, const char *prefix) int verbose = 0; const struct option options[] = { - OPT_BIT(0, "dry-run", &flags, N_("do not actually prune any entries"), + OPT_BIT('n', "dry-run", &flags, N_("do not actually prune any entries"), EXPIRE_REFLOGS_DRY_RUN), OPT_BIT(0, "rewrite", &flags, N_("rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"), |