From 96010b2a3ad29e2413ce39345ebfa2b0b7e09c88 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 9 Dec 2006 21:15:46 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.4.4.2-g4cfec --- config.txt | 11 +++++++++-- cvs-migration.html | 29 +++++++++++++++-------------- cvs-migration.txt | 27 ++++++++++++++------------- git-repo-config.html | 13 ++++++++++--- 4 files changed, 48 insertions(+), 32 deletions(-) diff --git a/config.txt b/config.txt index 909076281..21ec55797 100644 --- a/config.txt +++ b/config.txt @@ -125,10 +125,17 @@ apply.whitespace:: branch..remote:: When in branch , it tells `git fetch` which remote to fetch. + If this option is not given, `git fetch` defaults to remote "origin". branch..merge:: - When in branch , it tells `git fetch` the default remote branch - to be merged. + When in branch , it tells `git fetch` the default refspec to + be marked for merging in FETCH_HEAD. The value has exactly to match + a remote part of one of the refspecs which are fetched from the remote + given by "branch..remote". + The merge information is used by `git pull` (which at first calls + `git fetch`) to lookup the default branch for merging. Without + this option, `git pull` defaults to merge the first refspec fetched. + Specify multiple values to get an octopus merge. pager.color:: A boolean to enable/disable colored output when the pager is in diff --git a/cvs-migration.html b/cvs-migration.html index 9def6a9a5..d87dff6f9 100644 --- a/cvs-migration.html +++ b/cvs-migration.html @@ -307,8 +307,8 @@ Pull: refs/heads/master:refs/remotes/origin/master -

You can update the shared repository with your changes by first commiting -your changes, and then using:

+

You can update the shared repository with your changes by first committing +your changes, and then using the git-push(1) command:

$ git push origin master
@@ -335,11 +335,15 @@ other than master.

possibly created from scratch or from a tarball (see the tutorial), or imported from an already existing CVS repository (see the next section).

-

If your project's working directory is /home/alice/myproject, you can -create a shared repository at /pub/repo.git with:

+

Assume your existing repo is at /home/alice/myproject. Create a new "bare" +repository (a repository without a working tree) and fetch your project into +it:

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

Next, give every team member read/write access to this repository. One easy way to do this is to give all the team members ssh access to the @@ -350,10 +354,7 @@ users to do git pushes and pulls; see git-shell(1). writable by that group:

-
$ cd /pub
-$ chgrp -R $group repo.git
-$ find repo.git -mindepth 1 -type d |xargs chmod ug+rwx,g+s
-$ GIT_DIR=repo.git git repo-config core.sharedrepository true
+
$ chgrp -R $group /pub/my-repo.git

Make sure committers have a umask of at most 027, so that the directories they create are writable and searchable by other group members.

@@ -362,14 +363,14 @@ they create are writable and searchable by other group members.

First, install version 2.1 or higher of cvsps from http://www.cobite.com/cvsps/ and make -sure it is in your path. The magic command line is then

+sure it is in your path. Then cd to a checked out CVS working directory +of the project you are interested in and run git-cvsimport(1):

-
$ git cvsimport -v -d <cvsroot> -C <destination> <module>
+
$ git cvsimport -C <destination>

This puts a git archive of the named CVS module in the directory -<destination>, which will be created if necessary. The -v option makes -the conversion script very chatty.

+<destination>, which will be created if necessary.

The import checks out from CVS every revision of every file. Reportedly cvsimport can average some twenty revisions per second, so for a medium-sized project this should not take more than a couple of minutes. @@ -419,7 +420,7 @@ repositories without the need for a central maintainer.

diff --git a/cvs-migration.txt b/cvs-migration.txt index 47846bdab..b657f4589 100644 --- a/cvs-migration.txt +++ b/cvs-migration.txt @@ -43,8 +43,8 @@ Pull: refs/heads/master:refs/remotes/origin/master ------------ ================================ -You can update the shared repository with your changes by first commiting -your changes, and then using: +You can update the shared repository with your changes by first committing +your changes, and then using the gitlink:git-push[1] command: ------------------------------------------------ $ git push origin master @@ -76,11 +76,15 @@ possibly created from scratch or from a tarball (see the link:tutorial.html[tutorial]), or imported from an already existing CVS repository (see the next section). -If your project's working directory is /home/alice/myproject, you can -create a shared repository at /pub/repo.git with: +Assume your existing repo is at /home/alice/myproject. Create a new "bare" +repository (a repository without a working tree) and fetch your project into +it: ------------------------------------------------ -$ git clone -bare /home/alice/myproject /pub/repo.git +$ mkdir /pub/my-repo.git +$ cd /pub/my-repo.git +$ git --bare init-db --shared +$ git --bare fetch /home/alice/myproject master:master ------------------------------------------------ Next, give every team member read/write access to this repository. One @@ -93,10 +97,7 @@ Put all the committers in the same group, and make the repository writable by that group: ------------------------------------------------ -$ cd /pub -$ chgrp -R $group repo.git -$ find repo.git -mindepth 1 -type d |xargs chmod ug+rwx,g+s -$ GIT_DIR=repo.git git repo-config core.sharedrepository true +$ chgrp -R $group /pub/my-repo.git ------------------------------------------------ Make sure committers have a umask of at most 027, so that the directories @@ -107,15 +108,15 @@ Importing a CVS archive First, install version 2.1 or higher of cvsps from link:http://www.cobite.com/cvsps/[http://www.cobite.com/cvsps/] and make -sure it is in your path. The magic command line is then +sure it is in your path. Then cd to a checked out CVS working directory +of the project you are interested in and run gitlink:git-cvsimport[1]: ------------------------------------------- -$ git cvsimport -v -d -C +$ git cvsimport -C ------------------------------------------- This puts a git archive of the named CVS module in the directory -, which will be created if necessary. The -v option makes -the conversion script very chatty. +, which will be created if necessary. The import checks out from CVS every revision of every file. Reportedly cvsimport can average some twenty revisions per second, so for a diff --git a/git-repo-config.html b/git-repo-config.html index f6bcb40d7..c27b1414f 100644 --- a/git-repo-config.html +++ b/git-repo-config.html @@ -729,6 +729,7 @@ branch.<name>.remote

When in branch <name>, it tells git fetch which remote to fetch. + If this option is not given, git fetch defaults to remote "origin".

@@ -736,8 +737,14 @@ branch.<name>.merge

- When in branch <name>, it tells git fetch the default remote branch - to be merged. + When in branch <name>, it tells git fetch the default refspec to + be marked for merging in FETCH_HEAD. The value has exactly to match + a remote part of one of the refspecs which are fetched from the remote + given by "branch.<name>.remote". + The merge information is used by git pull (which at first calls + git fetch) to lookup the default branch for merging. Without + this option, git pull defaults to merge the first refspec fetched. + Specify multiple values to get an octopus merge.

@@ -1133,7 +1140,7 @@ receive.denyNonFastForwards
-- 2.26.2