summaryrefslogtreecommitdiff
path: root/builtin/fetch.c
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2018-08-31 20:09:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-08-31 21:04:05 (GMT)
commit8cd4b7c14895a055de01962237d580173e5beca1 (patch)
tree5a4868572a53c667275122a7715a5872607ee307 /builtin/fetch.c
parentb81699af4861f9363cdebb86e8f3d95bd0b794dc (diff)
downloadgit-8cd4b7c14895a055de01962237d580173e5beca1.zip
git-8cd4b7c14895a055de01962237d580173e5beca1.tar.gz
git-8cd4b7c14895a055de01962237d580173e5beca1.tar.bz2
fetch: change "branch" to "reference" in --force -h output
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>
Diffstat (limited to 'builtin/fetch.c')
-rw-r--r--builtin/fetch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c
index ac06f6a..767406e 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -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,