diff options
| -rw-r--r-- | Documentation/RelNotes/2.7.2.txt | 27 | ||||
| l--------- | RelNotes | 2 |
2 files changed, 28 insertions, 1 deletions
diff --git a/Documentation/RelNotes/2.7.2.txt b/Documentation/RelNotes/2.7.2.txt new file mode 100644 index 0000000000..f7846a2569 --- /dev/null +++ b/Documentation/RelNotes/2.7.2.txt @@ -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. @@ -1 +1 @@ -Documentation/RelNotes/2.7.1.txt
\ No newline at end of file +Documentation/RelNotes/2.7.2.txt
\ No newline at end of file |