Prepare for 1.7.0.4

Signed-off-by: Junio C Hamano <gitster@pobox.com>

2 files changed, 20 insertions, 1 deletions

diff --git a/Documentation/RelNotes-1.7.0.4.txt b/Documentation/RelNotes-1.7.0.4.txt
new file mode 100644
index 0000000000..cbc94a2f08
--- /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.
diff --git a/RelNotes b/RelNotes
index 02e74966cd..9148d7c5c2 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes-1.7.0.3.txt
\ No newline at end of file
+Documentation/RelNotes-1.7.0.4.txt
\ No newline at end of file