config.txt: move mailmap.* to a separate file

diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index 8631e365f437fd85058bed3dbd0cebde15756ccc..fa0a3151b3f7e96ee61e65669e057e48ee053aae 100644 (file)
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -42,6 +42,25 @@ the current repository has the same history as the source repository.
        .git/shallow. This option updates .git/shallow and accept such
        refs.
 
+--negotiation-tip=<commit|glob>::
+       By default, Git will report, to the server, commits reachable
+       from all local refs to find common commits in an attempt to
+       reduce the size of the to-be-received packfile. If specified,
+       Git will only report commits reachable from the given tips.
+       This is useful to speed up fetches when the user knows which
+       local ref is likely to have commits in common with the
+       upstream ref being fetched.
++
+This option may be specified more than once; if so, Git will report
+commits reachable from any of the given commits.
++
+The argument to this option may be a glob on ref names, a ref, or the (possibly
+abbreviated) SHA-1 of a commit. Specifying a glob is equivalent to specifying
+this option multiple times, one for each matching ref name.
++
+See also the `fetch.negotiationAlgorithm` configuration variable
+documented in linkgit:git-config[1].
+
 ifndef::git-pull[]
 --dry-run::
        Show what would be done, without making any changes.
@@ -49,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::
@@ -188,6 +212,14 @@ endif::git-pull[]
        is specified. This flag forces progress status even if the
        standard error stream is not directed to a terminal.
 
+-o <option>::
+--server-option=<option>::
+       Transmit the given string to the server when communicating using
+       protocol version 2.  The given string must not contain a NUL or LF
+       character.
+       When multiple `--server-option=<option>` are given, they are all
+       sent to the other side in the order listed on the command line.
+
 -4::
 --ipv4::
        Use IPv4 addresses only, ignoring IPv6 addresses.