@@ -12,6 +12,13 @@ The release notes to 1.7.5.1 forgot to mention:
12
12
Fixes since v1.7.5.1
13
13
--------------------
14
14
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
+
15
22
* "git cvsimport" did not know that CVSNT stores its password file in a
16
23
location different from the traditional CVS.
17
24
@@ -21,13 +28,21 @@ Fixes since v1.7.5.1
21
28
* "git diff -M --cached" used to use unmerged path as a possible rename
22
29
source candidate, which made no sense.
23
30
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
+
24
35
* "git format-patch" did not quote RFC822 special characters in the
25
36
email address (e.g From: Junio C. Hamano <
[email protected] >, not
26
37
From: "Junio C. Hamano" <
[email protected] >).
27
38
28
39
* "git format-patch" when run with "--quiet" option used to produce a
29
40
nonsense result that consists of alternating empty output.
30
41
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
+
31
46
* "git merge-one-file" did not honor GIT_WORK_TREE settings when
32
47
handling a "both sides added, differently" conflict.
33
48
0 commit comments