From: Junio C Hamano Date: Thu, 21 Aug 2008 00:27:40 +0000 (+0000) Subject: Autogenerated HTML docs for v1.6.0-49-gea35 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3580ad240fadb5ab479fd96c65350ec2b77c33bd;p=git.git Autogenerated HTML docs for v1.6.0-49-gea35 --- diff --git a/RelNotes-1.6.0.1.txt b/RelNotes-1.6.0.1.txt index 3ee85a799..bac117e89 100644 --- a/RelNotes-1.6.0.1.txt +++ b/RelNotes-1.6.0.1.txt @@ -4,12 +4,28 @@ GIT v1.6.0.1 Release Notes Fixes since v1.6.0 ------------------ -* ... +* "git diff --check" incorrectly detected new trailing blank lines when + whitespace check was in effect. + +* "git for-each-ref" tried to dereference NULL when asked for '%(body)" on + a tag with a single incomplete line as its payload. + +* "git format-patch" peeked before the beginning of a string when + "format.headers" variable is empty (a misconfiguration). + +* "git mailinfo" (hence "git am") was unhappy when MIME multipart message + contained garbage after the finishing boundary. + +* "git mailinfo" also was unhappy when the "From: " line only had a bare + e-mail address. + +* "git merge" did not refresh the index correctly when a merge resulted in + a fast-forward. Contains other various documentation fixes. -- exec >/var/tmp/1 -O=v1.6.0 +O=v1.6.0-14-g3a634dc 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 efaf9ac4f..d37da039f 100644 --- a/RelNotes-1.6.1.txt +++ b/RelNotes-1.6.1.txt @@ -4,6 +4,13 @@ GIT v1.6.1 Release Notes Updates since v1.6.0 -------------------- +When some commands (e.g. "git log", "git diff") spawn pager internally, we +used to make the pager the parent process of the git command that produces +output. This meant that the exit status of the whole thing comes from the +pager, not the underlying git command. We swapped the order of the +processes around and you will see the exit code from the command from now +on. + (subsystems) * ... @@ -18,16 +25,25 @@ Updates since v1.6.0 (performance) -* ... +* The underlying diff machinery to produce textual output has been + optimized, which would result in faster "git blame" processing. (usability, bells and whistles) -* ... +* "git checkout --track origin/hack" used to be a syntax error. It now + DWIMs to create a corresponding local branch "hack", i.e. acts as if you + said "git checkout --track -b hack origin/hack". -(internal) +* "git diff" learned to mimick --suppress-blank-empty from GNU diff via a + configuration option. -* ... +* "git imap-send" can optionally talk SSL. + +(internal) +* "git hash-object" learned to lie about the path being hashed, so that + correct gitattributes processing can be done while hashing contents + stored in a temporary file. Fixes since v1.6.0 ------------------ @@ -37,6 +53,6 @@ release, unless otherwise noted. -- exec >/var/tmp/1 -O=v1.6.0 +O=v1.6.0-48-ge28a867 echo O=$(git describe master) git shortlog --no-merges $O..master ^maint diff --git a/git-revert.html b/git-revert.html index 1c1588c59..343f5424f 100644 --- a/git-revert.html +++ b/git-revert.html @@ -327,6 +327,14 @@ git-revert(1) Manual Page

Given one existing commit, revert the change the patch introduces, and record a new commit that records it. This requires your working tree to be clean (no modifications from the HEAD commit).

+

Note: git revert is used to record a new commit to reverse the +effect of an earlier commit (often a faulty one). If you want to +throw away all uncommitted changes in your working directory, you +should see git-reset(1), particularly the --hard option. If +you want to extract specific files as they were in another commit, you +should see git-checkout(1), specifically the git checkout +<commit> — <filename> syntax. Take care with these alternatives as +both will discard uncommitted changes in your working directory.

OPTIONS

@@ -425,7 +433,7 @@ effect to your index in a row.

diff --git a/git-revert.txt b/git-revert.txt index 98cfa3c0d..caa07298a 100644 --- a/git-revert.txt +++ b/git-revert.txt @@ -15,6 +15,15 @@ Given one existing commit, revert the change the patch introduces, and record a new commit that records it. This requires your working tree to be clean (no modifications from the HEAD commit). +Note: 'git revert' is used to record a new commit to reverse the +effect of an earlier commit (often a faulty one). If you want to +throw away all uncommitted changes in your working directory, you +should see linkgit:git-reset[1], particularly the '--hard' option. If +you want to extract specific files as they were in another commit, you +should see linkgit:git-checkout[1], specifically the 'git checkout + -- ' syntax. Take care with these alternatives as +both will discard uncommitted changes in your working directory. + OPTIONS ------- ::