From: Junio C Hamano Date: Sun, 28 Jan 2007 20:55:22 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.0-rc2-67-gcace X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5a70233d40122ee513dac43224df67ece82e2a0a;p=git.git Autogenerated HTML docs for v1.5.0-rc2-67-gcace --- diff --git a/config.txt b/config.txt index 6ea7c76a6..ebda2e0f6 100644 --- a/config.txt +++ b/config.txt @@ -250,10 +250,15 @@ color.branch.:: Use customized color for branch coloration. `` is one of `current` (the current branch), `local` (a local branch), `remote` (a tracking branch in refs/remotes/), `plain` (other - refs), or `reset` (the normal terminal color). The value for - these configuration variables can be one of: `normal`, `bold`, - `dim`, `ul`, `blink`, `reverse`, `reset`, `black`, `red`, - `green`, `yellow`, `blue`, `magenta`, `cyan`, or `white`. + refs). ++ +The value for these configuration variables is a list of colors (at most +two) and attributes (at most one), separated by spaces. The colors +accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`, +`magenta`, `cyan` and `white`; the attributes are `bold`, `dim`, `ul`, +`blink` and `reverse`. The first color given is the foreground; the +second is the background. The position of the attribute, if any, +doesn't matter. color.diff:: When true (or `always`), always use colors in patch. @@ -261,12 +266,13 @@ color.diff:: colors only when the output is to the terminal. color.diff.:: - Use customized color for diff colorization. `` - specifies which part of the patch to use the specified - color, and is one of `plain` (context text), `meta` - (metainformation), `frag` (hunk header), `old` (removed - lines), or `new` (added lines). The values of these - variables may be specified as in color.branch.. + Use customized color for diff colorization. `` specifies + which part of the patch to use the specified color, and is one + of `plain` (context text), `meta` (metainformation), `frag` + (hunk header), `old` (removed lines), `new` (added lines), + `commit` (commit headers), or `whitespace` (highlighting dubious + whitespace). The values of these variables may be specified as + in color.branch.. color.pager:: A boolean to enable/disable colored output when the pager is in diff --git a/git-blame.html b/git-blame.html index 2e03242df..b10a5dad7 100644 --- a/git-blame.html +++ b/git-blame.html @@ -273,7 +273,7 @@ git-blame(1) Manual Page

SYNOPSIS

-
git-blame [-c] [-l] [-t] [-f] [-n] [-p] [-L n,m] [-S <revs-file>] +
git-blame [-c] [-l] [-t] [-f] [-n] [-p] [--incremental] [-L n,m] [-S <revs-file>] [-M] [-C] [-C] [--since=<date>] [<rev>] [--] <file>

DESCRIPTION

@@ -366,6 +366,15 @@ ea4c7f9bf69e781dd0cd88d2bccb2bf5cc15c9a7 git-blame: Make the output

+--incremental +
+
+

+ Show the result incrementally in a format designed for + machine consumption. +

+
+
-M
@@ -504,6 +513,62 @@ parents, using commit^! notation:

git blame -C -C -f $commit^! -- foo
+

INCREMENTAL OUTPUT

+
+

When called with --incremental option, the command outputs the +result as it is built. The output generally will talk about +lines touched by more recent commits first (i.e. the lines will +be annotated out of order) and is meant to be used by +interactive viewers.

+

The output format is similar to the Porcelain format, but it +does not contain the actual lines from the file that is being +annotated.

+
    +
  1. +

    +Each blame entry always starts with a line of: +

    +
    +
    +
    <40-byte hex sha1> <sourceline> <resultline> <num_lines>
    +
    +

    Line numbers count from 1.

    +
    2. +
  2. +

    +The first time that commit shows up in the stream, it has various + other information about it printed out with a one-word tag at the + beginning of each line about that "extended commit info" (author, + email, committer, dates, summary etc). +

    +
    3. +
  3. +

    +Unlike Porcelain format, the filename information is always + given and terminates the entry: +

    +
    +
    +
    "filename" <whitespace-quoted-filename-goes-here>
    +
    +

    and thus it's really quite easy to parse for some line- and word-oriented +parser (which should be quite natural for most scripting languages).

    +
    + + + +
    +
    Note
    +    		For people who do parsing: to make it more robust, just ignore any +lines in between the first and last one ("<sha1>" and "filename" lines) +where you don't recognize the tag-words (or care about that particular +one) at the beginning of the "extended information" lines. That way, if +there is ever added information (like the commit encoding or extended +commit commentary), a blame viewer won't ever care.
    +
    +
    4. +
+

SEE ALSO

git-annotate(1)

@@ -518,7 +583,7 @@ parents, using commit^! notation:

diff --git a/git-blame.txt b/git-blame.txt index 5dd8e36bb..0ee887d73 100644 --- a/git-blame.txt +++ b/git-blame.txt @@ -8,7 +8,7 @@ git-blame - Show what revision and author last modified each line of a file SYNOPSIS -------- [verse] -'git-blame' [-c] [-l] [-t] [-f] [-n] [-p] [-L n,m] [-S ] +'git-blame' [-c] [-l] [-t] [-f] [-n] [-p] [--incremental] [-L n,m] [-S ] [-M] [-C] [-C] [--since=] [] [--] DESCRIPTION @@ -63,6 +63,10 @@ OPTIONS -p, --porcelain:: Show in a format designed for machine consumption. +--incremental:: + Show the result incrementally in a format designed for + machine consumption. + -M:: Detect moving lines in the file as well. When a commit moves a block of lines in a file (e.g. the original file @@ -158,6 +162,47 @@ parents, using `commit{caret}!` notation: git blame -C -C -f $commit^! -- foo +INCREMENTAL OUTPUT +------------------ + +When called with `--incremental` option, the command outputs the +result as it is built. The output generally will talk about +lines touched by more recent commits first (i.e. the lines will +be annotated out of order) and is meant to be used by +interactive viewers. + +The output format is similar to the Porcelain format, but it +does not contain the actual lines from the file that is being +annotated. + +. Each blame entry always starts with a line of: + + <40-byte hex sha1> ++ +Line numbers count from 1. + +. The first time that commit shows up in the stream, it has various + other information about it printed out with a one-word tag at the + beginning of each line about that "extended commit info" (author, + email, committer, dates, summary etc). + +. Unlike Porcelain format, the filename information is always + given and terminates the entry: + + "filename" ++ +and thus it's really quite easy to parse for some line- and word-oriented +parser (which should be quite natural for most scripting languages). ++ +[NOTE] +For people who do parsing: to make it more robust, just ignore any +lines in between the first and last one ("" and "filename" lines) +where you don't recognize the tag-words (or care about that particular +one) at the beginning of the "extended information" lines. That way, if +there is ever added information (like the commit encoding or extended +commit commentary), a blame viewer won't ever care. + + SEE ALSO -------- gitlink:git-annotate[1] diff --git a/git-repo-config.html b/git-repo-config.html index 07a6b5122..c2c82087f 100644 --- a/git-repo-config.html +++ b/git-repo-config.html @@ -880,11 +880,15 @@ color.branch.<slot> Use customized color for branch coloration. <slot> is one of current (the current branch), local (a local branch), remote (a tracking branch in refs/remotes/), plain (other - refs), or reset (the normal terminal color). The value for - these configuration variables can be one of: normal, bold, - dim, ul, blink, reverse, reset, black, red, - green, yellow, blue, magenta, cyan, or white. + refs).

+

The value for these configuration variables is a list of colors (at most +two) and attributes (at most one), separated by spaces. The colors +accepted are normal, black, red, green, yellow, blue, +magenta, cyan and white; the attributes are bold, dim, ul, +blink and reverse. The first color given is the foreground; the +second is the background. The position of the attribute, if any, +doesn't matter.

color.diff @@ -901,12 +905,13 @@ color.diff.<slot>

- Use customized color for diff colorization. <slot> - specifies which part of the patch to use the specified - color, and is one of plain (context text), meta - (metainformation), frag (hunk header), old (removed - lines), or new (added lines). The values of these - variables may be specified as in color.branch.<slot>. + Use customized color for diff colorization. <slot> specifies + which part of the patch to use the specified color, and is one + of plain (context text), meta (metainformation), frag + (hunk header), old (removed lines), new (added lines), + commit (commit headers), or whitespace (highlighting dubious + whitespace). The values of these variables may be specified as + in color.branch.<slot>.

@@ -1390,7 +1395,7 @@ transfer.unpackLimit diff --git a/git.html b/git.html index e1910cdb2..9f6bfe8ab 100644 --- a/git.html +++ b/git.html @@ -2285,7 +2285,7 @@ contributors on the git-list <git@vger.kernel.org>.