Merge branch 'nd/pathspec-wildcard'

diff --git a/Documentation/RelNotes/1.8.2.txt b/Documentation/RelNotes/1.8.2.txt
index 1bdf3b6ebecf2ecada1e4c8869dc4af4e1123376..6c85bf4f0f8b968777cf338d45a60fd6dfb093cb 100644 (file)
--- a/Documentation/RelNotes/1.8.2.txt
+++ b/Documentation/RelNotes/1.8.2.txt
@@ -21,7 +21,10 @@ Updates since v1.8.1
 
 UI, Workflows & Features
 
- *
+ * Initial ports to QNX and z/OS UNIX System Services have started.
+
+ * Output from the tests is coloured using "green is okay, yellow is
+   questionable, red is bad and blue is informative" scheme.
 
 Foreign Interface
 
@@ -58,6 +61,12 @@ details).
    need to be in the cvsadmin group on NetBSD 6.0).
    (merge 8666df0 jc/test-cvs-no-init-in-existing-dir later to maint).
 
+ * The behaviour visible to the end users was confusing, when they
+   attempt to kill a process spawned in the editor that was in turn
+   launched by Git with SIGINT (or SIGQUIT), as Git would catch that
+   signal and die.  We ignore these signals now.
+   (merge 1250857 pf/editor-ignore-sigint later to maint).
+
  * After failing to create a temporary file using mkstemp(), failing
    pathname was not reported correctly on some platforms.
    (merge f7be59b jc/mkstemp-more-careful-error-reporting later to maint).