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>

diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index 4cb42237b559723a0e59ac8e29c78a20304f38d0..d5efa00dea7de8429b32dac006d0c5496076303d 100644 (file)
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -11,7 +11,7 @@ SYNOPSIS
 [verse]
 'git-clone' [--template=<template_directory>] [-l [-s]] [-q] [-n] [--bare]
          [-o <name>] [-u <upload-pack>] [--reference <repository>]
-         [--use-separate-remote | --use-immingled-remote] <repository>
+         [--use-separate-remote | --no-separate-remote] <repository>
          [<directory>]
 
 DESCRIPTION
@@ -105,7 +105,7 @@ OPTIONS
        of `$GIT_DIR/refs/heads/`.  Only the local master branch is
        saved in the latter. This is the default.
 
---use-immingled-remote::
+--no-separate-remote::
        Save remotes heads in the same namespace as the local
        heads, `$GIT_DIR/refs/heads/'.  In regular repositories,
        this is a legacy setup git-clone created by default in

diff --git a/git-clone.sh b/git-clone.sh
index d4ee93f75bba729c82560f0b2426d8f09f63d82e..89640396e9716dcc545710fc3f7697a1594d8e97 100755 (executable)
--- 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"