summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-03-29 04:52:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-29 04:52:18 (GMT)
commitff0a181fa6580d29ce0ab7abf79780a1fa3c5555 (patch)
treefab0521bc4c6168b85108e033c4601b25753f0e9
parent0acb62f202617cc58b6b4039dc9c7ad955ef0c88 (diff)
parente07665e524d0398a34059d605f674182bfeeaf39 (diff)
downloadgit-ff0a181fa6580d29ce0ab7abf79780a1fa3c5555.zip
git-ff0a181fa6580d29ce0ab7abf79780a1fa3c5555.tar.gz
git-ff0a181fa6580d29ce0ab7abf79780a1fa3c5555.tar.bz2
Merge branch 'maint'
* maint: Prepare for 1.7.0.4 Conflicts: RelNotes
-rw-r--r--Documentation/RelNotes-1.7.0.4.txt19
1 files changed, 19 insertions, 0 deletions
diff --git a/Documentation/RelNotes-1.7.0.4.txt b/Documentation/RelNotes-1.7.0.4.txt
new file mode 100644
index 0000000..cbc94a2
--- /dev/null
+++ b/Documentation/RelNotes-1.7.0.4.txt
@@ -0,0 +1,19 @@
+Git v1.7.0.4 Release Notes (draft)
+==================================
+
+Fixes since v1.7.0.3
+--------------------
+
+ * Color values given to "color.<cmd>.<slot>" configuration can now have
+ more than one attributes (e.g. "bold ul").
+
+ * "git add -u nonexistent-path" did not complain.
+
+ * "git apply --whitespace=fix" didn't work well when an early patch in
+ a patch series adds trailing blank lines and a later one depended on
+ such a block of blank lines at the end.
+
+ * "git fast-export" didn't check error status and stop when marks file
+ cannot be opened.
+
+And other minor fixes and documentation updates.