Merge branch 'jk/read-commit-buffer-data-after-free'

diff --git a/Documentation/RelNotes/1.8.2.txt b/Documentation/RelNotes/1.8.2.txt
index ad6496f826bdede34070d5e18c953d51063d8a4b..abf3b675fdebf145c72c50cc12ea7fabfb8dc6c6 100644 (file)
--- a/Documentation/RelNotes/1.8.2.txt
+++ b/Documentation/RelNotes/1.8.2.txt
@@ -115,6 +115,9 @@ UI, Workflows & Features
    rewrite the names and email addresses of people using the mailmap
    mechanism.
 
+ * "git log --cc --graph" now shows the combined diff output with the
+   ancestry graph.
+
  * "git mergetool" and "git difftool" learned to list the available
    tool backends in a more consistent manner.
 
@@ -144,6 +147,9 @@ UI, Workflows & Features
    you do not have any commits in your history, but it now gives you
    an empty index (to match non-existent commit you are not even on).
 
+ * "git status" says what branch is being bisected or rebased when
+   able, not just "bisecting" or "rebasing".
+
  * "git submodule" started learning a new mode to integrate with the
    tip of the remote branch (as opposed to integrating with the commit
    recorded in the superproject's gitlink).
@@ -211,6 +217,13 @@ Performance, Internal Implementation, etc.
    these implementations can reliably update.  This can be used to
    avoid excessive revalidation of contents.
 
+ * Some platforms ship with old version of expat where xmlparse.h
+   needs to be included instead of expat.h; the build procedure has
+   been taught about this.
+
+ * "make clean" on platforms that cannot compute header dependencies
+   on the fly did not work with implementations of "rm" that do not
+   like an empty argument list.
 
 Also contains minor documentation updates and code clean-ups.
 
@@ -295,6 +308,9 @@ details).
    failed to remove the real location of the $GIT_DIR it created.
    This was most visible when interrupting a submodule update.
 
+ * "git cvsimport" mishandled timestamps at DST boundary.
+   (merge 48c9162 bw/get-tz-offset-perl later to maint).
+
  * We used to have an arbitrary 32 limit for combined diff input,
    resulting in incorrect number of leading colons shown when showing
    the "--raw --cc" output.
@@ -383,6 +399,11 @@ details).
  * Command line completion code was inadvertently made incompatible with
    older versions of bash by using a newer array notation.
 
+ * "git push" was taught to refuse updating the branch that is
+   currently checked out long time ago, but the user manual was left
+   stale.
+   (merge d9be248 wk/man-deny-current-branch-is-default-these-days later to maint).
+
  * Some shells do not behave correctly when IFS is unset; work it
    around by explicitly setting it to the default value.