From: Junio C Hamano Date: Thu, 14 Sep 2006 07:38:22 +0000 (+0000) Subject: Autogenerated HTML docs for v1.4.2.1-g3852 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fd73d89626d7af23c1e2a51cdaca976c2bf89f23;p=git.git Autogenerated HTML docs for v1.4.2.1-g3852 --- diff --git a/core-tutorial.html b/core-tutorial.html index b012aab64..7073b3ac6 100644 --- a/core-tutorial.html +++ b/core-tutorial.html @@ -1917,7 +1917,7 @@ Use git format-patch origin to prepare patches for e-mail suggested in the previous section may be new to you. You do not have to worry. git supports "shared public repository" style of cooperation you are probably more familiar with as well.

-

See git for CVS users for the details.

+

See git for CVS users for the details.

Bundling your work together

@@ -2011,7 +2011,7 @@ to follow, not easier.

diff --git a/core-tutorial.txt b/core-tutorial.txt index 1185897f7..47505aa20 100644 --- a/core-tutorial.txt +++ b/core-tutorial.txt @@ -1620,7 +1620,7 @@ suggested in the previous section may be new to you. You do not have to worry. git supports "shared public repository" style of cooperation you are probably more familiar with as well. -See link:cvs-migration.txt[git for CVS users] for the details. +See link:cvs-migration.html[git for CVS users] for the details. Bundling your work together --------------------------- diff --git a/cvs-migration.html b/cvs-migration.html index 058b5440e..6560db47a 100644 --- a/cvs-migration.html +++ b/cvs-migration.html @@ -438,7 +438,7 @@ repository.

Git allows you to specify scripts called "hooks" to be run at certain points. You can use these, for example, to send all commits to the shared -repository to a mailing list. See Hooks used by git.

+repository to a mailing list. See Hooks used by git.

You can enforce finer grained permissions using update hooks. See Controlling access to branches using update hooks.

@@ -579,7 +579,7 @@ that contain this changed "if" statement:

diff --git a/cvs-migration.txt b/cvs-migration.txt index d2b0bd38d..6812683a1 100644 --- a/cvs-migration.txt +++ b/cvs-migration.txt @@ -172,7 +172,7 @@ Advanced Shared Repository Management Git allows you to specify scripts called "hooks" to be run at certain points. You can use these, for example, to send all commits to the shared -repository to a mailing list. See link:hooks.txt[Hooks used by git]. +repository to a mailing list. See link:hooks.html[Hooks used by git]. You can enforce finer grained permissions using update hooks. See link:howto/update-hook-example.txt[Controlling access to branches using diff --git a/git-apply.html b/git-apply.html index 733a07544..84af247e5 100644 --- a/git-apply.html +++ b/git-apply.html @@ -454,15 +454,10 @@ and a work tree.

- When applying a patch, which is a git-enhanced patch - that was prepared to record the pre- and post-image object - name in full, and the path being patched exactly matches - the object the patch applies to (i.e. "index" line's - pre-image object name is what is in the working tree), - and the post-image object is available in the object - database, use the post-image object as the patch - result. This allows binary files to be patched in a - very limited way. + Historically we did not allow binary patch applied + without an explicit permission from the user, and this + flag was the way to do so. Currently we always allow binary + patch application, so this is a no-op.

@@ -573,7 +568,7 @@ apply.whitespace diff --git a/git-apply.txt b/git-apply.txt index c76cfffdc..0a6f7b321 100644 --- a/git-apply.txt +++ b/git-apply.txt @@ -110,15 +110,10 @@ OPTIONS deletion part but not addition part. --allow-binary-replacement, --binary:: - When applying a patch, which is a git-enhanced patch - that was prepared to record the pre- and post-image object - name in full, and the path being patched exactly matches - the object the patch applies to (i.e. "index" line's - pre-image object name is what is in the working tree), - and the post-image object is available in the object - database, use the post-image object as the patch - result. This allows binary files to be patched in a - very limited way. + Historically we did not allow binary patch applied + without an explicit permission from the user, and this + flag was the way to do so. Currently we always allow binary + patch application, so this is a no-op. --exclude=:: Don't apply changes to files matching the given path pattern. This can diff --git a/git-unpack-objects.html b/git-unpack-objects.html index ab2e814ee..881d3c5b1 100644 --- a/git-unpack-objects.html +++ b/git-unpack-objects.html @@ -272,7 +272,7 @@ git-unpack-objects(1) Manual Page

SYNOPSIS

-

git-unpack-objects [-n] [-q] <pack-file

+

git-unpack-objects [-n] [-q] [-r] <pack-file

DESCRIPTION

@@ -306,6 +306,17 @@ new packs and replace existing ones.

flag suppresses it.

+
+-r +
+
+

+ When unpacking a corrupt packfile, the command dies at + the first corruption. This flag tells it to keep going + and make the best effort to recover as many objects as + possible. +

+

Author

@@ -322,7 +333,7 @@ new packs and replace existing ones.

diff --git a/git-unpack-objects.txt b/git-unpack-objects.txt index c20b38b08..ff6184b0f 100644 --- a/git-unpack-objects.txt +++ b/git-unpack-objects.txt @@ -8,7 +8,7 @@ git-unpack-objects - Unpack objects from a packed archive SYNOPSIS -------- -'git-unpack-objects' [-n] [-q]

In addition to being the staging area for new commits, the index file is also populated from the object database when checking out a branch, and is used to hold the trees involved in a merge operation. -See the core tutorial and the relevant man +See the core tutorial and the relevant man pages for details.

What next?

@@ -635,7 +635,7 @@ example, creating a new commit.

diff --git a/tutorial-2.txt b/tutorial-2.txt index 2f4fe1217..42b6e7d7d 100644 --- a/tutorial-2.txt +++ b/tutorial-2.txt @@ -368,7 +368,7 @@ in the index file is identical to the one in the working directory. In addition to being the staging area for new commits, the index file is also populated from the object database when checking out a branch, and is used to hold the trees involved in a merge operation. -See the link:core-tutorial.txt[core tutorial] and the relevant man +See the link:core-tutorial.html[core tutorial] and the relevant man pages for details. What next?