From f87ade69865f2460ed0e39cfc860247063eb2a66 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 7 Sep 2008 06:05:51 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.6.0.1-267-gec3a --- RelNotes-1.6.0.2.txt | 23 ++++++-- RelNotes-1.6.1.txt | 9 +++- git-annotate.html | 126 ++++++++++++++++++++++++++++++------------- git-annotate.txt | 5 ++ 4 files changed, 121 insertions(+), 42 deletions(-) diff --git a/RelNotes-1.6.0.2.txt b/RelNotes-1.6.0.2.txt index 686e60713..6c5446bc0 100644 --- a/RelNotes-1.6.0.2.txt +++ b/RelNotes-1.6.0.2.txt @@ -18,19 +18,32 @@ Fixes since v1.6.0.1 with GIT_WORK_TREE environment settings. - * "git apply --unidiff-zero" incorrectly applied a -U0 patch that inserts a new line before the second line. +* "git blame -c" did not exactly work like "git annotate" when range + boundaries are involved. + * "git clone $there $here/" with extra trailing slashes after explicit local directory name $here did not work as expected. * "git diff --dirstat -M" did not add changes in subdirectories up correctly for renamed paths. +* "git diff --cumulative" did not imply "--dirstat". + * "git for-each-ref refs/heads/" did not work as expected. -* "git log --grep=pattern -i" did not ignore case. +* "git gui" allowed users to feed patch without any context to be applied. + +* "git gui" botched parsing "diff" output when a line that begins with two + dashes and a space gets removed or a line that begins with two pluses + and a space gets added. + +* "git gui" translation updates and i18n fixes. + +* "git log -i --grep=pattern" did not ignore case; neither "git log -E + --grep=pattern" triggered extended regexp. * "git log --pretty="%ad" --date=short" did not use short format when showing the timestamp. @@ -38,6 +51,9 @@ Fixes since v1.6.0.1 * Build procedure for "git shell" that used stub versions of some functions and globals was not understood by linkers on some platforms. +* "git stash" was fooled by a stat-dirty but otherwise unmodified paths + and refused to work until the user refreshed the index. + * "git verify-pack -v" did not work correctly when given more than one packfile. @@ -45,6 +61,7 @@ Also contains many documentation updates. -- exec >/var/tmp/1 -O=v1.6.0.1-49-g6a42cfe +O=v1.6.0.1-61-g1eff26c echo O=$(git describe maint) git shortlog --no-merges $O..maint + diff --git a/RelNotes-1.6.1.txt b/RelNotes-1.6.1.txt index 7f41e30e2..609d4ca56 100644 --- a/RelNotes-1.6.1.txt +++ b/RelNotes-1.6.1.txt @@ -13,7 +13,8 @@ on. (subsystems) -* ... +* gitk can call out to git-gui to view "git blame" output; git-gui in turn + can run gitk from its blame view. (portability) @@ -108,8 +109,12 @@ release, unless otherwise noted. * "git push --tags --all $there" failed with generic usage message without telling saying these two options are incompatible. +* "git log --author/--committer" match used to potentially match the + timestamp part, exposing internal implementation detail. Also these did + not work with --fixed-strings match at all. + -- exec >/var/tmp/1 -O=v1.6.0.1-215-g9b8ae93 +O=v1.6.0.1-266-gaf9552f echo O=$(git describe master) git shortlog --no-merges $O..master ^maint diff --git a/git-annotate.html b/git-annotate.html index 7467fb487..79e7a1999 100644 --- a/git-annotate.html +++ b/git-annotate.html @@ -3,7 +3,7 @@ - + git-annotate(1) @@ -272,16 +320,20 @@ git-annotate(1) Manual Page

SYNOPSIS

-

git annotate [options] file [revision]

+

git annotate [options] file [revision]

-

DESCRIPTION

+

DESCRIPTION

-

Annotates each line in the given file with information from the commit -which introduced the line. Optionally annotate from a given revision.

+

Annotates each line in the given file with information from the commit +which introduced the line. Optionally annotate from a given revision.

+

The only difference between this command and git-blame(1) is that +they use slightly different output formats, and this command exists only +for backward compatibility to support existing scripts, and provide more +familiar command name for people coming from other SCM systems.

-

OPTIONS

+

OPTIONS

-
+
-b
@@ -316,30 +368,30 @@ which introduced the line. Optionally annotate from a given revision.

Annotate only the given line range. <start> and <end> can take one of these forms:

-
    +

    • number

      -

      If <start> or <end> is a number, it specifies an -absolute line number (lines count from 1).

      +

      If <start> or <end> is a number, it specifies an +absolute line number (lines count from 1).

    • /regex/

      -

      This form will use the first line matching the given +

      This form will use the first line matching the given POSIX regex. If <end> is a regex, it will search -starting at the line given by <start>.

      +starting at the line given by <start>.

    • +offset or -offset

      -

      This is only valid for <end> and will specify a number -of lines before or after the line given by <start>.

      +

      This is only valid for <end> and will specify a number +of lines before or after the line given by <start>.

      • -
    +
-l @@ -411,10 +463,10 @@ of lines before or after the line given by <start>.

to the child commit. With this option, both groups of lines are blamed on the parent.

-

<num> is optional but it is the lower bound on the number of +

<num> is optional but it is the lower bound on the number of alphanumeric characters that git must detect as moving within a file for it to associate those lines with the parent -commit.

+commit.

-C|<num>| @@ -428,10 +480,10 @@ commit.

the command looks for copies from all other files in the parent for the commit that creates the file in addition.

-

<num> is optional but it is the lower bound on the number of +

<num> is optional but it is the lower bound on the number of alphanumeric characters that git must detect as moving between files for it to associate those lines with the parent -commit.

+commit.

-h @@ -444,23 +496,23 @@ commit.

Show help message.

-
+
-

SEE ALSO

+

SEE ALSO

-

git-blame(1)

+

git-blame(1)

-

AUTHOR

+

AUTHOR

-

Written by Ryan Anderson <ryan@michonline.com>.

+

Written by Ryan Anderson <ryan@michonline.com>.

-

GIT

+

GIT

-

Part of the git(1) suite

+

Part of the git(1) suite

diff --git a/git-annotate.txt b/git-annotate.txt index 8b6b56a54..0aba022ba 100644 --- a/git-annotate.txt +++ b/git-annotate.txt @@ -14,6 +14,11 @@ DESCRIPTION Annotates each line in the given file with information from the commit which introduced the line. Optionally annotate from a given revision. +The only difference between this command and linkgit:git-blame[1] is that +they use slightly different output formats, and this command exists only +for backward compatibility to support existing scripts, and provide more +familiar command name for people coming from other SCM systems. + OPTIONS ------- include::blame-options.txt[] -- 2.26.2