Permalink
Browse files

Update draft release notes to 1.7.5.2

Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information...
1 parent 4bbfd8e commit ea1ab4b280ed3b041da53e161e32e38930569f3e @gitster gitster committed May 16, 2011
Showing with 15 additions and 0 deletions.
  1. +15 −0 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,13 +28,21 @@ 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 <jch@example.com>, not
From: "Junio C. Hamano" <jch@example.com>).
* "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.<name>.mergeoptions configuration
+ variables did not override the fallback default merge.<option>
+ configuration variables such as merge.ff, merge.log, etc.
+
* "git merge-one-file" did not honor GIT_WORK_TREE settings when
handling a "both sides added, differently" conflict.

0 comments on commit ea1ab4b

Please sign in to comment.