From: Junio C Hamano Date: Sat, 16 Jun 2007 09:54:05 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.2.2-236-g952c8 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6926bef5df36f65153ad9f9ab9202acc6d44cd5d;p=git.git Autogenerated HTML docs for v1.5.2.2-236-g952c8 --- diff --git a/RelNotes-1.5.2.2.txt b/RelNotes-1.5.2.2.txt new file mode 100644 index 000000000..f6393f8a9 --- /dev/null +++ b/RelNotes-1.5.2.2.txt @@ -0,0 +1,61 @@ +GIT v1.5.2.2 Release Notes +========================== + +Fixes since v1.5.2.1 +-------------------- + +* Usability fix + + - git-gui is shipped with its updated blame interface. It is + rumored that the older one was not just unusable but was + active health hazard, but this one is actually pretty. + Please see for yourself. + +* Bugfixes + + - "git checkout fubar" was utterly confused when there is a + branch fubar and a tag fubar at the same time. It correctly + checks out the branch fubar now. + + - "git clone /path/foo" to clone a local /path/foo.git + repository left an incorrect configuration. + + - "git send-email" correctly unquotes RFC 2047 quoted names in + the patch-email before using their values. + + - We did not accept number of seconds since epoch older than + year 2000 as a valid timestamp. We now interpret positive + integers more than 8 digits as such, which allows us to + express timestamps more recent than March 1973. + + - git-cvsimport did not work when you have GIT_DIR to point + your repository at a nonstandard location. + + - Some systems (notably, Solaris) lack hstrerror() to make + h_errno human readable; prepare a replacement + implementation. + + - .gitignore file listed git-core.spec but what we generate is + git.spec, and nobody noticed for a long time. + + - "git-merge-recursive" does not try to run file level merge + on binary files. + + - "git-branch --track" did not create tracking configuration + correctly when the branch name had slash in it. + + - The email address of the user specified with user.email + configuration was overriden by EMAIL environment variable. + + - The tree parser did not warn about tree entries with + nonsense file modes, and assumed they must be blobs. + + - "git log -z" without any other request to generate diff still + invoked the diff machinery, wasting cycles. + +* Documentation + + - Many updates to fix stale or missing documentation. + + - Although our documentation was primarily meant to be formatted + with AsciiDoc7, formatting with AsciiDoc8 is supported better. diff --git a/core-tutorial.html b/core-tutorial.html index 596a8593b..e01d454db 100644 --- a/core-tutorial.html +++ b/core-tutorial.html @@ -1968,7 +1968,7 @@ to follow, not easier.

diff --git a/cvs-migration.html b/cvs-migration.html index f32eaa363..1945e1988 100644 --- a/cvs-migration.html +++ b/cvs-migration.html @@ -416,7 +416,7 @@ repositories without the need for a central maintainer.

diff --git a/diffcore.html b/diffcore.html index cc0d156e3..af18da031 100644 --- a/diffcore.html +++ b/diffcore.html @@ -541,7 +541,7 @@ t diff --git a/everyday.html b/everyday.html index 3ecd4d9a2..65d8887bc 100644 --- a/everyday.html +++ b/everyday.html @@ -1069,7 +1069,7 @@ upload to public HTTP server hosted by your ISP. diff --git a/git-add.html b/git-add.html index c3c0d4202..6f83f74ce 100644 --- a/git-add.html +++ b/git-add.html @@ -555,7 +555,7 @@ diff diff --git a/git-am.html b/git-am.html index d56eb47f1..985e94f75 100644 --- a/git-am.html +++ b/git-am.html @@ -509,7 +509,7 @@ names.

diff --git a/git-annotate.html b/git-annotate.html index 1cba8dd41..bf382a302 100644 --- a/git-annotate.html +++ b/git-annotate.html @@ -460,7 +460,7 @@ commit. diff --git a/git-apply.html b/git-apply.html index aa905a9cb..5ab05f338 100644 --- a/git-apply.html +++ b/git-apply.html @@ -584,7 +584,7 @@ apply.whitespace diff --git a/git-archimport.html b/git-archimport.html index 787077b4a..cf21f284b 100644 --- a/git-archimport.html +++ b/git-archimport.html @@ -422,7 +422,7 @@ patches that have been traded out-of-sequence between the branches.

diff --git a/git-archive.html b/git-archive.html index 6a05723ff..6a0f28771 100644 --- a/git-archive.html +++ b/git-archive.html @@ -421,7 +421,7 @@ git archive --format=tar --prefix=git-1.4.0/ v1.4.0 | gzip >git-1.4.0.tar.gz

-git archive --format=tar --prefix=git-1.4.0/ v1.4.0^{tree} | gzip >git-1.4.0.tar.gz +git archive --format=tar --prefix=git-1.4.0/ v1.4.0^{tree} | gzip >git-1.4.0.tar.gz

@@ -454,7 +454,7 @@ git archive --format=zip --prefix=git-docs/ HEAD:Documentation/ > git-1.4.0-d

diff --git a/git-bisect.html b/git-bisect.html index 03ac93462..0351fba69 100644 --- a/git-bisect.html +++ b/git-bisect.html @@ -431,7 +431,7 @@ know the outcome.

diff --git a/git-blame.html b/git-blame.html index 556ca7399..323c0589f 100644 --- a/git-blame.html +++ b/git-blame.html @@ -616,7 +616,7 @@ introduced the file with:

git log --diff-filter=A --pretty=short -- foo

and then annotate the change between the commit and its -parents, using commit^! notation:

+parents, using commit^! notation:

git blame -C -C -f $commit^! -- foo
@@ -692,7 +692,7 @@ commit commentary), a blame viewer won't ever care.
diff --git a/git-branch.html b/git-branch.html index e34c687ee..22a51bfc7 100644 --- a/git-branch.html +++ b/git-branch.html @@ -526,7 +526,7 @@ a branch and check it out with a single command.

diff --git a/git-bundle.html b/git-bundle.html index 9c232acd3..2bf0bfb87 100644 --- a/git-bundle.html +++ b/git-bundle.html @@ -424,7 +424,7 @@ network.

diff --git a/git-cat-file.html b/git-cat-file.html index 5efd2186e..4eddb3bfa 100644 --- a/git-cat-file.html +++ b/git-cat-file.html @@ -366,7 +366,7 @@ be returned.

diff --git a/git-check-attr.html b/git-check-attr.html index dc679f38d..b02eece8e 100644 --- a/git-check-attr.html +++ b/git-check-attr.html @@ -308,7 +308,7 @@ git-check-attr(1) Manual Page diff --git a/git-check-ref-format.html b/git-check-ref-format.html index b797ae13f..d49cadca6 100644 --- a/git-check-ref-format.html +++ b/git-check-ref-format.html @@ -299,7 +299,7 @@ It cannot have two consecutive dots .. anywhere;

It cannot have ASCII control character (i.e. bytes whose values are lower than \040, or \177 DEL), space, tilde ~, - caret ^, colon :, question-mark ?, asterisk *, + caret ^, colon :, question-mark ?, asterisk *, or open bracket [ anywhere;

@@ -317,13 +317,13 @@ refname expressions (see git-rev-parse(1)). Na

  • double-dot .. are often used as in ref1..ref2, and in some - context this notation means ^ref1 ref2 (i.e. not in + context this notation means ^ref1 ref2 (i.e. not in ref1 and in ref2).

  • -tilde ~ and caret ^ are used to introduce postfix +tilde ~ and caret ^ are used to introduce postfix nth parent and peel onion operation.

    • @@ -343,7 +343,7 @@ colon : is used as in srcref:dstref to mean "use srcref's diff --git a/git-checkout-index.html b/git-checkout-index.html index b1b120e2a..2d35d4828 100644 --- a/git-checkout-index.html +++ b/git-checkout-index.html @@ -511,7 +511,7 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.

    diff --git a/git-checkout.html b/git-checkout.html index 0a578c311..15ed96d6c 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -537,7 +537,7 @@ $ git add frotz diff --git a/git-cherry-pick.html b/git-cherry-pick.html index 143fa28e4..06101a965 100644 --- a/git-cherry-pick.html +++ b/git-cherry-pick.html @@ -362,7 +362,7 @@ effect to your working tree in a row.

    diff --git a/git-cherry.html b/git-cherry.html index 87962e7ba..a859df7d4 100644 --- a/git-cherry.html +++ b/git-cherry.html @@ -356,7 +356,7 @@ than pushing or pulling commits directly.

    diff --git a/git-clean.html b/git-clean.html index c53b40547..3b4b4549f 100644 --- a/git-clean.html +++ b/git-clean.html @@ -353,7 +353,7 @@ affected are further limited to those that match them.

    diff --git a/git-clone.html b/git-clone.html index d13d85598..93dece946 100644 --- a/git-clone.html +++ b/git-clone.html @@ -521,7 +521,7 @@ Create a repository on the kernel.org machine that borrows from Linus diff --git a/git-commit-tree.html b/git-commit-tree.html index 86a695007..0c73facf6 100644 --- a/git-commit-tree.html +++ b/git-commit-tree.html @@ -482,7 +482,7 @@ reversible operation.

    diff --git a/git-commit.html b/git-commit.html index 64eec8cf2..7c1b54e07 100644 --- a/git-commit.html +++ b/git-commit.html @@ -664,7 +664,7 @@ Junio C Hamano <junkio@cox.net>

    diff --git a/git-config.html b/git-config.html index 59b71498d..c5c4d2e71 100644 --- a/git-config.html +++ b/git-config.html @@ -1777,7 +1777,7 @@ transfer.unpackLimit diff --git a/git-convert-objects.html b/git-convert-objects.html index b9dc4a525..6626df5a1 100644 --- a/git-convert-objects.html +++ b/git-convert-objects.html @@ -292,7 +292,7 @@ git-convert-objects(1) Manual Page diff --git a/git-count-objects.html b/git-count-objects.html index aa275b6ff..a32b81ad3 100644 --- a/git-count-objects.html +++ b/git-count-objects.html @@ -309,7 +309,7 @@ them, to help you decide when it is a good time to repack.

    diff --git a/git-cvsexportcommit.html b/git-cvsexportcommit.html index fb7b13bb6..99d143204 100644 --- a/git-cvsexportcommit.html +++ b/git-cvsexportcommit.html @@ -386,7 +386,7 @@ $ cvs commit -F .mgs <files>
    -Merge pending patches into CVS automatically — only if you really know what you are doing +Merge pending patches into CVS automatically — only if you really know what you are doing
    @@ -412,7 +412,7 @@ $ git-cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git-cvsexportcommit
    diff --git a/git-cvsexportcommit.txt b/git-cvsexportcommit.txt index 827711c3c..6c423e3a2 100644 --- a/git-cvsexportcommit.txt +++ b/git-cvsexportcommit.txt @@ -76,7 +76,7 @@ $ git-cvsexportcommit -v $ cvs commit -F .mgs ------------ -Merge pending patches into CVS automatically -- only if you really know what you are doing :: +Merge pending patches into CVS automatically -- only if you really know what you are doing:: + ------------ $ export GIT_DIR=~/project/.git diff --git a/git-cvsimport.html b/git-cvsimport.html index 0ab2f4fe1..2bdc2cf50 100644 --- a/git-cvsimport.html +++ b/git-cvsimport.html @@ -526,7 +526,7 @@ various participants of the git-list <git@vger.kernel.org>.

    diff --git a/git-cvsserver.html b/git-cvsserver.html index 9af816dee..1a3a627c2 100644 --- a/git-cvsserver.html +++ b/git-cvsserver.html @@ -272,9 +272,76 @@ git-cvsserver(1) Manual Page

    SYNOPSIS

    +

    SSH:

    export CVS_SERVER=git-cvsserver cvs -d :ext:user@server/path/repo.git co <HEAD_name>
    +

    pserver (/etc/inetd.conf):

    +
    +
    cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver
    +

    Usage:

    +
    +
    git-cvsserver [options] [pserver|server] [<directory> …]
    +
    +

    OPTIONS

    +
    +

    All these options obviously only make sense if enforced by the server side. +They have been implemented to resemble the git-daemon(1) options as +closely as possible.

    +
    +
    +--base-path <path> +
    +
    +

    +Prepend path to requested CVSROOT +

    +
    +
    +--strict-paths +
    +
    +

    +Don't allow recursing into subdirectories +

    +
    +
    +--export-all +
    +
    +

    +Don't check for gitcvs.enabled in config. You also have to specify a list +of allowed directories (see below) if you want to use this option. +

    +
    +
    +--version, -V +
    +
    +

    +Print version information and exit +

    +
    +
    +--help, -h, -H +
    +
    +

    +Print usage information and exit +

    +
    +
    +<directory> +
    +
    +

    +You can specify a list of allowed directories. If no directories +are given, all are allowed. This is an additional restriction, gitcvs +access still needs to be enabled by the gitcvs.enabled config option +unless --export-all was given, too. +

    +
    +

    DESCRIPTION

    @@ -624,7 +691,7 @@ Martin Langhoff <martin@catalyst.net.nz>
    diff --git a/git-cvsserver.txt b/git-cvsserver.txt index e5005f02f..60d0bcf0f 100644 --- a/git-cvsserver.txt +++ b/git-cvsserver.txt @@ -7,10 +7,53 @@ git-cvsserver - A CVS server emulator for git SYNOPSIS -------- + +SSH: + [verse] export CVS_SERVER=git-cvsserver 'cvs' -d :ext:user@server/path/repo.git co +pserver (/etc/inetd.conf): + +[verse] +cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver + +Usage: + +[verse] +'git-cvsserver' [options] [pserver|server] [ ...] + +OPTIONS +------- + +All these options obviously only make sense if enforced by the server side. +They have been implemented to resemble the gitlink:git-daemon[1] options as +closely as possible. + +--base-path :: +Prepend 'path' to requested CVSROOT + +--strict-paths:: +Don't allow recursing into subdirectories + +--export-all:: +Don't check for `gitcvs.enabled` in config. You also have to specify a list +of allowed directories (see below) if you want to use this option. + +--version, -V:: +Print version information and exit + +--help, -h, -H:: +Print usage information and exit + +:: +You can specify a list of allowed directories. If no directories +are given, all are allowed. This is an additional restriction, gitcvs +access still needs to be enabled by the `gitcvs.enabled` config option +unless '--export-all' was given, too. + + DESCRIPTION ----------- diff --git a/git-daemon.html b/git-daemon.html index 401c202cc..80ae80c47 100644 --- a/git-daemon.html +++ b/git-daemon.html @@ -624,7 +624,7 @@ they correspond to these IP addresses.

    diff --git a/git-describe.html b/git-describe.html index 79cfeda84..2acbb3789 100644 --- a/git-describe.html +++ b/git-describe.html @@ -428,7 +428,7 @@ updated by Shawn Pearce <spearce@spearce.org>.

    diff --git a/git-diff-files.html b/git-diff-files.html index 79cc56c81..cba19abeb 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -1070,7 +1070,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff-index.html b/git-diff-index.html index 50167c888..2b273e0a9 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -1152,7 +1152,7 @@ always have the special all-zero sha1. diff --git a/git-diff-tree.html b/git-diff-tree.html index 047f4e4fe..daf06da1c 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -1517,7 +1517,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff.html b/git-diff.html index 45a5aef28..4d450d5d5 100644 --- a/git-diff.html +++ b/git-diff.html @@ -861,7 +861,7 @@ output diff in reverse. diff --git a/git-fast-import.html b/git-fast-import.html index f240e9aa5..1d0ce26cd 100644 --- a/git-fast-import.html +++ b/git-fast-import.html @@ -728,9 +728,9 @@ current branch value should be written as:

            from refs/heads/branch^0
    -

    The ^0 suffix is necessary as fast-import does not permit a branch to +

    The ^0 suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the -from command is even read from the input. Adding ^0 will force +from command is even read from the input. Adding ^0 will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch.

    @@ -1203,7 +1203,7 @@ memory footprint (less than 2.7 MiB per active branch).

    diff --git a/git-fetch-pack.html b/git-fetch-pack.html index e48efe44e..94597fd19 100644 --- a/git-fetch-pack.html +++ b/git-fetch-pack.html @@ -420,7 +420,7 @@ have a common ancestor commit.

    diff --git a/git-fetch.html b/git-fetch.html index 9709ad90f..8ad878675 100644 --- a/git-fetch.html +++ b/git-fetch.html @@ -651,7 +651,7 @@ Junio C Hamano <junkio@cox.net>

    diff --git a/git-fmt-merge-msg.html b/git-fmt-merge-msg.html index 21aa2faa1..0614013c0 100644 --- a/git-fmt-merge-msg.html +++ b/git-fmt-merge-msg.html @@ -349,7 +349,7 @@ merge.summary diff --git a/git-for-each-ref.html b/git-for-each-ref.html index f866cd1d9..7033c9e4d 100644 --- a/git-for-each-ref.html +++ b/git-for-each-ref.html @@ -491,7 +491,7 @@ eval "$eval" diff --git a/git-format-patch.html b/git-format-patch.html index c5cd6df1f..b5c99f8b1 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -903,7 +903,7 @@ git-format-patch -3 diff --git a/git-fsck-objects.html b/git-fsck-objects.html index 9d3b974fb..1f53f4638 100644 --- a/git-fsck-objects.html +++ b/git-fsck-objects.html @@ -281,7 +281,7 @@ documentation of that command.

    diff --git a/git-fsck.html b/git-fsck.html index 7308735b5..051d7cc2f 100644 --- a/git-fsck.html +++ b/git-fsck.html @@ -510,7 +510,7 @@ GIT_ALTERNATE_OBJECT_DIRECTORIES diff --git a/git-gc.html b/git-gc.html index dcb37a51c..2fb1877f1 100644 --- a/git-gc.html +++ b/git-gc.html @@ -367,7 +367,7 @@ more details. This defaults to 10.

    diff --git a/git-get-tar-commit-id.html b/git-get-tar-commit-id.html index 16b4c5418..a42b36d33 100644 --- a/git-get-tar-commit-id.html +++ b/git-get-tar-commit-id.html @@ -298,7 +298,7 @@ a tree ID instead of a commit ID or tag.

    diff --git a/git-grep.html b/git-grep.html index 4105fe2e1..ac680bca8 100644 --- a/git-grep.html +++ b/git-grep.html @@ -528,7 +528,7 @@ revamped by Junio C Hamano.

    diff --git a/git-hash-object.html b/git-hash-object.html index 7899acda3..38042d778 100644 --- a/git-hash-object.html +++ b/git-hash-object.html @@ -327,7 +327,7 @@ specified, it defaults to "blob".

    diff --git a/git-http-fetch.html b/git-http-fetch.html index 1fcb5ee77..8ecaf7763 100644 --- a/git-http-fetch.html +++ b/git-http-fetch.html @@ -369,7 +369,7 @@ commit-id diff --git a/git-http-push.html b/git-http-push.html index d2d503af0..d8dbfed7a 100644 --- a/git-http-push.html +++ b/git-http-push.html @@ -412,7 +412,7 @@ to disable the fast-forward check only on that ref.

    diff --git a/git-imap-send.html b/git-imap-send.html index 55d5402ef..5ceace02e 100644 --- a/git-imap-send.html +++ b/git-imap-send.html @@ -320,7 +320,7 @@ configuration file (shown with examples):

    diff --git a/git-index-pack.html b/git-index-pack.html index 2e7a7fe01..d54ce5683 100644 --- a/git-index-pack.html +++ b/git-index-pack.html @@ -398,7 +398,7 @@ mentioned above.

    diff --git a/git-init-db.html b/git-init-db.html index 04f08ce11..278cfc13c 100644 --- a/git-init-db.html +++ b/git-init-db.html @@ -281,7 +281,7 @@ documentation of that command.

    diff --git a/git-init.html b/git-init.html index 55e4042f7..b3216462e 100644 --- a/git-init.html +++ b/git-init.html @@ -395,7 +395,7 @@ add all existing file to the index diff --git a/git-instaweb.html b/git-instaweb.html index 69e7435f1..0d4ec58cb 100644 --- a/git-instaweb.html +++ b/git-instaweb.html @@ -390,7 +390,7 @@ repository.

    diff --git a/git-local-fetch.html b/git-local-fetch.html index c14772286..927b5eb82 100644 --- a/git-local-fetch.html +++ b/git-local-fetch.html @@ -390,7 +390,7 @@ git-local-fetch(1) Manual Page diff --git a/git-log.html b/git-log.html index 6fc1ab834..db601f0f5 100644 --- a/git-log.html +++ b/git-log.html @@ -787,7 +787,7 @@ reversible operation.

    diff --git a/git-lost-found.html b/git-lost-found.html index 983efdb0a..16eccd680 100644 --- a/git-lost-found.html +++ b/git-lost-found.html @@ -338,7 +338,7 @@ $ git rev-parse not-lost-anymore diff --git a/git-ls-files.html b/git-ls-files.html index cbc8db28e..189d4dd11 100644 --- a/git-ls-files.html +++ b/git-ls-files.html @@ -603,7 +603,7 @@ pattern file appears in.

    diff --git a/git-ls-remote.html b/git-ls-remote.html index f39b346d4..99557a62e 100644 --- a/git-ls-remote.html +++ b/git-ls-remote.html @@ -361,7 +361,7 @@ c5db5456ae3b0873fc659c19fafdde22313cc441 refs/tags/v0.99.2 diff --git a/git-ls-tree.html b/git-ls-tree.html index db37157ec..c16a6c101 100644 --- a/git-ls-tree.html +++ b/git-ls-tree.html @@ -416,7 +416,7 @@ another major rewrite by Linus Torvalds <torvalds@osdl.org>

    diff --git a/git-mailinfo.html b/git-mailinfo.html index d9b9026e3..3003479cf 100644 --- a/git-mailinfo.html +++ b/git-mailinfo.html @@ -357,7 +357,7 @@ Junio C Hamano <junkio@cox.net>

    diff --git a/git-mailsplit.html b/git-mailsplit.html index 1c80b0c5b..e729bca84 100644 --- a/git-mailsplit.html +++ b/git-mailsplit.html @@ -362,7 +362,7 @@ and Junio C Hamano <junkio@cox.net>

    diff --git a/git-merge-base.html b/git-merge-base.html index 1184c8a03..234ff4936 100644 --- a/git-merge-base.html +++ b/git-merge-base.html @@ -312,7 +312,7 @@ relied on to decide in any particular way.

    diff --git a/git-merge-file.html b/git-merge-file.html index 341957b4b..ad06b9579 100644 --- a/git-merge-file.html +++ b/git-merge-file.html @@ -377,7 +377,7 @@ with parts copied from the original documentation of RCS merge.

    diff --git a/git-merge-index.html b/git-merge-index.html index b2017dd17..34261ba3f 100644 --- a/git-merge-index.html +++ b/git-merge-index.html @@ -372,7 +372,7 @@ One-shot merge by Petr Baudis <pasky@ucw.cz>

    diff --git a/git-merge-one-file.html b/git-merge-one-file.html index 343ee8787..d6de2cd16 100644 --- a/git-merge-one-file.html +++ b/git-merge-one-file.html @@ -294,7 +294,7 @@ Junio C Hamano <junkio@cox.net> and Petr Baudis <pasky@suse.cz>.

    diff --git a/git-merge-tree.html b/git-merge-tree.html index 7183ec2cf..4a5c053c4 100644 --- a/git-merge-tree.html +++ b/git-merge-tree.html @@ -300,7 +300,7 @@ entries that match <branch1> tree.

    diff --git a/git-merge.html b/git-merge.html index ea2db0721..9f4fa0b0a 100644 --- a/git-merge.html +++ b/git-merge.html @@ -579,7 +579,7 @@ Resolve the conflicts. git-diff would report only the diff --git a/git-mergetool.html b/git-mergetool.html index 523b819b8..761e5418e 100644 --- a/git-mergetool.html +++ b/git-mergetool.html @@ -316,7 +316,7 @@ will pick a suitable default.

    diff --git a/git-mktag.html b/git-mktag.html index 4c14f2a12..bc11333de 100644 --- a/git-mktag.html +++ b/git-mktag.html @@ -310,7 +310,7 @@ care about, but that can be verified with gpg.

    diff --git a/git-mktree.html b/git-mktree.html index 081322890..955385b37 100644 --- a/git-mktree.html +++ b/git-mktree.html @@ -307,7 +307,7 @@ built is written to the standard output.

    diff --git a/git-mv.html b/git-mv.html index bd528a417..61df37486 100644 --- a/git-mv.html +++ b/git-mv.html @@ -337,7 +337,7 @@ Move functionality added by Josef Weidendorfer <Josef.Weidendorfer@gmx.de> diff --git a/git-name-rev.html b/git-name-rev.html index cf85809ee..e138618a4 100644 --- a/git-name-rev.html +++ b/git-name-rev.html @@ -364,7 +364,7 @@ not the context.

    diff --git a/git-p4import.html b/git-p4import.html index 605303470..23be6c4d3 100644 --- a/git-p4import.html +++ b/git-p4import.html @@ -463,7 +463,7 @@ of mappings with each line containing one mapping in the format:

    diff --git a/git-pack-objects.html b/git-pack-objects.html index 72504dca8..fd8b144b3 100644 --- a/git-pack-objects.html +++ b/git-pack-objects.html @@ -538,7 +538,7 @@ base-name diff --git a/git-pack-redundant.html b/git-pack-redundant.html index 340467d99..bfdbbd005 100644 --- a/git-pack-redundant.html +++ b/git-pack-redundant.html @@ -335,7 +335,7 @@ objects.

    diff --git a/git-pack-refs.html b/git-pack-refs.html index 1d3104225..522dee9e1 100644 --- a/git-pack-refs.html +++ b/git-pack-refs.html @@ -336,7 +336,7 @@ hierarchy after packing them. This option tells it not to. diff --git a/git-parse-remote.html b/git-parse-remote.html index 91b32200e..47c90700c 100644 --- a/git-parse-remote.html +++ b/git-parse-remote.html @@ -326,7 +326,7 @@ get_remote_refs_for_push diff --git a/git-patch-id.html b/git-patch-id.html index 0018ca487..eef06d747 100644 --- a/git-patch-id.html +++ b/git-patch-id.html @@ -314,7 +314,7 @@ This can be used to make a mapping from patch ID to commit ID.

    diff --git a/git-peek-remote.html b/git-peek-remote.html index 4126d040e..87844a657 100644 --- a/git-peek-remote.html +++ b/git-peek-remote.html @@ -341,7 +341,7 @@ stores them in the local repository under the same name.

    diff --git a/git-prune-packed.html b/git-prune-packed.html index f21779aa9..016a72461 100644 --- a/git-prune-packed.html +++ b/git-prune-packed.html @@ -325,7 +325,7 @@ disk storage, etc.

    diff --git a/git-prune.html b/git-prune.html index 37dfd1fe1..97edc8c01 100644 --- a/git-prune.html +++ b/git-prune.html @@ -340,7 +340,7 @@ borrows from your repository via its diff --git a/git-pull.html b/git-pull.html index 1d6b62e2a..374eb3e8b 100644 --- a/git-pull.html +++ b/git-pull.html @@ -896,7 +896,7 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.

    diff --git a/git-push.html b/git-push.html index 0d24c0863..52d860e2d 100644 --- a/git-push.html +++ b/git-push.html @@ -320,9 +320,8 @@ corresponding remotes file---see below), then all the refs that exist both on the local side and on the remote side are updated.

    tag <tag> means the same as refs/tags/<tag>:refs/tags/<tag>.

    -

    A parameter <ref> without a colon is equivalent to -<ref>:<ref>, hence updates <ref> in the destination from <ref> -in the source.

    +

    A parameter <ref> without a colon pushes the <ref> from the source +repository to the destination repository under the same name.

    Pushing an empty <src> allows you to delete the <dst> ref from the remote repository.

    @@ -539,6 +538,42 @@ corresponding file in the $GIT_DIR/remotes/ directory.

    Pull: refs/heads/<head>:<remote> +

    Examples

    +
    +
    +
    +git push origin master +
    +
    +

    + Find a ref that matches master in the source repository + (most likely, it would find refs/heads/master), and update + the same ref (e.g. refs/heads/master) in origin repository + with it. +

    +
    +
    +git push origin :experimental +
    +
    +

    + Find a ref that matches experimental in the origin repository + (e.g. refs/heads/experimental), and delete it. +

    +
    +
    +git push origin master:satellite/master +
    +
    +

    + Find a ref that matches master in the source repository + (most likely, it would find refs/heads/master), and update + the ref that matches satellite/master (most likely, it would + be refs/remotes/satellite/master) in origin repository with it. +

    +
    +
    +

    Author

    Written by Junio C Hamano <junkio@cox.net>, later rewritten in C @@ -554,7 +589,7 @@ by Linus Torvalds <torvalds@osdl.org>

    diff --git a/git-push.txt b/git-push.txt index 366c5dbdc..665f6dc70 100644 --- a/git-push.txt +++ b/git-push.txt @@ -53,9 +53,8 @@ side are updated. + `tag ` means the same as `refs/tags/:refs/tags/`. + -A parameter without a colon is equivalent to -`:`, hence updates in the destination from -in the source. +A parameter without a colon pushes the from the source +repository to the destination repository under the same name. + Pushing an empty allows you to delete the ref from the remote repository. @@ -98,6 +97,26 @@ the remote repository. include::urls.txt[] + +Examples +-------- + +git push origin master:: + Find a ref that matches `master` in the source repository + (most likely, it would find `refs/heads/master`), and update + the same ref (e.g. `refs/heads/master`) in `origin` repository + with it. + +git push origin :experimental:: + Find a ref that matches `experimental` in the `origin` repository + (e.g. `refs/heads/experimental`), and delete it. + +git push origin master:satellite/master:: + Find a ref that matches `master` in the source repository + (most likely, it would find `refs/heads/master`), and update + the ref that matches `satellite/master` (most likely, it would + be `refs/remotes/satellite/master`) in `origin` repository with it. + Author ------ Written by Junio C Hamano , later rewritten in C diff --git a/git-quiltimport.html b/git-quiltimport.html index 6861a3660..aeabca4be 100644 --- a/git-quiltimport.html +++ b/git-quiltimport.html @@ -339,7 +339,7 @@ variable.

    diff --git a/git-read-tree.html b/git-read-tree.html index c0b0cd750..d1d94ba6c 100644 --- a/git-read-tree.html +++ b/git-read-tree.html @@ -700,7 +700,7 @@ have finished your work-in-progress), attempt the merge again.

    diff --git a/git-rebase.html b/git-rebase.html index a01cad511..2ccbda92a 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -596,7 +596,7 @@ a rebase. Upon completion, <branch> will be the current branch.

    diff --git a/git-receive-pack.html b/git-receive-pack.html index 814b4d02f..6de8debec 100644 --- a/git-receive-pack.html +++ b/git-receive-pack.html @@ -425,7 +425,7 @@ exec git-update-server-info diff --git a/git-reflog.html b/git-reflog.html index ea74b3784..8a0f25ce5 100644 --- a/git-reflog.html +++ b/git-reflog.html @@ -343,7 +343,7 @@ the current branch. It is basically an alias for git log -g --abbrev-commit diff --git a/git-relink.html b/git-relink.html index 409e44b27..38d1ca80c 100644 --- a/git-relink.html +++ b/git-relink.html @@ -315,7 +315,7 @@ if they are hardlinked, and replace one with a hardlink to the other if not.

    diff --git a/git-remote.html b/git-remote.html index d11c91b1f..dffebf8b9 100644 --- a/git-remote.html +++ b/git-remote.html @@ -410,7 +410,7 @@ $ git merge origin diff --git a/git-repack.html b/git-repack.html index d3ddc82ae..616d35764 100644 --- a/git-repack.html +++ b/git-repack.html @@ -404,7 +404,7 @@ that way can try to use older git with it).

    diff --git a/git-repo-config.html b/git-repo-config.html index ba818af0b..9a169472f 100644 --- a/git-repo-config.html +++ b/git-repo-config.html @@ -281,7 +281,7 @@ documentation of that command.

    diff --git a/git-request-pull.html b/git-request-pull.html index 622e36d67..8ff8f17de 100644 --- a/git-request-pull.html +++ b/git-request-pull.html @@ -322,7 +322,7 @@ the given URL in the generated summary.

    diff --git a/git-rerere.html b/git-rerere.html index d5d0aaa03..7caf338ce 100644 --- a/git-rerere.html +++ b/git-rerere.html @@ -481,7 +481,7 @@ conflict.

    diff --git a/git-reset.html b/git-reset.html index b262198f4..935e9721c 100644 --- a/git-reset.html +++ b/git-reset.html @@ -567,7 +567,7 @@ At this point the index file still has all the WIP changes you diff --git a/git-rev-list.html b/git-rev-list.html index 53068fb44..8324a5e36 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -305,7 +305,7 @@ git-rev-list(1) Manual Page

    Lists commit objects in reverse chronological order starting at the given commit(s), taking ancestry relationship into account. This is useful to produce human-readable log output.

    -

    Commits which are stated with a preceding ^ cause listing to +

    Commits which are stated with a preceding ^ cause listing to stop at that point. Their parents are implied. Thus the following command:

    @@ -315,7 +315,7 @@ command:

    means "list all the commits which are included in foo and bar, but not in baz".

    A special notation "<commit1>..<commit2>" can be used as a -short-hand for "^<commit1> <commit2>". For example, either of +short-hand for "^<commit1> <commit2>". For example, either of the following may be used interchangeably:

    @@ -584,7 +584,7 @@ limiting may be applied.

    - Reverses the meaning of the ^ prefix (or lack thereof) + Reverses the meaning of the ^ prefix (or lack thereof) for all following revision specifiers, up to the next --not.

    @@ -631,7 +631,7 @@ excluded from the output. Instead of walking the commit ancestry chain, walk reflog entries from the most recent one to older ones. When this option is used you cannot specify commits to - exclude (that is, ^commit, commit1..commit2, + exclude (that is, ^commit, commit1..commit2, nor commit1…commit2 notations cannot be used).
    With --pretty format other than oneline (for obvious reasons), this causes the output to have two extra lines of information @@ -1074,7 +1074,7 @@ and the git-list <git@vger.kernel.org>.

    diff --git a/git-rev-parse.html b/git-rev-parse.html index 0777e5f87..0ebcd0997 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html @@ -356,8 +356,8 @@ distinguish between them.

    - When showing object names, prefix them with ^ and - strip ^ prefix from the object names that already have + When showing object names, prefix them with ^ and + strip ^ prefix from the object names that already have one.

    @@ -367,7 +367,7 @@ distinguish between them.

    Usually the object names are output in SHA1 form (with - possible ^ prefix); this option makes them output in a + possible ^ prefix); this option makes them output in a form as close to the original input as possible.

    @@ -566,11 +566,11 @@ You can use the @ construct with an empty ref part to get at a

  • -A suffix ^ to a revision parameter means the first parent of - that commit object. ^<n> means the <n>th parent (i.e. - rev^ - is equivalent to rev^1). As a special rule, - rev^0 means the commit itself and is used when rev is the +A suffix ^ to a revision parameter means the first parent of + that commit object. ^<n> means the <n>th parent (i.e. + rev^ + is equivalent to rev^1). As a special rule, + rev^0 means the commit itself and is used when rev is the object name of a tag object that refers to a commit object.

    • @@ -579,25 +579,25 @@ A suffix ^ to a revision parameter means the first parent of A suffix ~<n> to a revision parameter means the commit object that is the <n>th generation grand-parent of the named commit object, following only the first parent. I.e. rev~3 is - equivalent to rev^^^ which is equivalent to - rev^1^1^1. See below for a illustration of + equivalent to rev^^^ which is equivalent to + rev^1^1^1. See below for a illustration of the usage of this form.

  • -A suffix ^ followed by an object type name enclosed in - brace pair (e.g. v0.99.8^{commit}) means the object +A suffix ^ followed by an object type name enclosed in + brace pair (e.g. v0.99.8^{commit}) means the object could be a tag, and dereference the tag recursively until an object of that type is found or the object cannot be - dereferenced anymore (in which case, barf). rev^0 - introduced earlier is a short-hand for rev^{commit}. + dereferenced anymore (in which case, barf). rev^0 + introduced earlier is a short-hand for rev^{commit}.

  • -A suffix ^ followed by an empty brace pair - (e.g. v0.99.8^{}) means the object could be a tag, +A suffix ^ followed by an empty brace pair + (e.g. v0.99.8^{}) means the object could be a tag, and dereference the tag recursively until a non-tag object is found.

    @@ -664,11 +664,11 @@ of commits, not just a single commit. To these commands, specifying a single revision with the notation described in the previous section means the set of commits reachable from that commit, following the commit ancestry chain.

    -

    To exclude commits reachable from a commit, a prefix ^ -notation is used. E.g. "^r1 r2" means commits reachable +

    To exclude commits reachable from a commit, a prefix ^ +notation is used. E.g. "^r1 r2" means commits reachable from r2 but exclude the ones reachable from r1.

    This set operation appears so often that there is a shorthand -for it. "r1..r2" is equivalent to "^r1 r2". It is +for it. "r1..r2" is equivalent to "^r1 r2". It is the difference of two sets (subtract the set of commits reachable from r1 from the set of commits reachable from r2).

    @@ -678,8 +678,8 @@ of r1 and r2 and is defined as It is the set of commits that are reachable from either one of r1 or r2 but not from both.

    Two other shorthands for naming a set that is formed by a commit -and its parent commits exists. r1^@ notation means all -parents of r1. r1^! includes commit r1 but excludes +and its parent commits exists. r1^@ notation means all +parents of r1. r1^! includes commit r1 but excludes its all parents.

    Here are a handful examples:

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

    diff --git a/git-revert.html b/git-revert.html index 21df6fba6..288d20a29 100644 --- a/git-revert.html +++ b/git-revert.html @@ -345,7 +345,7 @@ effect to your working tree in a row.

    • diff --git a/git-rm.html b/git-rm.html index 0096bcecf..728b9531a 100644 --- a/git-rm.html +++ b/git-rm.html @@ -414,7 +414,7 @@ git-rm -f git-*.sh
    diff --git a/git-runstatus.html b/git-runstatus.html index 021a634e3..1aa5fb3a8 100644 --- a/git-runstatus.html +++ b/git-runstatus.html @@ -355,7 +355,7 @@ of git-commit, and later rewritten in C by Jeff King.

    diff --git a/git-send-email.html b/git-send-email.html index c30cba57f..dd8444dd9 100644 --- a/git-send-email.html +++ b/git-send-email.html @@ -496,7 +496,7 @@ send_lots_of_email.pl by Greg Kroah-Hartman.

    diff --git a/git-send-pack.html b/git-send-pack.html index 9703e3790..377e899f1 100644 --- a/git-send-pack.html +++ b/git-send-pack.html @@ -443,7 +443,7 @@ to disable the fast-forward check only on that ref.

    diff --git a/git-sh-setup.html b/git-sh-setup.html index 8a284d228..2617d869e 100644 --- a/git-sh-setup.html +++ b/git-sh-setup.html @@ -364,7 +364,7 @@ require_work_tree diff --git a/git-shell.html b/git-shell.html index 656164af6..4dbda0622 100644 --- a/git-shell.html +++ b/git-shell.html @@ -298,7 +298,7 @@ are permitted to be called, with a single required argument.

    diff --git a/git-shortlog.html b/git-shortlog.html index 4e97c033b..77741c27a 100644 --- a/git-shortlog.html +++ b/git-shortlog.html @@ -344,7 +344,7 @@ Eve Jones <eve@laptop.(none)> diff --git a/git-show-branch.html b/git-show-branch.html index f88b6c68f..3dc5974d1 100644 --- a/git-show-branch.html +++ b/git-show-branch.html @@ -425,7 +425,7 @@ no <rev> nor <glob> is given on the command line.

    This helps track topic branches by hiding any commit that is already in the main line of development. When given "git show-branch --topics master topic1 topic2", this - will show the revisions given by "git rev-list ^master + will show the revisions given by "git rev-list ^master topic1 topic2"

    @@ -521,7 +521,7 @@ topologically related with each other.

    diff --git a/git-show-index.html b/git-show-index.html index e2a2efa3d..724d3a09c 100644 --- a/git-show-index.html +++ b/git-show-index.html @@ -296,7 +296,7 @@ offset and SHA1 of each object.

    diff --git a/git-show-ref.html b/git-show-ref.html index 86f927fd5..88e9136d8 100644 --- a/git-show-ref.html +++ b/git-show-ref.html @@ -460,7 +460,7 @@ Man page by Jonas Fonseca <fonseca@diku.dk>.

    diff --git a/git-show.html b/git-show.html index 5f26402cc..97a1de651 100644 --- a/git-show.html +++ b/git-show.html @@ -739,7 +739,7 @@ Johannes Schindelin <Johannes.Schindelin@gmx.de>.

    diff --git a/git-ssh-fetch.html b/git-ssh-fetch.html index 197fae3dd..7b59e117b 100644 --- a/git-ssh-fetch.html +++ b/git-ssh-fetch.html @@ -349,7 +349,7 @@ commit-id diff --git a/git-ssh-upload.html b/git-ssh-upload.html index 75daeaaac..69cbc3a71 100644 --- a/git-ssh-upload.html +++ b/git-ssh-upload.html @@ -348,7 +348,7 @@ commit-id diff --git a/git-status.html b/git-status.html index 0728475e0..924da2f0a 100644 --- a/git-status.html +++ b/git-status.html @@ -320,7 +320,7 @@ Junio C Hamano <junkio@cox.net>.

    diff --git a/git-stripspace.html b/git-stripspace.html index 6e650adef..6784f95eb 100644 --- a/git-stripspace.html +++ b/git-stripspace.html @@ -305,7 +305,7 @@ git-stripspace(1) Manual Page diff --git a/git-submodule.html b/git-submodule.html index 0e7357c95..5aef21260 100644 --- a/git-submodule.html +++ b/git-submodule.html @@ -363,7 +363,7 @@ to each submodule url is "module.$path.url".

    diff --git a/git-svn.html b/git-svn.html index a06ee4ffb..8c8436e57 100644 --- a/git-svn.html +++ b/git-svn.html @@ -1003,7 +1003,7 @@ should be manually entered with a text-editor or using diff --git a/git-svnimport.html b/git-svnimport.html index fcda155c9..ced326d65 100644 --- a/git-svnimport.html +++ b/git-svnimport.html @@ -534,7 +534,7 @@ various participants of the git-list <git@vger.kernel.org>.

    diff --git a/git-symbolic-ref.html b/git-symbolic-ref.html index 46ce27245..ed437eb60 100644 --- a/git-symbolic-ref.html +++ b/git-symbolic-ref.html @@ -336,7 +336,7 @@ name is not a symbolic ref, or 128 if another error occurs.

    diff --git a/git-tag.html b/git-tag.html index e94ddc65a..bae2bfde3 100644 --- a/git-tag.html +++ b/git-tag.html @@ -531,7 +531,7 @@ Junio C Hamano <junkio@cox.net> and Chris Wright <chrisw@osdl.org>.< diff --git a/git-tar-tree.html b/git-tar-tree.html index b0ec95ac6..3cb53c8c2 100644 --- a/git-tar-tree.html +++ b/git-tar-tree.html @@ -354,7 +354,7 @@ git tar-tree v1.4.0 git-1.4.0 | gzip >git-1.4.0.tar.gz

    -git tar-tree v1.4.0^{tree} git-1.4.0 | gzip >git-1.4.0.tar.gz +git tar-tree v1.4.0^{tree} git-1.4.0 | gzip >git-1.4.0.tar.gz

    @@ -395,7 +395,7 @@ git tar-tree HEAD:Documentation/ git-docs > git-1.4.0-docs.tar

    diff --git a/git-tools.html b/git-tools.html index be0bd676b..e68d4dcca 100644 --- a/git-tools.html +++ b/git-tools.html @@ -433,7 +433,7 @@ comprehensive list.

    diff --git a/git-unpack-file.html b/git-unpack-file.html index 4e7075c63..4f4a27f00 100644 --- a/git-unpack-file.html +++ b/git-unpack-file.html @@ -307,7 +307,7 @@ returns the name of the temporary file in the following format: diff --git a/git-unpack-objects.html b/git-unpack-objects.html index 5a04e6f2e..3008e346a 100644 --- a/git-unpack-objects.html +++ b/git-unpack-objects.html @@ -333,7 +333,7 @@ new packs and replace existing ones.

    diff --git a/git-update-index.html b/git-update-index.html index f0af8a36b..b37c1c178 100644 --- a/git-update-index.html +++ b/git-update-index.html @@ -721,7 +721,7 @@ from symbolic link to regular file.

    diff --git a/git-update-ref.html b/git-update-ref.html index f8a862379..87713c3a8 100644 --- a/git-update-ref.html +++ b/git-update-ref.html @@ -360,7 +360,7 @@ or does not have committer information available.

    diff --git a/git-update-server-info.html b/git-update-server-info.html index 8db05b647..72749d248 100644 --- a/git-update-server-info.html +++ b/git-update-server-info.html @@ -332,7 +332,7 @@ info/refs file unless --force flag is given.

    diff --git a/git-upload-archive.html b/git-upload-archive.html index 35c0203fe..042496cc9 100644 --- a/git-upload-archive.html +++ b/git-upload-archive.html @@ -309,7 +309,7 @@ is meant to be used to get an archive from a remote repository.

    diff --git a/git-upload-pack.html b/git-upload-pack.html index 4ce48e3d4..e51a3ebc1 100644 --- a/git-upload-pack.html +++ b/git-upload-pack.html @@ -326,7 +326,7 @@ repository. For push operations, see git-send-pack.

    diff --git a/git-var.html b/git-var.html index 57283f269..9c7a87cfd 100644 --- a/git-var.html +++ b/git-var.html @@ -372,7 +372,7 @@ Your sysadmin must hate you! diff --git a/git-verify-pack.html b/git-verify-pack.html index fc5c94297..652dd9c9e 100644 --- a/git-verify-pack.html +++ b/git-verify-pack.html @@ -338,7 +338,7 @@ corresponding pack file.

    diff --git a/git-verify-tag.html b/git-verify-tag.html index 2aea9cf2d..0b7859269 100644 --- a/git-verify-tag.html +++ b/git-verify-tag.html @@ -305,7 +305,7 @@ git-verify-tag(1) Manual Page diff --git a/git-whatchanged.html b/git-whatchanged.html index 5fceb8c99..ac66a68ef 100644 --- a/git-whatchanged.html +++ b/git-whatchanged.html @@ -384,7 +384,7 @@ Junio C Hamano <junkio@cox.net>

    diff --git a/git-write-tree.html b/git-write-tree.html index 1a37ff11d..8f4a0f554 100644 --- a/git-write-tree.html +++ b/git-write-tree.html @@ -323,7 +323,7 @@ now, you need to have done a git-update-index phase before you did the diff --git a/git.html b/git.html index aa8672c8a..502c89c98 100644 --- a/git.html +++ b/git.html @@ -2325,7 +2325,7 @@ contributors on the git-list <git@vger.kernel.org>.

    diff --git a/gitattributes.html b/gitattributes.html index b827f9383..59e39e78d 100644 --- a/gitattributes.html +++ b/gitattributes.html @@ -658,7 +658,7 @@ frotz unspecified diff --git a/gitignore.html b/gitignore.html index 196978c46..f1e12ba31 100644 --- a/gitignore.html +++ b/gitignore.html @@ -403,7 +403,7 @@ Frank Lichtenheld, and the git-list <git@vger.kernel.org>.

    diff --git a/gitk.html b/gitk.html index 8c7ecc83d..f26e57ff2 100644 --- a/gitk.html +++ b/gitk.html @@ -425,7 +425,7 @@ gitk --max-count=100 --all — Makefile diff --git a/gitmodules.html b/gitmodules.html new file mode 100644 index 000000000..9ed61e256 --- /dev/null +++ b/gitmodules.html @@ -0,0 +1,344 @@ + + + + + + +gitmodules(5) + + + +

    SYNOPSIS

    +
    +

    gitmodules

    +
    +

    DESCRIPTION

    +
    +

    The .gitmodules file, located in the top-level directory of a git +working tree, is a text file with a syntax matching the requirements +of git-config(1).

    +

    The file contains one subsection per submodule, and the subsection value +is the name of the submodule. Each submodule section also contains the +following required keys:

    +
    +
    +submodule.<name>.path +
    +
    +

    + Defines the path, relative to the top-level directory of the git + working tree, where the submodule is expected to be checked out. + The path name must not end with a /. All submodule paths must + be unique within the .gitmodules file. +

    +
    +
    +submodule.<name>.url +
    +
    +

    + Defines an url from where the submodule repository can be cloned. +

    +
    +
    +
    +

    EXAMPLES

    +
    +

    Consider the following .gitmodules file:

    +
    +
    +
    [submodule "libfoo"]
+        path = include/foo
+        url = git://foo.com/git/lib.git
    +
    +
    +
    +
    [submodule "libbar"]
+        path = include/bar
+        url = git://bar.com/git/lib.git
    +
    +

    This defines two submodules, libfoo and libbar. These are expected to +be checked out in the paths include/foo and include/bar, and for both +submodules an url is specified which can be used for cloning the submodules.

    +
    +

    SEE ALSO

    +
    +

    git-submodule(1) git-config(1)

    +
    +

    DOCUMENTATION

    +
    +

    Documentation by Lars Hjemli <hjemli@gmail.com>

    +
    +

    GIT

    +
    +

    Part of the git(7) suite

    +
    + + + diff --git a/gitmodules.txt b/gitmodules.txt new file mode 100644 index 000000000..035294e20 --- /dev/null +++ b/gitmodules.txt @@ -0,0 +1,62 @@ +gitmodules(5) +============= + +NAME +---- +gitmodules - defining submodule properties + +SYNOPSIS +-------- +gitmodules + + +DESCRIPTION +----------- + +The `.gitmodules` file, located in the top-level directory of a git +working tree, is a text file with a syntax matching the requirements +of gitlink:git-config[1]. + +The file contains one subsection per submodule, and the subsection value +is the name of the submodule. Each submodule section also contains the +following required keys: + +submodule..path:: + Defines the path, relative to the top-level directory of the git + working tree, where the submodule is expected to be checked out. + The path name must not end with a `/`. All submodule paths must + be unique within the .gitmodules file. + +submodule..url:: + Defines an url from where the submodule repository can be cloned. + + +EXAMPLES +-------- + +Consider the following .gitmodules file: + + [submodule "libfoo"] + path = include/foo + url = git://foo.com/git/lib.git + + [submodule "libbar"] + path = include/bar + url = git://bar.com/git/lib.git + + +This defines two submodules, `libfoo` and `libbar`. These are expected to +be checked out in the paths 'include/foo' and 'include/bar', and for both +submodules an url is specified which can be used for cloning the submodules. + +SEE ALSO +-------- +gitlink:git-submodule[1] gitlink:git-config[1] + +DOCUMENTATION +------------- +Documentation by Lars Hjemli + +GIT +--- +Part of the gitlink:git[7] suite diff --git a/glossary.html b/glossary.html index ef7ad71d9..107ee54ed 100644 --- a/glossary.html +++ b/glossary.html @@ -1069,7 +1069,7 @@ This commit is referred to as a "merge commit", or sometimes just a diff --git a/hooks.html b/hooks.html index 62f06e1cf..2879252d2 100644 --- a/hooks.html +++ b/hooks.html @@ -456,7 +456,7 @@ for the user.

    diff --git a/howto-index.html b/howto-index.html index d0119cb75..e351f21bf 100644 --- a/howto-index.html +++ b/howto-index.html @@ -341,7 +341,7 @@ into which branch and who can make a tag.

    diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index 5ccd281ee..09859e867 100644 --- a/howto/revert-branch-rebase.html +++ b/howto/revert-branch-rebase.html @@ -434,7 +434,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f diff --git a/repository-layout.html b/repository-layout.html index c042db028..f0bb79a4c 100644 --- a/repository-layout.html +++ b/repository-layout.html @@ -582,7 +582,7 @@ shallow diff --git a/tutorial-2.html b/tutorial-2.html index 8f14b97d6..cfff83547 100644 --- a/tutorial-2.html +++ b/tutorial-2.html @@ -647,7 +647,7 @@ example, creating a new commit.

    diff --git a/tutorial.html b/tutorial.html index f3d84d4d6..3fdd03827 100644 --- a/tutorial.html +++ b/tutorial.html @@ -786,7 +786,7 @@ digressions that may be interesting at this point are:

    diff --git a/user-manual.txt b/user-manual.txt index 0bfa21b3d..ff7c71d4f 100644 --- a/user-manual.txt +++ b/user-manual.txt @@ -2757,8 +2757,8 @@ As a result, the general consistency of an object can always be tested independently of the contents or the type of the object: all objects can be validated by verifying that (a) their hashes match the content of the file and (b) the object successfully inflates to a stream of bytes that -forms a sequence of + + + + . +forms a sequence of {plus} {plus} {plus} {plus} . The structured objects can further have their structure and connectivity to other objects verified. This is generally done with