From: Junio C Hamano Date: Tue, 23 Oct 2007 01:23:31 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.3.4-319-gdd817 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=764a667a8f360cfaafc6bfa9a0b5a2f09ed47586;p=git.git Autogenerated HTML docs for v1.5.3.4-319-gdd817 --- diff --git a/RelNotes-1.5.3.5.txt b/RelNotes-1.5.3.5.txt new file mode 100644 index 000000000..9581e03c4 --- /dev/null +++ b/RelNotes-1.5.3.5.txt @@ -0,0 +1,73 @@ +GIT v1.5.3.5 Release Notes +========================== + +Fixes since v1.5.3.4 +-------------------- + + * Comes with git-gui 0.8.4. + + * "git-config" silently ignored options after --list; now it will + error out with a usage message. + + * "git-config --file" failed if the argument used a relative path + as it changed directories before opening the file. + + * "git-config --file" now displays a proper error message if it + cannot read the file specified on the command line. + + * "git-config", "git-diff", "git-apply" failed if run from a + subdirectory with relative GIT_DIR and GIT_WORK_TREE set. + + * "git-blame" crashed if run during a merge conflict. + + * "git-add -i" did not handle single line hunks correctly. + + * "git-rebase -i" and "git-stash apply" failed if external diff + drivers were used for one or more files in a commit. They now + avoid calling the external diff drivers. + + * "git-log --follow" did not work unless diff generation (e.g. -p) + was also requested. + + * "git-log --follow -B" did not work at all. Fixed. + + * "git-log -M -B" did not correctly handle cases of very large files + being renamed and replaced by very small files in the same commit. + + * "git-log" printed extra newlines between commits when a diff + was generated internally (e.g. -S or --follow) but not displayed. + + * "git-push" error message is more helpful when pushing to a + repository with no matching refs and none specified. + + * "git-push" now respects + (force push) on wildcard refspecs, + matching the behavior of git-fetch. + + * "git-filter-branch" now updates the working directory when it + has finished filtering the current branch. + + * "git-instaweb" no longer fails on Mac OS X. + + * "git-cvsexportcommit" didn't always create new parent directories + before trying to create new child directories. Fixed. + + * "git-fetch" printed a scary (but bogus) error message while + fetching a tag that pointed to a tree or blob. The error did + not impact correctness, only user perception. The bogus error + is no longer printed. + + * "git-ls-files --ignored" did not properly descend into non-ignored + directories that themselves contained ignored files if d_type + was not supported by the filesystem. This bug impacted systems + such as AFS. Fixed. + + * Git segfaulted when reading an invalid .gitattributes file. Fixed. + + * post-receive-email example hook fixed was fixed for + non-fast-forward updates. + + * Documentation updates for supported (but previously undocumented) + options of "git-archive" and "git-reflog". + + * "make clean" no longer deletes the configure script that ships + with the git tarball, making multiple architecture builds easier. diff --git a/config.txt b/config.txt index 971fd9f16..d4a476e2f 100644 --- a/config.txt +++ b/config.txt @@ -188,7 +188,7 @@ core.worktree:: Set the path to the working tree. The value will not be used in combination with repositories found automatically in a .git directory (i.e. $GIT_DIR is not set). - This can be overriden by the GIT_WORK_TREE environment + This can be overridden by the GIT_WORK_TREE environment variable and the '--work-tree' command line option. core.logAllRefUpdates:: @@ -607,7 +607,7 @@ merge.verbosity:: message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level 5 and above outputs debugging information. The default is level 2. - Can be overriden by 'GIT_MERGE_VERBOSITY' environment variable. + Can be overridden by 'GIT_MERGE_VERBOSITY' environment variable. merge..name:: Defines a human readable name for a custom low-level diff --git a/git-archive.html b/git-archive.html index 5948cc678..437210699 100644 --- a/git-archive.html +++ b/git-archive.html @@ -274,7 +274,8 @@ git-archive(1) Manual Page
git-archive --format=<fmt> [--list] [--prefix=<prefix>/] [<extra>] - [--remote=<repo>] <tree-ish> [path…]
+ [--remote=<repo> [--exec=<git-upload-archive>]] <tree-ish> + [path…]

DESCRIPTION

@@ -346,6 +347,15 @@ comment.

+--exec=<git-upload-archive> +
+
+

+ Used with --remote to specify the path to the + git-upload-archive executable on the remote side. +

+
+
<tree-ish>
@@ -459,7 +469,7 @@ git archive --format=zip --prefix=git-docs/ HEAD:Documentation/ > git-1.4.0-d
diff --git a/git-archive.txt b/git-archive.txt index e1e2d60fe..7cd652655 100644 --- a/git-archive.txt +++ b/git-archive.txt @@ -10,7 +10,8 @@ SYNOPSIS -------- [verse] 'git-archive' --format= [--list] [--prefix=/] [] - [--remote=] [path...] + [--remote= [--exec=]] + [path...] DESCRIPTION ----------- @@ -52,6 +53,10 @@ OPTIONS Instead of making a tar archive from local repository, retrieve a tar archive from a remote repository. +--exec=:: + Used with --remote to specify the path to the + git-upload-archive executable on the remote side. + :: The tree or commit to produce an archive for. diff --git a/git-cherry-pick.html b/git-cherry-pick.html index 27ee353e7..3e510498e 100644 --- a/git-cherry-pick.html +++ b/git-cherry-pick.html @@ -307,11 +307,12 @@ modifications from the HEAD commit).

- Cause the command to append which commit was - cherry-picked after the original commit message when - making a commit. Do not use this option if you are - cherry-picking from your private branch because the - information is useless to the recipient. If on the + When recording the commit, append to the original commit + message a note that indicates which commit this change + was cherry-picked from. Append the note only for cherry + picks without conflicts. Do not use this option if + you are cherry-picking from your private branch because + the information is useless to the recipient. If on the other hand you are cherry-picking between two publicly visible branches (e.g. backporting a fix to a maintenance branch for an older release from a @@ -362,7 +363,7 @@ effect to your working tree in a row.

diff --git a/git-cherry-pick.txt b/git-cherry-pick.txt index 47b1e8c2f..76a2edfd9 100644 --- a/git-cherry-pick.txt +++ b/git-cherry-pick.txt @@ -27,11 +27,12 @@ OPTIONS message prior committing. -x:: - Cause the command to append which commit was - cherry-picked after the original commit message when - making a commit. Do not use this option if you are - cherry-picking from your private branch because the - information is useless to the recipient. If on the + When recording the commit, append to the original commit + message a note that indicates which commit this change + was cherry-picked from. Append the note only for cherry + picks without conflicts. Do not use this option if + you are cherry-picking from your private branch because + the information is useless to the recipient. If on the other hand you are cherry-picking between two publicly visible branches (e.g. backporting a fix to a maintenance branch for an older release from a diff --git a/git-config.html b/git-config.html index 770de75d3..f9d424012 100644 --- a/git-config.html +++ b/git-config.html @@ -889,7 +889,7 @@ core.worktree Set the path to the working tree. The value will not be used in combination with repositories found automatically in a .git directory (i.e. $GIT_DIR is not set). - This can be overriden by the GIT_WORK_TREE environment + This can be overridden by the GIT_WORK_TREE environment variable and the --work-tree command line option.

@@ -1609,7 +1609,7 @@ merge.verbosity message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level 5 and above outputs debugging information. The default is level 2. - Can be overriden by GIT_MERGE_VERBOSITY environment variable. + Can be overridden by GIT_MERGE_VERBOSITY environment variable.

@@ -1941,7 +1941,7 @@ transfer.unpackLimit diff --git a/git-diff.html b/git-diff.html index f03cc5c7b..57ac59bd9 100644 --- a/git-diff.html +++ b/git-diff.html @@ -873,7 +873,7 @@ Same as above.

  • -Changes that occured on the master branch since when the topic +Changes that occurred on the master branch since when the topic branch was started off it.

    • @@ -948,7 +948,7 @@ Output diff in reverse. diff --git a/git-diff.txt b/git-diff.txt index db2eb46a1..ce0f50246 100644 --- a/git-diff.txt +++ b/git-diff.txt @@ -125,7 +125,7 @@ $ git diff topic...master <3> + <1> Changes between the tips of the topic and the master branches. <2> Same as above. -<3> Changes that occured on the master branch since when the topic +<3> Changes that occurred on the master branch since when the topic branch was started off it. Limiting the diff output:: diff --git a/git-filter-branch.html b/git-filter-branch.html index 0a2d811c5..11fcd821c 100644 --- a/git-filter-branch.html +++ b/git-filter-branch.html @@ -489,8 +489,7 @@ or copyright violation) from all commits:

    git filter-branch --index-filter 'git update-index --remove filename' HEAD
    -

    Now, you will get the rewritten history saved in the branch newbranch -(your current branch is left untouched).

    +

    Now, you will get the rewritten history saved in HEAD.

    To set a commit (which typically is at the tip of another history) to be the parent of the current initial commit, in order to paste the other history behind the current history:

    @@ -594,7 +593,7 @@ and the git list <git@vger.kernel.org>

    diff --git a/git-filter-branch.txt b/git-filter-branch.txt index c878ed395..ba9b4fbca 100644 --- a/git-filter-branch.txt +++ b/git-filter-branch.txt @@ -180,8 +180,7 @@ A significantly faster version: git filter-branch --index-filter 'git update-index --remove filename' HEAD -------------------------------------------------------------------------- -Now, you will get the rewritten history saved in the branch 'newbranch' -(your current branch is left untouched). +Now, you will get the rewritten history saved in HEAD. To set a commit (which typically is at the tip of another history) to be the parent of the current initial commit, in diff --git a/git-gc.html b/git-gc.html index 4f2ef4b19..8f1ed4cba 100644 --- a/git-gc.html +++ b/git-gc.html @@ -282,7 +282,8 @@ performance) and removing unreachable objects which may have been created from prior invocations of git-add(1).

    Users are encouraged to run this task on a regular basis within each repository to maintain good disk space utilization and good -operating performance.

    +operating performance. Some git commands may automatically run +git-gc; see the --auto flag below for details.

    OPTIONS

    @@ -321,19 +322,22 @@ operating performance.

    - With this option, git gc checks if there are too many - loose objects in the repository and runs - git-repack(1) with -d -l option to pack them. - The threshold for loose objects is set with gc.auto configuration - variable, and can be disabled by setting it to 0. Some - Porcelain commands use this after they perform operation - that could create many loose objects automatically. - Additionally, when there are too many packs are present, - they are consolidated into one larger pack by running - the git-repack command with -A option. The - threshold for number of packs is set with - gc.autopacklimit configuration variable. + With this option, git gc checks whether any housekeeping is + required; if not, it exits without performing any work. + Some git commands run git gc --auto after performing + operations that could create many loose objects.

    +

    Housekeeping is required if there are too many loose objects or +too many packs in the repository. If the number of loose objects +exceeds the value of the gc.auto configuration variable, then +all loose objects are combined into a single pack using +git-repack -d -l. Setting the value of gc.auto to 0 +disables automatic packing of loose objects.

    +

    If the number of packs exceeds the value of gc.autopacklimit, +then existing packs (except those marked with a .keep file) +are consolidated into a single pack by using the -A option of +git-repack. Setting gc.autopacklimit to 0 disables +automatic consolidation of packs.

    @@ -386,7 +390,7 @@ more details. This defaults to 10.

    diff --git a/git-gc.txt b/git-gc.txt index b9d5660ea..872056ea0 100644 --- a/git-gc.txt +++ b/git-gc.txt @@ -19,7 +19,8 @@ created from prior invocations of gitlink:git-add[1]. Users are encouraged to run this task on a regular basis within each repository to maintain good disk space utilization and good -operating performance. +operating performance. Some git commands may automatically run +`git-gc`; see the `--auto` flag below for details. OPTIONS ------- @@ -44,18 +45,23 @@ OPTIONS few hundred changesets or so. --auto:: - With this option, `git gc` checks if there are too many - loose objects in the repository and runs - gitlink:git-repack[1] with `-d -l` option to pack them. - The threshold for loose objects is set with `gc.auto` configuration - variable, and can be disabled by setting it to 0. Some - Porcelain commands use this after they perform operation - that could create many loose objects automatically. - Additionally, when there are too many packs are present, - they are consolidated into one larger pack by running - the `git-repack` command with `-A` option. The - threshold for number of packs is set with - `gc.autopacklimit` configuration variable. + With this option, `git gc` checks whether any housekeeping is + required; if not, it exits without performing any work. + Some git commands run `git gc --auto` after performing + operations that could create many loose objects. ++ +Housekeeping is required if there are too many loose objects or +too many packs in the repository. If the number of loose objects +exceeds the value of the `gc.auto` configuration variable, then +all loose objects are combined into a single pack using +`git-repack -d -l`. Setting the value of `gc.auto` to 0 +disables automatic packing of loose objects. ++ +If the number of packs exceeds the value of `gc.autopacklimit`, +then existing packs (except those marked with a `.keep` file) +are consolidated into a single pack by using the `-A` option of +`git-repack`. Setting `gc.autopacklimit` to 0 disables +automatic consolidation of packs. Configuration ------------- diff --git a/git-index-pack.html b/git-index-pack.html index b553a024b..ab1fcebe0 100644 --- a/git-index-pack.html +++ b/git-index-pack.html @@ -320,7 +320,7 @@ objects/pack/ directory of a git repository.

    a default name determined from the pack content. If <pack-file> is not specified consider using --keep to prevent a race condition between this process and - :git-repack(1) . + :git-repack(1).

    @@ -398,7 +398,7 @@ mentioned above.

    diff --git a/git-index-pack.txt b/git-index-pack.txt index a8a7f6f04..bf5c2bddf 100644 --- a/git-index-pack.txt +++ b/git-index-pack.txt @@ -43,7 +43,7 @@ OPTIONS a default name determined from the pack content. If is not specified consider using --keep to prevent a race condition between this process and - gitlink::git-repack[1] . + gitlink::git-repack[1]. --fix-thin:: It is possible for gitlink:git-pack-objects[1] to build diff --git a/git-instaweb.html b/git-instaweb.html index ed5b4117f..ef8c51abe 100644 --- a/git-instaweb.html +++ b/git-instaweb.html @@ -301,7 +301,7 @@ repository.

    The HTTP daemon command-line that will be executed. Command-line options may be specified here, and the configuration file will be added at the end of the command-line. - Currently, lighttpd and apache2 are the only supported servers. + Currently lighttpd, apache2 and webrick are supported. (Default: lighttpd)

    @@ -390,7 +390,7 @@ repository.

    diff --git a/git-instaweb.txt b/git-instaweb.txt index cec60ee78..735008c1a 100644 --- a/git-instaweb.txt +++ b/git-instaweb.txt @@ -27,7 +27,7 @@ OPTIONS The HTTP daemon command-line that will be executed. Command-line options may be specified here, and the configuration file will be added at the end of the command-line. - Currently, lighttpd and apache2 are the only supported servers. + Currently lighttpd, apache2 and webrick are supported. (Default: lighttpd) -m|--module-path:: diff --git a/git-merge-index.html b/git-merge-index.html index 1dbcc2f8d..ab6549c03 100644 --- a/git-merge-index.html +++ b/git-merge-index.html @@ -325,7 +325,7 @@ files are passed as arguments 5, 6 and 7.

    If "git-merge-index" is called with multiple <file>s (or -a) then it processes them in turn only stopping if merge returns a non-zero exit code.

    -

    Typically this is run with the a script calling git's imitation of +

    Typically this is run with a script calling git's imitation of the merge command from the RCS package.

    A sample script called "git-merge-one-file" is included in the distribution.

    @@ -372,7 +372,7 @@ One-shot merge by Petr Baudis <pasky@ucw.cz>

    diff --git a/git-merge-index.txt b/git-merge-index.txt index 17e9f10c6..b726ddfe1 100644 --- a/git-merge-index.txt +++ b/git-merge-index.txt @@ -40,7 +40,7 @@ If "git-merge-index" is called with multiple s (or -a) then it processes them in turn only stopping if merge returns a non-zero exit code. -Typically this is run with the a script calling git's imitation of +Typically this is run with a script calling git's imitation of the merge command from the RCS package. A sample script called "git-merge-one-file" is included in the diff --git a/git-push.html b/git-push.html index dacd37547..8701f653d 100644 --- a/git-push.html +++ b/git-push.html @@ -273,7 +273,7 @@ git-push(1) Manual Page

    SYNOPSIS

    -
    git-push [--all] [--tags] [--receive-pack=<git-receive-pack>] +
    git-push [--all] [--dry-run] [--tags] [--receive-pack=<git-receive-pack>] [--repo=all] [-f | --force] [-v] [<repository> <refspec>…]

    DESCRIPTION

    @@ -335,6 +335,14 @@ the remote repository.

    +--dry-run +
    +
    +

    + Do everything except actually send the updates. +

    +
    +
    --tags
    @@ -613,7 +621,7 @@ by Linus Torvalds <torvalds@osdl.org>

    diff --git a/git-push.txt b/git-push.txt index 6bc559ddd..e5dd4c106 100644 --- a/git-push.txt +++ b/git-push.txt @@ -9,7 +9,7 @@ git-push - Update remote refs along with associated objects SYNOPSIS -------- [verse] -'git-push' [--all] [--tags] [--receive-pack=] +'git-push' [--all] [--dry-run] [--tags] [--receive-pack=] [--repo=all] [-f | --force] [-v] [ ...] DESCRIPTION @@ -63,6 +63,9 @@ the remote repository. Instead of naming each ref to push, specifies that all refs under `$GIT_DIR/refs/heads/` be pushed. +\--dry-run:: + Do everything except actually send the updates. + \--tags:: All refs under `$GIT_DIR/refs/tags` are pushed, in addition to refspecs explicitly listed on the command diff --git a/git-rebase.html b/git-rebase.html index 09f87b8eb..d746f3091 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -290,7 +290,10 @@ of commits that would be shown by git log <upstream>..HEAD.

    --onto option was supplied. This has the exact same effect as git reset --hard <upstream> (or <newbase>).

    The commits that were previously saved into the temporary area are -then reapplied to the current branch, one by one, in order.

    +then reapplied to the current branch, one by one, in order. Note that +any commits in HEAD which introduce the same textual changes as a commit +in HEAD..<upstream> are omitted (i.e., a patch already accepted upstream +with a different commit message or timestamp will be skipped).

    It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure and run git rebase --continue. Another option is to bypass the commit @@ -319,6 +322,24 @@ git-rebase master topic

    The latter form is just a short-hand of git checkout topic followed by git rebase master.

    +

    If the upstream branch already contains a change you have made (e.g., +because you mailed a patch which was applied upstream), then that commit +will be skipped. For example, running git-rebase master on the +following history (in which A' and A introduce the same set of changes, +but have different committer information):

    +
    +
    +
              A---B---C topic
+         /
+    D---E---A'---F master
    +
    +

    will result in:

    +
    +
    +
                       B'---C' topic
+                  /
+    D---E---A'---F master
    +

    Here is how you would transplant a topic branch based on one branch to another, to pretend that you forked the topic branch from the latter branch, using rebase --onto.

    @@ -810,7 +831,7 @@ Johannes E. Schindelin <johannes.schindelin@gmx.de>

    diff --git a/git-rebase.txt b/git-rebase.txt index e8e75790f..e4326d332 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -28,7 +28,10 @@ The current branch is reset to , or if the `git reset --hard ` (or ). The commits that were previously saved into the temporary area are -then reapplied to the current branch, one by one, in order. +then reapplied to the current branch, one by one, in order. Note that +any commits in HEAD which introduce the same textual changes as a commit +in HEAD.. are omitted (i.e., a patch already accepted upstream +with a different commit message or timestamp will be skipped). It is possible that a merge failure will prevent this process from being completely automatic. You will have to resolve any such merge failure @@ -62,6 +65,26 @@ would be: The latter form is just a short-hand of `git checkout topic` followed by `git rebase master`. +If the upstream branch already contains a change you have made (e.g., +because you mailed a patch which was applied upstream), then that commit +will be skipped. For example, running `git-rebase master` on the +following history (in which A' and A introduce the same set of changes, +but have different committer information): + +------------ + A---B---C topic + / + D---E---A'---F master +------------ + +will result in: + +------------ + B'---C' topic + / + D---E---A'---F master +------------ + Here is how you would transplant a topic branch based on one branch to another, to pretend that you forked the topic branch from the latter branch, using `rebase --onto`. diff --git a/git-reflog.html b/git-reflog.html index aae9ca781..8c0db1b1e 100644 --- a/git-reflog.html +++ b/git-reflog.html @@ -279,7 +279,7 @@ git-reflog(1) Manual Page

    The command takes various subcommands, and different options depending on the subcommand:

    -
    git reflog expire [--dry-run] [--stale-fix] +
    git reflog expire [--dry-run] [--stale-fix] [--verbose] [--expire=<time>] [--expire-unreachable=<time>] [--all] <refs>…

    git reflog [show] [log-options]

    Reflog is a mechanism to record when the tip of branches are @@ -345,6 +345,14 @@ them.

    Instead of listing <refs> explicitly, prune all refs.

    +
    +--verbose +
    +
    +

    + Print extra information on screen. +

    +

    Author

    @@ -361,7 +369,7 @@ them.

    diff --git a/git-reflog.txt b/git-reflog.txt index 5180f6810..5c7316ceb 100644 --- a/git-reflog.txt +++ b/git-reflog.txt @@ -16,7 +16,7 @@ The command takes various subcommands, and different options depending on the subcommand: [verse] -git reflog expire [--dry-run] [--stale-fix] +git reflog expire [--dry-run] [--stale-fix] [--verbose] [--expire=