diff options
| author | Jakub Narebski <jnareb@gmail.com> | 2006-12-04 14:29:09 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-04 13:49:08 -0800 |
| commit | b360cca0b100e14abffa4cae78521b493c783738 (patch) | |
| tree | 1ac23d3deca67efccd6fb2e9fdca3afef3ead4be /git-clone.sh | |
| parent | e1147267afc0afa269884767c4045847d9a2be8a (diff) | |
| download | git-b360cca0b100e14abffa4cae78521b493c783738.tar.gz git-b360cca0b100e14abffa4cae78521b493c783738.tar.xz | |
git-clone: Rename --use-immingled-remote option to --no-separate-remote
With making --use-separate-remote default when creating non-bare
clone, there was need for the flag which would turn off this behavior.
It was called --use-immingled-remote.
Immingle means to blend, to combine into one, to intermingle, but it
is a bit obscure word. I think it would be better to use simply
--no-separate-remote as the opposite to --use-separate-remote
option to git clone.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-clone.sh')
| -rwxr-xr-x | git-clone.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-clone.sh b/git-clone.sh index d4ee93f75..89640396e 100755 --- a/git-clone.sh +++ b/git-clone.sh @@ -14,7 +14,7 @@ die() { } usage() { - die "Usage: $0 [--template=<template_directory>] [--use-immingled-remote] [--reference <reference-repo>] [--bare] [-l [-s]] [-q] [-u <upload-pack>] [--origin <name>] [-n] <repo> [<dir>]" + die "Usage: $0 [--template=<template_directory>] [--no-separate-remote] [--reference <reference-repo>] [--bare] [-l [-s]] [-q] [-u <upload-pack>] [--origin <name>] [-n] <repo> [<dir>]" } get_repo_base() { @@ -140,7 +140,7 @@ while *,--use-separate-remote) # default use_separate_remote=t ;; - *,--use-immingled-remote) + *,--no-separate-remote) use_separate_remote= ;; 1,--reference) usage ;; *,--reference) @@ -176,7 +176,7 @@ repo="$1" test -n "$repo" || die 'you must specify a repository to clone.' -# --bare implies --no-checkout and --use-immingled-remote +# --bare implies --no-checkout and --no-separate-remote if test yes = "$bare" then if test yes = "$origin_override" |