From: Junio C Hamano Date: Sun, 7 Jan 2007 07:43:58 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.0-rc0-g13e86 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=79770b6ed3e6b40355c01e4d1c00c0da5c827086;p=git.git Autogenerated HTML docs for v1.5.0-rc0-g13e86 --- diff --git a/git-clone.html b/git-clone.html index 7be0c15d5..ff87a1cf7 100644 --- a/git-clone.html +++ b/git-clone.html @@ -281,12 +281,12 @@ git-clone(1) Manual Page

Clones a repository into a newly created directory, creates remote-tracking branches for each branch in the cloned repository -(visible using git branch -r), and creates and checks out a master -branch equal to the cloned repository's master branch.

+(visible using git branch -r), and creates and checks out an initial +branch equal to the cloned repository's currently active branch.

After the clone, a plain git fetch without arguments will update all the remote-tracking branches, and a git pull without arguments will in addition merge the remote master branch into the -current branch.

+current master branch, if any.

This default configuration is achieved by creating references to the remote branch heads under $GIT_DIR/refs/remotes/origin and by initializing remote.origin.url and remote.origin.fetch @@ -521,7 +521,7 @@ Create a repository on the kernel.org machine that borrows from Linus

diff --git a/git-clone.txt b/git-clone.txt index e7085fdf5..a78207461 100644 --- a/git-clone.txt +++ b/git-clone.txt @@ -18,13 +18,13 @@ DESCRIPTION Clones a repository into a newly created directory, creates remote-tracking branches for each branch in the cloned repository -(visible using `git branch -r`), and creates and checks out a master -branch equal to the cloned repository's master branch. +(visible using `git branch -r`), and creates and checks out an initial +branch equal to the cloned repository's currently active branch. After the clone, a plain `git fetch` without arguments will update all the remote-tracking branches, and a `git pull` without arguments will in addition merge the remote master branch into the -current branch. +current master branch, if any. This default configuration is achieved by creating references to the remote branch heads under `$GIT_DIR/refs/remotes/origin` and diff --git a/git-svn.html b/git-svn.html index 72cc62c36..f92f5e27e 100644 --- a/git-svn.html +++ b/git-svn.html @@ -326,11 +326,13 @@ manually joining branches on commit.

- Commit all diffs from a specified head directly to the SVN + Commit each diff from a specified head directly to the SVN repository, and then rebase or reset (depending on whether or - not there is a diff between SVN and head). It is recommended - that you run git-svn fetch and rebase (not pull) your commits - against the latest changes in the SVN repository. + not there is a diff between SVN and head). This will create + a revision in SVN for each commit in git. + It is recommended that you run git-svn fetch and rebase (not + pull or merge) your commits against the latest changes in the + SVN repository. An optional command-line argument may be specified as an alternative to HEAD. This is advantageous over set-tree (below) because it produces @@ -814,17 +816,18 @@ See also: git-svn multi-init -

REBASE VS. PULL

+

REBASE VS. PULL/MERGE

Originally, git-svn recommended that the remotes/git-svn branch be -pulled from. This is because the author favored git-svn set-tree B -to commit a single head rather than the git-svn set-tree A..B notation -to commit multiple commits.

-

If you use git-svn set-tree A..B to commit several diffs and you do not -have the latest remotes/git-svn merged into my-branch, you should use -git rebase to update your work branch instead of git pull. pull -can cause non-linear history to be flattened when committing into SVN, -which can lead to merge commits reversing previous commits in SVN.

+pulled or merged from. This is because the author favored +git-svn set-tree B to commit a single head rather than the +git-svn set-tree A..B notation to commit multiple commits.

+

If you use git-svn set-tree A..B to commit several diffs and you do +not have the latest remotes/git-svn merged into my-branch, you should +use git rebase to update your work branch instead of git pull or +git merge. pull/merge can cause non-linear history to be flattened +when committing into SVN, which can lead to merge commits reversing +previous commits in SVN.

DESIGN PHILOSOPHY

@@ -927,7 +930,7 @@ detect them.

diff --git a/git-svn.txt b/git-svn.txt index f754d2f67..ce63defff 100644 --- a/git-svn.txt +++ b/git-svn.txt @@ -53,11 +53,13 @@ See '<>' if you are interested in manually joining branches on commit. 'dcommit':: - Commit all diffs from a specified head directly to the SVN + Commit each diff from a specified head directly to the SVN repository, and then rebase or reset (depending on whether or - not there is a diff between SVN and head). It is recommended - that you run git-svn fetch and rebase (not pull) your commits - against the latest changes in the SVN repository. + not there is a diff between SVN and head). This will create + a revision in SVN for each commit in git. + It is recommended that you run git-svn fetch and rebase (not + pull or merge) your commits against the latest changes in the + SVN repository. An optional command-line argument may be specified as an alternative to HEAD. This is advantageous over 'set-tree' (below) because it produces @@ -408,19 +410,20 @@ See also: git-svn multi-init ------------------------------------------------------------------------ -REBASE VS. PULL ---------------- +REBASE VS. PULL/MERGE +--------------------- Originally, git-svn recommended that the remotes/git-svn branch be -pulled from. This is because the author favored 'git-svn set-tree B' -to commit a single head rather than the 'git-svn set-tree A..B' notation -to commit multiple commits. - -If you use 'git-svn set-tree A..B' to commit several diffs and you do not -have the latest remotes/git-svn merged into my-branch, you should use -'git rebase' to update your work branch instead of 'git pull'. 'pull' -can cause non-linear history to be flattened when committing into SVN, -which can lead to merge commits reversing previous commits in SVN. +pulled or merged from. This is because the author favored +'git-svn set-tree B' to commit a single head rather than the +'git-svn set-tree A..B' notation to commit multiple commits. + +If you use 'git-svn set-tree A..B' to commit several diffs and you do +not have the latest remotes/git-svn merged into my-branch, you should +use 'git rebase' to update your work branch instead of 'git pull' or +'git merge'. 'pull/merge' can cause non-linear history to be flattened +when committing into SVN, which can lead to merge commits reversing +previous commits in SVN. DESIGN PHILOSOPHY ----------------- diff --git a/git-svnimport.html b/git-svnimport.html index 65941326d..4e08b1064 100644 --- a/git-svnimport.html +++ b/git-svnimport.html @@ -278,7 +278,7 @@ git-svnimport(1) Manual Page [ -b branch_subdir ] [ -T trunk_subdir ] [ -t tag_subdir ] [ -s start_chg ] [ -m ] [ -r ] [ -M regex ] [ -I <ignorefile_name> ] [ -A <author_file> ] - [ -P <path_from_trunk> ] + [ -R <repack_each_revs>] [ -P <path_from_trunk> ] <SVN_repository_URL> [ <path> ]

DESCRIPTION

@@ -430,6 +430,18 @@ repository without -A.

due to SVN memory leaks. (These have been worked around.)

+-R <repack_each_revs> +
+
+

+ Specify how often git repository should be repacked. +

+

The default value is 1000. git-svnimport will do import in chunks of 1000 +revisions, after each chunk git repository will be repacked. To disable +this behavior specify some big value here which is mote than number of +revisions to import.

+
+
-P <path_from_trunk>
@@ -522,7 +534,7 @@ various participants of the git-list <git@vger.kernel.org>.

diff --git a/git-svnimport.txt b/git-svnimport.txt index 2c7c7dad5..b166cf332 100644 --- a/git-svnimport.txt +++ b/git-svnimport.txt @@ -15,7 +15,7 @@ SYNOPSIS [ -b branch_subdir ] [ -T trunk_subdir ] [ -t tag_subdir ] [ -s start_chg ] [ -m ] [ -r ] [ -M regex ] [ -I ] [ -A ] - [ -P ] + [ -R ] [ -P ] [ ] @@ -108,6 +108,14 @@ repository without -A. Formerly, this option controlled how many revisions to pull, due to SVN memory leaks. (These have been worked around.) +-R :: + Specify how often git repository should be repacked. ++ +The default value is 1000. git-svnimport will do import in chunks of 1000 +revisions, after each chunk git repository will be repacked. To disable +this behavior specify some big value here which is mote than number of +revisions to import. + -P :: Partial import of the SVN tree. + diff --git a/tutorial.html b/tutorial.html index a29d12242..66b00fc72 100644 --- a/tutorial.html +++ b/tutorial.html @@ -300,8 +300,7 @@ $ git init-db

You've now initialized the working directory—you may notice a new directory created, named ".git". Tell git that you want it to track -every file under the current directory with (notice the dot . -that means the current directory):

+every file under the current directory (note the .) with:

$ git add .
@@ -313,6 +312,9 @@ that means the current directory):

will prompt you for a commit message, then record the current state of all the files to the repository.

+ +

Making changes

+

Try modifying some files, then run

@@ -323,17 +325,17 @@ want the updated contents of these files in the commit and then make a commit, like this:

-
$ git add file1 file...
+
$ git add file1 file2 file3
 $ git commit

This will again prompt your for a message describing the change, and then -record the new versions of the files you listed. It is cumbersome -to list all files and you can say git commit -a (which stands for all) -instead of running git add beforehand.

+record the new versions of the files you listed.

+

Alternatively, instead of running git add beforehand, you can use

$ git commit -a
+

which will automatically notice modified (but not new) files.

A note on commit messages: Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more @@ -783,7 +785,7 @@ digressions that may be interesting at this point are:

diff --git a/tutorial.txt b/tutorial.txt index 79884d9c7..01d4a47a9 100644 --- a/tutorial.txt +++ b/tutorial.txt @@ -43,8 +43,7 @@ Initialized empty Git repository in .git/ You've now initialized the working directory--you may notice a new directory created, named ".git". Tell git that you want it to track -every file under the current directory with (notice the dot '.' -that means the current directory): +every file under the current directory (note the '.') with: ------------------------------------------------ $ git add . @@ -59,6 +58,9 @@ $ git commit will prompt you for a commit message, then record the current state of all the files to the repository. +Making changes +-------------- + Try modifying some files, then run ------------------------------------------------ @@ -70,19 +72,21 @@ want the updated contents of these files in the commit and then make a commit, like this: ------------------------------------------------ -$ git add file1 file... +$ git add file1 file2 file3 $ git commit ------------------------------------------------ This will again prompt your for a message describing the change, and then -record the new versions of the files you listed. It is cumbersome -to list all files and you can say `git commit -a` (which stands for 'all') -instead of running `git add` beforehand. +record the new versions of the files you listed. + +Alternatively, instead of running `git add` beforehand, you can use ------------------------------------------------ $ git commit -a ------------------------------------------------ +which will automatically notice modified (but not new) files. + A note on commit messages: Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more