summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-05-31 12:06:40 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-31 12:06:40 -0700
commit2b0b64ee850e72b9a88c821c418b1620fccf2092 (patch)
tree2c437c1bfee1c9f9e8420be73f562211e768a1e7
parentMerge branch 'tr/add-i-no-escape' into maint (diff)
downloadtgif-2b0b64ee850e72b9a88c821c418b1620fccf2092.tar.xz
Start 1.7.5.4 draft release notes
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/1.7.5.4.txt18
l---------RelNotes2
2 files changed, 19 insertions, 1 deletions
diff --git a/Documentation/RelNotes/1.7.5.4.txt b/Documentation/RelNotes/1.7.5.4.txt
new file mode 100644
index 0000000000..f3412ced33
--- /dev/null
+++ b/Documentation/RelNotes/1.7.5.4.txt
@@ -0,0 +1,18 @@
+Git v1.7.5.4 Release Notes
+==========================
+
+Fixes since v1.7.5.3
+--------------------
+
+ * The single-key mode of "git add -p" was easily fooled into thinking
+ that it was told to add everthing ('a') when up-arrow was pressed by
+ mistake.
+
+ * "git diff -C -C" used to disable the rename detection entirely when
+ there are too many copy candidate paths in the tree; now it falls
+ back to "-C" when doing so would keep the copy candidate paths
+ under the rename detection limit.
+
+ * "git rerere" did not diagnose a corrupt MERGE_RR file in some cases.
+
+And other minor fixes and documentation updates.
diff --git a/RelNotes b/RelNotes
index bb805da971..313a3c0290 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/1.7.5.3.txt \ No newline at end of file
+Documentation/RelNotes/1.7.5.4.txt \ No newline at end of file