Update draft release notes to 2.2

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

diff --git a/Documentation/RelNotes/2.2.0.txt b/Documentation/RelNotes/2.2.0.txt
index f65de525397c192ba0ca0163de36575c0fb89f3a..f77185470553ebf0c3aa1817efff9b5614819a4e 100644 (file)
--- a/Documentation/RelNotes/2.2.0.txt
+++ b/Documentation/RelNotes/2.2.0.txt
@@ -4,6 +4,12 @@ Git v2.2 Release Notes
 Updates since v2.1
 ------------------
 
 Updates since v2.1
 ------------------
 

+Ports
+
+ * Building on older MacOS X systems automatically sets
+   the necessary NO_APPLE_COMMON_CRYPTO build-time option.
+
+

 UI, Workflows & Features
 
  * "git config --edit --global" starts from a skeletal per-user
 UI, Workflows & Features
 
  * "git config --edit --global" starts from a skeletal per-user


@@ -12,9 +18,17 @@ UI, Workflows & Features
    need for a later "Have you forgotten setting core.user?" and we
    can add more to the template as we gain more experience.
 
    need for a later "Have you forgotten setting core.user?" and we
    can add more to the template as we gain more experience.
 

+ * "git stash list -p" used to be almost always a no-op because each
+   stash entry is represented as a merge commit.  It learned to show
+   the difference between the base commit version and the working tree
+   version, which is in line with what "git show" gives.

 
 Performance, Internal Implementation, etc.
 
 
 Performance, Internal Implementation, etc.
 

+ * In tests, we have been using NOT_{MINGW,CYGWIN} test prerequisites
+   long before negated prerequisites e.g. !MINGW were invented.
+   The former has been converted to the latter to avoid confusion.
+

  * Looking up remotes configuration in a repository with very many
    remotes defined has been optimized.
 
  * Looking up remotes configuration in a repository with very many
    remotes defined has been optimized.
 


@@ -36,6 +50,10 @@ Also contains various documentation updates and code clean-ups.
 Fixes since v2.1
 ----------------
 
 Fixes since v2.1
 ----------------
 

+Unless otherwise noted, all the fixes since v2.1 in the maintenance
+track are contained in this release (see the maintenance releases'
+notes for details).
+

  * "git log --pretty/format=" with an empty format string did not
    mean the more obvious "No output whatsoever" but "Use default
    format", which was counterintuitive.
  * "git log --pretty/format=" with an empty format string did not
    mean the more obvious "No output whatsoever" but "Use default
    format", which was counterintuitive.


@@ -46,7 +64,28 @@ Fixes since v2.1
    sure the permission bits of this file follows the same tar.umask
    configuration setting.
 
    sure the permission bits of this file follows the same tar.umask
    configuration setting.
 

+ * "git -c section.var command" and "git -c section.var= command"
+   should pass the configuration differently (the former should be a
+   boolean true, the latter should be an empty string).
+   (merge a789ca7 jk/command-line-config-empty-string later to maint).

 
 

-Unless otherwise noted, all the fixes since v2.1 in the maintenance
-track are contained in this release (see the maintenance releases'
-notes for details).
+ * Applying a patch not generated by Git in a subdirectory used to
+   check the whitespace breakage using the attributes for incorrect
+   paths. Also whitespace checks were performed even for paths
+   excluded via "git apply --exclude=<path>" mechanism.
+   (merge 477a08a jc/apply-ws-prefix later to maint).
+
+ * "git bundle create" with date-range specification were meant to
+   exclude tags outside the range, but it didn't.
+   (merge 2c8544a lf/bundle-exclusion later to maint).
+
+ * "git add x" where x that used to be a directory has become a
+   symbolic link to a directory misbehaved.
+   (merge ccad42d rs/refresh-beyond-symlink later to maint).
+
+ * The prompt script checked $GIT_DIR/ref/stash file to see if there
+   is a stash, which was a no-no.
+   (merge 0fa7f01 jk/prompt-stash-could-be-packed later to maint).
+
+ * Pack-protocol documentation had a minor typo.
+   (merge 5d146f7 sp/pack-protocol-doc-on-shallow later to maint).