]> granicus.if.org Git - git/commitdiff
fetch: change "branch" to "reference" in --force -h output
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Fri, 31 Aug 2018 20:09:56 +0000 (20:09 +0000)
committerJunio C Hamano <gitster@pobox.com>
Fri, 31 Aug 2018 21:04:05 +0000 (14:04 -0700)
The -h output has been referring to the --force command as forcing the
overwriting of local branches, but since "fetch" more generally
fetches all sorts of references in all refs/ namespaces, let's talk
about forcing the update of a a "reference" instead.

This wording was initially introduced in 8320199873 ("Rewrite
builtin-fetch option parsing to use parse_options().", 2007-12-04).

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/fetch.c

index ac06f6a5765d2f630116ab588c0e34eb2f0e4db4..767406ee05b8bf575ba4d819fe443eea5de7b92e 100644 (file)
@@ -113,7 +113,7 @@ static struct option builtin_fetch_options[] = {
                 N_("append to .git/FETCH_HEAD instead of overwriting")),
        OPT_STRING(0, "upload-pack", &upload_pack, N_("path"),
                   N_("path to upload pack on remote end")),
-       OPT__FORCE(&force, N_("force overwrite of local branch"), 0),
+       OPT__FORCE(&force, N_("force overwrite of local reference"), 0),
        OPT_BOOL('m', "multiple", &multiple,
                 N_("fetch from multiple remotes")),
        OPT_SET_INT('t', "tags", &tags,