Skip to content

Commit

Permalink
Start preparing for 2.7.2
Browse files Browse the repository at this point in the history
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Junio C Hamano committed Feb 17, 2016
1 parent 7516977 commit 8a71d90
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 1 deletion.
27 changes: 27 additions & 0 deletions Documentation/RelNotes/2.7.2.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
Git v2.7.2 Release Notes
========================

Fixes since v2.7.1
------------------

* The low-level merge machinery has been taught to use CRLF line
termination when inserting conflict markers to merged contents that
are themselves CRLF line-terminated.

* "git worktree" had a broken code that attempted to auto-fix
possible inconsistency that results from end-users moving a
worktree to different places without telling Git (the original
repository needs to maintain backpointers to its worktrees, but
"mv" run by end-users who are not familiar with that fact will
obviously not adjust them), which actually made things worse
when triggered.

* "git push --force-with-lease" has been taught to report if the push
needed to force (or fast-forwarded).

* The emulated "yes" command used in our test scripts has been
tweaked not to spend too much time generating unnecessary output
that is not used, to help those who test on Windows where it would
not stop until it fills the pipe buffer due to lack of SIGPIPE.

Also includes tiny documentation and test updates.
2 changes: 1 addition & 1 deletion RelNotes

0 comments on commit 8a71d90

Please sign in to comment.