summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Pitre <nico@cam.org>2007-01-07 12:31:29 -0500
committerJunio C Hamano <junkio@cox.net>2007-01-07 18:03:07 -0800
commit515377ea9ec6192f82a2fa5c5b5b7651d9d6cf6c (patch)
tree5a5643daddda26814cb3769ec63d344143b7ecf0
parentcf2999eb4cbe39d5a40add574be9e5c019df758b (diff)
downloadgit-515377ea9ec6192f82a2fa5c5b5b7651d9d6cf6c.tar.gz
"init-db" can really be just "init"
Make "init" the equivalent of "init-db". This should make first GIT impression a little more friendly. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Documentation/everyday.txt4
-rw-r--r--Documentation/git-init-db.txt1
-rw-r--r--Documentation/git.txt1
-rw-r--r--Documentation/tutorial-2.txt2
-rw-r--r--Documentation/tutorial.txt2
-rw-r--r--Makefile2
-rw-r--r--builtin-init-db.c2
-rw-r--r--git.c1
8 files changed, 9 insertions, 6 deletions
diff --git a/Documentation/everyday.txt b/Documentation/everyday.txt
index 2105a3d2e7..4e83994c58 100644
--- a/Documentation/everyday.txt
+++ b/Documentation/everyday.txt
@@ -25,7 +25,7 @@ Basic Repository[[Basic Repository]]
Everybody uses these commands to maintain git repositories.
- * gitlink:git-init-db[1] or gitlink:git-clone[1] to create a
+ * gitlink:git-init[1] or gitlink:git-clone[1] to create a
new repository.
* gitlink:git-fsck-objects[1] to check the repository for errors.
@@ -107,7 +107,7 @@ Use a tarball as a starting point for a new repository.::
------------
$ tar zxf frotz.tar.gz
$ cd frotz
-$ git-init-db
+$ git-init
$ git add . <1>
$ git commit -m 'import of frotz source tree.'
$ git tag v2.43 <2>
diff --git a/Documentation/git-init-db.txt b/Documentation/git-init-db.txt
index ca7d09dc0a..bc3ba14939 100644
--- a/Documentation/git-init-db.txt
+++ b/Documentation/git-init-db.txt
@@ -74,6 +74,7 @@ Running `git-init-db` in an existing repository is safe. It will not overwrite
things that are already there. The primary reason for rerunning `git-init-db`
is to pick up newly added templates.
+Note that `git-init` is the same as `git-init-db`.
EXAMPLES
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 36b2126d84..5662cdc27c 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -353,6 +353,7 @@ gitlink:git-hash-object[1]::
gitlink:git-index-pack[1]::
Build pack idx file for an existing packed archive.
+gitlink:git-init[1]::
gitlink:git-init-db[1]::
Creates an empty git object database, or reinitialize an
existing one.
diff --git a/Documentation/tutorial-2.txt b/Documentation/tutorial-2.txt
index 60e54777dc..f48894c9a2 100644
--- a/Documentation/tutorial-2.txt
+++ b/Documentation/tutorial-2.txt
@@ -17,7 +17,7 @@ Let's start a new project and create a small amount of history:
------------------------------------------------
$ mkdir test-project
$ cd test-project
-$ git init-db
+$ git init
Initialized empty Git repository in .git/
$ echo 'hello world' > file.txt
$ git add .
diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt
index 01d4a47a97..d2bf0b905a 100644
--- a/Documentation/tutorial.txt
+++ b/Documentation/tutorial.txt
@@ -32,7 +32,7 @@ can place it under git revision control as follows.
------------------------------------------------
$ tar xzf project.tar.gz
$ cd project
-$ git init-db
+$ git init
------------------------------------------------
Git will reply
diff --git a/Makefile b/Makefile
index 5c712b94c1..d2a8382760 100644
--- a/Makefile
+++ b/Makefile
@@ -210,7 +210,7 @@ EXTRA_PROGRAMS =
BUILT_INS = \
git-format-patch$X git-show$X git-whatchanged$X git-cherry$X \
- git-get-tar-commit-id$X \
+ git-get-tar-commit-id$X git-init$X \
$(patsubst builtin-%.o,git-%$X,$(BUILTIN_OBJS))
# what 'all' will build and 'install' will install, in gitexecdir
diff --git a/builtin-init-db.c b/builtin-init-db.c
index 97fd82ff06..bbef820e47 100644
--- a/builtin-init-db.c
+++ b/builtin-init-db.c
@@ -259,7 +259,7 @@ static int create_default_files(const char *git_dir, const char *template_path)
}
static const char init_db_usage[] =
-"git-init-db [--template=<template-directory>] [--shared]";
+"git-init [--template=<template-directory>] [--shared]";
/*
* If you want to, you can share the DB area with any number of branches.
diff --git a/git.c b/git.c
index c82ca458e4..bf55499dc3 100644
--- a/git.c
+++ b/git.c
@@ -231,6 +231,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
{ "get-tar-commit-id", cmd_get_tar_commit_id },
{ "grep", cmd_grep, RUN_SETUP },
{ "help", cmd_help },
+ { "init", cmd_init_db },
{ "init-db", cmd_init_db },
{ "log", cmd_log, RUN_SETUP | USE_PAGER },
{ "ls-files", cmd_ls_files, RUN_SETUP },