aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-01-26 18:11:06 -0800
committerJunio C Hamano <junkio@cox.net>2006-01-26 18:11:06 -0800
commit2796a9de31cb12d719c73695334ee873c5213d4a (patch)
tree4630739fa26fbdd027a19661765e11dec187cabd /Documentation
parent521698b1538fb3c9bd818ee98f2c17d2c80c9605 (diff)
downloadgit-2796a9de31cb12d719c73695334ee873c5213d4a.tar.gz
git-2796a9de31cb12d719c73695334ee873c5213d4a.tar.xz
git-fetch --upload-pack: disambiguate.
Johannes noticed the recent addition of this new flag inadvertently took over existing --update-head-ok (-u). Require longer abbreviation to this new option which would be needed in a rare setup. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/fetch-options.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index 83237562d..13f34d3ca 100644
--- 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