summaryrefslogtreecommitdiffstats
path: root/fetch-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-09-17 15:45:52 -0700
committerJunio C Hamano <gitster@pobox.com>2018-09-17 15:45:52 -0700
commit980e61ec567f55c9247391052477e61a32d24548 (patch)
tree6fe236d0a6fd3ffa6a1be9a52219ed50b7dfcd19 /fetch-options.txt
parenta68ff6db4d42f41cb49143a5423fbe50f539043e (diff)
downloadgit-htmldocs-980e61ec567f55c9247391052477e61a32d24548.tar.gz
Autogenerated HTML docs for v2.19.0-216-g2d3b1c
Diffstat (limited to 'fetch-options.txt')
-rw-r--r--fetch-options.txt15
1 files changed, 10 insertions, 5 deletions
diff --git a/fetch-options.txt b/fetch-options.txt
index 8bc36af4b..fa0a3151b 100644
--- a/fetch-options.txt
+++ b/fetch-options.txt
@@ -68,11 +68,16 @@ endif::git-pull[]
-f::
--force::
- 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
+ifdef::git-pull[]
+ in the `<refspec>` part of the linkgit:git-fetch[1]
+ documentation.
+endif::git-pull[]
+ifndef::git-pull[]
+ in the `<refspec>` part below.
+endif::git-pull[]
+ This option overrides that check.
-k::
--keep::