aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-31 12:07:14 -0700
committerJunio C Hamano <gitster@pobox.com>2011-05-31 12:07:14 -0700
commit2951df7a9afd1dc17bbca62af4bde340e1d9368f (patch)
tree57044f067125ecc6492b8b347de01384ab4fe7c0 /Documentation
parent766d6268c6af14970744f69c574e4b34ec056106 (diff)
parent2b0b64ee850e72b9a88c821c418b1620fccf2092 (diff)
downloadgit-2951df7a9afd1dc17bbca62af4bde340e1d9368f.tar.gz
git-2951df7a9afd1dc17bbca62af4bde340e1d9368f.tar.xz
Sync with maint
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/RelNotes/1.7.5.4.txt18
1 files changed, 18 insertions, 0 deletions
diff --git a/Documentation/RelNotes/1.7.5.4.txt b/Documentation/RelNotes/1.7.5.4.txt
new file mode 100644
index 000000000..f3412ced3
--- /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.