Merge branch 'js/refs' into next

diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index 83237562d2ba2a8891f06646ab65c0b4817e225e..13f34d3ca28a402d56420f3bf5615837cf529e0a 100644 (file)
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -3,8 +3,7 @@
        existing contents of `.git/FETCH_HEAD`.  Without this
        option old data in `.git/FETCH_HEAD` will be overwritten.
 
---upload-pack <upload-pack>::
--u <upload-pack>::
+\--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