Eighth batch for 2.11

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

diff --git a/Documentation/RelNotes/2.11.0.txt b/Documentation/RelNotes/2.11.0.txt
index 0f82a089cd7e2266a1899673157eaead3e22e403..44992687a24883b2b1904a838b27b4dbd97e7399 100644 (file)
--- a/Documentation/RelNotes/2.11.0.txt
+++ b/Documentation/RelNotes/2.11.0.txt
@@ -67,6 +67,25 @@ UI, Workflows & Features
 
  * "git gui" l10n to Portuguese.
 
 
  * "git gui" l10n to Portuguese.
 

+ * When given an abbreviated object name that is not (or more
+   realistically, "no longer") unique, we gave a fatal error
+   "ambiguous argument".  This error is now accompanied by hints that
+   lists the objects that begins with the given prefix.  During the
+   course of development of this new feature, numerous minor bugs were
+   uncovered and corrected, the most notable one of which is that we
+   gave "short SHA1 xxxx is ambiguous." twice without good reason.
+
+ * "git log rev^..rev" is an often-used revision range specification
+   to show what was done on a side branch merged at rev.  This has
+   gained a short-hand "rev^-1".  In general "rev^-$n" is the same as
+   "^rev^$n rev", i.e. what has happened on other branches while the
+   history leading to nth parent was looking the other way.
+
+ * In recent versions of cURL, GSSAPI credential delegation is
+   disabled by default due to CVE-2011-2192; introduce a configuration
+   to selectively allow enabling this.
+   (merge 26a7b23429 ps/http-gssapi-cred-delegation later to maint).
+

 
 Performance, Internal Implementation, Development Support etc.
 
 
 Performance, Internal Implementation, Development Support etc.
 


@@ -327,6 +346,21 @@ notes for details).
  * Doc update to clarify what "log -3 --reverse" does.
    (merge 04be69478f pb/rev-list-reverse-with-count later to maint).
 
  * Doc update to clarify what "log -3 --reverse" does.
    (merge 04be69478f pb/rev-list-reverse-with-count later to maint).
 

+ * Almost everybody uses DEFAULT_ABBREV to refer to the default
+   setting for the abbreviation, but "git blame" peeked into
+   underlying variable bypassing the macro for no good reason.
+   (merge 5293284b4d jc/blame-abbrev later to maint).
+
+ * The "graph" API used in "git log --graph" miscounted the number of
+   output columns consumed so far when drawing a padding line, which
+   has been fixed; this did not affect any existing code as nobody
+   tried to write anything after the padding on such a line, though.
+   (merge 1647793524 jk/graph-padding-fix later to maint).
+
+ * The code that parses the format parameter of for-each-ref command
+   has seen a micro-optimization.
+   (merge e94ce1394e sg/ref-filter-parse-optim later to maint).
+

  * Other minor doc, test and build updates and code cleanups.
    (merge e78d57e bw/pathspec-remove-unused-extern-decl later to maint).
    (merge ce25e4c rs/checkout-some-states-are-const later to maint).
  * Other minor doc, test and build updates and code cleanups.
    (merge e78d57e bw/pathspec-remove-unused-extern-decl later to maint).
    (merge ce25e4c rs/checkout-some-states-are-const later to maint).