summaryrefslogtreecommitdiffstats
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorTaylor Blau <me@ttaylorr.com>2023-04-18 22:40:35 +0200
committerJunio C Hamano <gitster@pobox.com>2023-04-18 23:56:47 +0200
commitc512f31109ea09a6db72af0af4572dc0a2c2df0f (patch)
tree1e6527f45f3f8233878c6b4d46ec521ce7c6a3b2 /builtin/merge.c
parentpack-write.c: plug a leak in stage_tmp_packfiles() (diff)
downloadgit-c512f31109ea09a6db72af0af4572dc0a2c2df0f.tar.xz
git-c512f31109ea09a6db72af0af4572dc0a2c2df0f.zip
builtin/repack.c: fix incorrect reference to '-C'
When cruft packs were originally being developed, `-C` was designated as the short-form for `--cruft` (as in `git repack -C`). This was dropped due to confusion with Git's top-level `-C` option before submitting to the list. But the reference to it in `--cruft-expiration`'s help text was never updated. Fix that dangling reference in this patch. Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions