From 9049d9108c3a4c2198a349fb905ec4a70cd62306 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 29 May 2008 02:09:50 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.6-rc0-46-gd2b3 --- git-add.html | 4 ++-- git-add.txt | 2 +- git-cherry.html | 10 ++++++++-- git-cherry.txt | 6 ++++++ git-commit-tree.html | 4 ++-- git-commit-tree.txt | 2 +- git-format-patch.html | 4 ++-- git-format-patch.txt | 2 +- git-gc.html | 4 ++-- git-gc.txt | 2 +- git-gui.html | 6 +++--- git-gui.txt | 4 ++-- git-ls-files.html | 4 ++-- git-ls-files.txt | 2 +- git-pack-objects.html | 4 ++-- git-pack-objects.txt | 2 +- git-pack-redundant.html | 4 ++-- git-pack-redundant.txt | 2 +- git-prune-packed.html | 4 ++-- git-prune-packed.txt | 2 +- git-prune.html | 4 ++-- git-prune.txt | 2 +- git-read-tree.html | 4 ++-- git-read-tree.txt | 2 +- git-remote.html | 4 ++-- git-remote.txt | 2 +- git-repack.html | 4 ++-- git-repack.txt | 2 +- git-rm.html | 4 ++-- git-rm.txt | 2 +- git-status.html | 4 ++-- git-status.txt | 2 +- git-update-index.html | 4 ++-- git-update-index.txt | 2 +- git-var.html | 4 ++-- git-var.txt | 2 +- gitk.html | 4 ++-- gitk.txt | 2 +- 38 files changed, 70 insertions(+), 58 deletions(-) diff --git a/git-add.html b/git-add.html index 2de91ce2f..3d177a78b 100644 --- a/git-add.html +++ b/git-add.html @@ -581,7 +581,7 @@ characters that need C-quoting. core.quotepath configuration can be used to work this limitation around to some degree, but backslash, double-quote and control characters will still have problems.

-

See Also

+

SEE ALSO

git-status(1) git-rm(1) @@ -604,7 +604,7 @@ double-quote and control characters will still have problems.

diff --git a/git-add.txt b/git-add.txt index bb4abe26b..1afd0c69e 100644 --- a/git-add.txt +++ b/git-add.txt @@ -246,7 +246,7 @@ characters that need C-quoting. `core.quotepath` configuration can be used to work this limitation around to some degree, but backslash, double-quote and control characters will still have problems. -See Also +SEE ALSO -------- linkgit:git-status[1] linkgit:git-rm[1] diff --git a/git-cherry.html b/git-cherry.html index 0d35243a5..0586a7bd7 100644 --- a/git-cherry.html +++ b/git-cherry.html @@ -277,7 +277,9 @@ git-cherry(1) Manual Page

DESCRIPTION

The changeset (or "diff") of each commit between the fork-point and <head> -is compared against each commit between the fork-point and <upstream>.

+is compared against each commit between the fork-point and <upstream>. +The commits are compared with their patch id, obtained from git-patch-id(1) +program.

Every commit that doesn't exist in the <upstream> branch has its id (sha1) reported, prefixed by a symbol. The ones that have equivalent change already @@ -342,6 +344,10 @@ than pushing or pulling commits directly.

+

SEE ALSO

+
+

git-patch-id(1)

+

Author

Written by Junio C Hamano <junkio@cox.net>

@@ -356,7 +362,7 @@ than pushing or pulling commits directly.

diff --git a/git-cherry.txt b/git-cherry.txt index b0468aa74..d8e0a5b84 100644 --- a/git-cherry.txt +++ b/git-cherry.txt @@ -13,6 +13,8 @@ DESCRIPTION ----------- The changeset (or "diff") of each commit between the fork-point and is compared against each commit between the fork-point and . +The commits are compared with their 'patch id', obtained from linkgit:git-patch-id[1] +program. Every commit that doesn't exist in the branch has its id (sha1) reported, prefixed by a symbol. The ones that have @@ -56,6 +58,10 @@ OPTIONS :: Do not report commits up to (and including) limit. +SEE ALSO +-------- +linkgit:git-patch-id[1] + Author ------ Written by Junio C Hamano diff --git a/git-commit-tree.html b/git-commit-tree.html index 0491306fd..4eee6dc9c 100644 --- a/git-commit-tree.html +++ b/git-commit-tree.html @@ -459,7 +459,7 @@ message when a commit is made to force UTF-8 at the commit object level, because re-coding to UTF-8 is not necessarily a reversible operation.

-

See Also

+

SEE ALSO

git-write-tree(1)

@@ -477,7 +477,7 @@ reversible operation.

diff --git a/git-commit-tree.txt b/git-commit-tree.txt index 170803a6d..700840d41 100644 --- a/git-commit-tree.txt +++ b/git-commit-tree.txt @@ -88,7 +88,7 @@ Discussion include::i18n.txt[] -See Also +SEE ALSO -------- linkgit:git-write-tree[1] diff --git a/git-format-patch.html b/git-format-patch.html index d60ed59ad..ab0ab40bf 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -1070,7 +1070,7 @@ as e-mailable patches: -

See Also

+

SEE ALSO

git-am(1), git-send-email(1)

@@ -1088,7 +1088,7 @@ as e-mailable patches: diff --git a/git-format-patch.txt b/git-format-patch.txt index c60ce123e..fefcd269c 100644 --- a/git-format-patch.txt +++ b/git-format-patch.txt @@ -223,7 +223,7 @@ as e-mailable patches: $ git format-patch -3 ------------ -See Also +SEE ALSO -------- linkgit:git-am[1], linkgit:git-send-email[1] diff --git a/git-gc.html b/git-gc.html index ca48034f2..199ae1307 100644 --- a/git-gc.html +++ b/git-gc.html @@ -386,7 +386,7 @@ that were later amended or rewound).

all of those locations and decide whether it makes sense in your case to remove those references.

-

See Also

+

SEE ALSO

git-prune(1) git-reflog(1) @@ -403,7 +403,7 @@ remove those references.

diff --git a/git-gc.txt b/git-gc.txt index b6b5ce151..f4097007f 100644 --- a/git-gc.txt +++ b/git-gc.txt @@ -119,7 +119,7 @@ If you are expecting some objects to be collected and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references. -See Also +SEE ALSO -------- linkgit:git-prune[1] linkgit:git-reflog[1] diff --git a/git-gui.html b/git-gui.html index ad66605d4..743f1fba9 100644 --- a/git-gui.html +++ b/git-gui.html @@ -387,11 +387,11 @@ git gui browser maint -

See Also

+

SEE ALSO

-gitk(1) +gitk(1)

@@ -433,7 +433,7 @@ of end users.

diff --git a/git-gui.txt b/git-gui.txt index 6d6cd5d87..bd5fe67b3 100644 --- a/git-gui.txt +++ b/git-gui.txt @@ -79,9 +79,9 @@ git gui browser maint:: selected in the browser can be viewed with the internal blame viewer. -See Also +SEE ALSO -------- -'gitk(1)':: +linkgit:gitk[1]:: The git repository browser. Shows branches, commit history and file differences. gitk is the utility started by git-gui's Repository Visualize actions. diff --git a/git-ls-files.html b/git-ls-files.html index eeb3b79a0..897e66494 100644 --- a/git-ls-files.html +++ b/git-ls-files.html @@ -608,7 +608,7 @@ top of the directory tree. A pattern read from a file specified by --exclude-per-directory is relative to the directory that the pattern file appears in.

-

See Also

+

SEE ALSO

git-read-tree(1), gitignore(5)

@@ -626,7 +626,7 @@ pattern file appears in.

diff --git a/git-ls-files.txt b/git-ls-files.txt index da9ebf405..4be45b001 100644 --- a/git-ls-files.txt +++ b/git-ls-files.txt @@ -177,7 +177,7 @@ top of the directory tree. A pattern read from a file specified by --exclude-per-directory is relative to the directory that the pattern file appears in. -See Also +SEE ALSO -------- linkgit:git-read-tree[1], linkgit:gitignore[5] diff --git a/git-pack-objects.html b/git-pack-objects.html index c6d2a068b..93e810953 100644 --- a/git-pack-objects.html +++ b/git-pack-objects.html @@ -565,7 +565,7 @@ base-name

Documentation by Junio C Hamano

-

See Also

+

SEE ALSO

git-rev-list(1) git-repack(1) @@ -577,7 +577,7 @@ base-name

diff --git a/git-pack-objects.txt b/git-pack-objects.txt index 3a1be0818..35d1856b5 100644 --- a/git-pack-objects.txt +++ b/git-pack-objects.txt @@ -200,7 +200,7 @@ Documentation ------------- Documentation by Junio C Hamano -See Also +SEE ALSO -------- linkgit:git-rev-list[1] linkgit:git-repack[1] diff --git a/git-pack-redundant.html b/git-pack-redundant.html index f60f36455..c188b176f 100644 --- a/git-pack-redundant.html +++ b/git-pack-redundant.html @@ -323,7 +323,7 @@ objects.

Documentation by Lukas Sandström <lukass@etek.chalmers.se>

-

See Also

+

SEE ALSO

git-pack-objects(1) git-repack(1) @@ -335,7 +335,7 @@ objects.

diff --git a/git-pack-redundant.txt b/git-pack-redundant.txt index af4aa4a2e..c7bc7b336 100644 --- a/git-pack-redundant.txt +++ b/git-pack-redundant.txt @@ -46,7 +46,7 @@ Documentation -------------- Documentation by Lukas Sandström -See Also +SEE ALSO -------- linkgit:git-pack-objects[1] linkgit:git-repack[1] diff --git a/git-prune-packed.html b/git-prune-packed.html index 61065e6a8..0bbd9a607 100644 --- a/git-prune-packed.html +++ b/git-prune-packed.html @@ -314,7 +314,7 @@ disk storage, etc.

Documentation by Ryan Anderson <ryan@michonline.com>

-

See Also

+

SEE ALSO

git-pack-objects(1) git-repack(1)

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

diff --git a/git-prune-packed.txt b/git-prune-packed.txt index 93ee82ae5..3219eb3dd 100644 --- a/git-prune-packed.txt +++ b/git-prune-packed.txt @@ -42,7 +42,7 @@ Documentation -------------- Documentation by Ryan Anderson -See Also +SEE ALSO -------- linkgit:git-pack-objects[1] linkgit:git-repack[1] diff --git a/git-prune.html b/git-prune.html index f24683834..a79f10289 100644 --- a/git-prune.html +++ b/git-prune.html @@ -353,7 +353,7 @@ many other housekeeping tasks.

For a description of which objects are considered for pruning, see git-fsck's --unreachable option.

-

See Also

+

SEE ALSO

git-fsck(1), git-gc(1), @@ -373,7 +373,7 @@ git-fsck's --unreachable option.

diff --git a/git-prune.txt b/git-prune.txt index 3178bc44c..82a03e376 100644 --- a/git-prune.txt +++ b/git-prune.txt @@ -66,7 +66,7 @@ many other housekeeping tasks. For a description of which objects are considered for pruning, see git-fsck's --unreachable option. -See Also +SEE ALSO -------- linkgit:git-fsck[1], diff --git a/git-read-tree.html b/git-read-tree.html index 1b74cc7de..e0f719aa1 100644 --- a/git-read-tree.html +++ b/git-read-tree.html @@ -692,7 +692,7 @@ a case, you can simply continue doing what you were in the middle of doing, and when your working tree is ready (i.e. you have finished your work-in-progress), attempt the merge again.

-

See Also

+

SEE ALSO

git-write-tree(1); git-ls-files(1); gitignore(5)

@@ -711,7 +711,7 @@ have finished your work-in-progress), attempt the merge again.

diff --git a/git-read-tree.txt b/git-read-tree.txt index 8421d1fd7..2e097a140 100644 --- a/git-read-tree.txt +++ b/git-read-tree.txt @@ -345,7 +345,7 @@ middle of doing, and when your working tree is ready (i.e. you have finished your work-in-progress), attempt the merge again. -See Also +SEE ALSO -------- linkgit:git-write-tree[1]; linkgit:git-ls-files[1]; linkgit:gitignore[5] diff --git a/git-remote.html b/git-remote.html index f41e9ff8a..edb5b71c0 100644 --- a/git-remote.html +++ b/git-remote.html @@ -410,7 +410,7 @@ $ git merge origin -

See Also

+

SEE ALSO

git-fetch(1) git-branch(1) @@ -430,7 +430,7 @@ $ git merge origin

diff --git a/git-remote.txt b/git-remote.txt index b20e85197..5c55290ee 100644 --- a/git-remote.txt +++ b/git-remote.txt @@ -128,7 +128,7 @@ $ git merge origin ------------ -See Also +SEE ALSO -------- linkgit:git-fetch[1] linkgit:git-branch[1] diff --git a/git-repack.html b/git-repack.html index 305b07818..78b6f4fab 100644 --- a/git-repack.html +++ b/git-repack.html @@ -432,7 +432,7 @@ that way can try to use older git with it).

Documentation by Ryan Anderson <ryan@michonline.com>

-

See Also

+

SEE ALSO

git-pack-objects(1) git-prune-packed(1)

@@ -443,7 +443,7 @@ that way can try to use older git with it).

diff --git a/git-repack.txt b/git-repack.txt index f81a6607d..ef578f0f8 100644 --- a/git-repack.txt +++ b/git-repack.txt @@ -122,7 +122,7 @@ Documentation -------------- Documentation by Ryan Anderson -See Also +SEE ALSO -------- linkgit:git-pack-objects[1] linkgit:git-prune-packed[1] diff --git a/git-rm.html b/git-rm.html index 6e9359e8a..ffe79fe61 100644 --- a/git-rm.html +++ b/git-rm.html @@ -409,7 +409,7 @@ git-rm -f git-*.sh -

See Also

+

SEE ALSO

git-add(1)

@@ -427,7 +427,7 @@ git-rm -f git-*.sh diff --git a/git-rm.txt b/git-rm.txt index 9c81b72db..6481f4ae5 100644 --- a/git-rm.txt +++ b/git-rm.txt @@ -93,7 +93,7 @@ git-rm -f git-*.sh:: (i.e. you are listing the files explicitly), it does not remove `subdir/git-foo.sh`. -See Also +SEE ALSO -------- linkgit:git-add[1] diff --git a/git-status.html b/git-status.html index 7179293b7..23eca2555 100644 --- a/git-status.html +++ b/git-status.html @@ -313,7 +313,7 @@ to -1 or an unlimited number), the submodule summary will be enabled and a summary of commits for modified submodules will be shown (see --summary-limit option of git-submodule(1)).

-

See Also

+

SEE ALSO

gitignore(5)

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

diff --git a/git-status.txt b/git-status.txt index ea4376a17..057e2a167 100644 --- a/git-status.txt +++ b/git-status.txt @@ -57,7 +57,7 @@ to -1 or an unlimited number), the submodule summary will be enabled and a summary of commits for modified submodules will be shown (see --summary-limit option of linkgit:git-submodule[1]). -See Also +SEE ALSO -------- linkgit:gitignore[5] diff --git a/git-update-index.html b/git-update-index.html index 2365540af..069a55711 100644 --- a/git-update-index.html +++ b/git-update-index.html @@ -708,7 +708,7 @@ from symbolic link to regular file.

The command looks at core.ignorestat configuration variable. See Using "assume unchanged" bit section above.

-

See Also

+

SEE ALSO

git-config(1), git-add(1)

@@ -727,7 +727,7 @@ from symbolic link to regular file.

diff --git a/git-update-index.txt b/git-update-index.txt index 06640603c..77d312adc 100644 --- a/git-update-index.txt +++ b/git-update-index.txt @@ -312,7 +312,7 @@ The command looks at `core.ignorestat` configuration variable. See 'Using "assume unchanged" bit' section above. -See Also +SEE ALSO -------- linkgit:git-config[1], linkgit:git-add[1] diff --git a/git-var.html b/git-var.html index 45f13fd38..32384e32f 100644 --- a/git-var.html +++ b/git-var.html @@ -352,7 +352,7 @@ Your sysadmin must hate you! -

See Also

+

SEE ALSO

git-commit-tree(1) git-tag(1) @@ -372,7 +372,7 @@ Your sysadmin must hate you!

diff --git a/git-var.txt b/git-var.txt index 298028390..242a1d9bb 100644 --- a/git-var.txt +++ b/git-var.txt @@ -45,7 +45,7 @@ Your parents must have hated you!:: Your sysadmin must hate you!:: The password(5) name field is longer than a giant static buffer. -See Also +SEE ALSO -------- linkgit:git-commit-tree[1] linkgit:git-tag[1] diff --git a/gitk.html b/gitk.html index de583ce38..519e06f0e 100644 --- a/gitk.html +++ b/gitk.html @@ -394,7 +394,7 @@ gitk --max-count=100 --all -- Makefile

Gitk creates the .gitk file in your $HOME directory to store preferences such as display options, font, and colors.

-

See Also

+

SEE ALSO

@@ -440,7 +440,7 @@ such as display options, font, and colors.

diff --git a/gitk.txt b/gitk.txt index 50d12da89..b88fd9566 100644 --- a/gitk.txt +++ b/gitk.txt @@ -85,7 +85,7 @@ Files Gitk creates the .gitk file in your $HOME directory to store preferences such as display options, font, and colors. -See Also +SEE ALSO -------- 'qgit(1)':: A repository browser written in C++ using Qt. -- 2.26.2