diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2018-08-31 20:09:56 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-08-31 14:04:05 -0700 |
| commit | 8cd4b7c14895a055de01962237d580173e5beca1 (patch) | |
| tree | 5a4868572a53c667275122a7715a5872607ee307 /builtin | |
| parent | pull doc: fix a long-standing grammar error (diff) | |
| download | tgif-8cd4b7c14895a055de01962237d580173e5beca1.tar.xz | |
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')
| -rw-r--r-- | builtin/fetch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c index ac06f6a576..767406ee05 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, |