Git 2.6-rc0

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

Junio C Hamano committed Sep 2, 2015 at 12:55 UTC 16ffa6443e279a9b3b63d7a2bebeb07833506010
2 files changed +13 -4
Documentation/RelNotes/2.6.0.txt
+12 -3
@@ -212,7 +212,7 @@ notes for details).
212 * "Is this subdirectory a separate repository that should not be
213 touched?" check "git clean" was inefficient. This was replaced
214 with a more optimized check.
215 - (merge 38ae878 ee/clean-remove-dirs later to maint).
215 + (merge fbf2fec ee/clean-remove-dirs later to maint).
216
217 * The "new-worktree-mode" hack in "checkout" that was added in
218 nd/multiple-work-trees topic has been removed by updating the
@@ -248,7 +248,7 @@ notes for details).
248
249 Note that this is irrelevant for 'master' with "git pull" rewritten
250 in C.
251 - (merge 22d6857 mm/pull-upload-pack later to maint).
251 + (merge 13e0e28 mm/pull-upload-pack later to maint).
252
253 * When trying to see that an object does not exist, a state errno
254 leaked from our "first try to open a packfile with O_NOATIME and
@@ -277,7 +277,11 @@ notes for details).
277
278 * "interpret-trailers" helper mistook a single-liner log message that
279 has a colon as the end of existing trailer.
280 - (merge 6262fe9 cc/trailers-corner-case-fix later to maint).
280 +
281 + * The "interpret-trailers" helper mistook a multi-paragraph title of
282 + a commit log message with a colon in it as the end of the trailer
283 + block.
284 + (merge 5c99995 cc/trailers-corner-case-fix later to maint).
285
286 * "git describe" without argument defaulted to describe the HEAD
287 commit, but "git describe --contains" didn't. Arguably, in a
@@ -319,6 +323,10 @@ notes for details).
323 * On case insensitive systems, "git p4" did not work well with client
324 specs.
325
326 + * "git init empty && git -C empty log" said "bad default revision 'HEAD'",
327 + which was found to be a bit confusing to new users.
328 + (merge ce11360 jk/log-missing-default-HEAD later to maint).
329 +
330 * Code cleanups and documentation updates.
331 (merge 1c601af es/doc-clean-outdated-tools later to maint).
332 (merge 3581304 kn/tag-doc-fix later to maint).
@@ -340,3 +348,4 @@ notes for details).
348 (merge 9476c2c ah/read-tree-usage-string later to maint).
349 (merge b8c1d27 ah/pack-objects-usage-strings later to maint).
350 (merge 486e1e1 br/svn-doc-include-paths-config later to maint).
351 + (merge 1733ed3 ee/clean-test-fixes later to maint).
GIT-VERSION-GEN
+1 -1
@@ -1,7 +1,7 @@
1 #!/bin/sh
2
3 GVF=GIT-VERSION-FILE
4 -DEF_VER=v2.5.0.GIT
4 +DEF_VER=v2.6.0-rc0
5
6 LF='
7 '