Skip to content

Commit 552a736

Browse files
committed
Start preparing for 2.5.1
Signed-off-by: Junio C Hamano <[email protected]>
1 parent 91db009 commit 552a736

File tree

2 files changed

+50
-1
lines changed

2 files changed

+50
-1
lines changed

Documentation/RelNotes/2.5.1.txt

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
Git v2.5.1 Release Notes
2+
========================
3+
4+
Fixes since v2.5
5+
----------------
6+
7+
* Running an aliased command from a subdirectory when the .git thing
8+
in the working tree is a gitfile pointing elsewhere did not work.
9+
10+
* Often a fast-import stream builds a new commit on top of the
11+
previous commit it built, and it often unconditionally emits a
12+
"from" command to specify the first parent, which can be omitted in
13+
such a case. This caused fast-import to forget the tree of the
14+
previous commit and then re-read it from scratch, which was
15+
inefficient. Optimize for this common case.
16+
17+
* The "rev-parse --parseopt" mode parsed the option specification
18+
and the argument hint in a strange way to allow '=' and other
19+
special characters in the option name while forbidding them from
20+
the argument hint. This made it impossible to define an option
21+
like "--pair <key>=<value>" with "pair=key=value" specification,
22+
which instead would have defined a "--pair=key <value>" option.
23+
24+
* A "rebase" replays changes of the local branch on top of something
25+
else, as such they are placed in stage #3 and referred to as
26+
"theirs", while the changes in the new base, typically a foreign
27+
work, are placed in stage #2 and referred to as "ours". Clarify
28+
the "checkout --ours/--theirs".
29+
30+
* An experimental "untracked cache" feature used uname(2) in a
31+
slightly unportable way.
32+
33+
* "sparse checkout" misbehaved for a path that is excluded from the
34+
checkout when switching between branches that differ at the path.
35+
36+
* The low-level "git send-pack" did not honor 'user.signingkey'
37+
configuration variable when sending a signed-push.
38+
39+
* An attempt to delete a ref by pushing into a repository whose HEAD
40+
symbolic reference points at an unborn branch that cannot be
41+
created due to ref D/F conflict (e.g. refs/heads/a/b exists, HEAD
42+
points at refs/heads/a) failed.
43+
44+
* "git subtree" (in contrib/) depended on "git log" output to be
45+
stable, which was a no-no. Apply a workaround to force a
46+
particular date format.
47+
48+
Also contains typofixes, documentation updates and trivial code
49+
clean-ups.

RelNotes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Documentation/RelNotes/2.5.0.txt
1+
Documentation/RelNotes/2.5.1.txt

0 commit comments

Comments
 (0)