Merge branch 'nd/fsck-progress'

diff --git a/Documentation/RelNotes/1.7.5.2.txt b/Documentation/RelNotes/1.7.5.2.txt
index b985b07da5259ef0920646d0c21f1c421479bd22..951eb7cb08427f98e27b6d0ecc6d9260cf672d45 100644 (file)
--- 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 <jch@example.com>, not
    From: "Junio C. Hamano" <jch@example.com>).
@@ -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.<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.