Skip to content

Commit 16ffa64

Browse files
committed
Git 2.6-rc0
Signed-off-by: Junio C Hamano <[email protected]>
1 parent cdd00df commit 16ffa64

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

Documentation/RelNotes/2.6.0.txt

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ notes for details).
212212
* "Is this subdirectory a separate repository that should not be
213213
touched?" check "git clean" was inefficient. This was replaced
214214
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).
216216

217217
* The "new-worktree-mode" hack in "checkout" that was added in
218218
nd/multiple-work-trees topic has been removed by updating the
@@ -248,7 +248,7 @@ notes for details).
248248

249249
Note that this is irrelevant for 'master' with "git pull" rewritten
250250
in C.
251-
(merge 22d6857 mm/pull-upload-pack later to maint).
251+
(merge 13e0e28 mm/pull-upload-pack later to maint).
252252

253253
* When trying to see that an object does not exist, a state errno
254254
leaked from our "first try to open a packfile with O_NOATIME and
@@ -277,7 +277,11 @@ notes for details).
277277

278278
* "interpret-trailers" helper mistook a single-liner log message that
279279
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).
281285

282286
* "git describe" without argument defaulted to describe the HEAD
283287
commit, but "git describe --contains" didn't. Arguably, in a
@@ -319,6 +323,10 @@ notes for details).
319323
* On case insensitive systems, "git p4" did not work well with client
320324
specs.
321325

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+
322330
* Code cleanups and documentation updates.
323331
(merge 1c601af es/doc-clean-outdated-tools later to maint).
324332
(merge 3581304 kn/tag-doc-fix later to maint).
@@ -340,3 +348,4 @@ notes for details).
340348
(merge 9476c2c ah/read-tree-usage-string later to maint).
341349
(merge b8c1d27 ah/pack-objects-usage-strings later to maint).
342350
(merge 486e1e1 br/svn-doc-include-paths-config later to maint).
351+
(merge 1733ed3 ee/clean-test-fixes later to maint).

GIT-VERSION-GEN

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
GVF=GIT-VERSION-FILE
4-
DEF_VER=v2.5.0.GIT
4+
DEF_VER=v2.6.0-rc0
55

66
LF='
77
'

0 commit comments

Comments
 (0)