Merge fixes up to GIT 1.0.4

diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index a25d04a4fa2e6449d4e5ec1beddf305385ae8571..200c9b240dc3f89cd29350332447e48b53bcfdc1 100644 (file)
--- 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