summaryrefslogtreecommitdiff
path: root/builtin/diff-files.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-09-20 21:51:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-09-20 21:51:43 (GMT)
commit150f307afc13961b0322ad0e7205a7b193368586 (patch)
tree726a7011eab1d8fcf25654304901e6bb494e89c5 /builtin/diff-files.c
parentdbc50fd63c75320720481a1787312e080249220d (diff)
parent73e947963c7b44bfa5a9b5dc48f62cbf6d0bc39b (diff)
downloadgit-150f307afc13961b0322ad0e7205a7b193368586.zip
git-150f307afc13961b0322ad0e7205a7b193368586.tar.gz
git-150f307afc13961b0322ad0e7205a7b193368586.tar.bz2
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
Diffstat (limited to 'builtin/diff-files.c')
0 files changed, 0 insertions, 0 deletions