{"thread":{"id":"43736","subject":"[PATCH] git-clone: Rename --use-immingled-remote option to --no-separate-remote","startedAt":"2006-12-04T13:29:09Z","lastAt":"2006-12-04T13:29:09Z","messageCount":1,"participants":["Jakub Narebski"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"297558","messageId":"200612041429.09835.jnareb@gmail.com","threadId":"43736","inReplyTo":null,"subject":"[PATCH] git-clone: Rename --use-immingled-remote option to --no-separate-remote","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2006-12-04T13:29:09Z","receivedAt":"2006-12-04T13:29:09Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"With making --use-separate-remote default when creating non-bare\nclone, there was need for the flag which would turn off this behavior.\nIt was called --use-immingled-remote.\n\nImmingle means to blend, to combine into one, to intermingle, but it\nis a bit obscure word. I think it would be better to use simply\n--no-separate-remote as the opposite to --use-separate-remote\noption to git clone.\n\nSigned-off-by: Jakub Narebski <jnareb@gmail.com>\n---\n Documentation/git-clone.txt |    4 ++--\n git-clone.sh                |    6 +++---\n 2 files changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt\nindex 4cb4223..d5efa00 100644\n--- a/Documentation/git-clone.txt\n+++ b/Documentation/git-clone.txt\n@@ -11,7 +11,7 @@ SYNOPSIS\n [verse]\n 'git-clone' [--template=<template_directory>] [-l [-s]] [-q] [-n] [--bare]\n \t  [-o <name>] [-u <upload-pack>] [--reference <repository>]\n-\t  [--use-separate-remote | --use-immingled-remote] <repository>\n+\t  [--use-separate-remote | --no-separate-remote] <repository>\n \t  [<directory>]\n \n DESCRIPTION\n@@ -105,7 +105,7 @@ OPTIONS\n \tof `$GIT_DIR/refs/heads/`.  Only the local master branch is\n \tsaved in the latter. This is the default.\n \n---use-immingled-remote::\n+--no-separate-remote::\n \tSave remotes heads in the same namespace as the local\n \theads, `$GIT_DIR/refs/heads/'.  In regular repositories,\n \tthis is a legacy setup git-clone created by default in\ndiff --git a/git-clone.sh b/git-clone.sh\nindex d4ee93f..8964039 100755\n--- a/git-clone.sh\n+++ b/git-clone.sh\n@@ -14,7 +14,7 @@ die() {\n }\n \n usage() {\n-\tdie \"Usage: $0 [--template=<template_directory>] [--use-immingled-remote] [--reference <reference-repo>] [--bare] [-l [-s]] [-q] [-u <upload-pack>] [--origin <name>] [-n] <repo> [<dir>]\"\n+\tdie \"Usage: $0 [--template=<template_directory>] [--no-separate-remote] [--reference <reference-repo>] [--bare] [-l [-s]] [-q] [-u <upload-pack>] [--origin <name>] [-n] <repo> [<dir>]\"\n }\n \n get_repo_base() {\n@@ -140,7 +140,7 @@ while\n \t*,--use-separate-remote)\n \t\t# default\n \t\tuse_separate_remote=t ;;\n-\t*,--use-immingled-remote)\n+\t*,--no-separate-remote)\n \t\tuse_separate_remote= ;;\n \t1,--reference) usage ;;\n \t*,--reference)\n@@ -176,7 +176,7 @@ repo=\"$1\"\n test -n \"$repo\" ||\n     die 'you must specify a repository to clone.'\n \n-# --bare implies --no-checkout and --use-immingled-remote\n+# --bare implies --no-checkout and --no-separate-remote\n if test yes = \"$bare\"\n then\n \tif test yes = \"$origin_override\"\n-- \n1.4.4.1\n"}]}