From: Junio C Hamano <junkio@cox.net>
Date: Thu, 1 Dec 2005 20:24:51 +0000 (-0800)
Subject: Documentation: describe '-f' option to git-fetch.
X-Git-Tag: v0.99.9l^2~21
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a3e3dc46901e3ba20a9f1d3ae503ac2faf5a8ea9;p=git.git

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>
---

diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index a25d04a4f..200c9b240 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