From f22a432b157c5673a1004934a2e6ba77dd55b356 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 5 Sep 2008 00:29:51 -0700 Subject: Mention the fact that 'git annotate' is only for backward compatibility. When somebody is reading git-blame.txt (or git-annotate.txt) for the first time, the message we would like to send is: (1) Here is why you would want to use this command, what it can do (perhaps more than what you would have expected from "$scm blame"), and how you tell it to do what it does. This is obvious. (2) You might have heard of the command with the other name. There is no difference between the two, except they differ in their default output formats. This is essential to answer: "git has both? how are they different?" (3) We tend to encourage blame over annotate for new scripts and new people, but there is no reason to choose one over the other. This is not as important as (2), but would be useful to avoid repeated questions about "when will we start deprecating this?" As long as we describe (2) on git-annotate page clearly enough, people who read git-blame page first and get curious can refer to git-annotate page. While at it, subtly hint (3) without being overly explicit. Signed-off-by: Junio C Hamano --- Documentation/git-annotate.txt | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Documentation') diff --git a/Documentation/git-annotate.txt b/Documentation/git-annotate.txt index 8b6b56a544..0aba022ba6 100644 --- a/Documentation/git-annotate.txt +++ b/Documentation/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[] -- cgit v1.3 From aaefbfa66c348a461b3081873ef42819c8b38dac Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 6 Sep 2008 16:18:31 -0700 Subject: Update draft release notes for 1.6.0.2 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.6.0.2.txt | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) (limited to 'Documentation') diff --git a/Documentation/RelNotes-1.6.0.2.txt b/Documentation/RelNotes-1.6.0.2.txt index 686e60713b..6c5446bc07 100644 --- a/Documentation/RelNotes-1.6.0.2.txt +++ b/Documentation/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 + -- cgit v1.3