Sync with 2.9.3

* tag 'v2.9.3':
Git 2.9.3

diff --git a/Documentation/RelNotes/2.9.3.txt b/Documentation/RelNotes/2.9.3.txt
index d19f14438243e8229f9c2cfe53ef89b9ac059548..695b86f612fa178b816696fef76467ffc71f3db7 100644 (file)
--- a/Documentation/RelNotes/2.9.3.txt
+++ b/Documentation/RelNotes/2.9.3.txt
@@ -157,4 +157,14 @@ Fixes since v2.9.2
    can be safely discarded without any other consideration.  State
    that it is safe to do so.
 
+ * Not-so-recent rewrite of "git am" that started making internal
+   calls into the commit machinery had an unintended regression, in
+   that no matter how many seconds it took to apply many patches, the
+   resulting committer timestamp for the resulting commits were all
+   the same.
+
+ * "git difftool <paths>..." started in a subdirectory failed to
+   interpret the paths relative to that directory, which has been
+   fixed.
+
 Also contains minor documentation updates and code clean-ups.

diff --git a/Documentation/git.txt b/Documentation/git.txt
index f4dfc9d42c2dec433c2b996d0b198a23cd0334af..bd659c44711b96ab011d7b6d52b71b0f2c486bd2 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,9 +43,10 @@ unreleased) version of Git, that is available from the 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
-* link:v2.9.2/git.html[documentation for release 2.9.2]
+* link:v2.9.3/git.html[documentation for release 2.9.3]
 
 * release notes for
+  link:RelNotes/2.9.3.txt[2.9.3],
   link:RelNotes/2.9.2.txt[2.9.2],
   link:RelNotes/2.9.1.txt[2.9.1],
   link:RelNotes/2.9.0.txt[2.9].