diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-02-17 10:05:44 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-02-17 10:05:44 -0800 |
commit | 8a71d90b7e6bcf88232e34c77560dd3d0b334247 (patch) | |
tree | 14a0a9053de95f274f433acfb15da3b93c14c3ef /Documentation/RelNotes | |
parent | Merge branch 'js/test-lib-windows-emulated-yes' into maint (diff) | |
download | tgif-8a71d90b7e6bcf88232e34c77560dd3d0b334247.tar.xz |
Start preparing for 2.7.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/RelNotes')
-rw-r--r-- | Documentation/RelNotes/2.7.2.txt | 27 |
1 files changed, 27 insertions, 0 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. |