From 527d4a638e330f4efe459442bbfb0799d29fd73a Mon Sep 17 00:00:00 2001 From: GyuYong Jung Date: Wed, 17 Feb 2016 11:14:58 +0900 Subject: [PATCH 1/2] git-cvsserver.perl: fix typo Signed-off-by: GyuYong Jung Signed-off-by: Junio C Hamano --- git-cvsserver.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-cvsserver.perl b/git-cvsserver.perl index 95e69b19a..02c0445be 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". From 8a71d90b7e6bcf88232e34c77560dd3d0b334247 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 17 Feb 2016 10:05:44 -0800 Subject: [PATCH 2/2] Start preparing for 2.7.2 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.7.2.txt | 27 +++++++++++++++++++++++++++ RelNotes | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 Documentation/RelNotes/2.7.2.txt diff --git a/Documentation/RelNotes/2.7.2.txt b/Documentation/RelNotes/2.7.2.txt new file mode 100644 index 000000000..f7846a256 --- /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/RelNotes b/RelNotes index 213c0d085..64e8170aa 120000 --- a/RelNotes +++ b/RelNotes @@ -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