path: root/Documentation/fetch-options.txt
diff options
authorJunio C Hamano <>2018-09-17 20:54:00 (GMT)
committerJunio C Hamano <>2018-09-17 20:54:00 (GMT)
commitd39cab3989f9e660cae124f78143369b13ad2901 (patch)
treec7968b5d7ff14c5d4a2207e101a92e17cbbbc964 /Documentation/fetch-options.txt
parent1c515bf7e2b395509a122fb92cd6f925bf09a6fe (diff)
parent0bc8d71b99e91c9e90b519073b639a5066119591 (diff)
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/fetch-options.txt')
1 files changed, 10 insertions, 5 deletions
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index 8bc36af..fa0a315 100644
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -68,11 +68,16 @@ endif::git-pull[]
- When 'git fetch' is used with `<rbranch>:<lbranch>`
- refspec, it refuses to update the local branch
- `<lbranch>` unless the remote branch `<rbranch>` it
- fetches is a descendant of `<lbranch>`. This option
- overrides that check.
+ When 'git fetch' is used with `<src>:<dst>` refspec it may
+ refuse to update the local branch as discussed
+ in the `<refspec>` part of the linkgit:git-fetch[1]
+ documentation.
+ in the `<refspec>` part below.
+ This option overrides that check.