summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-09-17 13:54:00 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-09-17 13:54:00 -0700
commitd39cab3989f9e660cae124f78143369b13ad2901 (patch)
treec7968b5d7ff14c5d4a2207e101a92e17cbbbc964 /Documentation/git-merge.txt
parentMerge branch 'es/worktree-forced-ops-fix' (diff)
parentfetch: stop clobbering existing tags without --force (diff)
downloadtgif-d39cab3989f9e660cae124f78143369b13ad2901.tar.xz
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. * ab/fetch-tags-noclobber: fetch: stop clobbering existing tags without --force fetch: document local ref updates with/without --force push doc: correct lies about how push refspecs work push doc: move mention of "tag <tag>" later in the prose push doc: remove confusing mention of remote merger fetch tests: add a test for clobbering tag behavior push tests: use spaces in interpolated string push tests: make use of unused $1 in test description fetch: change "branch" to "reference" in --force -h output
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions