@@ -12,6 +12,13 @@ The release notes to 1.7.5.1 forgot to mention:
1212Fixes since v1.7.5.1
1313--------------------
1414
15+ * "git add -p" did not work correctly when a hunk is split and then
16+ one of them was given to the editor.
17+
18+ * "git add -u" did not resolve a conflict where our history deleted and
19+ their history modified the same file, and the working tree resolved to
20+ keep a file.
21+
1522 * "git cvsimport" did not know that CVSNT stores its password file in a
1623 location different from the traditional CVS.
1724
@@ -21,13 +28,21 @@ Fixes since v1.7.5.1
2128 * "git diff -M --cached" used to use unmerged path as a possible rename
2229 source candidate, which made no sense.
2330
31+ * The option name parser in "git fast-import" used prefix matches for
32+ some options where it shouldn't, and accepted non-existent options,
33+ e.g. "--relative-marksmith" or "--forceps".
34+
2435 * "git format-patch" did not quote RFC822 special characters in the
2536 email address (e.g From: Junio C. Hamano <
[email protected] >, not
2637 From: "Junio C. Hamano" <
[email protected] >).
2738
2839 * "git format-patch" when run with "--quiet" option used to produce a
2940 nonsense result that consists of alternating empty output.
3041
42+ * In "git merge", per-branch branch.<name>.mergeoptions configuration
43+ variables did not override the fallback default merge.<option>
44+ configuration variables such as merge.ff, merge.log, etc.
45+
3146 * "git merge-one-file" did not honor GIT_WORK_TREE settings when
3247 handling a "both sides added, differently" conflict.
3348
0 commit comments