summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/RelNotes/2.5.0.txt7
-rwxr-xr-xGIT-VERSION-GEN2
2 files changed, 8 insertions, 1 deletions
diff --git a/Documentation/RelNotes/2.5.0.txt b/Documentation/RelNotes/2.5.0.txt
index 5e03961..994b113 100644
--- a/Documentation/RelNotes/2.5.0.txt
+++ b/Documentation/RelNotes/2.5.0.txt
@@ -467,6 +467,11 @@ notes for details).
tags as boundary commits.
(merge 9b7a61d jc/do-not-feed-tags-to-clear-commit-marks later to maint).
+ * "git fetch --depth=<depth>" and "git clone --depth=<depth>" issued
+ a shallow transfer request even to an upload-pack that does not
+ support the capability.
+ (merge eb86a50 me/fetch-into-shallow-safety later to maint).
+
* Code cleanups and documentation updates.
(merge 0269f96 mm/usage-log-l-can-take-regex later to maint).
(merge 64f2589 nd/t1509-chroot-test later to maint).
@@ -493,3 +498,5 @@ notes for details).
(merge 72dbb36 sg/completion-commit-cleanup later to maint).
(merge e654eb2 es/utf8-stupid-compiler-workaround later to maint).
(merge 34b935c es/osx-header-pollutes-mask-macro later to maint).
+ (merge ab7fade jc/prompt-document-ps1-state-separator later to maint).
+ (merge 25f600e mm/describe-doc later to maint).
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index f27adc2..b34941c 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.5.0-rc0
+DEF_VER=v2.5.0-rc1
LF='
'