Merge branch 'maint'

[git.git] / Documentation / fetch-options.txt

diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index 1fe8423b94739e16f2ad8ec4b07ed45a2e6b964a..bdc7332c7b11c25957ee170b0582f9fe182755eb 100644 (file)
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -1,8 +1,21 @@
+-q, \--quiet::
+       Pass --quiet to git-fetch-pack and silence any other internally
+       used programs.
+
+-v, \--verbose::
+       Be verbose.
+
 -a, \--append::
        Append ref names and object names of fetched refs to the
        existing contents of `.git/FETCH_HEAD`.  Without this
        option old data in `.git/FETCH_HEAD` will be overwritten.
 
+\--upload-pack <upload-pack>::
+       When given, and the repository to fetch from is handled
+       by 'git-fetch-pack', '--exec=<upload-pack>' is passed to
+       the command to specify non-default path for the command
+       run on the other end.
+
 -f, \--force::
        When `git-fetch` is used with `<rbranch>:<lbranch>`
        refspec, it refuses to update the local branch
@@ -10,7 +23,7 @@
        fetches is a descendant of `<lbranch>`.  This option
        overrides that check.
 
-\--no-tags::
+-n, \--no-tags::
        By default, `git-fetch` fetches tags that point at
        objects that are downloaded from the remote repository
        and stores them locally.  This option disables this
@@ -24,9 +37,19 @@
        flag lets all tags and their associated objects be
        downloaded.
 
+-k, \--keep::
+       Keep downloaded pack.
+
 -u, \--update-head-ok::
        By default `git-fetch` refuses to update the head which
        corresponds to the current branch.  This flag disables the
-       check.  Note that fetching into the current branch will not
-       update the index and working directory, so use it with care.
+       check.  This is purely for the internal use for `git-pull`
+       to communicate with `git-fetch`, and unless you are
+       implementing your own Porcelain you are not supposed to
+       use it.
+
+\--depth=<depth>::
+       Deepen the history of a 'shallow' repository created by
+       `git clone` with `--depth=<depth>` option (see gitlink:git-clone[1])
+       by the specified number of commits.