summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-08-12 09:17:51 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-08-12 09:17:51 -0700
commite0c1ceafc5bece92d35773a75fff59497e1d9bd5 (patch)
tree3cc4bf42e1b9aaa3c650af7247019890f7e01c95
parentMerge branch 'jk/difftool-in-subdir' into maint (diff)
downloadtgif-e0c1ceafc5bece92d35773a75fff59497e1d9bd5.tar.xz
Git 2.9.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.9.3.txt10
-rw-r--r--Documentation/git.txt3
-rwxr-xr-xGIT-VERSION-GEN2
3 files changed, 13 insertions, 2 deletions
diff --git a/Documentation/RelNotes/2.9.3.txt b/Documentation/RelNotes/2.9.3.txt
index d19f144382..695b86f612 100644
--- 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 ff25701d4e..923aa49db7 100644
--- 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].
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 09f1228bcd..0011c3fc69 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.9.2
+DEF_VER=v2.9.3
LF='
'