summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-29 23:22:53 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-29 23:22:53 -0700
commit28de297ffeb0d6357118e384f8d943f4a41e75ac (patch)
treecf9426f6eb316299bafad8f4538ee23be2688880 /Documentation/RelNotes
parentda5a2bd525400b9106dfdccc61e2079a97589a0d (diff)
parentd8cf053dacb4f78920c112d10c7be21e4f5a5817 (diff)
downloadgit-28de297ffeb0d6357118e384f8d943f4a41e75ac.tar.gz
Sync with 1.7.12.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/RelNotes')
-rw-r--r--Documentation/RelNotes/1.7.12.2.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/RelNotes/1.7.12.2.txt b/Documentation/RelNotes/1.7.12.2.txt
index 93c7b345e5..69255745e6 100644
--- 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