From 24351a850088ad4095ad5582fb14e9a8ee689377 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 13 Jan 2007 08:09:17 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.0-rc1-gb60d --- config.txt | 2 +- core-tutorial.html | 12 ++++++------ core-tutorial.txt | 10 +++++----- cvs-migration.html | 4 ++-- cvs-migration.txt | 2 +- git-commit.html | 10 +++------- git-commit.txt | 8 ++------ git-init.html | 6 ++---- git-init.txt | 4 +--- git-p4import.html | 4 ++-- git-p4import.txt | 2 +- git-prune-packed.html | 12 ++++++++++-- git-prune-packed.txt | 5 ++++- git-repo-config.html | 4 ++-- git-svn.html | 8 ++++---- git-svn.txt | 6 +++--- git.html | 7 ++----- git.txt | 3 +-- glossary.html | 6 +++--- glossary.txt | 2 +- hooks.html | 4 ++-- hooks.txt | 2 +- howto-index.html | 2 +- howto/setup-git-server-over-http.txt | 2 +- repository-layout.html | 4 ++-- repository-layout.txt | 2 +- 26 files changed, 64 insertions(+), 69 deletions(-) diff --git a/config.txt b/config.txt index b4aae0d0a..f7dba8977 100644 --- a/config.txt +++ b/config.txt @@ -100,7 +100,7 @@ core.sharedRepository:: group-writable). When 'all' (or 'world' or 'everybody'), the repository will be readable by all users, additionally to being group-shareable. When 'umask' (or 'false'), git will use permissions - reported by umask(2). See gitlink:git-init-db[1]. False by default. + reported by umask(2). See gitlink:git-init[1]. False by default. core.warnAmbiguousRefs:: If true, git will warn you if the ref name you passed it is ambiguous diff --git a/core-tutorial.html b/core-tutorial.html index 8927cbb74..dd84bf099 100644 --- a/core-tutorial.html +++ b/core-tutorial.html @@ -309,12 +309,12 @@ to import into git.

For our first example, we're going to start a totally new repository from scratch, with no pre-existing files, and we'll call it git-tutorial. To start up, create a subdirectory for it, change into that -subdirectory, and initialize the git infrastructure with git-init-db:

+subdirectory, and initialize the git infrastructure with git-init:

$ mkdir git-tutorial
 $ cd git-tutorial
-$ git-init-db
+$ git-init

to which git will reply

@@ -1613,11 +1613,11 @@ an empty directory:

$ mkdir my-git.git

Then, make that directory into a git repository by running -git init-db, but this time, since its name is not the usual +git init, but this time, since its name is not the usual .git, we do things slightly differently:

-
$ GIT_DIR=my-git.git git-init-db
+
$ GIT_DIR=my-git.git git-init

Make sure this directory is available for others you want your changes to be pulled by via the transport of your choice. Also @@ -1761,7 +1761,7 @@ Prepare a public repository accessible to others.

If other people are pulling from your repository over dumb transport protocols (HTTP), you need to keep this repository -dumb transport friendly. After git init-db, +dumb transport friendly. After git init, $GIT_DIR/hooks/post-update copied from the standard templates would contain a call to git-update-server-info but the post-update hook itself is disabled by default — enable it @@ -2004,7 +2004,7 @@ to follow, not easier.

diff --git a/core-tutorial.txt b/core-tutorial.txt index 5ea611748..0cd33fb5b 100644 --- a/core-tutorial.txt +++ b/core-tutorial.txt @@ -46,12 +46,12 @@ to import into git. For our first example, we're going to start a totally new repository from scratch, with no pre-existing files, and we'll call it `git-tutorial`. To start up, create a subdirectory for it, change into that -subdirectory, and initialize the git infrastructure with `git-init-db`: +subdirectory, and initialize the git infrastructure with `git-init`: ------------------------------------------------ $ mkdir git-tutorial $ cd git-tutorial -$ git-init-db +$ git-init ------------------------------------------------ to which git will reply @@ -1371,11 +1371,11 @@ $ mkdir my-git.git ------------ Then, make that directory into a git repository by running -`git init-db`, but this time, since its name is not the usual +`git init`, but this time, since its name is not the usual `.git`, we do things slightly differently: ------------ -$ GIT_DIR=my-git.git git-init-db +$ GIT_DIR=my-git.git git-init ------------ Make sure this directory is available for others you want your @@ -1511,7 +1511,7 @@ A recommended workflow for a "project lead" goes like this: + If other people are pulling from your repository over dumb transport protocols (HTTP), you need to keep this repository -'dumb transport friendly'. After `git init-db`, +'dumb transport friendly'. After `git init`, `$GIT_DIR/hooks/post-update` copied from the standard templates would contain a call to `git-update-server-info` but the `post-update` hook itself is disabled by default -- enable it diff --git a/cvs-migration.html b/cvs-migration.html index e882687ee..249264969 100644 --- a/cvs-migration.html +++ b/cvs-migration.html @@ -338,7 +338,7 @@ it:

$ mkdir /pub/my-repo.git
 $ cd /pub/my-repo.git
-$ git --bare init-db --shared
+$ git --bare init --shared
 $ git --bare fetch /home/alice/myproject master:master

Next, give every team member read/write access to this repository. One @@ -416,7 +416,7 @@ repositories without the need for a central maintainer.

diff --git a/cvs-migration.txt b/cvs-migration.txt index 8e09beaa7..775bf4266 100644 --- a/cvs-migration.txt +++ b/cvs-migration.txt @@ -80,7 +80,7 @@ it: ------------------------------------------------ $ mkdir /pub/my-repo.git $ cd /pub/my-repo.git -$ git --bare init-db --shared +$ git --bare init --shared $ git --bare fetch /home/alice/myproject master:master ------------------------------------------------ diff --git a/git-commit.html b/git-commit.html index 849254d2c..7575c7708 100644 --- a/git-commit.html +++ b/git-commit.html @@ -383,12 +383,8 @@ that, you can recover from it with git-reset(1).

- By default, the command looks for suspicious lines the - commit introduces, and aborts committing if there is one. - The definition of suspicious lines is currently the - lines that has trailing whitespaces, and the lines whose - indentation has a SP character immediately followed by a - TAB character. This option turns off the check. + This option bypasses the pre-commit hook. + See also hooks.

@@ -654,7 +650,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-commit.txt b/git-commit.txt index a7adf24fa..cb081cda8 100644 --- a/git-commit.txt +++ b/git-commit.txt @@ -72,12 +72,8 @@ OPTIONS Add Signed-off-by line at the end of the commit message. --no-verify:: - By default, the command looks for suspicious lines the - commit introduces, and aborts committing if there is one. - The definition of 'suspicious lines' is currently the - lines that has trailing whitespaces, and the lines whose - indentation has a SP character immediately followed by a - TAB character. This option turns off the check. + This option bypasses the pre-commit hook. + See also link:hooks.html[hooks]. -e|--edit:: The message taken from file with `-F`, command line with diff --git a/git-init.html b/git-init.html index b400c4a25..badaeb5f2 100644 --- a/git-init.html +++ b/git-init.html @@ -351,9 +351,7 @@ was primarily meant to initialize the object database, but over time it has become responsible for setting up the other aspects of the repository, such as installing the default hooks and setting the configuration variables. The old name is retained -because people are so used to it and many existing documents -refer to it that way, and this will not change for some time to -come.

+for backward compatibility reasons.

EXAMPLES

@@ -397,7 +395,7 @@ add all existing file to the index
diff --git a/git-init.txt b/git-init.txt index e1fd6884f..596b567c9 100644 --- a/git-init.txt +++ b/git-init.txt @@ -79,9 +79,7 @@ was primarily meant to initialize the object database, but over time it has become responsible for setting up the other aspects of the repository, such as installing the default hooks and setting the configuration variables. The old name is retained -because people are so used to it and many existing documents -refer to it that way, and this will not change for some time to -come. +for backward compatibility reasons. EXAMPLES diff --git a/git-p4import.html b/git-p4import.html index 99ab519c4..1b218a828 100644 --- a/git-p4import.html +++ b/git-p4import.html @@ -396,7 +396,7 @@ perforce branch into a branch named "jammy", like so:

$ mkdir -p /home/sean/import/jam
 $ cd /home/sean/import/jam
-$ git init-db
+$ git init
 $ git p4import //public/jam jammy
@@ -461,7 +461,7 @@ of mappings with each line containing one mapping in the format:

diff --git a/git-p4import.txt b/git-p4import.txt index ee9e8fa90..6edb9f12b 100644 --- a/git-p4import.txt +++ b/git-p4import.txt @@ -93,7 +93,7 @@ perforce branch into a branch named "jammy", like so: ------------ $ mkdir -p /home/sean/import/jam $ cd /home/sean/import/jam -$ git init-db +$ git init $ git p4import //public/jam jammy ------------ diff --git a/git-prune-packed.html b/git-prune-packed.html index 82685e532..dc3ebd039 100644 --- a/git-prune-packed.html +++ b/git-prune-packed.html @@ -272,7 +272,7 @@ git-prune-packed(1) Manual Page

SYNOPSIS

-

git-prune-packed [-n]

+

git-prune-packed [-n] [-q]

DESCRIPTION

@@ -296,6 +296,14 @@ disk storage, etc.

removed.

+
+-q +
+
+

+ Squelch the progress indicator. +

+

Author

@@ -317,7 +325,7 @@ disk storage, etc.

diff --git a/git-prune-packed.txt b/git-prune-packed.txt index 234882685..a79193fb0 100644 --- a/git-prune-packed.txt +++ b/git-prune-packed.txt @@ -9,7 +9,7 @@ residing in a pack file. SYNOPSIS -------- -'git-prune-packed' [-n] +'git-prune-packed' [-n] [-q] DESCRIPTION @@ -32,6 +32,9 @@ OPTIONS Don't actually remove any objects, only show those that would have been removed. +-q:: + Squelch the progress indicator. + Author ------ Written by Linus Torvalds diff --git a/git-repo-config.html b/git-repo-config.html index 78ca7305c..97ff00c25 100644 --- a/git-repo-config.html +++ b/git-repo-config.html @@ -690,7 +690,7 @@ core.sharedRepository group-writable). When all (or world or everybody), the repository will be readable by all users, additionally to being group-shareable. When umask (or false), git will use permissions - reported by umask(2). See git-init-db(1). False by default. + reported by umask(2). See git-init(1). False by default.

@@ -1268,7 +1268,7 @@ receive.denyNonFastForwards diff --git a/git-svn.html b/git-svn.html index 49e63b689..954cf47db 100644 --- a/git-svn.html +++ b/git-svn.html @@ -514,7 +514,7 @@ manually joining branches on commit.

Only used with the init command. - These are passed directly to git-init-db(1). + These are passed directly to git-init(1).

@@ -786,7 +786,7 @@ SVN was very wrong.

Tracking and contributing to a the trunk of a Subversion-managed project:

-
# Initialize a repo (like git init-db):
+
# Initialize a repo (like git init):
         git-svn init http://svn.foo.org/project/trunk
 # Fetch remote revisions:
         git-svn fetch
@@ -806,7 +806,7 @@ See also:
 Tracking Multiple Repositories or Branches

 

 

-
# Initialize a repo (like git init-db):
+
# Initialize a repo (like git init):
         git-svn multi-init http://svn.foo.org/project \
                 -T trunk -b branches -t tags
 # Fetch remote revisions:
@@ -911,7 +911,7 @@ detect them.

 

 
 
diff --git a/git-svn.txt b/git-svn.txt
index 1b013139a..9ed721118 100644
--- a/git-svn.txt
+++ b/git-svn.txt
@@ -171,7 +171,7 @@ OPTIONS
 --shared::
 --template=::
 	Only used with the 'init' command.
-	These are passed directly to gitlink:git-init-db[1].
+	These are passed directly to gitlink:git-init[1].
 
 -r ::
 --revision ::
@@ -367,7 +367,7 @@ Basic Examples
 Tracking and contributing to a the trunk of a Subversion-managed project:
 
 ------------------------------------------------------------------------
-# Initialize a repo (like git init-db):
+# Initialize a repo (like git init):
 	git-svn init http://svn.foo.org/project/trunk
 # Fetch remote revisions:
 	git-svn fetch
@@ -388,7 +388,7 @@ See also:
 '<>'
 
 ------------------------------------------------------------------------
-# Initialize a repo (like git init-db):
+# Initialize a repo (like git init):
 	git-svn multi-init http://svn.foo.org/project \
 		-T trunk -b branches -t tags
 # Fetch remote revisions:
diff --git a/git.html b/git.html
index bbc3ec0d8..da533ba67 100644
--- a/git.html
+++ b/git.html
@@ -1046,12 +1046,9 @@ repositories.

 

 git-init(1)
 

-

-git-init-db(1)
-

 

 

-        Creates an empty git object database, or reinitialize an
+        Creates an empty git repository, or reinitialize an
         existing one.
 

 

@@ -2288,7 +2285,7 @@ contributors on the git-list <git@vger.kernel.org>.

 

 
 
diff --git a/git.txt b/git.txt
index 5662cdc27..f89d745ef 100644
--- a/git.txt
+++ b/git.txt
@@ -354,8 +354,7 @@ 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
+	Creates an empty git repository, or reinitialize an
 	existing one.
 
 gitlink:git-merge-file[1]::
diff --git a/glossary.html b/glossary.html
index e3f8f2189..06658c055 100644
--- a/glossary.html
+++ b/glossary.html
@@ -804,8 +804,8 @@ div.exampleblock-content {
         branch head". And git push
         $URL refs/heads/master:refs/heads/to-upstream means
         "publish my master branch
-        head as to-upstream master head
-        at $URL". See also git-push(1)
+        head as to-upstream branch at $URL". See
+        also git-push(1)
 

 
 

@@ -984,7 +984,7 @@ the git-list <git@vger.kernel.org>.
diff --git a/glossary.txt b/glossary.txt index cd61aa260..bc917bbac 100644 --- a/glossary.txt +++ b/glossary.txt @@ -259,7 +259,7 @@ refspec:: means "grab the master branch head from the $URL and store it as my origin branch head". And `git push $URL refs/heads/master:refs/heads/to-upstream` - means "publish my master branch head as to-upstream master head + means "publish my master branch head as to-upstream branch at $URL". See also gitlink:git-push[1] repository:: diff --git a/hooks.html b/hooks.html index d4faf7f51..e1cc5d64e 100644 --- a/hooks.html +++ b/hooks.html @@ -265,7 +265,7 @@ div.exampleblock-content {

Hooks are little scripts you can place in $GIT_DIR/hooks directory to trigger action at certain points. When -git-init-db is run, a handful example hooks are copied in the +git-init is run, a handful example hooks are copied in the hooks directory of the new repository, but by default they are all disabled. To enable a hook, make it executable with chmod +x.

This document describes the currently defined hooks.

@@ -406,7 +406,7 @@ you can redirect your output to your stderr.

diff --git a/hooks.txt b/hooks.txt index 161123f14..e3b76f96e 100644 --- a/hooks.txt +++ b/hooks.txt @@ -3,7 +3,7 @@ Hooks used by git Hooks are little scripts you can place in `$GIT_DIR/hooks` directory to trigger action at certain points. When -`git-init-db` is run, a handful example hooks are copied in the +`git-init` is run, a handful example hooks are copied in the `hooks` directory of the new repository, but by default they are all disabled. To enable a hook, make it executable with `chmod +x`. diff --git a/howto-index.html b/howto-index.html index 5b4f07252..31eb72534 100644 --- a/howto-index.html +++ b/howto-index.html @@ -365,7 +365,7 @@ as a Linux subsystem maintainer.

diff --git a/howto/setup-git-server-over-http.txt b/howto/setup-git-server-over-http.txt index ba191569a..a202f3a46 100644 --- a/howto/setup-git-server-over-http.txt +++ b/howto/setup-git-server-over-http.txt @@ -70,7 +70,7 @@ DocumentRoot /where/ever/httpd.conf" to find your root: Initialize a bare repository $ cd my-new-repo.git - $ git --bare init-db + $ git --bare init Change the ownership to your web-server's credentials. Use "grep ^User diff --git a/repository-layout.html b/repository-layout.html index 6dda03f7d..106c4dc18 100644 --- a/repository-layout.html +++ b/repository-layout.html @@ -437,7 +437,7 @@ hooks

Hooks are customization scripts used by various git commands. A handful of sample hooks are installed when - git init-db is run, but all of them are disabled by + git init is run, but all of them are disabled by default. To enable, they need to be made executable. Read hooks for more details about each hook. @@ -543,7 +543,7 @@ logs/refs/tags/name

diff --git a/repository-layout.txt b/repository-layout.txt index e20fb7e74..0fdd36614 100644 --- a/repository-layout.txt +++ b/repository-layout.txt @@ -102,7 +102,7 @@ branches:: hooks:: Hooks are customization scripts used by various git commands. A handful of sample hooks are installed when - `git init-db` is run, but all of them are disabled by + `git init` is run, but all of them are disabled by default. To enable, they need to be made executable. Read link:hooks.html[hooks] for more details about each hook. -- 2.26.2