From: Junio C Hamano Date: Fri, 6 Jun 2008 22:50:53 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.6-rc1-21-g03300 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f7c042d91f834c0648b5ca3ebf1ef6d0cdc1e36d;p=git.git Autogenerated HTML docs for v1.5.6-rc1-21-g03300 --- diff --git a/diff-options.txt b/diff-options.txt index 859d67990..572154834 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -241,4 +241,4 @@ endif::git-format-patch[] Do not show any source or destination prefix. For more detailed explanation on these common options, see also -link:diffcore.html[diffcore documentation]. +linkgit:gitdiffcore[7][diffcore documentation]. diff --git a/git-add.html b/git-add.html index d1728720e..d4119d376 100644 --- a/git-add.html +++ b/git-add.html @@ -410,7 +410,7 @@ commit.

The optional configuration variable core.excludesfile indicates a path to a file containing patterns of file names to exclude from git-add, similar to $GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to -those in info/exclude. See repository layout.

+those in info/exclude. See gitrepository-layout(5)[repository layout].

EXAMPLES

@@ -600,11 +600,11 @@ double-quote and control characters will still have problems.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-add.txt b/git-add.txt index 1afd0c69e..88165da38 100644 --- a/git-add.txt +++ b/git-add.txt @@ -100,7 +100,7 @@ Configuration The optional configuration variable 'core.excludesfile' indicates a path to a file containing patterns of file names to exclude from git-add, similar to $GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to -those in info/exclude. See link:repository-layout.html[repository layout]. +those in info/exclude. See linkgit:gitrepository-layout[5][repository layout]. EXAMPLES @@ -265,4 +265,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-am.html b/git-am.html index c70f0b2c3..f8b767344 100644 --- a/git-am.html +++ b/git-am.html @@ -496,11 +496,11 @@ names.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-am.txt b/git-am.txt index 2387a8d6c..7f6f5b472 100644 --- a/git-am.txt +++ b/git-am.txt @@ -153,4 +153,4 @@ Documentation by Petr Baudis, Junio C Hamano and the git-list

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-annotate.txt b/git-annotate.txt index 45a6a7251..da15379ae 100644 --- a/git-annotate.txt +++ b/git-annotate.txt @@ -28,4 +28,4 @@ Written by Ryan Anderson . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-apply.html b/git-apply.html index c0ae67ca4..8bfc9f53f 100644 --- a/git-apply.html +++ b/git-apply.html @@ -600,11 +600,11 @@ subdirectory is checked and (if possible) updated.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-apply.txt b/git-apply.txt index 2dec2ec1c..76277bd17 100644 --- a/git-apply.txt +++ b/git-apply.txt @@ -206,4 +206,4 @@ Documentation by Junio C Hamano GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-archimport.html b/git-archimport.html index 281d39766..82cce9863 100644 --- a/git-archimport.html +++ b/git-archimport.html @@ -418,11 +418,11 @@ patches that have been traded out-of-sequence between the branches.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-archimport.txt b/git-archimport.txt index bd20fd820..603117c79 100644 --- a/git-archimport.txt +++ b/git-archimport.txt @@ -117,4 +117,4 @@ Documentation by Junio C Hamano, Martin Langhoff and the git-list

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-archive.txt b/git-archive.txt index d3eaa16af..a3e36dbb0 100644 --- a/git-archive.txt +++ b/git-archive.txt @@ -118,4 +118,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-bisect.txt b/git-bisect.txt index 0b8b0ebba..37c7acbe9 100644 --- a/git-bisect.txt +++ b/git-bisect.txt @@ -283,4 +283,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-blame.html b/git-blame.html index a3ba6e941..7e7e39a36 100644 --- a/git-blame.html +++ b/git-blame.html @@ -682,11 +682,11 @@ commit commentary), a blame viewer won't ever care.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-blame.txt b/git-blame.txt index 14163b65f..7900f33d4 100644 --- a/git-blame.txt +++ b/git-blame.txt @@ -192,4 +192,4 @@ Written by Junio C Hamano GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-branch.html b/git-branch.html index 53f0526a1..55500d2b6 100644 --- a/git-branch.html +++ b/git-branch.html @@ -609,11 +609,11 @@ but different purposes:

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-branch.txt b/git-branch.txt index c824d8874..a70fa76f3 100644 --- a/git-branch.txt +++ b/git-branch.txt @@ -209,4 +209,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-bundle.html b/git-bundle.html index 9fab1759a..fed3d1755 100644 --- a/git-bundle.html +++ b/git-bundle.html @@ -480,11 +480,11 @@ network.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-bundle.txt b/git-bundle.txt index 18330cdcd..f6a06129a 100644 --- a/git-bundle.txt +++ b/git-bundle.txt @@ -171,4 +171,4 @@ Written by Mark Levedahl GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-cat-file.html b/git-cat-file.html index ff1ccc037..89dd3f4c2 100644 --- a/git-cat-file.html +++ b/git-cat-file.html @@ -402,11 +402,11 @@ for each object specified on stdin that does not exist in the repository:

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-cat-file.txt b/git-cat-file.txt index f6c394c48..3f77dbd10 100644 --- a/git-cat-file.txt +++ b/git-cat-file.txt @@ -103,4 +103,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-check-attr.txt b/git-check-attr.txt index 290f10f16..ef16b9398 100644 --- a/git-check-attr.txt +++ b/git-check-attr.txt @@ -38,4 +38,4 @@ Documentation by James Bowes. GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-check-ref-format.html b/git-check-ref-format.html index 464441899..5f53e1282 100644 --- a/git-check-ref-format.html +++ b/git-check-ref-format.html @@ -339,11 +339,11 @@ colon : is used as in srcref:dstref to mean "use srcref's

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-check-ref-format.txt b/git-check-ref-format.txt index a67688042..c560c0aa6 100644 --- a/git-check-ref-format.txt +++ b/git-check-ref-format.txt @@ -52,4 +52,4 @@ refname expressions (see linkgit:git-rev-parse[1]). Namely: GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-checkout-index.html b/git-checkout-index.html index e1ebd1aa4..0be6d76e9 100644 --- a/git-checkout-index.html +++ b/git-checkout-index.html @@ -507,11 +507,11 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-checkout-index.txt b/git-checkout-index.txt index cbbb0b509..a8cad9c21 100644 --- a/git-checkout-index.txt +++ b/git-checkout-index.txt @@ -181,4 +181,4 @@ Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-checkout.html b/git-checkout.html index 01e323241..102bf2d60 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -535,11 +535,11 @@ $ git add frotz

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-checkout.txt b/git-checkout.txt index a644173e1..a5bf9d6f8 100644 --- a/git-checkout.txt +++ b/git-checkout.txt @@ -215,4 +215,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-cherry-pick.html b/git-cherry-pick.html index b87bf0ce2..06f2744d6 100644 --- a/git-cherry-pick.html +++ b/git-cherry-pick.html @@ -379,11 +379,11 @@ effect to your working tree in a row.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-cherry-pick.txt b/git-cherry-pick.txt index ca048f46f..3762272b8 100644 --- a/git-cherry-pick.txt +++ b/git-cherry-pick.txt @@ -78,4 +78,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-cherry.html b/git-cherry.html index 33e086021..a3b9464a4 100644 --- a/git-cherry.html +++ b/git-cherry.html @@ -358,11 +358,11 @@ than pushing or pulling commits directly.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-cherry.txt b/git-cherry.txt index d8e0a5b84..ef7caf61e 100644 --- a/git-cherry.txt +++ b/git-cherry.txt @@ -72,4 +72,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-citool.html b/git-citool.html index 8c0192f94..5d64e7a12 100644 --- a/git-citool.html +++ b/git-citool.html @@ -293,11 +293,11 @@ See git-gui(1) for more details.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-citool.txt b/git-citool.txt index aca1d75e5..09108d0e6 100644 --- a/git-citool.txt +++ b/git-citool.txt @@ -29,4 +29,4 @@ Documentation by Shawn O. Pearce . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-clean.html b/git-clean.html index 86e199c1e..b4dc63922 100644 --- a/git-clean.html +++ b/git-clean.html @@ -349,11 +349,11 @@ affected are further limited to those that match them.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-clean.txt b/git-clean.txt index 5e9da036b..deebf3b31 100644 --- a/git-clean.txt +++ b/git-clean.txt @@ -54,4 +54,4 @@ Written by Pavel Roskin GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-clone.html b/git-clone.html index 7d33af6df..6d902b1b6 100644 --- a/git-clone.html +++ b/git-clone.html @@ -664,11 +664,11 @@ Create a repository on the kernel.org machine that borrows from Linus

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-clone.txt b/git-clone.txt index 9b564420c..7973e6af4 100644 --- a/git-clone.txt +++ b/git-clone.txt @@ -205,4 +205,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-commit-tree.html b/git-commit-tree.html index 8ebd33f3c..62542e63e 100644 --- a/git-commit-tree.html +++ b/git-commit-tree.html @@ -473,11 +473,11 @@ reversible operation.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-commit-tree.txt b/git-commit-tree.txt index 700840d41..728c2fae8 100644 --- a/git-commit-tree.txt +++ b/git-commit-tree.txt @@ -103,4 +103,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-commit.txt b/git-commit.txt index c3c9f5b90..02d4baab6 100644 --- a/git-commit.txt +++ b/git-commit.txt @@ -312,4 +312,4 @@ Junio C Hamano GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-config.html b/git-config.html index a22b24283..099fd992a 100644 --- a/git-config.html +++ b/git-config.html @@ -2588,11 +2588,11 @@ web.browser

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-config.txt b/git-config.txt index 5de5d051b..84b754f8d 100644 --- a/git-config.txt +++ b/git-config.txt @@ -334,4 +334,4 @@ Documentation by Johannes Schindelin, Petr Baudis and the git-list

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-count-objects.txt b/git-count-objects.txt index 7fb08e934..e1219b316 100644 --- a/git-count-objects.txt +++ b/git-count-objects.txt @@ -34,4 +34,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-cvsexportcommit.html b/git-cvsexportcommit.html index 920af796b..b7906d2b4 100644 --- a/git-cvsexportcommit.html +++ b/git-cvsexportcommit.html @@ -452,11 +452,11 @@ $ git-cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git-cvsexportcommit

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-cvsexportcommit.txt b/git-cvsexportcommit.txt index f75afaaad..5fa91e51a 100644 --- a/git-cvsexportcommit.txt +++ b/git-cvsexportcommit.txt @@ -117,4 +117,4 @@ Documentation by Martin Langhoff and others. GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-cvsimport.html b/git-cvsimport.html index 7eff155a8..72cff455c 100644 --- a/git-cvsimport.html +++ b/git-cvsimport.html @@ -524,11 +524,11 @@ various participants of the git-list <git@vger.kernel.org>.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-cvsimport.txt b/git-cvsimport.txt index 58eefd42e..2f9b35f62 100644 --- a/git-cvsimport.txt +++ b/git-cvsimport.txt @@ -170,4 +170,4 @@ Documentation by Matthias Urlichs . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-cvsserver.html b/git-cvsserver.html index efd420436..b03879af0 100644 --- a/git-cvsserver.html +++ b/git-cvsserver.html @@ -722,11 +722,11 @@ Martin Langhoff <martin@catalyst.net.nz>

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-cvsserver.txt b/git-cvsserver.txt index a33382ec2..b7721131d 100644 --- a/git-cvsserver.txt +++ b/git-cvsserver.txt @@ -352,4 +352,4 @@ Documentation by Martyn Smith , Martin Langhoff

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-daemon.txt b/git-daemon.txt index cf261dd40..3fb71d683 100644 --- a/git-daemon.txt +++ b/git-daemon.txt @@ -272,4 +272,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-describe.html b/git-describe.html index e163c4de0..8e795af9d 100644 --- a/git-describe.html +++ b/git-describe.html @@ -458,11 +458,11 @@ updated by Shawn Pearce <spearce@spearce.org>.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-describe.txt b/git-describe.txt index 69e1ab750..3f0b7b2f4 100644 --- a/git-describe.txt +++ b/git-describe.txt @@ -142,4 +142,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list

For more detailed explanation on these common options, see also -diffcore documentation.

+gitdiffcore(7)[diffcore documentation].

-1 -2 -3 or --base --ours --theirs, and -0 @@ -1284,11 +1284,11 @@ the pathname, but if that is NUL, the record will show two paths.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-diff-files.txt b/git-diff-files.txt index ca1bb6a8e..ed9bd75b7 100644 --- a/git-diff-files.txt +++ b/git-diff-files.txt @@ -54,4 +54,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list

For more detailed explanation on these common options, see also -diffcore documentation.

+gitdiffcore(7)[diffcore documentation].

<tree-ish> @@ -1374,11 +1374,11 @@ always have the special all-zero sha1.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-diff-index.txt b/git-diff-index.txt index e86777859..f6e844fe6 100644 --- a/git-diff-index.txt +++ b/git-diff-index.txt @@ -129,4 +129,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list

For more detailed explanation on these common options, see also -diffcore documentation.

+gitdiffcore(7)[diffcore documentation].

<tree-ish> @@ -1769,11 +1769,11 @@ the pathname, but if that is NUL, the record will show two paths.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-diff-tree.txt b/git-diff-tree.txt index 58d02c6a2..56caeb2d2 100644 --- a/git-diff-tree.txt +++ b/git-diff-tree.txt @@ -165,4 +165,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list

For more detailed explanation on these common options, see also -diffcore documentation.

+gitdiffcore(7)[diffcore documentation].

<path>… @@ -1489,11 +1489,11 @@ Output diff in reverse.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-diff.txt b/git-diff.txt index 57c28628b..7acd42896 100644 --- a/git-diff.txt +++ b/git-diff.txt @@ -168,4 +168,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-fast-export.html b/git-fast-export.html index 11b8e4304..6deea7529 100644 --- a/git-fast-export.html +++ b/git-fast-export.html @@ -347,11 +347,11 @@ a tag referencing a tree instead of a commit.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-fast-export.txt b/git-fast-export.txt index 6dac475a0..332346cc5 100644 --- a/git-fast-export.txt +++ b/git-fast-export.txt @@ -80,4 +80,4 @@ Documentation by Johannes E. Schindelin . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-fast-import.html b/git-fast-import.html index 20f5fe48c..040be1511 100644 --- a/git-fast-import.html +++ b/git-fast-import.html @@ -1412,11 +1412,11 @@ memory footprint (less than 2.7 MiB per active branch).

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-fast-import.txt b/git-fast-import.txt index c29a4f812..395c055f9 100644 --- a/git-fast-import.txt +++ b/git-fast-import.txt @@ -1119,4 +1119,4 @@ Documentation by Shawn O. Pearce . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-fetch-pack.html b/git-fetch-pack.html index 227a932fe..a554f39e6 100644 --- a/git-fetch-pack.html +++ b/git-fetch-pack.html @@ -427,11 +427,11 @@ have a common ancestor commit.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-fetch-pack.txt b/git-fetch-pack.txt index 57598eb05..6ee3dccc1 100644 --- a/git-fetch-pack.txt +++ b/git-fetch-pack.txt @@ -99,4 +99,4 @@ Documentation by Junio C Hamano. GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-fetch.html b/git-fetch.html index eaa393ca2..f247132d9 100644 --- a/git-fetch.html +++ b/git-fetch.html @@ -705,11 +705,11 @@ Junio C Hamano <junkio@cox.net>

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-fetch.txt b/git-fetch.txt index d982f961f..489b2b17e 100644 --- a/git-fetch.txt +++ b/git-fetch.txt @@ -53,4 +53,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-filter-branch.txt b/git-filter-branch.txt index 35cb1677f..44060687a 100644 --- a/git-filter-branch.txt +++ b/git-filter-branch.txt @@ -317,4 +317,4 @@ Documentation by Petr Baudis and the git list. GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-fmt-merge-msg.html b/git-fmt-merge-msg.html index c06a5011c..e37120c2f 100644 --- a/git-fmt-merge-msg.html +++ b/git-fmt-merge-msg.html @@ -363,11 +363,11 @@ merge.summary

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-fmt-merge-msg.txt b/git-fmt-merge-msg.txt index 457cf4256..328cc542d 100644 --- a/git-fmt-merge-msg.txt +++ b/git-fmt-merge-msg.txt @@ -67,4 +67,4 @@ Documentation by Petr Baudis, Junio C Hamano and the git-list SYNOPSIS
-
git-for-each-ref [--count=<count>]* - [--shell|--perl|--python|--tcl] - [--sort=<key>]* [--format=<format>] [<pattern>]
+
git-for-each-ref [--count=<count>] [--shell|--perl|--python|--tcl] + [--sort=<key>]* [--format=<format>] [<pattern>…]

DESCRIPTION

@@ -306,8 +305,9 @@ host language allowing their direct evaluation in that language.

A field name to sort on. Prefix - to sort in descending order of the value. When unspecified, - refname is used. More than one sort keys can be - given. + refname is used. You may use the --sort=<key> option + multiple times, in which case the last key becomes the primary + key.

@@ -332,9 +332,10 @@ host language allowing their direct evaluation in that language.

- If given, the name of the ref is matched against this - using fnmatch(3). Refs that do not match the pattern - are not shown. + If one or more patterns are given, only refs are shown that + match againt at least one pattern, either using fnmatch(3) or + literally, in the latter case matching completely or from the + beginning up to a slash.

@@ -495,7 +496,7 @@ eval "$eval" diff --git a/git-for-each-ref.txt b/git-for-each-ref.txt index f1f90cca6..6325ff9a6 100644 --- a/git-for-each-ref.txt +++ b/git-for-each-ref.txt @@ -8,9 +8,8 @@ git-for-each-ref - Output information on each ref SYNOPSIS -------- [verse] -'git-for-each-ref' [--count=]\* - [--shell|--perl|--python|--tcl] - [--sort=]\* [--format=] [] +'git-for-each-ref' [--count=] [--shell|--perl|--python|--tcl] + [--sort=]\* [--format=] [...] DESCRIPTION ----------- @@ -32,8 +31,9 @@ OPTIONS :: A field name to sort on. Prefix `-` to sort in descending order of the value. When unspecified, - `refname` is used. More than one sort keys can be - given. + `refname` is used. You may use the --sort= option + multiple times, in which case the last key becomes the primary + key. :: A string that interpolates `%(fieldname)` from the @@ -48,9 +48,10 @@ OPTIONS `%09` to `\t` (TAB) and `%0a` to `\n` (LF). :: - If given, the name of the ref is matched against this - using fnmatch(3). Refs that do not match the pattern - are not shown. + If one or more patterns are given, only refs are shown that + match againt at least one pattern, either using fnmatch(3) or + literally, in the latter case matching completely or from the + beginning up to a slash. --shell, --perl, --python, --tcl:: If given, strings that substitute `%(fieldname)` diff --git a/git-format-patch.html b/git-format-patch.html index b6249f514..371140074 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -806,7 +806,7 @@ reference.

For more detailed explanation on these common options, see also -diffcore documentation.

+gitdiffcore(7)[diffcore documentation].

-<n> @@ -1084,11 +1084,11 @@ as e-mailable patches:

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-format-patch.txt b/git-format-patch.txt index fefcd269c..cdee64206 100644 --- a/git-format-patch.txt +++ b/git-format-patch.txt @@ -238,4 +238,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-fsck.html b/git-fsck.html index 52983e5d1..bdbf668a8 100644 --- a/git-fsck.html +++ b/git-fsck.html @@ -518,11 +518,11 @@ GIT_ALTERNATE_OBJECT_DIRECTORIES

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-fsck.txt b/git-fsck.txt index 4cc26fb74..9846c859c 100644 --- a/git-fsck.txt +++ b/git-fsck.txt @@ -151,4 +151,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-gc.txt b/git-gc.txt index f4097007f..6ace615d8 100644 --- a/git-gc.txt +++ b/git-gc.txt @@ -132,4 +132,4 @@ Written by Shawn O. Pearce GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-get-tar-commit-id.html b/git-get-tar-commit-id.html index 307d79360..c71449010 100644 --- a/git-get-tar-commit-id.html +++ b/git-get-tar-commit-id.html @@ -294,11 +294,11 @@ a tree ID instead of a commit ID or tag.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-get-tar-commit-id.txt b/git-get-tar-commit-id.txt index dea41490c..c13bf9869 100644 --- a/git-get-tar-commit-id.txt +++ b/git-get-tar-commit-id.txt @@ -33,4 +33,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-grep.html b/git-grep.html index 2d84bd61d..a2f2f8770 100644 --- a/git-grep.html +++ b/git-grep.html @@ -526,11 +526,11 @@ revamped by Junio C Hamano.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-grep.txt b/git-grep.txt index a97f0557f..13b9cf770 100644 --- a/git-grep.txt +++ b/git-grep.txt @@ -145,4 +145,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-gui.html b/git-gui.html index ad74bfef5..de06a8efb 100644 --- a/git-gui.html +++ b/git-gui.html @@ -429,11 +429,11 @@ of end users.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-gui.txt b/git-gui.txt index bd5fe67b3..105397f2b 100644 --- a/git-gui.txt +++ b/git-gui.txt @@ -112,4 +112,4 @@ Documentation by Shawn O. Pearce . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-hash-object.html b/git-hash-object.html index 916e5b930..6e4752423 100644 --- a/git-hash-object.html +++ b/git-hash-object.html @@ -331,11 +331,11 @@ specified, it defaults to "blob".

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-hash-object.txt b/git-hash-object.txt index 99a21434b..cf3dce8a4 100644 --- a/git-hash-object.txt +++ b/git-hash-object.txt @@ -45,4 +45,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list git-config(1) for more information about this.

Documentation

-

Initial documentation was part of the git(7) man page. +

Initial documentation was part of the git(1) man page. Christian Couder <chriscool@tuxfamily.org> extracted and rewrote it a little. Maintenance is done by the git-list <git@vger.kernel.org>.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-help.txt b/git-help.txt index bfbba9e23..8994c6d43 100644 --- a/git-help.txt +++ b/git-help.txt @@ -172,10 +172,10 @@ Written by Junio C Hamano and the git-list Documentation ------------- -Initial documentation was part of the linkgit:git[7] man page. +Initial documentation was part of the linkgit:git[1] man page. Christian Couder extracted and rewrote it a little. Maintenance is done by the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-http-fetch.html b/git-http-fetch.html index 0ac3368a1..1250a815a 100644 --- a/git-http-fetch.html +++ b/git-http-fetch.html @@ -365,11 +365,11 @@ commit-id

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-http-fetch.txt b/git-http-fetch.txt index b784a9d07..70fb63529 100644 --- a/git-http-fetch.txt +++ b/git-http-fetch.txt @@ -53,4 +53,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-http-push.txt b/git-http-push.txt index 0b8272234..143291d12 100644 --- a/git-http-push.txt +++ b/git-http-push.txt @@ -101,4 +101,4 @@ Documentation by Nick Hengeveld GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-imap-send.html b/git-imap-send.html index 946d1d177..60f9b8603 100644 --- a/git-imap-send.html +++ b/git-imap-send.html @@ -316,11 +316,11 @@ configuration file (shown with examples):

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-imap-send.txt b/git-imap-send.txt index 522b73c12..f4fdc2428 100644 --- a/git-imap-send.txt +++ b/git-imap-send.txt @@ -59,4 +59,4 @@ Documentation by Mike McCormack GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-index-pack.html b/git-index-pack.html index 9658ffc63..413e5541a 100644 --- a/git-index-pack.html +++ b/git-index-pack.html @@ -402,11 +402,11 @@ mentioned above.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-index-pack.txt b/git-index-pack.txt index a7825b614..6409363ae 100644 --- a/git-index-pack.txt +++ b/git-index-pack.txt @@ -100,4 +100,4 @@ Documentation by Sergey Vlasov GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-init.html b/git-init.html index a2e23c928..5202de5b1 100644 --- a/git-init.html +++ b/git-init.html @@ -417,11 +417,11 @@ add all existing file to the index

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-init.txt b/git-init.txt index b48c31289..c48b615da 100644 --- a/git-init.txt +++ b/git-init.txt @@ -122,4 +122,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-instaweb.txt b/git-instaweb.txt index 51f1532ef..11e6a8177 100644 --- a/git-instaweb.txt +++ b/git-instaweb.txt @@ -86,4 +86,4 @@ Documentation by Eric Wong . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-log.html b/git-log.html index 615c09acc..ab9ff5033 100644 --- a/git-log.html +++ b/git-log.html @@ -758,7 +758,7 @@ each commit introduces are shown.

For more detailed explanation on these common options, see also -diffcore documentation.

+gitdiffcore(7)[diffcore documentation].

-<n> @@ -1909,11 +1909,11 @@ reversible operation.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-log.txt b/git-log.txt index ebaee4b33..db61bc96c 100644 --- a/git-log.txt +++ b/git-log.txt @@ -112,4 +112,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-lost-found.txt b/git-lost-found.txt index b1c797f10..4dc475e0d 100644 --- a/git-lost-found.txt +++ b/git-lost-found.txt @@ -78,4 +78,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-ls-files.html b/git-ls-files.html index 6cbe9458c..411f10277 100644 --- a/git-ls-files.html +++ b/git-ls-files.html @@ -622,11 +622,11 @@ pattern file appears in.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-ls-files.txt b/git-ls-files.txt index 4be45b001..1b0b21224 100644 --- a/git-ls-files.txt +++ b/git-ls-files.txt @@ -192,4 +192,4 @@ Documentation by David Greaves, Junio C Hamano, Josh Triplett, and the git-list GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-ls-remote.html b/git-ls-remote.html index 4c0a4c4c1..033c53532 100644 --- a/git-ls-remote.html +++ b/git-ls-remote.html @@ -357,11 +357,11 @@ c5db5456ae3b0873fc659c19fafdde22313cc441 refs/tags/v0.99.2

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-ls-remote.txt b/git-ls-remote.txt index c5ba0aad1..8ad7a94f9 100644 --- a/git-ls-remote.txt +++ b/git-ls-remote.txt @@ -69,4 +69,4 @@ Written by Junio C Hamano GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-ls-tree.html b/git-ls-tree.html index 4972222e3..8bd04949d 100644 --- a/git-ls-tree.html +++ b/git-ls-tree.html @@ -412,11 +412,11 @@ another major rewrite by Linus Torvalds <torvalds@osdl.org>

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-ls-tree.txt b/git-ls-tree.txt index 360c0a1b9..d9881fbbb 100644 --- a/git-ls-tree.txt +++ b/git-ls-tree.txt @@ -91,4 +91,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-mailinfo.html b/git-mailinfo.html index 92e069316..c70db35ef 100644 --- a/git-mailinfo.html +++ b/git-mailinfo.html @@ -353,11 +353,11 @@ Junio C Hamano <junkio@cox.net>

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-mailinfo.txt b/git-mailinfo.txt index 3846f0e6e..183dc1dd7 100644 --- a/git-mailinfo.txt +++ b/git-mailinfo.txt @@ -66,4 +66,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-mailsplit.html b/git-mailsplit.html index 2922ebe00..a1a1f5c8f 100644 --- a/git-mailsplit.html +++ b/git-mailsplit.html @@ -358,11 +358,11 @@ and Junio C Hamano <junkio@cox.net>

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-mailsplit.txt b/git-mailsplit.txt index 421e7782b..9a2aedd48 100644 --- a/git-mailsplit.txt +++ b/git-mailsplit.txt @@ -55,4 +55,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-merge-base.html b/git-merge-base.html index f5a668e28..c68bcbaa8 100644 --- a/git-merge-base.html +++ b/git-merge-base.html @@ -308,11 +308,11 @@ relied on to decide in any particular way.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-merge-base.txt b/git-merge-base.txt index 07f78b4ae..bbe851239 100644 --- a/git-merge-base.txt +++ b/git-merge-base.txt @@ -39,4 +39,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-merge-file.txt b/git-merge-file.txt index c513184ba..149f13105 100644 --- a/git-merge-file.txt +++ b/git-merge-file.txt @@ -89,4 +89,4 @@ with parts copied from the original documentation of RCS merge. GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-merge-index.html b/git-merge-index.html index 763413bae..6b289bf3a 100644 --- a/git-merge-index.html +++ b/git-merge-index.html @@ -368,11 +368,11 @@ One-shot merge by Petr Baudis <pasky@ucw.cz>

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-merge-index.txt b/git-merge-index.txt index 19ee017ae..a0ead2bbf 100644 --- a/git-merge-index.txt +++ b/git-merge-index.txt @@ -84,4 +84,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-merge-one-file.txt b/git-merge-one-file.txt index ee95df3bc..5c9ce641e 100644 --- a/git-merge-one-file.txt +++ b/git-merge-one-file.txt @@ -26,4 +26,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-merge-tree.txt b/git-merge-tree.txt index 4cc0964e7..b785e0f6e 100644 --- a/git-merge-tree.txt +++ b/git-merge-tree.txt @@ -33,4 +33,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-merge.html b/git-merge.html index ba283a553..4512eee57 100644 --- a/git-merge.html +++ b/git-merge.html @@ -745,11 +745,11 @@ Resolve the conflicts. git-diff would report only the

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-merge.txt b/git-merge.txt index ef1f055c8..55bc36747 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -168,4 +168,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-mergetool.html b/git-mergetool.html index e78a596fc..887da677b 100644 --- a/git-mergetool.html +++ b/git-mergetool.html @@ -336,11 +336,11 @@ success of the resolution after the custom tool has exited.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-mergetool.txt b/git-mergetool.txt index 8ed44947e..83525609c 100644 --- a/git-mergetool.txt +++ b/git-mergetool.txt @@ -70,4 +70,4 @@ Documentation by Theodore Y Ts'o. GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-mktag.html b/git-mktag.html index 31bb98b71..31cd8bdb2 100644 --- a/git-mktag.html +++ b/git-mktag.html @@ -306,11 +306,11 @@ care about, but that can be verified with gpg.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-mktag.txt b/git-mktag.txt index 82db9f5d8..232bc1a33 100644 --- a/git-mktag.txt +++ b/git-mktag.txt @@ -43,4 +43,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-mktree.txt b/git-mktree.txt index f312036ab..1ddbf00af 100644 --- a/git-mktree.txt +++ b/git-mktree.txt @@ -31,4 +31,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-mv.html b/git-mv.html index 74c706d74..8407840b5 100644 --- a/git-mv.html +++ b/git-mv.html @@ -333,11 +333,11 @@ Move functionality added by Josef Weidendorfer <Josef.Weidendorfer@gmx.de>

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-mv.txt b/git-mv.txt index bff3fbe74..fb485de2c 100644 --- a/git-mv.txt +++ b/git-mv.txt @@ -50,4 +50,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-name-rev.txt b/git-name-rev.txt index efcabdc27..12784d737 100644 --- a/git-name-rev.txt +++ b/git-name-rev.txt @@ -75,4 +75,4 @@ Documentation by Johannes Schindelin. GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-pack-objects.html b/git-pack-objects.html index 6480c308c..a3d62da8b 100644 --- a/git-pack-objects.html +++ b/git-pack-objects.html @@ -573,11 +573,11 @@ base-name

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-pack-objects.txt b/git-pack-objects.txt index 35d1856b5..d5a87effa 100644 --- a/git-pack-objects.txt +++ b/git-pack-objects.txt @@ -208,4 +208,4 @@ linkgit:git-prune-packed[1] GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-pack-redundant.html b/git-pack-redundant.html index 65821cb57..000abe92b 100644 --- a/git-pack-redundant.html +++ b/git-pack-redundant.html @@ -331,11 +331,11 @@ objects.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-pack-redundant.txt b/git-pack-redundant.txt index c7bc7b336..6737326f0 100644 --- a/git-pack-redundant.txt +++ b/git-pack-redundant.txt @@ -54,4 +54,4 @@ linkgit:git-prune-packed[1] GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-pack-refs.html b/git-pack-refs.html index d45fa23a4..dc6628ebf 100644 --- a/git-pack-refs.html +++ b/git-pack-refs.html @@ -332,11 +332,11 @@ hierarchy after packing them. This option tells it not to.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-pack-refs.txt b/git-pack-refs.txt index e4ff93471..fa4868137 100644 --- a/git-pack-refs.txt +++ b/git-pack-refs.txt @@ -63,4 +63,4 @@ Written by Linus Torvalds GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-parse-remote.html b/git-parse-remote.html index 5013c4846..13017a52e 100644 --- a/git-parse-remote.html +++ b/git-parse-remote.html @@ -322,11 +322,11 @@ get_remote_refs_for_push

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-parse-remote.txt b/git-parse-remote.txt index deb8b2f01..951dbd6c8 100644 --- a/git-parse-remote.txt +++ b/git-parse-remote.txt @@ -47,4 +47,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-patch-id.html b/git-patch-id.html index d93e52340..2dcc8da83 100644 --- a/git-patch-id.html +++ b/git-patch-id.html @@ -310,11 +310,11 @@ This can be used to make a mapping from patch ID to commit ID.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-patch-id.txt b/git-patch-id.txt index 894852a78..bb8a07925 100644 --- a/git-patch-id.txt +++ b/git-patch-id.txt @@ -39,4 +39,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-peek-remote.html b/git-peek-remote.html index 9eb82044f..1c3568a26 100644 --- a/git-peek-remote.html +++ b/git-peek-remote.html @@ -328,11 +328,11 @@ git-peek-remote(1) Manual Page

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-peek-remote.txt b/git-peek-remote.txt index 000171007..56be1b611 100644 --- a/git-peek-remote.txt +++ b/git-peek-remote.txt @@ -47,4 +47,4 @@ Documentation by Junio C Hamano. GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-prune-packed.html b/git-prune-packed.html index cdddb8c10..6cc257392 100644 --- a/git-prune-packed.html +++ b/git-prune-packed.html @@ -321,11 +321,11 @@ disk storage, etc.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-prune-packed.txt b/git-prune-packed.txt index 3219eb3dd..f330b8a5b 100644 --- a/git-prune-packed.txt +++ b/git-prune-packed.txt @@ -49,4 +49,4 @@ linkgit:git-repack[1] GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-prune.html b/git-prune.html index 1c2cebdda..74874f5e8 100644 --- a/git-prune.html +++ b/git-prune.html @@ -369,11 +369,11 @@ git-fsck's --unreachable option.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-prune.txt b/git-prune.txt index 82a03e376..7283d07a0 100644 --- a/git-prune.txt +++ b/git-prune.txt @@ -83,4 +83,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-pull.txt b/git-pull.txt index 66304f025..5c522ced9 100644 --- a/git-pull.txt +++ b/git-pull.txt @@ -203,4 +203,4 @@ Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-push.html b/git-push.html index 31f820ba5..b0bf1c695 100644 --- a/git-push.html +++ b/git-push.html @@ -755,11 +755,11 @@ by Linus Torvalds <torvalds@osdl.org>

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-push.txt b/git-push.txt index 0cc44d799..9d8c37971 100644 --- a/git-push.txt +++ b/git-push.txt @@ -200,4 +200,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-quiltimport.html b/git-quiltimport.html index 46e1cd580..b6d545322 100644 --- a/git-quiltimport.html +++ b/git-quiltimport.html @@ -335,11 +335,11 @@ variable.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-quiltimport.txt b/git-quiltimport.txt index 0fc2b56c1..d0bc182c7 100644 --- a/git-quiltimport.txt +++ b/git-quiltimport.txt @@ -57,4 +57,4 @@ Documentation by Eric Biederman GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-read-tree.html b/git-read-tree.html index a95c8a63e..195725150 100644 --- a/git-read-tree.html +++ b/git-read-tree.html @@ -707,11 +707,11 @@ have finished your work-in-progress), attempt the merge again.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-read-tree.txt b/git-read-tree.txt index 2e097a140..cbe68352b 100644 --- a/git-read-tree.txt +++ b/git-read-tree.txt @@ -361,4 +361,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-rebase.txt b/git-rebase.txt index e0412e086..cc48beec7 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -401,4 +401,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-receive-pack.html b/git-receive-pack.html index 5cc51620f..71b973051 100644 --- a/git-receive-pack.html +++ b/git-receive-pack.html @@ -426,11 +426,11 @@ exec git-update-server-info

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-receive-pack.txt b/git-receive-pack.txt index 4111434bb..a70c7168f 100644 --- a/git-receive-pack.txt +++ b/git-receive-pack.txt @@ -162,4 +162,4 @@ Documentation by Junio C Hamano. GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-reflog.html b/git-reflog.html index eed8baf2b..51add9853 100644 --- a/git-reflog.html +++ b/git-reflog.html @@ -393,11 +393,11 @@ them.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-reflog.txt b/git-reflog.txt index 047e3ce14..8492aeacf 100644 --- a/git-reflog.txt +++ b/git-reflog.txt @@ -102,4 +102,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-relink.html b/git-relink.html index 4a393d1fe..033d94b2e 100644 --- a/git-relink.html +++ b/git-relink.html @@ -312,11 +312,11 @@ repository will be replaced with a hardlink to the master repository.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-relink.txt b/git-relink.txt index 1b024ded3..f6dafd449 100644 --- a/git-relink.txt +++ b/git-relink.txt @@ -34,4 +34,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-remote.html b/git-remote.html index 24df82c5e..0bfe6284e 100644 --- a/git-remote.html +++ b/git-remote.html @@ -426,11 +426,11 @@ $ git merge origin

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-remote.txt b/git-remote.txt index 5c55290ee..e97dc0929 100644 --- a/git-remote.txt +++ b/git-remote.txt @@ -146,4 +146,4 @@ Documentation by J. Bruce Fields and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-repack.html b/git-repack.html index dd84d371b..fdac98954 100644 --- a/git-repack.html +++ b/git-repack.html @@ -439,11 +439,11 @@ that way can try to use older git with it).

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-repack.txt b/git-repack.txt index ef578f0f8..793dccaa9 100644 --- a/git-repack.txt +++ b/git-repack.txt @@ -129,4 +129,4 @@ linkgit:git-prune-packed[1] GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-request-pull.html b/git-request-pull.html index 25a09726a..bf956af1a 100644 --- a/git-request-pull.html +++ b/git-request-pull.html @@ -318,11 +318,11 @@ the given URL in the generated summary.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-request-pull.txt b/git-request-pull.txt index 9a14c04e3..c71d86985 100644 --- a/git-request-pull.txt +++ b/git-request-pull.txt @@ -36,4 +36,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-rerere.html b/git-rerere.html index 48056ee16..9e7ef16a7 100644 --- a/git-rerere.html +++ b/git-rerere.html @@ -477,11 +477,11 @@ conflict.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-rerere.txt b/git-rerere.txt index a53858e25..8030ec4d0 100644 --- a/git-rerere.txt +++ b/git-rerere.txt @@ -208,4 +208,4 @@ Written by Junio C Hamano GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-reset.html b/git-reset.html index cdfb0e542..7c880ddbd 100644 --- a/git-reset.html +++ b/git-reset.html @@ -603,11 +603,11 @@ Adds the file to the index again.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-reset.txt b/git-reset.txt index fac59c972..12ea9b23c 100644 --- a/git-reset.txt +++ b/git-reset.txt @@ -203,4 +203,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-rev-list.html b/git-rev-list.html index 3a0254dcc..719b0d053 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -1221,11 +1221,11 @@ and the git-list <git@vger.kernel.org>.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-rev-list.txt b/git-rev-list.txt index d80cdf550..c9b095032 100644 --- a/git-rev-list.txt +++ b/git-rev-list.txt @@ -109,4 +109,4 @@ and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-rev-parse.html b/git-rev-parse.html index 01a73666a..579ca4ee7 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html @@ -897,11 +897,11 @@ Junio C Hamano <junkio@cox.net> and Pierre Habouzit <madcoder@debian.or

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-rev-parse.txt b/git-rev-parse.txt index 5641d9951..a0ef1fd55 100644 --- a/git-rev-parse.txt +++ b/git-rev-parse.txt @@ -417,4 +417,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-revert.html b/git-revert.html index 15b472c7e..28f4be3f8 100644 --- a/git-revert.html +++ b/git-revert.html @@ -361,11 +361,11 @@ effect to your working tree in a row.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-revert.txt b/git-revert.txt index 13ceabbcc..5e6adfcea 100644 --- a/git-revert.txt +++ b/git-revert.txt @@ -65,4 +65,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-rm.html b/git-rm.html index fbc0d66c2..c955bc825 100644 --- a/git-rm.html +++ b/git-rm.html @@ -423,11 +423,11 @@ git-rm -f git-*.sh

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-rm.txt b/git-rm.txt index 6481f4ae5..da3fe5913 100644 --- a/git-rm.txt +++ b/git-rm.txt @@ -107,4 +107,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-send-email.html b/git-send-email.html index 0f0697220..6083c99e8 100644 --- a/git-send-email.html +++ b/git-send-email.html @@ -681,11 +681,11 @@ send_lots_of_email.pl by Greg Kroah-Hartman.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-send-email.txt b/git-send-email.txt index 9d0a10c56..a29583796 100644 --- a/git-send-email.txt +++ b/git-send-email.txt @@ -241,4 +241,4 @@ Documentation by Ryan Anderson GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-send-pack.html b/git-send-pack.html index 4347e83fe..893499f1a 100644 --- a/git-send-pack.html +++ b/git-send-pack.html @@ -449,11 +449,11 @@ to disable the fast-forward check only on that ref.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-send-pack.txt b/git-send-pack.txt index 777515b12..850c351dc 100644 --- a/git-send-pack.txt +++ b/git-send-pack.txt @@ -125,4 +125,4 @@ Documentation by Junio C Hamano. GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-sh-setup.html b/git-sh-setup.html index 4e00a9f82..258f6ae36 100644 --- a/git-sh-setup.html +++ b/git-sh-setup.html @@ -379,11 +379,11 @@ get_author_ident_from_commit

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-sh-setup.txt b/git-sh-setup.txt index 16b8b7514..c54317034 100644 --- a/git-sh-setup.txt +++ b/git-sh-setup.txt @@ -77,4 +77,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-shell.html b/git-shell.html index 544b2bb89..ad71efd45 100644 --- a/git-shell.html +++ b/git-shell.html @@ -294,11 +294,11 @@ are permitted to be called, with a single required argument.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-shell.txt b/git-shell.txt index bc031e0cc..bd09196ac 100644 --- a/git-shell.txt +++ b/git-shell.txt @@ -31,4 +31,4 @@ Documentation by Petr Baudis and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-shortlog.html b/git-shortlog.html index fed86125a..0ef9065c0 100644 --- a/git-shortlog.html +++ b/git-shortlog.html @@ -355,11 +355,11 @@ Eve Jones <eve@laptop.(none)>

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-shortlog.txt b/git-shortlog.txt index d7cb4c046..5079b568e 100644 --- a/git-shortlog.txt +++ b/git-shortlog.txt @@ -65,4 +65,4 @@ Documentation by Junio C Hamano. GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-show-branch.html b/git-show-branch.html index 3d9a009c6..05005e789 100644 --- a/git-show-branch.html +++ b/git-show-branch.html @@ -517,11 +517,11 @@ topologically related with each other.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-show-branch.txt b/git-show-branch.txt index 0bb8250b2..32595ad54 100644 --- a/git-show-branch.txt +++ b/git-show-branch.txt @@ -190,4 +190,4 @@ Documentation by Junio C Hamano. GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-show-index.html b/git-show-index.html index 7793f5112..d6ac7d29a 100644 --- a/git-show-index.html +++ b/git-show-index.html @@ -292,11 +292,11 @@ offset and SHA1 of each object.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-show-index.txt b/git-show-index.txt index 535a88464..891f0eff2 100644 --- a/git-show-index.txt +++ b/git-show-index.txt @@ -31,4 +31,4 @@ Documentation by Junio C Hamano GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-show-ref.html b/git-show-ref.html index f6bb4b901..cb96173b1 100644 --- a/git-show-ref.html +++ b/git-show-ref.html @@ -456,11 +456,11 @@ Man page by Jonas Fonseca <fonseca@diku.dk>.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-show-ref.txt b/git-show-ref.txt index ce0e643fb..a85332c36 100644 --- a/git-show-ref.txt +++ b/git-show-ref.txt @@ -169,4 +169,4 @@ Man page by Jonas Fonseca . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-show.html b/git-show.html index 6f2ccbb58..752730da5 100644 --- a/git-show.html +++ b/git-show.html @@ -764,11 +764,11 @@ Johannes Schindelin <Johannes.Schindelin@gmx.de>.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-show.txt b/git-show.txt index 29ed0acc6..baaf2bc8f 100644 --- a/git-show.txt +++ b/git-show.txt @@ -81,4 +81,4 @@ Documentation by David Greaves, Petr Baudis and the git-list

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-stash.txt b/git-stash.txt index 8dc35d493..baa4f55b4 100644 --- a/git-stash.txt +++ b/git-stash.txt @@ -182,4 +182,4 @@ Written by Nanako Shiraishi GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-status.html b/git-status.html index 107c3b4a4..e74d60257 100644 --- a/git-status.html +++ b/git-status.html @@ -328,11 +328,11 @@ Junio C Hamano <junkio@cox.net>.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-status.txt b/git-status.txt index 057e2a167..fef62b16d 100644 --- a/git-status.txt +++ b/git-status.txt @@ -72,4 +72,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-stripspace.txt b/git-stripspace.txt index fc5687502..4883834a1 100644 --- a/git-stripspace.txt +++ b/git-stripspace.txt @@ -32,4 +32,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-submodule.html b/git-submodule.html index b9cd275d0..80f821111 100644 --- a/git-submodule.html +++ b/git-submodule.html @@ -415,11 +415,11 @@ for details.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-submodule.txt b/git-submodule.txt index 0668f295e..139206f01 100644 --- a/git-submodule.txt +++ b/git-submodule.txt @@ -98,4 +98,4 @@ Written by Lars Hjemli GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-symbolic-ref.html b/git-symbolic-ref.html index a3499daa8..a4953d3ca 100644 --- a/git-symbolic-ref.html +++ b/git-symbolic-ref.html @@ -332,11 +332,11 @@ name is not a symbolic ref, or 128 if another error occurs.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-symbolic-ref.txt b/git-symbolic-ref.txt index a5b40f3e8..e9b996baa 100644 --- a/git-symbolic-ref.txt +++ b/git-symbolic-ref.txt @@ -58,4 +58,4 @@ Written by Junio C Hamano GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-tag.html b/git-tag.html index b7223bd95..1b85af9e2 100644 --- a/git-tag.html +++ b/git-tag.html @@ -548,11 +548,11 @@ Junio C Hamano <junkio@cox.net> and Chris Wright <chrisw@osdl.org>.<

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-tag.txt b/git-tag.txt index 9712392f7..8f40f4bf0 100644 --- a/git-tag.txt +++ b/git-tag.txt @@ -255,4 +255,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-tar-tree.txt b/git-tar-tree.txt index 65c68176e..74ed06525 100644 --- a/git-tar-tree.txt +++ b/git-tar-tree.txt @@ -86,4 +86,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-unpack-file.txt b/git-unpack-file.txt index 1864d13ed..d0552b2c7 100644 --- a/git-unpack-file.txt +++ b/git-unpack-file.txt @@ -32,4 +32,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-unpack-objects.txt b/git-unpack-objects.txt index 50947c50d..b9c4279a8 100644 --- a/git-unpack-objects.txt +++ b/git-unpack-objects.txt @@ -54,4 +54,4 @@ Documentation by Junio C Hamano GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-update-index.html b/git-update-index.html index 3d1407d64..e8f3e0afa 100644 --- a/git-update-index.html +++ b/git-update-index.html @@ -723,11 +723,11 @@ from symbolic link to regular file.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-update-index.txt b/git-update-index.txt index 77d312adc..c70336518 100644 --- a/git-update-index.txt +++ b/git-update-index.txt @@ -328,4 +328,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-update-ref.txt b/git-update-ref.txt index 4dc475992..7f7e3d197 100644 --- a/git-update-ref.txt +++ b/git-update-ref.txt @@ -90,4 +90,4 @@ Written by Linus Torvalds . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-update-server-info.html b/git-update-server-info.html index b34fe1640..6a1a4502c 100644 --- a/git-update-server-info.html +++ b/git-update-server-info.html @@ -298,8 +298,8 @@ generates such auxiliary files.

OUTPUT

Currently the command updates the following files. Please see -repository-layout for description -of what they are for:

+gitrepository-layout(5)[repository-layout] for description of +what they are for:

  • @@ -328,11 +328,11 @@ info/refs file unless --force flag is given.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-update-server-info.txt b/git-update-server-info.txt index 1cf89fd79..aa1ee67cb 100644 --- a/git-update-server-info.txt +++ b/git-update-server-info.txt @@ -30,8 +30,8 @@ OUTPUT ------ Currently the command updates the following files. Please see -link:repository-layout.html[repository-layout] for description -of what they are for: +linkgit:gitrepository-layout[5][repository-layout] for description of +what they are for: * objects/info/packs @@ -54,4 +54,4 @@ Documentation by Junio C Hamano. GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-upload-archive.html b/git-upload-archive.html index 16a3133af..6131da773 100644 --- a/git-upload-archive.html +++ b/git-upload-archive.html @@ -305,11 +305,11 @@ is meant to be used to get an archive from a remote repository.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-upload-archive.txt b/git-upload-archive.txt index c1ef1440b..e49f68f68 100644 --- a/git-upload-archive.txt +++ b/git-upload-archive.txt @@ -34,4 +34,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-upload-pack.html b/git-upload-pack.html index 4ae5b8d0c..110ef7a90 100644 --- a/git-upload-pack.html +++ b/git-upload-pack.html @@ -322,11 +322,11 @@ repository. For push operations, see git-send-pack.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-upload-pack.txt b/git-upload-pack.txt index 2330d1381..521da5b20 100644 --- a/git-upload-pack.txt +++ b/git-upload-pack.txt @@ -43,4 +43,4 @@ Documentation by Junio C Hamano. GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-var.html b/git-var.html index 9e96191cd..3bb71a2c1 100644 --- a/git-var.html +++ b/git-var.html @@ -368,11 +368,11 @@ Your sysadmin must hate you!

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-var.txt b/git-var.txt index 242a1d9bb..67e8e1f93 100644 --- a/git-var.txt +++ b/git-var.txt @@ -61,4 +61,4 @@ Documentation by Eric Biederman and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-verify-pack.html b/git-verify-pack.html index bc2446e4c..8765cdc55 100644 --- a/git-verify-pack.html +++ b/git-verify-pack.html @@ -334,11 +334,11 @@ corresponding pack file.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-verify-pack.txt b/git-verify-pack.txt index ba2a15729..478f23699 100644 --- a/git-verify-pack.txt +++ b/git-verify-pack.txt @@ -50,4 +50,4 @@ Documentation by Junio C Hamano GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-verify-tag.html b/git-verify-tag.html index a84e71402..aae567a98 100644 --- a/git-verify-tag.html +++ b/git-verify-tag.html @@ -301,11 +301,11 @@ git-verify-tag(1) Manual Page

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-verify-tag.txt b/git-verify-tag.txt index 7e9c1ed15..dffba8906 100644 --- a/git-verify-tag.txt +++ b/git-verify-tag.txt @@ -28,4 +28,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-web--browse.html b/git-web--browse.html index 37a0ae829..fc43d39d0 100644 --- a/git-web--browse.html +++ b/git-web--browse.html @@ -415,11 +415,11 @@ git-list <git@vger.kernel.org>.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-web--browse.txt b/git-web--browse.txt index 5ba0b9f1c..f8d5fb11d 100644 --- a/git-web--browse.txt +++ b/git-web--browse.txt @@ -118,4 +118,4 @@ git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/git-whatchanged.html b/git-whatchanged.html index 8da0dab6b..3f8f41ed2 100644 --- a/git-whatchanged.html +++ b/git-whatchanged.html @@ -703,11 +703,11 @@ Junio C Hamano <junkio@cox.net>

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-whatchanged.txt b/git-whatchanged.txt index a6e7bd4c8..f5d39c787 100644 --- a/git-whatchanged.txt +++ b/git-whatchanged.txt @@ -76,4 +76,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list git-update-index phase before you did the

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/git-write-tree.txt b/git-write-tree.txt index 461c813f5..8744f6535 100644 --- a/git-write-tree.txt +++ b/git-write-tree.txt @@ -46,4 +46,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list -git(7) +git(1)

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/gitattributes.txt b/gitattributes.txt index 04ca63ca3..471754eb1 100644 --- a/gitattributes.txt +++ b/gitattributes.txt @@ -265,7 +265,7 @@ When git needs to show you a diff for the path with `diff` attribute set to `jcdiff`, it calls the command you specified with the above configuration, i.e. `j-c-diff`, with 7 parameters, just like `GIT_EXTERNAL_DIFF` program is called. -See linkgit:git[7] for details. +See linkgit:git[1] for details. Defining a custom hunk-header @@ -518,4 +518,4 @@ commit hash. GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/gitcli.html b/gitcli.html index a3993d682..41c527cbc 100644 --- a/gitcli.html +++ b/gitcli.html @@ -384,11 +384,11 @@ $ git describe --abbrev 10 HEAD # NOT WHAT YOU MEANT

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/gitcli.txt b/gitcli.txt index 835cb05f9..8fb5d889e 100644 --- a/gitcli.txt +++ b/gitcli.txt @@ -110,4 +110,4 @@ Documentation by Pierre Habouzit. GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/gitcore-tutorial.html b/gitcore-tutorial.html index 58468ee66..67efaa16d 100644 --- a/gitcore-tutorial.html +++ b/gitcore-tutorial.html @@ -385,7 +385,7 @@ populating your tree.
Note
An advanced user may want to take a look at the -repository layout document +gitrepository-layout(5)[repository layout] document after finishing this tutorial. @@ -1986,11 +1986,11 @@ to follow, not easier.

GIT

-

Part of the git(7) suite.

+

Part of the git(1) suite.

diff --git a/gitcore-tutorial.txt b/gitcore-tutorial.txt index 5995a2e15..cb4ec4044 100644 --- a/gitcore-tutorial.txt +++ b/gitcore-tutorial.txt @@ -109,7 +109,7 @@ populating your tree. [NOTE] An advanced user may want to take a look at the -link:repository-layout.html[repository layout] document +linkgit:gitrepository-layout[5][repository layout] document after finishing this tutorial. You have now created your first git repository. Of course, since it's @@ -1696,4 +1696,4 @@ link:user-manual.html[The Git User's Manual] GIT --- -Part of the linkgit:git[7] suite. +Part of the linkgit:git[1] suite. diff --git a/gitcvs-migration.html b/gitcvs-migration.html index 7625355d4..f7d2759d3 100644 --- a/gitcvs-migration.html +++ b/gitcvs-migration.html @@ -438,11 +438,11 @@ repositories without the need for a central maintainer.

GIT

-

Part of the git(7) suite.

+

Part of the git(1) suite.

diff --git a/gitcvs-migration.txt b/gitcvs-migration.txt index de02a4268..1db3f5294 100644 --- a/gitcvs-migration.txt +++ b/gitcvs-migration.txt @@ -193,4 +193,4 @@ link:user-manual.html[The Git User's Manual] GIT --- -Part of the linkgit:git[7] suite. +Part of the linkgit:git[1] suite. diff --git a/gitdiffcore.html b/gitdiffcore.html new file mode 100644 index 000000000..f29b5b572 --- /dev/null +++ b/gitdiffcore.html @@ -0,0 +1,575 @@ + + + + + + +gitdiffcore(7) + + + +

SYNOPSIS

+
+

git diff *

+
+

DESCRIPTION

+
+

The diff commands git-diff-index, git-diff-files, and git-diff-tree +can be told to manipulate differences they find in +unconventional ways before showing diff(1) output. The manipulation +is collectively called "diffcore transformation". This short note +describes what they are and how to use them to produce diff outputs +that are easier to understand than the conventional kind.

+
+

The chain of operation

+
+

The git-diff-* family works by first comparing two sets of +files:

+
    +
  • +

    +git-diff-index compares contents of a "tree" object and the + working directory (when --cached flag is not used) or a + "tree" object and the index file (when --cached flag is + used); +

    +
    • +
  • +

    +git-diff-files compares contents of the index file and the + working directory; +

    +
    • +
  • +

    +git-diff-tree compares contents of two "tree" objects; +

    +
    • +
+

In all of these cases, the commands themselves compare +corresponding paths in the two sets of files. The result of +comparison is passed from these commands to what is internally +called "diffcore", in a format similar to what is output when +the -p option is not used. E.g.

+
+
+
in-place edit  :100644 100644 bcd1234... 0123456... M file0
+create         :000000 100644 0000000... 1234567... A file4
+delete         :100644 000000 1234567... 0000000... D file5
+unmerged       :000000 000000 0000000... 0000000... U file6
+
+

The diffcore mechanism is fed a list of such comparison results +(each of which is called "filepair", although at this point each +of them talks about a single file), and transforms such a list +into another list. There are currently 6 such transformations:

+
    +
  • +

    +diffcore-pathspec +

    +
    • +
  • +

    +diffcore-break +

    +
    • +
  • +

    +diffcore-rename +

    +
    • +
  • +

    +diffcore-merge-broken +

    +
    • +
  • +

    +diffcore-pickaxe +

    +
    • +
  • +

    +diffcore-order +

    +
    • +
+

These are applied in sequence. The set of filepairs git-diff-* +commands find are used as the input to diffcore-pathspec, and +the output from diffcore-pathspec is used as the input to the +next transformation. The final result is then passed to the +output routine and generates either diff-raw format (see Output +format sections of the manual for git-diff-* commands) or +diff-patch format.

+
+

diffcore-pathspec: For Ignoring Files Outside Our Consideration

+
+

The first transformation in the chain is diffcore-pathspec, and +is controlled by giving the pathname parameters to the +git-diff-* commands on the command line. The pathspec is used +to limit the world diff operates in. It removes the filepairs +outside the specified set of pathnames. E.g. If the input set +of filepairs included:

+
+
+
:100644 100644 bcd1234... 0123456... M junkfile
+
+

but the command invocation was "git-diff-files myfile", then the +junkfile entry would be removed from the list because only "myfile" +is under consideration.

+

Implementation note. For performance reasons, git-diff-tree +uses the pathname parameters on the command line to cull set of +filepairs it feeds the diffcore mechanism itself, and does not +use diffcore-pathspec, but the end result is the same.

+
+

diffcore-break: For Splitting Up "Complete Rewrites"

+
+

The second transformation in the chain is diffcore-break, and is +controlled by the -B option to the git-diff-* commands. This is +used to detect a filepair that represents "complete rewrite" and +break such filepair into two filepairs that represent delete and +create. E.g. If the input contained this filepair:

+
+
+
:100644 100644 bcd1234... 0123456... M file0
+
+

and if it detects that the file "file0" is completely rewritten, +it changes it to:

+
+
+
:100644 000000 bcd1234... 0000000... D file0
+:000000 100644 0000000... 0123456... A file0
+
+

For the purpose of breaking a filepair, diffcore-break examines +the extent of changes between the contents of the files before +and after modification (i.e. the contents that have "bcd1234…" +and "0123456…" as their SHA1 content ID, in the above +example). The amount of deletion of original contents and +insertion of new material are added together, and if it exceeds +the "break score", the filepair is broken into two. The break +score defaults to 50% of the size of the smaller of the original +and the result (i.e. if the edit shrinks the file, the size of +the result is used; if the edit lengthens the file, the size of +the original is used), and can be customized by giving a number +after "-B" option (e.g. "-B75" to tell it to use 75%).

+
+

diffcore-rename: For Detection Renames and Copies

+
+

This transformation is used to detect renames and copies, and is +controlled by the -M option (to detect renames) and the -C option +(to detect copies as well) to the git-diff-* commands. If the +input contained these filepairs:

+
+
+
:100644 000000 0123456... 0000000... D fileX
+:000000 100644 0000000... 0123456... A file0
+
+

and the contents of the deleted file fileX is similar enough to +the contents of the created file file0, then rename detection +merges these filepairs and creates:

+
+
+
:100644 100644 0123456... 0123456... R100 fileX file0
+
+

When the "-C" option is used, the original contents of modified files, +and deleted files (and also unmodified files, if the +"--find-copies-harder" option is used) are considered as candidates +of the source files in rename/copy operation. If the input were like +these filepairs, that talk about a modified file fileY and a newly +created file file0:

+
+
+
:100644 100644 0123456... 1234567... M fileY
+:000000 100644 0000000... bcd3456... A file0
+
+

the original contents of fileY and the resulting contents of +file0 are compared, and if they are similar enough, they are +changed to:

+
+
+
:100644 100644 0123456... 1234567... M fileY
+:100644 100644 0123456... bcd3456... C100 fileY file0
+
+

In both rename and copy detection, the same "extent of changes" +algorithm used in diffcore-break is used to determine if two +files are "similar enough", and can be customized to use +a similarity score different from the default of 50% by giving a +number after the "-M" or "-C" option (e.g. "-M8" to tell it to use +8/10 = 80%).

+

Note. When the "-C" option is used with --find-copies-harder +option, git-diff-* commands feed unmodified filepairs to +diffcore mechanism as well as modified ones. This lets the copy +detector consider unmodified files as copy source candidates at +the expense of making it slower. Without --find-copies-harder, +git-diff-* commands can detect copies only if the file that was +copied happened to have been modified in the same changeset.

+
+

diffcore-merge-broken: For Putting "Complete Rewrites" Back Together

+
+

This transformation is used to merge filepairs broken by +diffcore-break, and not transformed into rename/copy by +diffcore-rename, back into a single modification. This always +runs when diffcore-break is used.

+

For the purpose of merging broken filepairs back, it uses a +different "extent of changes" computation from the ones used by +diffcore-break and diffcore-rename. It counts only the deletion +from the original, and does not count insertion. If you removed +only 10 lines from a 100-line document, even if you added 910 +new lines to make a new 1000-line document, you did not do a +complete rewrite. diffcore-break breaks such a case in order to +help diffcore-rename to consider such filepairs as candidate of +rename/copy detection, but if filepairs broken that way were not +matched with other filepairs to create rename/copy, then this +transformation merges them back into the original +"modification".

+

The "extent of changes" parameter can be tweaked from the +default 80% (that is, unless more than 80% of the original +material is deleted, the broken pairs are merged back into a +single modification) by giving a second number to -B option, +like these:

+
    +
  • +

    +-B50/60 (give 50% "break score" to diffcore-break, use 60% + for diffcore-merge-broken). +

    +
    • +
  • +

    +-B/60 (the same as above, since diffcore-break defaults to 50%). +

    +
    • +
+

Note that earlier implementation left a broken pair as a separate +creation and deletion patches. This was an unnecessary hack and +the latest implementation always merges all the broken pairs +back into modifications, but the resulting patch output is +formatted differently for easier review in case of such +a complete rewrite by showing the entire contents of old version +prefixed with -, followed by the entire contents of new +version prefixed with +.

+
+

diffcore-pickaxe: For Detecting Addition/Deletion of Specified String

+
+

This transformation is used to find filepairs that represent +changes that touch a specified string, and is controlled by the +-S option and the --pickaxe-all option to the git-diff-* +commands.

+

When diffcore-pickaxe is in use, it checks if there are +filepairs whose "original" side has the specified string and +whose "result" side does not. Such a filepair represents "the +string appeared in this changeset". It also checks for the +opposite case that loses the specified string.

+

When --pickaxe-all is not in effect, diffcore-pickaxe leaves +only such filepairs that touch the specified string in its +output. When --pickaxe-all is used, diffcore-pickaxe leaves all +filepairs intact if there is such a filepair, or makes the +output empty otherwise. The latter behaviour is designed to +make reviewing of the changes in the context of the whole +changeset easier.

+
+

diffcore-order: For Sorting the Output Based on Filenames

+
+

This is used to reorder the filepairs according to the user's +(or project's) taste, and is controlled by the -O option to the +git-diff-* commands.

+

This takes a text file each of whose lines is a shell glob +pattern. Filepairs that match a glob pattern on an earlier line +in the file are output before ones that match a later line, and +filepairs that do not match any glob pattern are output last.

+

As an example, a typical orderfile for the core git probably +would look like this:

+
+
+
README
+Makefile
+Documentation
+*.h
+*.c
+t
+
+
+

SEE ALSO

+
+

git-diff(1), +git-diff-files(1), +git-diff-index(1), +git-diff-tree(1), +git-format-patch(1), +git-log(1), +gitglossary(7), +The Git User's Manual

+
+

GIT

+
+

Part of the git(1) suite.

+
+ + + diff --git a/diffcore.txt b/gitdiffcore.txt similarity index 96% rename from diffcore.txt rename to gitdiffcore.txt index c6a983a5d..4d56c8526 100644 --- a/diffcore.txt +++ b/gitdiffcore.txt @@ -1,10 +1,16 @@ -Tweaking diff output -==================== -June 2005 +gitdiffcore(7) +============== +NAME +---- +gitdiffcore - Tweaking diff output (June 2005) -Introduction ------------- +SYNOPSIS +-------- +git diff * + +DESCRIPTION +----------- The diff commands git-diff-index, git-diff-files, and git-diff-tree can be told to manipulate differences they find in @@ -269,3 +275,18 @@ Documentation *.c t ------------------------------------------------ + +SEE ALSO +-------- +linkgit:git-diff[1], +linkgit:git-diff-files[1], +linkgit:git-diff-index[1], +linkgit:git-diff-tree[1], +linkgit:git-format-patch[1], +linkgit:git-log[1], +linkgit:gitglossary[7], +link:user-manual.html[The Git User's Manual] + +GIT +--- +Part of the linkgit:git[1] suite. diff --git a/gitglossary.html b/gitglossary.html index b0d4c8675..011eeeed1 100644 --- a/gitglossary.html +++ b/gitglossary.html @@ -1100,11 +1100,11 @@ This commit is referred to as a "merge commit", or sometimes just a

GIT

-

Part of the git(7) suite.

+

Part of the git(1) suite.

diff --git a/gitglossary.txt b/gitglossary.txt index e8475a042..5c5c31d31 100644 --- a/gitglossary.txt +++ b/gitglossary.txt @@ -22,4 +22,4 @@ link:user-manual.html[The Git User's Manual] GIT --- -Part of the linkgit:git[7] suite. +Part of the linkgit:git[1] suite. diff --git a/githooks.html b/githooks.html index 70473ce18..ba53140f0 100644 --- a/githooks.html +++ b/githooks.html @@ -521,11 +521,11 @@ to abort.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/githooks.txt b/githooks.txt index 53747febd..4f06ae0ed 100644 --- a/githooks.txt +++ b/githooks.txt @@ -300,4 +300,4 @@ to abort. GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/gitignore.html b/gitignore.html index 73bbb8680..38e8b0af3 100644 --- a/gitignore.html +++ b/gitignore.html @@ -429,11 +429,11 @@ Frank Lichtenheld, and the git-list <git@vger.kernel.org>.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/gitignore.txt b/gitignore.txt index 613dca006..2881c9cb9 100644 --- a/gitignore.txt +++ b/gitignore.txt @@ -138,4 +138,4 @@ Frank Lichtenheld, and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/gitk.html b/gitk.html index 807e17242..f2d5cd05f 100644 --- a/gitk.html +++ b/gitk.html @@ -436,11 +436,11 @@ such as display options, font, and colors.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/gitk.txt b/gitk.txt index b88fd9566..14bcf91f4 100644 --- a/gitk.txt +++ b/gitk.txt @@ -109,4 +109,4 @@ Documentation by Junio C Hamano, Jonas Fonseca, and the git-list GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/gitmodules.html b/gitmodules.html index 593802cca..237513571 100644 --- a/gitmodules.html +++ b/gitmodules.html @@ -333,11 +333,11 @@ submodules an url is specified which can be used for cloning the submodules.

GIT

-

Part of the git(7) suite

+

Part of the git(1) suite

diff --git a/gitmodules.txt b/gitmodules.txt index cc95b69f2..f8d122a8b 100644 --- a/gitmodules.txt +++ b/gitmodules.txt @@ -59,4 +59,4 @@ Documentation by Lars Hjemli GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite diff --git a/gitrepository-layout.html b/gitrepository-layout.html new file mode 100644 index 000000000..99b37764c --- /dev/null +++ b/gitrepository-layout.html @@ -0,0 +1,619 @@ + + + + + + +gitrepository-layout(5) + + + +

SYNOPSIS

+
+

$GIT_DIR/*

+
+

DESCRIPTION

+
+

You may find these things in your git repository (.git +directory for a repository associated with your working tree, or +<project>.git directory for a public bare repository. It is +also possible to have a working tree where .git is a plain +ascii file containing gitdir: <path>, i.e. the path to the +real git repository).

+
+
+objects +
+
+

+ Object store associated with this repository. Usually + an object store is self sufficient (i.e. all the objects + that are referred to by an object found in it are also + found in it), but there are couple of ways to violate + it. +

+
    +
  1. +

    +You could populate the repository by running a commit walker +without -a option. Depending on which options are given, you +could have only commit objects without associated blobs and +trees this way, for example. A repository with this kind of +incomplete object store is not suitable to be published to the +outside world but sometimes useful for private repository. +

    +
    2. +
  2. +

    +You also could have an incomplete but locally usable repository +by cloning shallowly. See git-clone(1). +

    +
    3. +
  3. +

    +You can be using objects/info/alternates mechanism, or +$GIT_ALTERNATE_OBJECT_DIRECTORIES mechanism to borrow +objects from other object stores. A repository with this kind +of incomplete object store is not suitable to be published for +use with dumb transports but otherwise is OK as long as +objects/info/alternates points at the right object stores +it borrows from. +

    +
    4. +
+
+
+objects/[0-9a-f][0-9a-f] +
+
+

+ Traditionally, each object is stored in its own file. + They are split into 256 subdirectories using the first + two letters from its object name to keep the number of + directory entries objects directory itself needs to + hold. Objects found here are often called unpacked + (or loose) objects. +

+
+
+objects/pack +
+
+

+ Packs (files that store many object in compressed form, + along with index files to allow them to be randomly + accessed) are found in this directory. +

+
+
+objects/info +
+
+

+ Additional information about the object store is + recorded in this directory. +

+
+
+objects/info/packs +
+
+

+ This file is to help dumb transports discover what packs + are available in this object store. Whenever a pack is + added or removed, git update-server-info should be run + to keep this file up-to-date if the repository is + published for dumb transports. git repack does this + by default. +

+
+
+objects/info/alternates +
+
+

+ This file records paths to alternate object stores that + this object store borrows objects from, one pathname per + line. Note that not only native Git tools use it locally, + but the HTTP fetcher also tries to use it remotely; this + will usually work if you have relative paths (relative + to the object database, not to the repository!) in your + alternates file, but it will not work if you use absolute + paths unless the absolute path in filesystem and web URL + is the same. See also objects/info/http-alternates. +

+
+
+objects/info/http-alternates +
+
+

+ This file records URLs to alternate object stores that + this object store borrows objects from, to be used when + the repository is fetched over HTTP. +

+
+
+refs +
+
+

+ References are stored in subdirectories of this + directory. The git prune command knows to keep + objects reachable from refs found in this directory and + its subdirectories. +

+
+
+refs/heads/name +
+
+

+ records tip-of-the-tree commit objects of branch name +

+
+
+refs/tags/name +
+
+

+ records any object name (not necessarily a commit + object, or a tag object that points at a commit object). +

+
+
+refs/remotes/name +
+
+

+ records tip-of-the-tree commit objects of branches copied + from a remote repository. +

+
+
+packed-refs +
+
+

+ records the same information as refs/heads/, refs/tags/, + and friends record in a more efficient way. See + git-pack-refs(1). +

+
+
+HEAD +
+
+

+ A symref (see glossary) to the refs/heads/ namespace + describing the currently active branch. It does not mean + much if the repository is not associated with any working tree + (i.e. a bare repository), but a valid git repository + must have the HEAD file; some porcelains may use it to + guess the designated "default" branch of the repository + (usually master). It is legal if the named branch + name does not (yet) exist. In some legacy setups, it is + a symbolic link instead of a symref that points at the current + branch. +

+

HEAD can also record a specific commit directly, instead of +being a symref to point at the current branch. Such a state +is often called detached HEAD, and almost all commands work +identically as normal. See git-checkout(1) for +details.

+
+
+branches +
+
+

+ A slightly deprecated way to store shorthands to be used + to specify URL to git fetch, git pull and git push + commands is to store a file in branches/<name> and + give name to these commands in place of repository + argument. +

+
+
+hooks +
+
+

+ Hooks are customization scripts used by various git + commands. A handful of sample hooks are installed when + git init is run, but all of them are disabled by + default. To enable, they need to be made executable. + Read githooks(5)[hooks] for more details about + each hook. +

+
+
+index +
+
+

+ The current index file for the repository. It is + usually not found in a bare repository. +

+
+
+info +
+
+

+ Additional information about the repository is recorded + in this directory. +

+
+
+info/refs +
+
+

+ This file helps dumb transports discover what refs are + available in this repository. If the repository is + published for dumb transports, this file should be + regenerated by git update-server-info every time a tag + or branch is created or modified. This is normally done + from the hooks/update hook, which is run by the + git-receive-pack command when you git push into the + repository. +

+
+
+info/grafts +
+
+

+ This file records fake commit ancestry information, to + pretend the set of parents a commit has is different + from how the commit was actually created. One record + per line describes a commit and its fake parents by + listing their 40-byte hexadecimal object names separated + by a space and terminated by a newline. +

+
+
+info/exclude +
+
+

+ This file, by convention among Porcelains, stores the + exclude pattern list. .gitignore is the per-directory + ignore file. git status, git add, git rm and git + clean look at it but the core git commands do not look + at it. See also: gitignore(5). +

+
+
+remotes +
+
+

+ Stores shorthands to be used to give URL and default + refnames to interact with remote repository to git + fetch, git pull and git push commands. +

+
+
+logs +
+
+

+ Records of changes made to refs are stored in this + directory. See the documentation on git-update-ref + for more information. +

+
+
+logs/refs/heads/name +
+
+

+ Records all changes made to the branch tip named name. +

+
+
+logs/refs/tags/name +
+
+

+ Records all changes made to the tag named name. +

+
+
+shallow +
+
+

+ This is similar to info/grafts but is internally used + and maintained by shallow clone mechanism. See --depth + option to git-clone(1) and git-fetch(1). +

+
+
+
+

SEE ALSO

+
+

git-init(1), +git-clone(1), +git-fetch(1), +git-pack-refs(1), +git-gc(1), +git-checkout(1), +gitglossary(7), +The Git User's Manual

+
+

GIT

+
+

Part of the git(1) suite.

+
+ + + diff --git a/repository-layout.txt b/gitrepository-layout.txt similarity index 92% rename from repository-layout.txt rename to gitrepository-layout.txt index 7fd187be8..03c52ff52 100644 --- a/repository-layout.txt +++ b/gitrepository-layout.txt @@ -1,9 +1,20 @@ -git repository layout -===================== +gitrepository-layout(5) +======================= + +NAME +---- +gitrepository-layout - Git Repository Layout + +SYNOPSIS +-------- +$GIT_DIR/* + +DESCRIPTION +----------- You may find these things in your git repository (`.git` directory for a repository associated with your working tree, or -`'project'.git` directory for a public 'bare' repository. It is +`.git` directory for a public 'bare' repository. It is also possible to have a working tree where `.git` is a plain ascii file containing `gitdir: `, i.e. the path to the real git repository). @@ -115,7 +126,7 @@ details. branches:: A slightly deprecated way to store shorthands to be used to specify URL to `git fetch`, `git pull` and `git push` - commands is to store a file in `branches/'name'` and + commands is to store a file in `branches/` and give 'name' to these commands in place of 'repository' argument. @@ -180,3 +191,18 @@ shallow:: This is similar to `info/grafts` but is internally used and maintained by shallow clone mechanism. See `--depth` option to linkgit:git-clone[1] and linkgit:git-fetch[1]. + +SEE ALSO +-------- +linkgit:git-init[1], +linkgit:git-clone[1], +linkgit:git-fetch[1], +linkgit:git-pack-refs[1], +linkgit:git-gc[1], +linkgit:git-checkout[1], +linkgit:gitglossary[7], +link:user-manual.html[The Git User's Manual] + +GIT +--- +Part of the linkgit:git[1] suite. diff --git a/gittutorial-2.html b/gittutorial-2.html index 37cc60c46..81c550ef5 100644 --- a/gittutorial-2.html +++ b/gittutorial-2.html @@ -668,11 +668,11 @@ example, creating a new commit.

GIT

-

Part of the git(7) suite.

+

Part of the git(1) suite.

diff --git a/gittutorial-2.txt b/gittutorial-2.txt index 4880ba9ae..e3d5c1fbf 100644 --- a/gittutorial-2.txt +++ b/gittutorial-2.txt @@ -427,4 +427,4 @@ link:user-manual.html[The Git User's Manual] GIT --- -Part of the linkgit:git[7] suite. +Part of the linkgit:git[1] suite. diff --git a/gittutorial.html b/gittutorial.html index de893eb97..8d9330ae9 100644 --- a/gittutorial.html +++ b/gittutorial.html @@ -807,11 +807,11 @@ digressions that may be interesting at this point are:

GIT

-

Part of the git(7) suite.

+

Part of the git(1) suite.

diff --git a/gittutorial.txt b/gittutorial.txt index 722b32321..9563a632e 100644 --- a/gittutorial.txt +++ b/gittutorial.txt @@ -605,4 +605,4 @@ link:user-manual.html[The Git User's Manual] GIT --- -Part of the linkgit:git[7] suite. +Part of the linkgit:git[1] suite.