Merge branch 'ag/rebase-i-in-c' into js/rebase-in-c-5.5-work-with-rebase-i-in-c

diff --git a/Documentation/RelNotes/1.7.12.2.txt b/Documentation/RelNotes/1.7.12.2.txt
index 93c7b345e589ec5a33a9f4c1869097876219dfbd..69255745e6ea7a27b610bdbef71c4e5fa8ce6597 100644 (file)
--- a/Documentation/RelNotes/1.7.12.2.txt
+++ b/Documentation/RelNotes/1.7.12.2.txt
@@ -4,6 +4,9 @@ Git 1.7.12.2 Release Notes
 Fixes since v1.7.12.1
 ---------------------
 
+ * When "git am" is fed an input that has multiple "Content-type: ..."
+   header, it did not grok charset= attribute correctly.
+
  * Even during a conflicted merge, "git blame $path" always meant to
    blame uncommitted changes to the "working tree" version; make it
    more useful by showing cleanly merged parts as coming from the other
@@ -24,6 +27,11 @@ Fixes since v1.7.12.1
    is not their language, mildly irritating others. Localization to
    the line has been disabled for now.
 
+ * "git log --all-match --grep=A --grep=B" ought to show commits that
+   mention both A and B, but when these three options are used with
+   --author or --committer, it showed commits that mention either A or
+   B (or both) instead.
+
  * The subcommand to remove the definition of a remote in "git remote"
    was named "rm" even though all other subcommands were spelled out.
    Introduce "git remote remove" to remove confusion, and keep "rm" as