From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 20 Sep 2018 21:51:43 +0000 (-0700)
Subject: Merge branch 'ab/fetch-tags-noclobber'
X-Git-Tag: v2.20.0-rc0~225
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/150f307afc13961b0322ad0e7205a7b193368586?ds=inline;hp=--cc

Merge branch 'ab/fetch-tags-noclobber'

The rules used by "git push" and "git fetch" to determine if a ref
can or cannot be updated were inconsistent; specifically, fetching
to update existing tags were allowed even though tags are supposed
to be unmoving anchoring points.  "git fetch" was taught to forbid
updates to existing tags without the "--force" option.
This is a backward incompatible change but in a good way; it may
still need to be treated carefully.

* ab/fetch-tags-noclobber:
fetch doc: correct grammar in --force docs
push doc: add spacing between two words
---

150f307afc13961b0322ad0e7205a7b193368586