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 /Documentation | |
| 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 'Documentation')
| -rw-r--r-- | Documentation/git-clone.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt index 4cb42237b..d5efa00de 100644 --- 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 |