From 8c8e978f5719c6a58fb998742207bf907f963143 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 24 Jun 2017 15:31:36 -0700 Subject: Git 2.13.2 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.13.2.txt | 17 +++++++++++++++++ GIT-VERSION-GEN | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Documentation/RelNotes/2.13.2.txt b/Documentation/RelNotes/2.13.2.txt index c8ba0fa16f..8c2b20071e 100644 --- a/Documentation/RelNotes/2.13.2.txt +++ b/Documentation/RelNotes/2.13.2.txt @@ -34,4 +34,21 @@ Fixes since v2.13.1 * "git pull --rebase --autostash" didn't auto-stash when the local history fast-forwards to the upstream. + * "git describe --contains" penalized light-weight tags so much that + they were almost never considered. Instead, give them about the + same chance to be considered as an annotated tag that is the same + age as the underlying commit would. + + * The result from "git diff" that compares two blobs, e.g. "git diff + $commit1:$path $commit2:$path", used to be shown with the full + object name as given on the command line, but it is more natural to + use the $path in the output and use it to look up .gitattributes. + + * A flaky test has been corrected. + + * Help contributors that visit us at GitHub. + + * "git stash push " did not work from a subdirectory at all. + Bugfix for a topic in v2.13 + Also contains various documentation updates and code clean-ups. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 5b6722840e..c26b01f60b 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.13.1 +DEF_VER=v2.13.2 LF=' ' -- cgit v1.2.3