Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index 1fe8423b94739e16f2ad8ec4b07ed45a2e6b964a..13f34d3ca28a402d56420f3bf5615837cf529e0a 100644 (file)
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -3,6 +3,12 @@
        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
@@ -24,6 +30,9 @@
        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