Documentation: merge: add an overview

[git.git] / Documentation / RelNotes-1.7.0.txt

diff --git a/Documentation/RelNotes-1.7.0.txt b/Documentation/RelNotes-1.7.0.txt
index d519d0612f0e6ad2d47f2ebc6879c193516eb624..d66a9732c3620f20c4518fa63b23b7f62662b058 100644 (file)
--- a/Documentation/RelNotes-1.7.0.txt
+++ b/Documentation/RelNotes-1.7.0.txt
@@ -50,6 +50,12 @@ Updates since v1.6.6
 
 (usability, bells and whistles)
 
+ * "git commit --date='<date>'" can be used to override the author date
+   just like "git commit --author='<name> <email>'" can be used to
+   override the author identity.
+
+ * "git status" learned "-s(hort)" output format.
+
 
 Fixes since v1.6.6
 ------------------
@@ -59,6 +65,6 @@ release, unless otherwise noted.
 
 --
 exec >/var/tmp/1
-O=v1.6.6-27-g648f407
+O=v1.6.6-101-gf012d27
 echo O=$(git describe master)
 git shortlog --no-merges $O..master ^maint