Merge branch 'jb/reflog-expire-delete-dry-run-options'

Command line parsing fix for "git reflog".

* jb/reflog-expire-delete-dry-run-options:
  builtin/reflog.c: fix dry-run option short name

diff --cc builtin/reflog.c
index 6e490f83d543bb2e38af7f737dc7966ef009c35b,f2acecac9a0ce7a02572f6e7e53d1e94059c27a0..a5a4099f61a5f825d6e622572c9ee85ae563de7b
--- 1/builtin/reflog.c
--- 2/builtin/reflog.c
+++ b/builtin/reflog.c
@@@ -366,9 -725,10 +366,9 @@@ static int cmd_reflog_delete(int argc, 
        int i, status = 0;
        unsigned int flags = 0;
        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"),