@matheusbsbs / matheus-bagliano / commits / 2796a9de31
Fork 0

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>

Junio C Hamano committed Jan 26, 2006 at 18:11 UTC 2796a9de31cb12d719c73695334ee873c5213d4a
2 files changed +3 -4
Documentation/fetch-options.txt
+1 -2
@@ -3,8 +3,7 @@
3 existing contents of `.git/FETCH_HEAD`. Without this
4 option old data in `.git/FETCH_HEAD` will be overwritten.
5
6 ---upload-pack <upload-pack>::
7 --u <upload-pack>::
6 +\--upload-pack <upload-pack>::
7 When given, and the repository to fetch from is handled
8 by 'git-fetch-pack', '--exec=<upload-pack>' is passed to
9 the command to specify non-default path for the command
git-fetch.sh
+2 -2
@@ -25,8 +25,8 @@ do
25 -a|--a|--ap|--app|--appe|--appen|--append)
26 append=t
27 ;;
28 - -u|--u|--up|--upl|--uploa|--upload|--upload-|--upload-p|--upload-pa|\
29 - --upload-pac|--upload-pack)
28 + --upl|--uplo|--uploa|--upload|--upload-|--upload-p|\
29 + --upload-pa|--upload-pac|--upload-pack)
30 shift
31 exec="--exec=$1"
32 upload_pack="-u $1"