summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2005-12-01 12:24:51 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2005-12-01 12:24:51 -0800
commita3e3dc46901e3ba20a9f1d3ae503ac2faf5a8ea9 (patch)
tree16dc32c5c6a61ee31a45318496a1701849fe14c7
parentMove couple of ifdefs after "include config.mk" (diff)
downloadtgif-a3e3dc46901e3ba20a9f1d3ae503ac2faf5a8ea9.tar.xz
Documentation: describe '-f' option to git-fetch.
The option description header was there without body text, confusingly getting rendered as if the description for --tags applied to the option. Noticed by Carl Baldwin. Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Documentation/fetch-options.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index a25d04a4fa..200c9b240d 100644
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -4,6 +4,11 @@
option old data in `.git/FETCH_HEAD` will be overwritten.
-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.
-t, \--tags::
By default, the git core utilities will not fetch and store