tree 726a7011eab1d8fcf25654304901e6bb494e89c5
parent dbc50fd63c75320720481a1787312e080249220d
parent 73e947963c7b44bfa5a9b5dc48f62cbf6d0bc39b
author Junio C Hamano <gitster@pobox.com> 1537480303 -0700
committer Junio C Hamano <gitster@pobox.com> 1537480303 -0700

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