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>
Jakub Narebski committed
Dec 4, 2006 at 14:29 UTC
b360cca0b100e14abffa4cae78521b493c783738
2 files changed
+5
-5
Documentation/git-clone.txt
+2
-2
@@ -11,7 +11,7 @@ SYNOPSIS
11
[verse]
12
'git-clone' [--template=<template_directory>] [-l [-s]] [-q] [-n] [--bare]
13
[-o <name>] [-u <upload-pack>] [--reference <repository>]
14
- [--use-separate-remote | --use-immingled-remote] <repository>
14
+ [--use-separate-remote | --no-separate-remote] <repository>
15
[<directory>]
16
17
DESCRIPTION
@@ -105,7 +105,7 @@ OPTIONS
105
of `$GIT_DIR/refs/heads/`. Only the local master branch is
106
saved in the latter. This is the default.
107
108
---use-immingled-remote::
108
+--no-separate-remote::
109
Save remotes heads in the same namespace as the local
110
heads, `$GIT_DIR/refs/heads/'. In regular repositories,
111
this is a legacy setup git-clone created by default in
git-clone.sh
+3
-3
@@ -14,7 +14,7 @@ die() {
14
}
15
16
usage() {
17
- die "Usage: $0 [--template=<template_directory>] [--use-immingled-remote] [--reference <reference-repo>] [--bare] [-l [-s]] [-q] [-u <upload-pack>] [--origin <name>] [-n] <repo> [<dir>]"
17
+ die "Usage: $0 [--template=<template_directory>] [--no-separate-remote] [--reference <reference-repo>] [--bare] [-l [-s]] [-q] [-u <upload-pack>] [--origin <name>] [-n] <repo> [<dir>]"
18
}
19
20
get_repo_base() {
@@ -140,7 +140,7 @@ while
140
*,--use-separate-remote)
141
# default
142
use_separate_remote=t ;;
143
- *,--use-immingled-remote)
143
+ *,--no-separate-remote)
144
use_separate_remote= ;;
145
1,--reference) usage ;;
146
*,--reference)
@@ -176,7 +176,7 @@ repo="$1"
176
test -n "$repo" ||
177
die 'you must specify a repository to clone.'
178
179
-# --bare implies --no-checkout and --use-immingled-remote
179
+# --bare implies --no-checkout and --no-separate-remote
180
if test yes = "$bare"
181
then
182
if test yes = "$origin_override"