From 38b693c01c9994bafe01485f12cd3d2aebade5dd Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 3 Jun 2007 08:40:14 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.2.1-111-gc94b --- RelNotes-1.5.2.1.txt | 53 +++++ RelNotes-1.5.3.txt | 109 ++++++++++ cmds-ancillaryinterrogators.txt | 3 - cmds-mainporcelain.txt | 3 + cmds-purehelpers.txt | 3 - git-am.html | 7 +- git-am.txt | 5 +- git-applymbox.txt | 98 --------- git-applypatch.txt | 53 ----- git-mailinfo.html | 4 +- git-mailinfo.txt | 2 +- git-submodule.html | 370 ++++++++++++++++++++++++++++++++ git-submodule.txt | 65 ++++++ git.html | 26 +-- hooks.html | 15 +- hooks.txt | 13 +- 16 files changed, 628 insertions(+), 201 deletions(-) create mode 100644 RelNotes-1.5.2.1.txt create mode 100644 RelNotes-1.5.3.txt delete mode 100644 git-applymbox.txt delete mode 100644 git-applypatch.txt create mode 100644 git-submodule.html create mode 100644 git-submodule.txt diff --git a/RelNotes-1.5.2.1.txt b/RelNotes-1.5.2.1.txt new file mode 100644 index 000000000..ebf20e22a --- /dev/null +++ b/RelNotes-1.5.2.1.txt @@ -0,0 +1,53 @@ +GIT v1.5.2.1 Release Notes +========================== + +Fixes since v1.5.2 +------------------ + +* Bugfixes + + - Temporary files that are used when invoking external diff + programs did not tolerate a long TMPDIR. + + - git-daemon did not notice when it could not write into its + pid file. + + - git-status did not honor core.excludesFile configuration like + git-add did. + + - git-annotate did not work from a subdirectory while + git-blame did. + + - git-cvsserver should have disabled access to a repository + with "gitcvs.pserver.enabled = false" set even when + "gitcvs.enabled = true" was set at the same time. It + didn't. + + - git-cvsimport did not work correctly in a repository with + its branch heads were packed with pack-refs. + + - ident unexpansion to squash "$Id: xxx $" that is in the + repository copy removed incorrect number of bytes. + + - git-svn misbehaved when the subversion repository did not + provide MD5 checksums for files. + + - git rebase (and git am) misbehaved on commits that have '\n' + (literally backslash and en, not a linefeed) in the title. + + - code to decode base85 used in binary patches had one error + return codepath wrong. + + - RFC2047 Q encoding output by git-format-patch used '_' for a + space, which is not understood by some programs. It uses =20 + which is safer. + + - git-fastimport --import-marks was broken; fixed. + + - A lot of documentation updates, clarifications and fixes. + +-- +exec >/var/tmp/1 +O=v1.5.2-65-g996e2d6 +echo O=`git describe refs/heads/maint` +git shortlog --no-merges $O..refs/heads/maint diff --git a/RelNotes-1.5.3.txt b/RelNotes-1.5.3.txt new file mode 100644 index 000000000..d111661a7 --- /dev/null +++ b/RelNotes-1.5.3.txt @@ -0,0 +1,109 @@ +GIT v1.5.3 Release Notes (draft) +======================== + +Updates since v1.5.2 +-------------------- + +* An initial interation of Porcelain level superproject support + started to take shape. + +* Thee are a handful pack-objects changes to help you cope better with + repositories with pathologically large blobs in them. + +* New commands and options. + + - "git-submodule" command helps you manage the projects from + the superproject that contain them. + + - In addition to core.compression configuration option, + core.loosecompression and pack.compression options can + independently tweak zlib compression levels used for loose + and packed objects. + + - "git-ls-tree -l" shows size of blobs pointed at by the + tree entries, similar to "/bin/ls -l". + + - "git-rev-list" learned --regexp-ignore-case and + --extended-regexp options to tweak its matching logic used + for --grep fitering. + + - "git-describe --contains" is a handier way to call more + obscure command "git-name-rev --tags". + + - "git gc --aggressive" tells the command to spend more cycles + to optimize the repository harder. + + - "git repack" can be told to split resulting packs to avoid + exceeding limit specified with "--max-pack-size". + +* Updated behavior of existing commands. + + - "git push" pretends that you immediately fetched back from + the remote by updating corresponding remote tracking + branches if you have any. + + - The diffstat given after a merge (or a pull) honors the + color.diff configuration. + + - "git-apply --whitespace=strip" removes blank lines added at + the end of the file. + + - fetch over git native protocols with -v shows connection + status, and the IP address of the other end, to help + diagnosing problems. + + - core.legacyheaders is no more, although we still can read + objects created in a new loose object format. + + - "git-mailsplit" (hence "git-am") can read from Maildir + formatted mailboxes. + + - "git cvsserver" does not barf upon seeing "cvs login" + request. + + - "pack-objects" honors "delta" attribute set in + .gitattributes. It does not attempt to deltify blobs that + come from paths with delta attribute set to false. + + - new-workdir script (in contrib) can now be used with a bare + repository. + + +* Builds + + - + +* Performance Tweaks + + - git-pack-objects avoids re-deltification cost by caching + small enough delta results it creates while looking for the + best delta candidates. + + - diff-delta code that is used for packing has been improved + to work better on big files. + + - when there are more than one pack files in the repository, + the runtime used to try finding an object always from the + newest packfile; it now tries the same packfile as we found + the object requested the last time, which exploits the + locality of references. + +Fixes since v1.5.2 +------------------ + +All of the fixes in v1.5.2 maintenance series are included in +this release, unless otherwise noted. + +* Bugfixes + + - .... This has not + been backported to 1.5.2.x series, as it is rather an + intrusive change. + + +-- +exec >/var/tmp/1 +O=v1.5.2-45-ged82edc +O=v1.5.2-172-g1a8b769 +echo O=`git describe refs/heads/master` +git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint diff --git a/cmds-ancillaryinterrogators.txt b/cmds-ancillaryinterrogators.txt index b09fdfa24..5a52eabdd 100644 --- a/cmds-ancillaryinterrogators.txt +++ b/cmds-ancillaryinterrogators.txt @@ -1,9 +1,6 @@ gitlink:git-annotate[1]:: Annotate file lines with commit info. -gitlink:git-applymbox[1]:: - Apply a series of patches in a mailbox. - gitlink:git-blame[1]:: Show what revision and author last modified each line of a file. diff --git a/cmds-mainporcelain.txt b/cmds-mainporcelain.txt index f01571b71..a2a5eb354 100644 --- a/cmds-mainporcelain.txt +++ b/cmds-mainporcelain.txt @@ -91,6 +91,9 @@ gitlink:git-show[1]:: gitlink:git-status[1]:: Show the working tree status. +gitlink:git-submodule[1]:: + Initialize, update or inspect submodules. + gitlink:git-tag[1]:: Create, list, delete or verify a tag object signed with GPG. diff --git a/cmds-purehelpers.txt b/cmds-purehelpers.txt index 05a2f38b9..9880388de 100644 --- a/cmds-purehelpers.txt +++ b/cmds-purehelpers.txt @@ -1,6 +1,3 @@ -gitlink:git-applypatch[1]:: - Apply one patch extracted from an e-mail. - gitlink:git-check-attr[1]:: Display gitattributes information.. diff --git a/git-am.html b/git-am.html index c96c821ef..3f4902ff0 100644 --- a/git-am.html +++ b/git-am.html @@ -470,8 +470,7 @@ a line that begins with "Index: " is terminated before the first occurrence of such a line.

When initially invoking it, you give it names of the mailboxes to crunch. Upon seeing the first patch that does not apply, it -aborts in the middle, just like git-applymbox does. You can -recover from this in one of two ways:

+aborts in the middle,. You can recover from this in one of two ways:

  1. @@ -494,7 +493,7 @@ names.

    SEE ALSO

    -

    git-applymbox(1), git-applypatch(1), git-apply(1).

    +

    git-apply(1).

    Author

    @@ -510,7 +509,7 @@ names.

    diff --git a/git-am.txt b/git-am.txt index f78e5dc28..f3387f5d0 100644 --- a/git-am.txt +++ b/git-am.txt @@ -127,8 +127,7 @@ is terminated before the first occurrence of such a line. When initially invoking it, you give it names of the mailboxes to crunch. Upon seeing the first patch that does not apply, it -aborts in the middle, just like 'git-applymbox' does. You can -recover from this in one of two ways: +aborts in the middle,. You can recover from this in one of two ways: . skip the current patch by re-running the command with '--skip' option. @@ -145,7 +144,7 @@ names. SEE ALSO -------- -gitlink:git-applymbox[1], gitlink:git-applypatch[1], gitlink:git-apply[1]. +gitlink:git-apply[1]. Author diff --git a/git-applymbox.txt b/git-applymbox.txt deleted file mode 100644 index ea919ba5d..000000000 --- a/git-applymbox.txt +++ /dev/null @@ -1,98 +0,0 @@ -git-applymbox(1) -================ - -NAME ----- -git-applymbox - Apply a series of patches in a mailbox - - -SYNOPSIS --------- -'git-applymbox' [-u] [-k] [-q] [-m] ( -c .dotest/ | ) [ ] - -DESCRIPTION ------------ -Splits mail messages in a mailbox into commit log message, -authorship information and patches, and applies them to the -current branch. - - -OPTIONS -------- --q:: - Apply patches interactively. The user will be given - opportunity to edit the log message and the patch before - attempting to apply it. - --k:: - Usually the program 'cleans up' the Subject: header line - to extract the title line for the commit log message, - among which (1) remove 'Re:' or 're:', (2) leading - whitespaces, (3) '[' up to ']', typically '[PATCH]', and - then prepends "[PATCH] ". This flag forbids this - munging, and is most useful when used to read back 'git - format-patch -k' output. - --m:: - Patches are applied with `git-apply` command, and unless - it cleanly applies without fuzz, the processing fails. - With this flag, if a tree that the patch applies cleanly - is found in a repository, the patch is applied to the - tree and then a 3-way merge between the resulting tree - and the current tree. - --u:: - Pass `-u` flag to `git-mailinfo` (see gitlink:git-mailinfo[1]). - The proposed commit log message taken from the e-mail - are re-coded into UTF-8 encoding (configuration variable - `i18n.commitencoding` can be used to specify project's - preferred encoding if it is not UTF-8). This used to be - optional but now it is the default. -+ -Note that the patch is always used as-is without charset -conversion, even with this flag. - --n:: - Pass `-n` flag to `git-mailinfo` (see - gitlink:git-mailinfo[1]). - --c .dotest/:: - When the patch contained in an e-mail does not cleanly - apply, the command exits with an error message. The - patch and extracted message are found in .dotest/, and - you could re-run 'git applymbox' with '-c .dotest/' - flag to restart the process after inspecting and fixing - them. - -:: - The name of the file that contains the e-mail messages - with patches. This file should be in the UNIX mailbox - format. See 'SubmittingPatches' document to learn about - the formatting convention for e-mail submission. - -:: - The name of the file that contains your "Signed-off-by" - line. See 'SubmittingPatches' document to learn what - "Signed-off-by" line means. You can also just say - 'yes', 'true', 'me', or 'please' to use an automatically - generated "Signed-off-by" line based on your committer - identity. - - -SEE ALSO --------- -gitlink:git-am[1], gitlink:git-applypatch[1]. - - -Author ------- -Written by Linus Torvalds - -Documentation --------------- -Documentation by Junio C Hamano and the git-list . - -GIT ---- -Part of the gitlink:git[7] suite - diff --git a/git-applypatch.txt b/git-applypatch.txt deleted file mode 100644 index 451434a75..000000000 --- a/git-applypatch.txt +++ /dev/null @@ -1,53 +0,0 @@ -git-applypatch(1) -================= - -NAME ----- -git-applypatch - Apply one patch extracted from an e-mail - - -SYNOPSIS --------- -'git-applypatch' [] - -DESCRIPTION ------------ -This is usually not what an end user wants to run directly. See -gitlink:git-am[1] instead. - -Takes three files , , and prepared from an -e-mail message by 'git-mailinfo', and creates a commit. It is -usually not necessary to use this command directly. - -This command can run `applypatch-msg`, `pre-applypatch`, and -`post-applypatch` hooks. See link:hooks.html[hooks] for more -information. - - -OPTIONS -------- -:: - Commit log message (sans the first line, which comes - from e-mail Subject stored in ). - -:: - The patch to apply. - -:: - Author and subject information extracted from e-mail, - used on "author" line and as the first line of the - commit log message. - - -Author ------- -Written by Linus Torvalds - -Documentation --------------- -Documentation by Junio C Hamano and the git-list . - -GIT ---- -Part of the gitlink:git[7] suite - diff --git a/git-mailinfo.html b/git-mailinfo.html index f74ee53ff..b896aded8 100644 --- a/git-mailinfo.html +++ b/git-mailinfo.html @@ -279,7 +279,7 @@ git-mailinfo(1) Manual Page

    Reading a single e-mail message from the standard input, and writes the commit log message in <msg> file, and the patches in <patch> file. The author name, e-mail and e-mail subject are -written out to the standard output to be used by git-applypatch +written out to the standard output to be used by git-am to create a commit. It is usually not necessary to use this command directly. See git-am(1) instead.

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

    diff --git a/git-mailinfo.txt b/git-mailinfo.txt index 8eadcebfc..16956951d 100644 --- a/git-mailinfo.txt +++ b/git-mailinfo.txt @@ -16,7 +16,7 @@ DESCRIPTION Reading a single e-mail message from the standard input, and writes the commit log message in file, and the patches in file. The author name, e-mail and e-mail subject are -written out to the standard output to be used by git-applypatch +written out to the standard output to be used by git-am to create a commit. It is usually not necessary to use this command directly. See gitlink:git-am[1] instead. diff --git a/git-submodule.html b/git-submodule.html new file mode 100644 index 000000000..e28c90774 --- /dev/null +++ b/git-submodule.html @@ -0,0 +1,370 @@ + + + + + + +git-submodule(1) + + + +

    SYNOPSIS

    +
    +

    git-submodule [--quiet] [--cached] [status|init|update] [--] [<path>…]

    +
    +

    COMMANDS

    +
    +
    +
    +status +
    +
    +

    + Show the status of the submodules. This will print the SHA-1 of the + currently checked out commit for each submodule, along with the + submodule path and the output of git-describe(1) for the + SHA-1. Each SHA-1 will be prefixed with - if the submodule is not + initialized and + if the currently checked out submodule commit + does not match the SHA-1 found in the index of the containing + repository. This command is the default command for git-submodule. +

    +
    +
    +init +
    +
    +

    + Initialize the submodules, i.e. clone the git repositories specified + in the .gitmodules file and checkout the submodule commits specified + in the index of the containing repository. This will make the + submodules HEAD be detached. +

    +
    +
    +update +
    +
    +

    + Update the initialized submodules, i.e. checkout the submodule commits + specified in the index of the containing repository. This will make + the submodules HEAD be detached. +

    +
    +
    +
    +

    OPTIONS

    +
    +
    +
    +-q, --quiet +
    +
    +

    + Only print error messages. +

    +
    +
    +--cached +
    +
    +

    + Display the SHA-1 stored in the index, not the SHA-1 of the currently + checked out submodule commit. This option is only valid for the + status command. +

    +
    +
    +<path> +
    +
    +

    + Path to submodule(s). When specified this will restrict the command + to only operate on the submodules found at the specified paths. +

    +
    +
    +
    +

    FILES

    +
    +

    When cloning submodules, a .gitmodules file in the top-level directory +of the containing repository is used to find the url of each submodule. +This file should be formatted in the same way as $GIR_DIR/config. The key +to each submodule url is "module.$path.url".

    +
    +

    AUTHOR

    +
    +

    Written by Lars Hjemli <hjemli@gmail.com>

    +
    +

    GIT

    +
    +

    Part of the git(7) suite

    +
    + + + diff --git a/git-submodule.txt b/git-submodule.txt new file mode 100644 index 000000000..cb0424f77 --- /dev/null +++ b/git-submodule.txt @@ -0,0 +1,65 @@ +git-submodule(1) +================ + +NAME +---- +git-submodule - Initialize, update or inspect submodules + + +SYNOPSIS +-------- +'git-submodule' [--quiet] [--cached] [status|init|update] [--] [...] + + +COMMANDS +-------- +status:: + Show the status of the submodules. This will print the SHA-1 of the + currently checked out commit for each submodule, along with the + submodule path and the output of gitlink:git-describe[1] for the + SHA-1. Each SHA-1 will be prefixed with `-` if the submodule is not + initialized and `+` if the currently checked out submodule commit + does not match the SHA-1 found in the index of the containing + repository. This command is the default command for git-submodule. + +init:: + Initialize the submodules, i.e. clone the git repositories specified + in the .gitmodules file and checkout the submodule commits specified + in the index of the containing repository. This will make the + submodules HEAD be detached. + +update:: + Update the initialized submodules, i.e. checkout the submodule commits + specified in the index of the containing repository. This will make + the submodules HEAD be detached. + + +OPTIONS +------- +-q, --quiet:: + Only print error messages. + +--cached:: + Display the SHA-1 stored in the index, not the SHA-1 of the currently + checked out submodule commit. This option is only valid for the + status command. + +:: + Path to submodule(s). When specified this will restrict the command + to only operate on the submodules found at the specified paths. + +FILES +----- +When cloning submodules, a .gitmodules file in the top-level directory +of the containing repository is used to find the url of each submodule. +This file should be formatted in the same way as $GIR_DIR/config. The key +to each submodule url is "module.$path.url". + + +AUTHOR +------ +Written by Lars Hjemli + +GIT +--- +Part of the gitlink:git[7] suite diff --git a/git.html b/git.html index 057b7523f..58de7a887 100644 --- a/git.html +++ b/git.html @@ -623,6 +623,14 @@ ancillary user utilities.

    +git-submodule(1) +
    +
    +

    + Initialize, update or inspect submodules. +

    +
    +
    git-tag(1)
    @@ -734,14 +742,6 @@ ancillary user utilities.

    -git-applymbox(1) -
    -
    -

    - Apply a series of patches in a mailbox. -

    -
    -
    git-blame(1)
    @@ -1362,14 +1362,6 @@ typically do not use them directly.

    users typically do not use them directly.

    -git-applypatch(1) -
    -
    -

    - Apply one patch extracted from an e-mail. -

    -
    -
    git-check-attr(1)
    @@ -2333,7 +2325,7 @@ contributors on the git-list <git@vger.kernel.org>.

    diff --git a/hooks.html b/hooks.html index 2f910a9e3..cb170c17b 100644 --- a/hooks.html +++ b/hooks.html @@ -273,11 +273,10 @@ all disabled. To enable a hook, make it executable with chmod +x.

    applypatch-msg

    -

    This hook is invoked by git-applypatch script, which is -typically invoked by git-applymbox. It takes a single +

    This hook is invoked by git-am script. It takes a single parameter, the name of the file that holds the proposed commit log message. Exiting with non-zero status causes -git-applypatch to abort before applying the patch.

    +git-am to abort before applying the patch.

    The hook is allowed to edit the message file in place, and can be used to normalize the message into some project standard format (if the project has one). It can also be used to refuse @@ -287,8 +286,7 @@ the commit after inspecting the message file.

    pre-applypatch

    -

    This hook is invoked by git-applypatch script, which is -typically invoked by git-applymbox. It takes no parameter, +

    This hook is invoked by git-am. It takes no parameter, and is invoked after the patch is applied, but before a commit is made. Exiting with non-zero status causes the working tree after application of the patch not committed.

    @@ -299,11 +297,10 @@ make a commit if it does not pass certain test.

    post-applypatch

    -

    This hook is invoked by git-applypatch script, which is -typically invoked by git-applymbox. It takes no parameter, +

    This hook is invoked by git-am. It takes no parameter, and is invoked after the patch is applied and a commit is made.

    This hook is meant primarily for notification, and cannot affect -the outcome of git-applypatch.

    +the outcome of git-am.

    pre-commit

    @@ -459,7 +456,7 @@ for the user.

    diff --git a/hooks.txt b/hooks.txt index aabb9750f..6836477ca 100644 --- a/hooks.txt +++ b/hooks.txt @@ -12,11 +12,10 @@ This document describes the currently defined hooks. applypatch-msg -------------- -This hook is invoked by `git-applypatch` script, which is -typically invoked by `git-applymbox`. It takes a single +This hook is invoked by `git-am` script. It takes a single parameter, the name of the file that holds the proposed commit log message. Exiting with non-zero status causes -`git-applypatch` to abort before applying the patch. +`git-am` to abort before applying the patch. The hook is allowed to edit the message file in place, and can be used to normalize the message into some project standard @@ -29,8 +28,7 @@ The default 'applypatch-msg' hook, when enabled, runs the pre-applypatch -------------- -This hook is invoked by `git-applypatch` script, which is -typically invoked by `git-applymbox`. It takes no parameter, +This hook is invoked by `git-am`. It takes no parameter, and is invoked after the patch is applied, but before a commit is made. Exiting with non-zero status causes the working tree after application of the patch not committed. @@ -44,12 +42,11 @@ The default 'pre-applypatch' hook, when enabled, runs the post-applypatch --------------- -This hook is invoked by `git-applypatch` script, which is -typically invoked by `git-applymbox`. It takes no parameter, +This hook is invoked by `git-am`. It takes no parameter, and is invoked after the patch is applied and a commit is made. This hook is meant primarily for notification, and cannot affect -the outcome of `git-applypatch`. +the outcome of `git-am`. pre-commit ---------- -- 2.26.2