From: Junio C Hamano Date: Sun, 6 Jul 2008 05:20:31 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.6.2-212-g08b5 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ba4b9286c25f18c7ebbb809ee5732a7810377ab6;p=git.git Autogenerated HTML docs for v1.5.6.2-212-g08b5 --- diff --git a/RelNotes-1.5.6.2.txt b/RelNotes-1.5.6.2.txt index 02d5910d5..5902a85a7 100644 --- a/RelNotes-1.5.6.2.txt +++ b/RelNotes-1.5.6.2.txt @@ -11,21 +11,30 @@ Futureproof Fixes since v1.5.6.1 -------------------- -* Optimization for a large import via "git-svn" introduced in v1.5.6 had a - serious memory and temporary file leak, which made it unusable for - moderately large import. +* "git clone" from a remote that is named with url.insteadOf setting in + $HOME/.gitconfig did not work well. -* "git-svn" mangled remote nickname used in the configuration file - unnecessarily. +* "git describe --long --tags" segfaulted when the described revision was + tagged with a lightweight tag. * "git diff --check" did not report the result via its exit status reliably. +* When remote side used to have branch 'foo' and git-fetch finds that now + it has branch 'foo/bar', it refuses to lose the existing remote tracking + branch and its reflog. The error message has been improved to suggest + pruning the remote if the user wants to proceed and get the latest set + of branches from the remote, including such 'foo/bar'. + +* "git reset file" should mean the same thing as "git reset HEAD file", + but we required disambiguating -- even when "file" is not ambiguous. + * "git show" segfaulted when an annotated tag that points at another annotated tag was given to it. --- -exec >/var/tmp/1 -echo O=$(git describe maint) -O=v1.5.6.1-13-g4f3dcc2 -git shortlog --no-merges $O..maint +* Optimization for a large import via "git-svn" introduced in v1.5.6 had a + serious memory and temporary file leak, which made it unusable for + moderately large import. + +* "git-svn" mangled remote nickname used in the configuration file + unnecessarily. diff --git a/cmds-mainporcelain.txt b/cmds-mainporcelain.txt index 514de13d6..95ad966ab 100644 --- a/cmds-mainporcelain.txt +++ b/cmds-mainporcelain.txt @@ -86,7 +86,7 @@ linkgit:git-rm[1]:: Remove files from the working tree and from the index. linkgit:git-shortlog[1]:: - Summarize 'git log' output. + Summarize 'git-log' output. linkgit:git-show[1]:: Show various types of objects. diff --git a/config.txt b/config.txt index 561ff645f..a403d46c1 100644 --- a/config.txt +++ b/config.txt @@ -63,7 +63,7 @@ The values following the equals sign in variable assign are all either a string, an integer, or a boolean. Boolean values may be given as yes/no, 0/1 or true/false. Case is not significant in boolean values, when converting value to the canonical form using '--bool' type specifier; -`git-config` will ensure that the output is "true" or "false". +'git-config' will ensure that the output is "true" or "false". String values may be entirely or partially enclosed in double quotes. You need to enclose variable value in double quotes if you want to @@ -118,8 +118,8 @@ core.fileMode:: See linkgit:git-update-index[1]. True by default. core.quotepath:: - The commands that output paths (e.g. `ls-files`, - `diff`), when not given the `-z` option, will quote + The commands that output paths (e.g. 'ls-files', + 'diff'), when not given the `-z` option, will quote "unusual" characters in the pathname by enclosing the pathname in a double-quote pair and with backslashes the same way strings in C source code are quoted. If this @@ -356,8 +356,8 @@ core.pager:: core.whitespace:: A comma separated list of common whitespace problems to - notice. `git diff` will use `color.diff.whitespace` to - highlight them, and `git apply --whitespace=error` will + notice. 'git-diff' will use `color.diff.whitespace` to + highlight them, and 'git-apply --whitespace=error' will consider them as errors: + * `trailing-space` treats trailing whitespaces at the end of the line @@ -396,11 +396,11 @@ it will be treated as a shell command. For example, defining "gitk --all --not ORIG_HEAD". apply.whitespace:: - Tells `git-apply` how to handle whitespaces, in the same way + Tells 'git-apply' how to handle whitespaces, in the same way as the '--whitespace' option. See linkgit:git-apply[1]. branch.autosetupmerge:: - Tells `git-branch` and `git-checkout` to setup new branches + Tells 'git-branch' and 'git-checkout' to setup new branches so that linkgit:git-pull[1] will appropriately merge from the starting point branch. Note that even if this option is not set, this behavior can be chosen per-branch using the `--track` @@ -411,7 +411,7 @@ branch.autosetupmerge:: branch. This option defaults to true. branch.autosetuprebase:: - When a new branch is created with `git-branch` or `git-checkout` + When a new branch is created with 'git-branch' or 'git-checkout' that tracks another branch, this variable tells git to set up pull to rebase instead of merge (see "branch..rebase"). When `never`, rebase is never automatically set to true. @@ -426,20 +426,20 @@ branch.autosetuprebase:: This option defaults to never. branch..remote:: - When in branch , it tells `git fetch` which remote to fetch. - If this option is not given, `git fetch` defaults to remote "origin". + When in branch , it tells 'git-fetch' which remote to fetch. + If this option is not given, 'git-fetch' defaults to remote "origin". branch..merge:: - When in branch , it tells `git fetch` the default + When in branch , it tells 'git-fetch' the default refspec to be marked for merging in FETCH_HEAD. The value is handled like the remote part of a refspec, and must match a ref which is fetched from the remote given by "branch..remote". - The merge information is used by `git pull` (which at first calls - `git fetch`) to lookup the default branch for merging. Without - this option, `git pull` defaults to merge the first refspec fetched. + The merge information is used by 'git-pull' (which at first calls + 'git-fetch') to lookup the default branch for merging. Without + this option, 'git-pull' defaults to merge the first refspec fetched. Specify multiple values to get an octopus merge. - If you wish to setup `git pull` so that it merges into from + If you wish to setup 'git-pull' so that it merges into from another branch in the local repository, you can point branch..merge to the desired branch, and use the special setting `.` (a period) for branch..remote. @@ -508,12 +508,12 @@ color.diff.:: color.interactive:: When set to `always`, always use colors for interactive prompts - and displays (such as those used by "git add --interactive"). + and displays (such as those used by "git-add --interactive"). When false (or `never`), never. When set to `true` or `auto`, use colors only when the output is to the terminal. Defaults to false. color.interactive.:: - Use customized color for `git add --interactive` + Use customized color for 'git-add --interactive' output. `` may be `prompt`, `header`, or `help`, for three distinct types of normal output from interactive programs. The values of these variables may be specified as @@ -550,14 +550,14 @@ color.ui:: take precedence over this setting. Defaults to false. diff.autorefreshindex:: - When using `git diff` to compare with work tree + When using 'git-diff' to compare with work tree files, do not consider stat-only change as changed. Instead, silently run `git update-index --refresh` to update the cached stat information for paths whose contents in the work tree match the contents in the index. This option defaults to true. Note that this - affects only `git diff` Porcelain, and not lower level - `diff` commands, such as `git diff-files`. + affects only 'git-diff' Porcelain, and not lower level + 'diff' commands, such as 'git-diff-files'. diff.external:: If this config variable is set, diff generation is not @@ -568,7 +568,7 @@ diff.external:: diff.renameLimit:: The number of files to consider when performing the copy/rename - detection; equivalent to the git diff option '-l'. + detection; equivalent to the 'git-diff' option '-l'. diff.renames:: Tells git to detect renames. If set to any boolean value, it @@ -608,7 +608,7 @@ format.pretty:: gc.aggressiveWindow:: The window size parameter used in the delta compression - algorithm used by 'git gc --aggressive'. This defaults + algorithm used by 'git-gc --aggressive'. This defaults to 10. gc.auto:: @@ -625,37 +625,37 @@ gc.autopacklimit:: default value is 50. Setting this to 0 disables it. gc.packrefs:: - `git gc` does not run `git pack-refs` in a bare repository by + 'git-gc' does not run `git pack-refs` in a bare repository by default so that older dumb-transport clients can still fetch - from the repository. Setting this to `true` lets `git - gc` to run `git pack-refs`. Setting this to `false` tells - `git gc` never to run `git pack-refs`. The default setting is + from the repository. Setting this to `true` lets 'git-gc' + to run `git pack-refs`. Setting this to `false` tells + 'git-gc' never to run `git pack-refs`. The default setting is `notbare`. Enable it only when you know you do not have to support such clients. The default setting will change to `true` at some stage, and setting this to `false` will continue to - prevent `git pack-refs` from being run from `git gc`. + prevent `git pack-refs` from being run from 'git-gc'. gc.pruneexpire:: - When `git gc` is run, it will call `prune --expire 2.weeks.ago`. + When 'git-gc' is run, it will call 'prune --expire 2.weeks.ago'. Override the grace period with this config variable. gc.reflogexpire:: - `git reflog expire` removes reflog entries older than + 'git-reflog expire' removes reflog entries older than this time; defaults to 90 days. gc.reflogexpireunreachable:: - `git reflog expire` removes reflog entries older than + 'git-reflog expire' removes reflog entries older than this time and are not reachable from the current tip; defaults to 30 days. gc.rerereresolved:: Records of conflicted merge you resolved earlier are - kept for this many days when `git rerere gc` is run. + kept for this many days when 'git-rerere gc' is run. The default is 60 days. See linkgit:git-rerere[1]. gc.rerereunresolved:: Records of conflicted merge you have not resolved are - kept for this many days when `git rerere gc` is run. + kept for this many days when 'git-rerere gc' is run. The default is 15 days. See linkgit:git-rerere[1]. rerere.enabled:: @@ -821,7 +821,7 @@ i18n.commitEncoding:: i18n.logOutputEncoding:: Character encoding the commit messages are converted to when - running `git-log` and friends. + running 'git-log' and friends. instaweb.browser:: Specify the program that will be used to browse your working @@ -844,7 +844,7 @@ instaweb.port:: log.date:: Set default date-time mode for the log command. Setting log.date - value is similar to using git log's --date option. The value is one of + value is similar to using 'git-log'\'s --date option. The value is one of the following alternatives: {relative,local,default,iso,rfc,short}. See linkgit:git-log[1]. diff --git a/fetch-options.txt b/fetch-options.txt index 85c87180d..d313795fd 100644 --- a/fetch-options.txt +++ b/fetch-options.txt @@ -21,7 +21,7 @@ -f:: --force:: - When `git-fetch` is used with `:` + When 'git-fetch' is used with `:` refspec, it refuses to update the local branch `` unless the remote branch `` it fetches is a descendant of ``. This option @@ -53,10 +53,10 @@ endif::git-pull[] -u:: --update-head-ok:: - By default `git-fetch` refuses to update the head which + By default 'git-fetch' refuses to update the head which corresponds to the current branch. This flag disables the - check. This is purely for the internal use for `git-pull` - to communicate with `git-fetch`, and unless you are + check. This is purely for the internal use for 'git-pull' + to communicate with 'git-fetch', and unless you are implementing your own Porcelain you are not supposed to use it. diff --git a/git-am.html b/git-am.html index 830ba2789..7fcfa1333 100644 --- a/git-am.html +++ b/git-am.html @@ -3,7 +3,7 @@ - + git-am(1) @@ -279,15 +327,15 @@ git-am(1) Manual Page <mbox>|<Maildir>… git am [--skip | --resolved] -

DESCRIPTION

+

DESCRIPTION

-

Splits mail messages in a mailbox into commit log message, +

Splits mail messages in a mailbox into commit log message, authorship information and patches, and applies them to the -current branch.

+current branch.

-

OPTIONS

+

OPTIONS

-
+
<mbox>|<Maildir>…
@@ -318,7 +366,7 @@ current branch.

- Pass -k flag to git-mailinfo (see git-mailinfo(1)). + Pass -k flag to git-mailinfo (see git-mailinfo(1)).

@@ -329,21 +377,21 @@ current branch.

- Pass -u flag to git-mailinfo (see git-mailinfo(1)). + Pass -u flag to git-mailinfo (see git-mailinfo(1)). The proposed commit log message taken from the e-mail is 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 was optional in prior versions of git, but now it is the -default. You could use --no-utf8 to override this.

+

This was optional in prior versions of git, but now it is the +default. You could use --no-utf8 to override this.

--no-utf8

- Pass -n flag to git-mailinfo (see + Pass -n flag to git-mailinfo (see git-mailinfo(1)).

@@ -369,7 +417,7 @@ default. You could use --no-utf8 to override this.

- Pass --allow-binary-replacement flag to git-apply + Pass --allow-binary-replacement flag to git-apply (see git-apply(1)).

@@ -378,7 +426,7 @@ default. You could use --no-utf8 to override this.

- This flag is passed to the git-apply (see git-apply(1)) + This flag is passed to the git-apply (see git-apply(1)) program that applies the patch.

@@ -391,7 +439,7 @@ default. You could use --no-utf8 to override this.

- These flags are passed to the git-apply (see git-apply(1)) + These flags are passed to the git-apply (see git-apply(1)) program that applies the patch.

@@ -441,30 +489,30 @@ default. You could use --no-utf8 to override this.

to the screen before exiting. This overrides the standard message informing you to use --resolved or --skip to handle the failure. This is solely - for internal use between git-rebase and git-am. + for internal use between git-rebase and git-am.

-
+
-

DISCUSSION

+

DISCUSSION

-

The commit author name is taken from the "From: " line of the +

The commit author name is taken from the "From: " line of the message, and commit author time is taken from the "Date: " line of the message. The "Subject: " line is used as the title of the commit, after stripping common prefix "[PATCH <anything>]". It is supposed to describe what the commit is about concisely as -a one line text.

-

The body of the message (iow, after a blank line that terminates +a one line text.

+

The body of the message (iow, after a blank line that terminates RFC2822 headers) can begin with "Subject: " and "From: " lines that are different from those of the mail header, to override -the values of these fields.

-

The commit message is formed by the title taken from the +the values of these fields.

+

The commit message is formed by the title taken from the "Subject: ", a blank line and the body of the message up to where the patch begins. Excess whitespaces at the end of the -lines are automatically stripped.

-

The patch is expected to be inline, directly following the -message. Any line that is of form:

-
    +lines are automatically stripped.

+

The patch is expected to be inline, directly following the +message. Any line that is of form:

+

  • three-dashes and end-of-line, or @@ -480,13 +528,13 @@ a line that begins with "diff -", or a line that begins with "Index: "

    • -
-

is taken as the beginning of a patch, and the commit log message -is terminated before the first occurrence of such a line.

-

When initially invoking it, you give it names of the mailboxes +

+

is taken as the beginning of a patch, and the commit log message +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,. 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. skip the current patch by re-running the command with --skip @@ -500,31 +548,31 @@ hand resolve the conflict in the working directory, and update have produced. Then run the command with --resolved option.

    2. -
-

The command refuses to process new mailboxes while .dotest +

+

The command refuses to process new mailboxes while .dotest directory exists, so if you decide to start over from scratch, run rm -f -r .dotest before running the command with mailbox -names.

+names.

-

SEE ALSO

+

SEE ALSO

-

git-apply(1).

+

git-apply(1).

-

Author

+

Author

-

Written by Junio C Hamano <junkio@cox.net>

+

Written by Junio C Hamano <junkio@cox.net>

-

Documentation

+

Documentation

-

Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.org>.

+

Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.org>.

-

GIT

+

GIT

-

Part of the git(1) suite

+

Part of the git(1) suite

diff --git a/git-am.txt b/git-am.txt index 1296b9117..3863eebce 100644 --- a/git-am.txt +++ b/git-am.txt @@ -35,11 +35,11 @@ OPTIONS -k:: --keep:: - Pass `-k` flag to `git-mailinfo` (see linkgit:git-mailinfo[1]). + Pass `-k` flag to 'git-mailinfo' (see linkgit:git-mailinfo[1]). -u:: --utf8:: - Pass `-u` flag to `git-mailinfo` (see linkgit:git-mailinfo[1]). + Pass `-u` flag to 'git-mailinfo' (see linkgit:git-mailinfo[1]). The proposed commit log message taken from the e-mail is re-coded into UTF-8 encoding (configuration variable `i18n.commitencoding` can be used to specify project's @@ -49,7 +49,7 @@ This was optional in prior versions of git, but now it is the default. You could use `--no-utf8` to override this. --no-utf8:: - Pass `-n` flag to `git-mailinfo` (see + Pass `-n` flag to 'git-mailinfo' (see linkgit:git-mailinfo[1]). -3:: @@ -61,17 +61,17 @@ default. You could use `--no-utf8` to override this. -b:: --binary:: - Pass `--allow-binary-replacement` flag to `git-apply` + Pass `--allow-binary-replacement` flag to 'git-apply' (see linkgit:git-apply[1]). --whitespace=