Update draft release notes to 1.7.5.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
May 16, 2011 at 16:44 UTC
ea1ab4b280ed3b041da53e161e32e38930569f3e
1 file changed
+15
Documentation/RelNotes/1.7.5.2.txt
+15
@@ -12,6 +12,13 @@ The release notes to 1.7.5.1 forgot to mention:
12
Fixes since v1.7.5.1
13
--------------------
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
+
22
* "git cvsimport" did not know that CVSNT stores its password file in a
23
location different from the traditional CVS.
24
@@ -21,6 +28,10 @@ Fixes since v1.7.5.1
28
* "git diff -M --cached" used to use unmerged path as a possible rename
29
source candidate, which made no sense.
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
+
35
* "git format-patch" did not quote RFC822 special characters in the
36
email address (e.g From: Junio C. Hamano <jch@example.com>, not
37
From: "Junio C. Hamano" <jch@example.com>).
@@ -28,6 +39,10 @@ Fixes since v1.7.5.1
39
* "git format-patch" when run with "--quiet" option used to produce a
40
nonsense result that consists of alternating empty output.
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
+
46
* "git merge-one-file" did not honor GIT_WORK_TREE settings when
47
handling a "both sides added, differently" conflict.
48