Update draft release notes to 1.7.4

We are getting closer to -rc0 ;-)

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/RelNotes/1.7.4.txt b/Documentation/RelNotes/1.7.4.txt
index c1ed23a0c6decbfe4b4ab141b00d24d2f399b872..ace061f5fe4d60341fcf7be6bca08cc1fcb27929 100644 (file)
--- a/Documentation/RelNotes/1.7.4.txt
+++ b/Documentation/RelNotes/1.7.4.txt
@@ -29,17 +29,42 @@ Updates since v1.7.3
  * Bash completion script in contrib/ has been adjusted to be also
    usable by zsh.
 
  * Bash completion script in contrib/ has been adjusted to be also
    usable by zsh.
 

+ * Different pagers can be chosen depending on which subcommand is
+   being run under the pager, using "pager.<subcommand>" variable.
+
+ * The hardcoded tab-width of 8 used in whitespace breakage checks is now
+   configurable via the attributes mechanism.
+
+ * Support of case insensitive filesystems (i.e. "core.ignorecase") has
+   been improved.  For example, the gitignore mechanism didn't pay attention
+   to the case insensitivity.
+
+ * The <tree>:<path> syntax to name a blob in a tree, and :<path>
+   syntax to name a blob in the index (e.g. "master:Makefile",
+   ":hello.c") have been extended.  You can start <path> with "./" to
+   implicitly have the (sub)directory you are in prefixed to the
+   lookup.  Similarly, ":../Makefile" from a subdirectory would mean
+   "the Makefile of the parent directory in the index".
+

  * "git blame" learned --show-email option to display the e-mail
    addresses instead of the names of authors.
 
  * "git blame" learned --show-email option to display the e-mail
    addresses instead of the names of authors.
 

+ * "git commit" learned --fixup and --squash options to help later invocation
+   of the interactive rebase.
+

  * "git daemon" can be built in MinGW environment.
 
  * "git daemon" can take more than one --listen option to listen to
    multiple addresses.
 
  * "git daemon" can be built in MinGW environment.
 
  * "git daemon" can take more than one --listen option to listen to
    multiple addresses.
 

+ * "git describe --exact-match" was optimized not to read commit
+   objects unnecessarily.
+

  * "git diff" and "git grep" learned how functions and subroutines
    in Fortran look like.
 
  * "git diff" and "git grep" learned how functions and subroutines
    in Fortran look like.
 

+ * "git fetch" learned "--recurse-submodules" option.
+

  * "git mergetool" tells vim/gvim to show three-way diff by default
    (use vimdiff2/gvimdiff2 as the tool name for old behaviour).
 
  * "git mergetool" tells vim/gvim to show three-way diff by default
    (use vimdiff2/gvimdiff2 as the tool name for old behaviour).
 


@@ -81,11 +106,16 @@ Updates since v1.7.3
    git-only login over ssh as login shell, with custom set of
    commands.
 
    git-only login over ssh as login shell, with custom set of
    commands.
 

+ * The current branch name in "git status" output can be colored differently
+   from the generic header color by setting "color.status.branch" variable.
+

  * "git submodule sync" updates metainformation for all submodules,
    not just the ones that have been checked out.
 
  * gitweb can use custom 'highlight' command with its configuration file.
 
  * "git submodule sync" updates metainformation for all submodules,
    not just the ones that have been checked out.
 
  * gitweb can use custom 'highlight' command with its configuration file.
 

+ * other gitweb updates.
+

 
 Also contains various documentation updates.
 
 
 Also contains various documentation updates.
 


@@ -113,6 +143,6 @@ release, unless otherwise noted.
 
 ---
 exec >/var/tmp/1
 
 ---
 exec >/var/tmp/1

-O=v1.7.3.2-450-g5b9c331
+O=v1.7.3.4-567-g38a5932

 echo O=$(git describe master)
 git shortlog --no-merges ^maint ^$O master
 echo O=$(git describe master)
 git shortlog --no-merges ^maint ^$O master

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 80d795dc567553fe3a89b34e200d881026de1aba..012837145e86b144d4676c9e1517486226e137df 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -53,26 +53,29 @@ Documentation for older releases are available here:
   link:RelNotes/1.7.3.1.txt[1.7.3.1],
   link:RelNotes/1.7.3.txt[1.7.3].
 
   link:RelNotes/1.7.3.1.txt[1.7.3.1],
   link:RelNotes/1.7.3.txt[1.7.3].
 

-* link:v1.7.2.4/git.html[documentation for release 1.7.2.4]
+* link:v1.7.2.5/git.html[documentation for release 1.7.2.5]

 
 * release notes for
 
 * release notes for

+  link:RelNotes/1.7.2.5.txt[1.7.2.5],

   link:RelNotes/1.7.2.4.txt[1.7.2.4],
   link:RelNotes/1.7.2.3.txt[1.7.2.3],
   link:RelNotes/1.7.2.2.txt[1.7.2.2],
   link:RelNotes/1.7.2.1.txt[1.7.2.1],
   link:RelNotes/1.7.2.txt[1.7.2].
 
   link:RelNotes/1.7.2.4.txt[1.7.2.4],
   link:RelNotes/1.7.2.3.txt[1.7.2.3],
   link:RelNotes/1.7.2.2.txt[1.7.2.2],
   link:RelNotes/1.7.2.1.txt[1.7.2.1],
   link:RelNotes/1.7.2.txt[1.7.2].
 

-* link:v1.7.1.3/git.html[documentation for release 1.7.1.3]
+* link:v1.7.1.4/git.html[documentation for release 1.7.1.4]

 
 * release notes for
 
 * release notes for

+  link:RelNotes/1.7.1.4.txt[1.7.1.4],

   link:RelNotes/1.7.1.3.txt[1.7.1.3],
   link:RelNotes/1.7.1.2.txt[1.7.1.2],
   link:RelNotes/1.7.1.1.txt[1.7.1.1],
   link:RelNotes/1.7.1.txt[1.7.1].
 
   link:RelNotes/1.7.1.3.txt[1.7.1.3],
   link:RelNotes/1.7.1.2.txt[1.7.1.2],
   link:RelNotes/1.7.1.1.txt[1.7.1.1],
   link:RelNotes/1.7.1.txt[1.7.1].
 

-* link:v1.7.0.8/git.html[documentation for release 1.7.0.8]
+* link:v1.7.0.9/git.html[documentation for release 1.7.0.9]

 
 * release notes for
 
 * release notes for

+  link:RelNotes/1.7.0.9.txt[1.7.0.9],

   link:RelNotes/1.7.0.8.txt[1.7.0.8],
   link:RelNotes/1.7.0.7.txt[1.7.0.7],
   link:RelNotes/1.7.0.6.txt[1.7.0.6],
   link:RelNotes/1.7.0.8.txt[1.7.0.8],
   link:RelNotes/1.7.0.7.txt[1.7.0.7],
   link:RelNotes/1.7.0.6.txt[1.7.0.6],


@@ -83,16 +86,18 @@ Documentation for older releases are available here:
   link:RelNotes/1.7.0.1.txt[1.7.0.1],
   link:RelNotes/1.7.0.txt[1.7.0].
 
   link:RelNotes/1.7.0.1.txt[1.7.0.1],
   link:RelNotes/1.7.0.txt[1.7.0].
 

-* link:v1.6.6.2/git.html[documentation for release 1.6.6.2]
+* link:v1.6.6.3/git.html[documentation for release 1.6.6.3]

 
 * release notes for
 
 * release notes for

+  link:RelNotes/1.6.6.3.txt[1.6.6.3],

   link:RelNotes/1.6.6.2.txt[1.6.6.2],
   link:RelNotes/1.6.6.1.txt[1.6.6.1],
   link:RelNotes/1.6.6.txt[1.6.6].
 
   link:RelNotes/1.6.6.2.txt[1.6.6.2],
   link:RelNotes/1.6.6.1.txt[1.6.6.1],
   link:RelNotes/1.6.6.txt[1.6.6].
 

-* link:v1.6.5.8/git.html[documentation for release 1.6.5.8]
+* link:v1.6.5.9/git.html[documentation for release 1.6.5.9]

 
 * release notes for
 
 * release notes for

+  link:RelNotes/1.6.5.9.txt[1.6.5.9],

   link:RelNotes/1.6.5.8.txt[1.6.5.8],
   link:RelNotes/1.6.5.7.txt[1.6.5.7],
   link:RelNotes/1.6.5.6.txt[1.6.5.6],
   link:RelNotes/1.6.5.8.txt[1.6.5.8],
   link:RelNotes/1.6.5.7.txt[1.6.5.7],
   link:RelNotes/1.6.5.6.txt[1.6.5.6],


@@ -103,9 +108,10 @@ Documentation for older releases are available here:
   link:RelNotes/1.6.5.1.txt[1.6.5.1],
   link:RelNotes/1.6.5.txt[1.6.5].
 
   link:RelNotes/1.6.5.1.txt[1.6.5.1],
   link:RelNotes/1.6.5.txt[1.6.5].
 

-* link:v1.6.4.4/git.html[documentation for release 1.6.4.4]
+* link:v1.6.4.5/git.html[documentation for release 1.6.4.5]

 
 * release notes for
 
 * release notes for

+  link:RelNotes/1.6.4.5.txt[1.6.4.5],

   link:RelNotes/1.6.4.4.txt[1.6.4.4],
   link:RelNotes/1.6.4.3.txt[1.6.4.3],
   link:RelNotes/1.6.4.2.txt[1.6.4.2],
   link:RelNotes/1.6.4.4.txt[1.6.4.4],
   link:RelNotes/1.6.4.3.txt[1.6.4.3],
   link:RelNotes/1.6.4.2.txt[1.6.4.2],