Second batch for 2.12

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

diff --git a/Documentation/RelNotes/2.12.0.txt b/Documentation/RelNotes/2.12.0.txt
index 01db423a92c0a559efead5f39124ceab4d6a1447..c8b7fbb700e9dccc429e294c6ef5b662f6962120 100644 (file)
--- a/Documentation/RelNotes/2.12.0.txt
+++ b/Documentation/RelNotes/2.12.0.txt
@@ -22,16 +22,42 @@ UI, Workflows & Features
 
  * Various updates to "git p4".
 
+ * "git p4" didn't interact with the internal of .git directory
+   correctly in the modern "git-worktree"-enabled world.
+
+ * "git branch --list" and friends learned "--ignore-case" option to
+   optionally sort branches and tags case insensitively.
+
+ * In addition to %(subject), %(body), "log --pretty=format:..."
+   learned a new placeholder %(trailers).
+
+ * "git rebase" learned "--quit" option, which allows a user to
+   remove the metadata left by an earlier "git rebase" that was
+   manually aborted without using "git rebase --abort".
+
 
 Performance, Internal Implementation, Development Support etc.
 
- *
+ * Commands that operate on a log message and add lines to the trailer
+   blocks, such as "format-patch -s", "cherry-pick (-x|-s)", and
+   "commit -s", have been taught to use the logic of and share the
+   code with "git interpret-trailer".
 
+ * The default Travis-CI configuration specifies newer P4 and GitLFS.
+   (merge 5f703e8f02 ls/travis-update-p4-and-lfs later to maint).
 
-Also contains various documentation updates and code clean-ups.
+ * The "fast hash" that had disastrous performance issues in some
+   corner cases has been retired from the internal diff.
 
- *
+ * The character width table has been updated to match Unicode 9.0
+   (merge 9e6e9aefdf bb/unicode-9.0 later to maint).
 
+ * Update the procedure to generate "tags" for developer support.
+   (merge 046e4c1c09 jk/make-tags-find-sources-tweak later to maint).
+
+
+
+Also contains various documentation updates and code clean-ups.
 
 Fixes since v2.10
 -----------------
@@ -81,6 +107,67 @@ notes for details).
  * "git p4" LFS support was broken when LFS stores an empty blob.
    (merge d5eb3cf5e7 ls/p4-empty-file-on-lfs later to maint).
 
+ * A corner case in merge-recursive regression that crept in
+   during 2.10 development cycle has been fixed.
+   (merge 1c25d2d8ed jc/renormalize-merge-kill-safer-crlf later to maint).
+
+ * Transport with dumb http can be fooled into following foreign URLs
+   that the end user does not intend to, especially with the server
+   side redirects and http-alternates mechanism, which can lead to
+   security issues.  Tighten the redirection and make it more obvious
+   to the end user when it happens.
+   (merge cb4d2d35c4 jk/http-walker-limit-redirect-2.9 later to maint).
+
+ * Update the error messages from the dumb-http client when it fails
+   to obtain loose objects; we used to give sensible error message
+   only upon 404 but we now forbid unexpected redirects that needs to
+   be reported with something sensible.
+   (merge 3680f16f9d jk/http-walker-limit-redirect later to maint).
+
+ * When diff.renames configuration is on (and with Git 2.9 and later,
+   it is enabled by default, which made it worse), "git stash"
+   misbehaved if a file is removed and another file with a very
+   similar content is added.
+   (merge 9d4e28ead5 jk/stash-disable-renames-internally later to maint).
+
+ * "git diff --no-index" did not take "--no-abbrev" option.
+   (merge 43d1948b7b jb/diff-no-index-no-abbrev later to maint).
+
+ * "git difftool --dir-diff" had a minor regression when started from
+   a subdirectory, which has been fixed.
+   (merge 853e10c197 da/difftool-dir-diff-fix later to maint).
+
+ * "git commit --allow-empty --only" (no pathspec) with dirty index
+   ought to be an acceptable way to create a new commit that does not
+   change any paths, but it was forbidden, perhaps because nobody
+   needed it so far.
+   (merge beb635ca9c ak/commit-only-allow-empty later to maint).
+
+ * Git 2.11 had a minor regression in "merge --ff-only" that competed
+   with another process that simultanously attempted to update the
+   index. We used to explain what went wrong with an error message,
+   but the new code silently failed.  The error message has been
+   resurrected.
+
+ * A pathname that begins with "//" or "\\" on Windows is special but
+   path normalization logic was unaware of it.
+   (merge 7814fbe3f1 js/normalize-path-copy-ceil later to maint).
+
+ * "git pull --rebase", when there is no new commits on our side since
+   we forked from the upstream, should be able to fast-forward without
+   invoking "git rebase", but it didn't.
+   (merge 33b842a1e9 jc/pull-rebase-ff later to maint).
+
+ * The way to specify hotkeys to "xxdiff" that is used by "git
+   mergetool" has been modernized to match recent versions of xxdiff.
+   (merge 6cf5f6cef7 da/mergetool-xxdiff-hotkey later to maint).
+
  * Other minor doc, test and build updates and code cleanups.
    (merge fa6ca11105 nd/qsort-in-merge-recursive later to maint).
    (merge fa3142c919 ak/lazy-prereq-mktemp later to maint).
+   (merge 9c48b4fb23 ls/t0021-fixup later to maint).
+   (merge 584f99c87b sb/unpack-trees-grammofix later to maint).
+   (merge 54471fdcc3 jk/readme-gmane-is-no-more later to maint).
+   (merge 9e189f1a5c sb/t3600-cleanup later to maint).
+   (merge e2c20be57c lr/doc-fix-cet later to maint).
+   (merge 47437fd3bd kh/tutorial-grammofix later to maint).