Skip to content

Commit 8a71d90

Browse files
committed
Start preparing for 2.7.2
Signed-off-by: Junio C Hamano <[email protected]>
1 parent 7516977 commit 8a71d90

File tree

2 files changed

+28
-1
lines changed

2 files changed

+28
-1
lines changed

Documentation/RelNotes/2.7.2.txt

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
Git v2.7.2 Release Notes
2+
========================
3+
4+
Fixes since v2.7.1
5+
------------------
6+
7+
* The low-level merge machinery has been taught to use CRLF line
8+
termination when inserting conflict markers to merged contents that
9+
are themselves CRLF line-terminated.
10+
11+
* "git worktree" had a broken code that attempted to auto-fix
12+
possible inconsistency that results from end-users moving a
13+
worktree to different places without telling Git (the original
14+
repository needs to maintain backpointers to its worktrees, but
15+
"mv" run by end-users who are not familiar with that fact will
16+
obviously not adjust them), which actually made things worse
17+
when triggered.
18+
19+
* "git push --force-with-lease" has been taught to report if the push
20+
needed to force (or fast-forwarded).
21+
22+
* The emulated "yes" command used in our test scripts has been
23+
tweaked not to spend too much time generating unnecessary output
24+
that is not used, to help those who test on Windows where it would
25+
not stop until it fills the pipe buffer due to lack of SIGPIPE.
26+
27+
Also includes tiny documentation and test updates.

RelNotes

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

0 commit comments

Comments
 (0)