Update draft release notes to 2.2

gitster · gitster · commit 5b509df0c3b5 · 2014-10-29T10:18:31.000-07:00
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/Documentation/RelNotes/2.2.0.txt b/Documentation/RelNotes/2.2.0.txt
@@ -11,6 +11,9 @@ Ports
 
  * The support to build with NO_PTHREADS has been resurrected.
 
+ * Compilation options has been updated a bit to support z/OS port
+   better.
+
 
 UI, Workflows & Features
 
@@ -33,10 +36,16 @@ UI, Workflows & Features
    to replace blob contents, names of people and paths and log
    messages with bland and simple strings to help them.
 
+ * "git difftool" learned an option to stop feeding paths to the
+   diff backend when it exits with a non-zero status.
+
  * "log --date=iso" uses a slight variant of ISO 8601 format that is
    made more human readable.  A new "--date=iso-strict" option gives
    datetime output that is more strictly conformant.
 
+ * The logic "git prune" uses is more resilient against various corner
+   cases.
+
  * A broken reimplementation of Git could write an invalid index that
    records both stage #0 and higher stage entries for the same path.
    We now notice and reject such an index, as there is no sensible
@@ -53,6 +62,10 @@ UI, Workflows & Features
    creted temporary directory, instead of the current directory, by
    setting the mergetool.writeToTemp configuration variable.
 
+ * "git mergetool" understands "--tool bc" now, as version 4 of
+   BeyondCompare can be driven the same way as its version 3 and it
+   feels awkward to say "--tool bc3".
+
  * The "pre-receive" and "post-receive" hooks are no longer required
    to consume their input fully (not following this requirement used
    to result in intermittent errors in "git push").
@@ -150,6 +163,10 @@ Performance, Internal Implementation, etc.
    array for child process, alleviating the need for the callers to
    allocate and deallocate them.
 
+ * Some people use AsciiDoctor, instead of AsciiDoc, to format our
+   documentation set; the documentation has been adjusted, as
+   AsciiDoctor is pickier than AsciiDoc in its input mark-up.
+
 
 Also contains various documentation updates and code clean-ups.
 
