Merge gitk changes from Paul Mackerras at git://ozlabs.org/~paulus/gitk

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

diff --git a/Documentation/RelNotes/1.7.10.txt b/Documentation/RelNotes/1.7.10.txt
index 540ce38c456d1c0c37152ed58a75bdfa8a512c7c..ca917523bb36bbccb798bcf8f54e9927a88a98aa 100644 (file)
--- a/Documentation/RelNotes/1.7.10.txt
+++ b/Documentation/RelNotes/1.7.10.txt
@@ -29,6 +29,16 @@ Compatibility Notes
    while and were deprecated in mid 2008 (v1.6.0).  When you give these
    options to "git am", it will now warn and ask you not to use them.
 
+ * When you do not tell which branches and tags to push to the "git push"
+   command in any way, the command used "matching refs" rule to update
+   remote branches and tags with branches and tags with the same name you
+   locally have.  In future versions of Git, this will change to use the
+   "upstream" rule to update the branch at the remote you would "pull"
+   from into your current branch with your local current branch.  The
+   release after 1.7.10 will start issuing a warning about this change,
+   to encourage you to tell the command what to push out, e.g. by setting
+   push.default configuration.
+
 
 Updates since v1.7.9
 --------------------
@@ -180,6 +190,14 @@ Unless otherwise noted, all the fixes since v1.7.9 in the maintenance
 releases are contained in this release (see release notes to them for
 details).
 
+ * Build with NO_PERL_MAKEMAKER was broken and Git::I18N did not work
+   with versions of Perl older than 5.8.3.
+   (merge 5eb660e ab/perl-i18n later to maint).
+
+ * "git fast-import" accepted "ls" command with an empty path by
+   mistake.
+   (merge 178e1de jn/maint-fast-import-empty-ls later to maint).
+
  * The "remaining" subcommand to "git rerere" was not documented.
    (merge 3e7a1df ph/rerere-doc later to maint).
 
@@ -192,13 +210,20 @@ details).
    error was at the end of line.
    (merge 4b34059 ms/maint-config-error-at-eol-linecount later to maint).
 
+ * "configure" script learned to take "--sane-tool-path" from the
+   command line to record SANE_TOOL_PATH (used to avoid broken
+   platform tools in /usr/bin) in config.mak-autogen.  This may be useful
+   for people on Solaris who have saner tools outside /usr/xpg[46]/bin.
+
+ * zsh port of bash completion script needed another workaround.
+
  * "gitweb" used to drop warnings in the log file when "heads" view is
    accessed in a repository whose HEAD does not point at a valid
    branch.
 
 ---
 exec >/var/tmp/1
-O=v1.7.10-rc0-50-gd973dc0
+O=v1.7.10-rc1-32-geb2c67c
 echo O=$(git describe)
 git log --first-parent --oneline ^maint $O..
 echo