diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-02-17 10:14:39 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-02-17 10:14:39 -0800 |
commit | 0233b800c838ddda41db318ee396320b3c21a560 (patch) | |
tree | a5e39ea059bb2a8ae6dd78e9b6bd217f326eabe9 | |
parent | 63438327976c8dfbb3b03bcb6b143747afa7e724 (diff) | |
parent | 8a71d90b7e6bcf88232e34c77560dd3d0b334247 (diff) | |
download | git-0233b800c838ddda41db318ee396320b3c21a560.tar.gz |
Merge branch 'maint'
* maint:
Start preparing for 2.7.2
git-cvsserver.perl: fix typo
-rw-r--r-- | Documentation/RelNotes/2.7.2.txt | 27 | ||||
-rwxr-xr-x | git-cvsserver.perl | 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. diff --git a/git-cvsserver.perl b/git-cvsserver.perl index 95e69b19a7..02c0445be1 100755 --- a/git-cvsserver.perl +++ b/git-cvsserver.perl @@ -2664,7 +2664,7 @@ sub argsfromdir # co # Obtain list directly. # remove # HERE: TEST: MAYBE client does the recursion for us, # # since it only makes sense to remove stuff already in - # # the sandobx? + # # the sandbox? # ci # HERE: Similar to remove... # # Don't try to implement the confusing/weird # # ci -r bug er.."feature". |