Skip to content

Commit 74f6b03

Browse files
committed
GIT 1.5.4-rc1
It's been a week since -rc0, and we have quite a lot of fixes, so here it is. Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent dbedf97 commit 74f6b03

File tree

3 files changed

+21
-10
lines changed

3 files changed

+21
-10
lines changed

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Karl Hasselström <kha@treskal.com>
2525
Kent Engstrom <kent@lysator.liu.se>
2626
Lars Doelle <lars.doelle@on-line ! de>
2727
Lars Doelle <lars.doelle@on-line.de>
28+
Li Hong <leehong@pku.edu.cn>
2829
Lukas Sandström <lukass@etek.chalmers.se>
2930
Martin Langhoff <martin@catalyst.net.nz>
3031
Michael Coleman <tutufan@gmail.com>

Documentation/RelNotes-1.5.4.txt

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@ Removal
1414
Deprecation notices
1515
-------------------
1616

17-
* Next feature release of git (this change is scheduled for v1.5.5 but
18-
it could slip) will by default install dashed form of commands
19-
(e.g. "git-commit") outside of users' normal $PATH, and will install
20-
only selected commands ("git" itself, and "gitk") in $PATH. This
21-
implies:
17+
* Next feature release of git (this change is scheduled for v1.6.0)
18+
will by default install dashed form of commands (e.g. "git-commit")
19+
outside of users' normal $PATH, and will install only selected
20+
commands ("git" itself, and "gitk") in $PATH. This implies:
2221

2322
- Using dashed form of git commands (e.g. "git-commit") from the
2423
command line has been informally deprecated since early 2006, but
@@ -38,20 +37,20 @@ Deprecation notices
3837
* The post-receive hook was introduced in March 2007 to supersede
3938
post-update hook, primarily to overcome the command line length
4039
limitation of the latter. Use of post-update hook will be deprecated
41-
in future versions of git, perhaps in v1.5.5.
40+
in future versions of git, starting from v1.6.0.
4241

4342
* "git lost-found" was deprecated in favor of "git fsck"'s --lost-found
4443
option, and will be removed in the future.
4544

4645
* "git peek-remote" is deprecated, as "git ls-remote" was written in C
4746
and works for all transports, and will be removed in the future.
4847

49-
* From v1.5.5, the repack.usedeltabaseoffset config option will default
48+
* From v1.6.0, the repack.usedeltabaseoffset config option will default
5049
to true, which will give denser packfile (i.e. more efficient storage).
5150
The downside is that git older than version 1.4.4 will not be able
5251
to directly use a repository packed using this setting.
5352

54-
* From v1.5.5, the pack.indexversion config option will default to 2,
53+
* From v1.6.0, the pack.indexversion config option will default to 2,
5554
which is slightly more efficient, and makes repacking more immune to
5655
data corruptions. Git older than version 1.5.2 may revert to version 1
5756
of the pack index with a manual "git index-pack" to be able to directly
@@ -88,6 +87,9 @@ Updates since v1.5.3
8887
mean "always" (even when the output is not going to a terminal).
8988
This has been corrected to mean the same thing as "auto".
9089

90+
* "git diff" Porcelain now respects diff.external configuration, which
91+
is another way to specify GIT_EXTERNAL_DIFF.
92+
9193
* HTTP proxy can be specified per remote repository using
9294
remote.*.httpproxy configuration, or global http.proxy configuration
9395
variable.
@@ -112,6 +114,8 @@ Updates since v1.5.3
112114

113115
* "git rebase --interactive" mode can now work on detached HEAD.
114116

117+
* Other minor to serious bugs in "git rebase -i" has been fixed.
118+
115119
* "git rebase" now detaches head during its operation, so after a
116120
successful "git rebase" operation, the reflog entry branch@{1} for
117121
the current branch points at the commit before the rebase was
@@ -238,6 +242,12 @@ Updates since v1.5.3
238242
"git commit"; the parameters to -m options are formatted as separate
239243
paragraphs.
240244

245+
* The format "git show" outputs an annotated tag has been updated to
246+
include "Tagger: " and "Date: " lines from the tag itself. Strictly
247+
speaking this is a backward incompatible change, but this is a
248+
reasonable usability fix and people's script shouldn't have been
249+
relying on the exact output from "git show" Porcelain anyway.
250+
241251
* "git cvsexportcommit" learned -w option to specify and switch to the
242252
CVS working directory.
243253

@@ -314,6 +324,6 @@ series.
314324

315325
--
316326
exec >/var/tmp/1
317-
O=v1.5.4-rc0-35-g530e741
327+
O=v1.5.4-rc0-85-gdbedf97
318328
echo O=`git describe refs/heads/master`
319329
git shortlog --no-merges $O..refs/heads/master ^refs/heads/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=v1.5.4-rc0.GIT
4+
DEF_VER=v1.5.4-rc1.GIT
55

66
LF='
77
'

0 commit comments

Comments
 (0)