The third batch post 2.14

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

diff --git a/Documentation/RelNotes/2.15.0.txt b/Documentation/RelNotes/2.15.0.txt
index 001f0068afb93508bae107972f549a4dfdf7b4c0..2fd49978d7641184089581fc8ee1592e4d898121 100644 (file)
--- a/Documentation/RelNotes/2.15.0.txt
+++ b/Documentation/RelNotes/2.15.0.txt
@@ -41,6 +41,12 @@ UI, Workflows & Features
    the original bug reporter.
    (merge 09ac673788 eb/contacts-reported-by later to maint).
 
+ * "git rebase", especially when it is run by mistake and ends up
+   trying to replay many changes, spent long time in silence.  The
+   command has been taught to show progress report when it spends
+   long time preparing these many changes to replay (which would give
+   the user a chance to abort with ^C).
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -76,6 +82,11 @@ Performance, Internal Implementation, Development Support etc.
 
  * The "ref-store" code reorganization continues.
 
+ * "git commit" used to discard the index and re-read from the filesystem
+   just in case the pre-commit hook has updated it in the middle; this
+   has been optimized out when we know we do not run the pre-commit hook.
+   (merge 680ee550d7 kw/commit-keep-index-when-pre-commit-is-not-run later to maint).
+
 
 Also contains various documentation updates and code clean-ups.
 
@@ -164,6 +175,19 @@ Fixes since v2.14
    (merge 896dca3ab7 rs/unpack-entry-leakfix later to maint).
    (merge 149d8cbb2e rs/win32-syslog-leakfix later to maint).
 
+ * "git stash -u" used the contents of the committed version of the
+   ".gitignore" file to decide which paths are ignored, even when the
+   file has local changes.  The command has been taught to instead use
+   the locally modified contents.
+
+ * bash 4.4 or newer gave a warning on NUL byte in command
+   substitution done in "git stash"; this has been squelched.
+   (merge 5fc92f8828 kd/stash-with-bash-4.4 later to maint).
+
+ * "git grep -L" and "git grep --quiet -L" reported different exit
+   codes; this has been corrected.
+   (merge e1f68c66d5 as/grep-quiet-no-match-exit-code-fix later to maint).
+
  * Other minor doc, test and build updates and code cleanups.
    (merge 5b114f3bb0 rs/bswap-ubsan-fix later to maint).
    (merge 168e63554c rs/move-array later to maint).
@@ -188,3 +212,9 @@ Fixes since v2.14
    (merge 881529c846 rs/apply-lose-prefix-length later to maint).
    (merge 6355a76802 rs/find-pack-entry-bisection later to maint).
    (merge de3ce210ed rs/merge-microcleanup later to maint).
+   (merge 7f0a02be2f ah/doc-empty-string-is-false later to maint).
+   (merge 70ec6bd63b rs/t1002-do-not-use-sum later to maint).
+   (merge 2456990dfd sb/sha1-file-cleanup later to maint).
+   (merge 2aac933c62 hv/t5526-andand-chain-fix later to maint).
+   (merge c8d0c4fe9b sb/submodule-parallel-update later to maint).
+   (merge 794b7e1674 mg/format-ref-doc-fix later to maint).