Git 2.9.3

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

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.
 
    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.
 Also contains minor documentation updates and code clean-ups.

diff --git a/Documentation/git.txt b/Documentation/git.txt
index ff25701d4ecad3468a3f78f54ca678718a93756c..923aa49db7f67ca6cb4510852f941654c55c59b2 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:
 
 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
 
 * 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].
   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].

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 09f1228bcd79d963b60663e93aa53c35e4ff9fe7..0011c3fc69c0cbc45b248b71aebbc5d2c5c17368 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE

-DEF_VER=v2.9.2
+DEF_VER=v2.9.3

 
 LF='
 '
 
 LF='
 '