Merge branch 'js/configurable-tab'

[git.git] / Documentation / RelNotes / 1.7.4.txt

diff --git a/Documentation/RelNotes/1.7.4.txt b/Documentation/RelNotes/1.7.4.txt
index 0a73e6dc0f76d8f4b46a04508796b8ecaf8c7433..6084f7ddf6d4c977b5ac29043186c73920ca947d 100644 (file)
--- a/Documentation/RelNotes/1.7.4.txt
+++ b/Documentation/RelNotes/1.7.4.txt
@@ -4,6 +4,10 @@ Git v1.7.4 Release Notes (draft)
 Updates since v1.7.3
 --------------------
 
 Updates since v1.7.3
 --------------------
 

+ * The documentation Makefile now assumes by default asciidoc 8 and
+   docbook-xsl >= 1.73. If you have older versions, you can set
+   ASCIIDOC7 and ASCIIDOC_ROFF, respectively.
+

  * The option parsers of various commands that create new branch (or
    rename existing ones to a new name) were too loose and users were
    allowed to call a branch with a name that begins with a dash by
  * The option parsers of various commands that create new branch (or
    rename existing ones to a new name) were too loose and users were
    allowed to call a branch with a name that begins with a dash by


@@ -92,24 +96,11 @@ Fixes since v1.7.3
 All of the fixes in v1.7.3.X maintenance series are included in this
 release, unless otherwise noted.
 
 All of the fixes in v1.7.3.X maintenance series are included in this
 release, unless otherwise noted.
 

- * Smart HTTP transport used to incorrectly retry redirected POST
-   request with GET request (311e2ea006).
-
- * "git apply" did not correctly handle patches that only change modes
-   if told to apply while stripping leading paths with -p option (aae1f6ac).
-
- * "git apply" can deal with patches with timezone formatted with a
-   colon between the hours and minutes part (e.g. "-08:00" instead of
-   "-0800").
-

  * "git checkout" removed an untracked file "foo" from the working
     tree when switching to a branch that contains a tracked path
     "foo/bar".  Prevent this, just like the case where the conflicting
     path were "foo" (c752e7f..7980872d).
 
  * "git checkout" removed an untracked file "foo" from the working
     tree when switching to a branch that contains a tracked path
     "foo/bar".  Prevent this, just like the case where the conflicting
     path were "foo" (c752e7f..7980872d).
 

- * "git diff --check" reported an incorrect line number for added
-   blank lines at the end of file (8837d335).
-

  * "git log --author=me --author=her" did not find commits written by
    me or by her; instead it looked for commits written by me and by
    her, which is impossible.
  * "git log --author=me --author=her" did not find commits written by
    me or by her; instead it looked for commits written by me and by
    her, which is impossible.