From ea1ab4b280ed3b041da53e161e32e38930569f3e Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 16 May 2011 16:44:50 -0700 Subject: [PATCH] Update draft release notes to 1.7.5.2 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.5.2.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Documentation/RelNotes/1.7.5.2.txt b/Documentation/RelNotes/1.7.5.2.txt index b985b07da5..951eb7cb08 100644 --- a/Documentation/RelNotes/1.7.5.2.txt +++ b/Documentation/RelNotes/1.7.5.2.txt @@ -12,6 +12,13 @@ The release notes to 1.7.5.1 forgot to mention: Fixes since v1.7.5.1 -------------------- + * "git add -p" did not work correctly when a hunk is split and then + one of them was given to the editor. + + * "git add -u" did not resolve a conflict where our history deleted and + their history modified the same file, and the working tree resolved to + keep a file. + * "git cvsimport" did not know that CVSNT stores its password file in a location different from the traditional CVS. @@ -21,6 +28,10 @@ Fixes since v1.7.5.1 * "git diff -M --cached" used to use unmerged path as a possible rename source candidate, which made no sense. + * The option name parser in "git fast-import" used prefix matches for + some options where it shouldn't, and accepted non-existent options, + e.g. "--relative-marksmith" or "--forceps". + * "git format-patch" did not quote RFC822 special characters in the email address (e.g From: Junio C. Hamano , not From: "Junio C. Hamano" ). @@ -28,6 +39,10 @@ Fixes since v1.7.5.1 * "git format-patch" when run with "--quiet" option used to produce a nonsense result that consists of alternating empty output. + * In "git merge", per-branch branch..mergeoptions configuration + variables did not override the fallback default merge.