From: Junio C Hamano Date: Wed, 3 Oct 2007 12:05:53 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.3.4-203-gcc61a X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1b50ce9004d2296213fca188964ee273b87b2d12;p=git.git Autogenerated HTML docs for v1.5.3.4-203-gcc61a --- diff --git a/RelNotes-1.5.3.4.txt b/RelNotes-1.5.3.4.txt index 47ba2870a..b04b3a45a 100644 --- a/RelNotes-1.5.3.4.txt +++ b/RelNotes-1.5.3.4.txt @@ -4,25 +4,32 @@ GIT v1.5.3.4 Release Notes Fixes since v1.5.3.3 -------------------- - * Sample 'post-receive-hook' incorrectly sent out push + * Change to "git-ls-files" in v1.5.3.3 that was introduced to support + partial commit of removal better had a segfaulting bug, which was + diagnosed and fixed by Keith and Carl. + + * Performance improvements for rename detection has been backported + from the 'master' branch. + + * "git-for-each-ref --format='%(numparent)'" was not working + correctly at all, and --format='%(parent)' was not working for + merge commits. + + * Sample "post-receive-hook" incorrectly sent out push notification e-mails marked as "From: " the committer of the commit that happened to be at the tip of the branch that was pushed, not from the person who pushed. - * git-remote did not exit non-zero status upon error. + * "git-remote" did not exit non-zero status upon error. * "git-add -i" did not respond very well to EOF from tty nor bogus input. - * "git rebase -i" squash subcommand incorrectly made the + * "git-rebase -i" squash subcommand incorrectly made the author of later commit the author of resulting commit, instead of taking from the first one in the squashed series. - * "git stash apply --index" was not documented. - + * "git-stash apply --index" was not documented. --- -exec >/var/tmp/1 -O=v1.5.3.3-6-g0bdcac5 -echo O=`git describe refs/heads/maint` -git shortlog --no-merges $O..refs/heads/maint + * autoconfiguration learned that "ar" command is found as "gas" on + some systems. diff --git a/config.txt b/config.txt index 015910f27..971fd9f16 100644 --- a/config.txt +++ b/config.txt @@ -337,6 +337,12 @@ branch..merge:: branch..merge to the desired branch, and use the special setting `.` (a period) for branch..remote. +branch..mergeoptions:: + Sets default options for merging into branch . The syntax and + supported options are equal to that of gitlink:git-merge[1], but + option values containing whitespace characters are currently not + supported. + clean.requireForce:: A boolean to make git-clean do nothing unless given -f or -n. Defaults to false. @@ -439,6 +445,19 @@ gc.aggressiveWindow:: algorithm used by 'git gc --aggressive'. This defaults to 10. +gc.auto:: + When there are approximately more than this many loose + objects in the repository, `git gc --auto` will pack them. + Some Porcelain commands use this command to perform a + light-weight garbage collection from time to time. Setting + this to 0 disables it. + +gc.autopacklimit:: + When there are more than this many packs that are not + marked with `*.keep` file in the repository, `git gc + --auto` consolidates them into one larger pack. Setting + this to 0 disables this. + gc.packrefs:: `git gc` does not run `git pack-refs` in a bare repository by default so that older dumb-transport clients can still fetch @@ -579,7 +598,7 @@ merge.summary:: merge.tool:: Controls which merge resolution program is used by - gitlink:git-mergetool[l]. Valid values are: "kdiff3", "tkdiff", + gitlink:git-mergetool[1]. Valid values are: "kdiff3", "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and "opendiff". merge.verbosity:: diff --git a/diff-options.txt b/diff-options.txt index 228ccaf10..b1f528ae8 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -179,8 +179,8 @@ --ext-diff:: Allow an external diff helper to be executed. If you set an - external diff driver with gitlink:gitattributes(5), you need - to use this option with gitlink:git-log(1) and friends. + external diff driver with gitlink:gitattributes[5], you need + to use this option with gitlink:git-log[1] and friends. --no-ext-diff:: Disallow external diff drivers. diff --git a/git-branch.html b/git-branch.html index f846de943..4229be714 100644 --- a/git-branch.html +++ b/git-branch.html @@ -289,6 +289,9 @@ and option -a shows both.

It will start out with a head equal to the one given as <start-point>. If no <start-point> is given, the branch will be created with a head equal to that of the currently checked out branch.

+

Note that this will create the new branch, but it will not switch the +working tree to it; use "git checkout <newbranch>" to switch to the +new branch.

When a local branch is started off a remote branch, git can setup the branch so that git-pull(1) will appropriately merge from that remote branch. If this behavior is desired, it is possible to make it @@ -418,6 +421,31 @@ to delete remote-tracking branches.

+--track +
+
+

+ Set up configuration so that git-pull will automatically + retrieve data from the remote branch. Use this if you always + pull from the same remote branch into the new branch, or if you + don't want to use "git pull <repository> <refspec>" explicitly. Set the + branch.autosetupmerge configuration variable to true if you + want git-checkout and git-branch to always behave as if + --track were given. +

+
+
+--no-track +
+
+

+ When -b is given and a branch is created off a remote branch, + set up configuration so that git-pull will not retrieve data + from the remote branch, ignoring the branch.autosetupmerge + configuration variable. +

+
+
<branchname>
@@ -527,7 +555,7 @@ a branch and check it out with a single command.

diff --git a/git-branch.txt b/git-branch.txt index 33bc31b0d..b7285bcdb 100644 --- a/git-branch.txt +++ b/git-branch.txt @@ -26,6 +26,10 @@ It will start out with a head equal to the one given as . If no is given, the branch will be created with a head equal to that of the currently checked out branch. +Note that this will create the new branch, but it will not switch the +working tree to it; use "git checkout " to switch to the +new branch. + When a local branch is started off a remote branch, git can setup the branch so that gitlink:git-pull[1] will appropriately merge from that remote branch. If this behavior is desired, it is possible to make it @@ -91,6 +95,21 @@ OPTIONS --no-abbrev:: Display the full sha1s in output listing rather than abbreviating them. +--track:: + Set up configuration so that git-pull will automatically + retrieve data from the remote branch. Use this if you always + pull from the same remote branch into the new branch, or if you + don't want to use "git pull " explicitly. Set the + branch.autosetupmerge configuration variable to true if you + want git-checkout and git-branch to always behave as if + '--track' were given. + +--no-track:: + When -b is given and a branch is created off a remote branch, + set up configuration so that git-pull will not retrieve data + from the remote branch, ignoring the branch.autosetupmerge + configuration variable. + :: The name of the branch to create or delete. The new branch name must pass all checks defined by diff --git a/git-checkout.html b/git-checkout.html index 9a3729b47..7e3e2d061 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -332,7 +332,9 @@ working tree.

When -b is given and a branch is created off a remote branch, set up configuration so that git-pull will automatically - retrieve data from the remote branch. Set the + retrieve data from the remote branch. Use this if you always + pull from the same remote branch into the new branch, or if you + don't want to use "git pull <repository> <refspec>" explicitly. Set the branch.autosetupmerge configuration variable to true if you want git-checkout and git-branch to always behave as if --track were given. @@ -538,7 +540,7 @@ $ git add frotz

diff --git a/git-checkout.txt b/git-checkout.txt index 734928bf9..2e58481ed 100644 --- a/git-checkout.txt +++ b/git-checkout.txt @@ -50,7 +50,9 @@ OPTIONS --track:: When -b is given and a branch is created off a remote branch, set up configuration so that git-pull will automatically - retrieve data from the remote branch. Set the + retrieve data from the remote branch. Use this if you always + pull from the same remote branch into the new branch, or if you + don't want to use "git pull " explicitly. Set the branch.autosetupmerge configuration variable to true if you want git-checkout and git-branch to always behave as if '--track' were given. diff --git a/git-config.html b/git-config.html index 5f353cb0a..770de75d3 100644 --- a/git-config.html +++ b/git-config.html @@ -1116,6 +1116,17 @@ branch.<name>.merge

+branch.<name>.mergeoptions +
+
+

+ Sets default options for merging into branch <name>. The syntax and + supported options are equal to that of git-merge(1), but + option values containing whitespace characters are currently not + supported. +

+
+
clean.requireForce
@@ -1297,6 +1308,29 @@ gc.aggressiveWindow

+gc.auto +
+
+

+ When there are approximately more than this many loose + objects in the repository, git gc --auto will pack them. + Some Porcelain commands use this command to perform a + light-weight garbage collection from time to time. Setting + this to 0 disables it. +

+
+
+gc.autopacklimit +
+
+

+ When there are more than this many packs that are not + marked with *.keep file in the repository, git gc + --auto consolidates them into one larger pack. Setting + this to 0 disables this. +

+
+
gc.packrefs
@@ -1561,7 +1595,7 @@ merge.tool

Controls which merge resolution program is used by - git-mergetool(l). Valid values are: "kdiff3", "tkdiff", + git-mergetool(1). Valid values are: "kdiff3", "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and "opendiff".

@@ -1907,7 +1941,7 @@ transfer.unpackLimit diff --git a/git-diff-files.html b/git-diff-files.html index f80a5a231..41c6bc487 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -679,8 +679,8 @@ same as "git-diff-index" and "git-diff-tree".

Allow an external diff helper to be executed. If you set an - external diff driver with gitlink:gitattributes(5), you need - to use this option with gitlink:git-log(1) and friends. + external diff driver with gitattributes(5), you need + to use this option with git-log(1) and friends.

@@ -1113,7 +1113,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff-index.html b/git-diff-index.html index 9d6dc39e6..f415f9a48 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -680,8 +680,8 @@ entries in the index are compared.

Allow an external diff helper to be executed. If you set an - external diff driver with gitlink:gitattributes(5), you need - to use this option with gitlink:git-log(1) and friends. + external diff driver with gitattributes(5), you need + to use this option with git-log(1) and friends.

@@ -1195,7 +1195,7 @@ always have the special all-zero sha1. diff --git a/git-diff-tree.html b/git-diff-tree.html index b45da3655..02401c308 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -682,8 +682,8 @@ git-diff-tree(1) Manual Page

Allow an external diff helper to be executed. If you set an - external diff driver with gitlink:gitattributes(5), you need - to use this option with gitlink:git-log(1) and friends. + external diff driver with gitattributes(5), you need + to use this option with git-log(1) and friends.

@@ -1583,7 +1583,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff.html b/git-diff.html index 577fc0b1d..f03cc5c7b 100644 --- a/git-diff.html +++ b/git-diff.html @@ -758,8 +758,8 @@ and the range notations ("<commit>..<commit>" and

Allow an external diff helper to be executed. If you set an - external diff driver with gitlink:gitattributes(5), you need - to use this option with gitlink:git-log(1) and friends. + external diff driver with gitattributes(5), you need + to use this option with git-log(1) and friends.

@@ -948,7 +948,7 @@ Output diff in reverse. diff --git a/git-for-each-ref.html b/git-for-each-ref.html index 0c8770cba..5ef1b8b56 100644 --- a/git-for-each-ref.html +++ b/git-for-each-ref.html @@ -405,6 +405,10 @@ All other fields are used to sort in their byte-value order.

In any case, a field name that refers to a field inapplicable to the object referred by the ref does not cause an error. It returns an empty string instead.

+

As a special case for the date-type fields, you may specify a format for +the date by adding one of :default, :relative, :short, :local, +:iso8601 or :rfc2822 to the end of the fieldname; e.g. +%(taggerdate:relative).

EXAMPLES

@@ -491,7 +495,7 @@ eval "$eval"
diff --git a/git-for-each-ref.txt b/git-for-each-ref.txt index 6df8e8500..f1f90cca6 100644 --- a/git-for-each-ref.txt +++ b/git-for-each-ref.txt @@ -100,6 +100,11 @@ In any case, a field name that refers to a field inapplicable to the object referred by the ref does not cause an error. It returns an empty string instead. +As a special case for the date-type fields, you may specify a format for +the date by adding one of `:default`, `:relative`, `:short`, `:local`, +`:iso8601` or `:rfc2822` to the end of the fieldname; e.g. +`%(taggerdate:relative)`. + EXAMPLES -------- diff --git a/git-format-patch.html b/git-format-patch.html index adee47f9c..db3610165 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -726,8 +726,8 @@ reference.

Allow an external diff helper to be executed. If you set an - external diff driver with gitlink:gitattributes(5), you need - to use this option with gitlink:git-log(1) and friends. + external diff driver with gitattributes(5), you need + to use this option with git-log(1) and friends.

@@ -979,7 +979,7 @@ git-format-patch -3 diff --git a/git-gc.html b/git-gc.html index 4b3bbe8bf..4f2ef4b19 100644 --- a/git-gc.html +++ b/git-gc.html @@ -272,7 +272,7 @@ git-gc(1) Manual Page

SYNOPSIS

-

git-gc [--prune] [--aggressive]

+

git-gc [--prune] [--aggressive] [--auto]

DESCRIPTION

@@ -316,6 +316,25 @@ operating performance.

few hundred changesets or so.

+
+--auto +
+
+

+ 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. +

+

Configuration

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

diff --git a/git-gc.txt b/git-gc.txt index c7742ca96..b9d5660ea 100644 --- a/git-gc.txt +++ b/git-gc.txt @@ -8,7 +8,7 @@ git-gc - Cleanup unnecessary files and optimize the local repository SYNOPSIS -------- -'git-gc' [--prune] [--aggressive] +'git-gc' [--prune] [--aggressive] [--auto] DESCRIPTION ----------- @@ -43,6 +43,20 @@ OPTIONS persistent, so this option only needs to be used occasionally; every 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. + Configuration ------------- diff --git a/git-merge.html b/git-merge.html index ea8855106..329795b6a 100644 --- a/git-merge.html +++ b/git-merge.html @@ -312,6 +312,15 @@ which drives multiple merge strategy scripts.

+--commit +
+
+

+ Perform the merge and commit the result. This option can + be used to override --no-commit. +

+
+
--squash
@@ -326,6 +335,34 @@ which drives multiple merge strategy scripts.

+--no-squash +
+
+

+ Perform the merge and commit the result. This option can + be used to override --squash. +

+
+
+--no-ff +
+
+

+ Generate a merge commit even if the merge resolved as a + fast-forward. +

+
+
+--ff +
+
+

+ Do not generate a merge commit if the merge resolved as + a fast-forward, only update the branch pointer. This is + the default behavior of git-merge. +

+
+
-s <strategy>, --strategy=<strategy>
@@ -454,6 +491,16 @@ merge.verbosity Can be overridden by GIT_MERGE_VERBOSITY environment variable.

+
+branch.<name>.mergeoptions +
+
+

+ Sets default options for merging into branch <name>. The syntax and + supported options are equal to that of git-merge, but option values + containing whitespace characters are currently not supported. +

+

HOW MERGE WORKS

@@ -606,7 +653,7 @@ Resolve the conflicts. git-diff would report only the diff --git a/git-merge.txt b/git-merge.txt index eae49c487..bca4212e5 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -58,6 +58,10 @@ merge.verbosity:: above outputs debugging information. The default is level 2. Can be overridden by 'GIT_MERGE_VERBOSITY' environment variable. +branch..mergeoptions:: + Sets default options for merging into branch . The syntax and + supported options are equal to that of git-merge, but option values + containing whitespace characters are currently not supported. HOW MERGE WORKS --------------- diff --git a/git-pull.html b/git-pull.html index 579aca1e2..7139b9dd3 100644 --- a/git-pull.html +++ b/git-pull.html @@ -313,6 +313,15 @@ when merging local branches into the current branch.

+--commit +
+
+

+ Perform the merge and commit the result. This option can + be used to override --no-commit. +

+
+
--squash
@@ -327,6 +336,34 @@ when merging local branches into the current branch.

+--no-squash +
+
+

+ Perform the merge and commit the result. This option can + be used to override --squash. +

+
+
+--no-ff +
+
+

+ Generate a merge commit even if the merge resolved as a + fast-forward. +

+
+
+--ff +
+
+

+ Do not generate a merge commit if the merge resolved as + a fast-forward, only update the branch pointer. This is + the default behavior of git-merge. +

+
+
-s <strategy>, --strategy=<strategy>
@@ -909,7 +946,7 @@ Junio C Hamano and the git-list <git@vger.kernel.org>.

diff --git a/hooks.html b/hooks.html index 4501dcfa0..5a3fb8c5f 100644 --- a/hooks.html +++ b/hooks.html @@ -334,6 +334,18 @@ parameter, and is invoked after a commit is made.

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

+

post-checkout

+
+

This hook is invoked when a git-checkout is run after having updated the +worktree. The hook is given three parameters: the ref of the previous HEAD, +the ref of the new HEAD (which may or may not have changed), and a flag +indicating whether the checkout was a branch checkout (changing branches, +flag=1) or a file checkout (retrieving a file from the index, flag=0). +This hook cannot affect the outcome of git-checkout.

+

This hook can be used to perform repository validity checks, auto-display +differences from the previous HEAD if different, or set working dir metadata +properties.

+

post-merge

This hook is invoked by git-merge, which happens when a git pull @@ -467,7 +479,7 @@ for the user.

diff --git a/hooks.txt b/hooks.txt index 58b954759..f110162b0 100644 --- a/hooks.txt +++ b/hooks.txt @@ -87,6 +87,20 @@ parameter, and is invoked after a commit is made. This hook is meant primarily for notification, and cannot affect the outcome of `git-commit`. +post-checkout +----------- + +This hook is invoked when a `git-checkout` is run after having updated the +worktree. The hook is given three parameters: the ref of the previous HEAD, +the ref of the new HEAD (which may or may not have changed), and a flag +indicating whether the checkout was a branch checkout (changing branches, +flag=1) or a file checkout (retrieving a file from the index, flag=0). +This hook cannot affect the outcome of `git-checkout`. + +This hook can be used to perform repository validity checks, auto-display +differences from the previous HEAD if different, or set working dir metadata +properties. + post-merge ----------- diff --git a/merge-options.txt b/merge-options.txt index d64c259bb..9f1fc8255 100644 --- a/merge-options.txt +++ b/merge-options.txt @@ -10,6 +10,10 @@ not autocommit, to give the user a chance to inspect and further tweak the merge result before committing. +--commit:: + Perform the merge and commit the result. This option can + be used to override --no-commit. + --squash:: Produce the working tree and index state as if a real merge happened, but do not actually make a commit or @@ -19,6 +23,19 @@ top of the current branch whose effect is the same as merging another branch (or more in case of an octopus). +--no-squash:: + Perform the merge and commit the result. This option can + be used to override --squash. + +--no-ff:: + Generate a merge commit even if the merge resolved as a + fast-forward. + +--ff:: + Do not generate a merge commit if the merge resolved as + a fast-forward, only update the branch pointer. This is + the default behavior of git-merge. + -s , \--strategy=:: Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried.