Git 1.7.12.2

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

Junio C Hamano committed Sep 29, 2012 at 22:33 UTC d8cf053dacb4f78920c112d10c7be21e4f5a5817
3 files changed +11 -2
Documentation/RelNotes/1.7.12.2.txt
+8
@@ -4,6 +4,9 @@ Git 1.7.12.2 Release Notes
4 Fixes since v1.7.12.1
5 ---------------------
6
7 + * When "git am" is fed an input that has multiple "Content-type: ..."
8 + header, it did not grok charset= attribute correctly.
9 +
10 * Even during a conflicted merge, "git blame $path" always meant to
11 blame uncommitted changes to the "working tree" version; make it
12 more useful by showing cleanly merged parts as coming from the other
@@ -24,6 +27,11 @@ Fixes since v1.7.12.1
27 is not their language, mildly irritating others. Localization to
28 the line has been disabled for now.
29
30 + * "git log --all-match --grep=A --grep=B" ought to show commits that
31 + mention both A and B, but when these three options are used with
32 + --author or --committer, it showed commits that mention either A or
33 + B (or both) instead.
34 +
35 * The subcommand to remove the definition of a remote in "git remote"
36 was named "rm" even though all other subcommands were spelled out.
37 Introduce "git remote remove" to remove confusion, and keep "rm" as
Documentation/git.txt
+2 -1
@@ -43,9 +43,10 @@ unreleased) version of git, that is available from 'master'
43 branch of the `git.git` repository.
44 Documentation for older releases are available here:
45
46 -* link:v1.7.12.1/git.html[documentation for release 1.7.12.1]
46 +* link:v1.7.12.2/git.html[documentation for release 1.7.12.2]
47
48 * release notes for
49 + link:RelNotes/1.7.12.2.txt[1.7.12.2],
50 link:RelNotes/1.7.12.1.txt[1.7.12.1],
51 link:RelNotes/1.7.12.txt[1.7.12].
52
GIT-VERSION-GEN
+1 -1
@@ -1,7 +1,7 @@
1 #!/bin/sh
2
3 GVF=GIT-VERSION-FILE
4 -DEF_VER=v1.7.12.1
4 +DEF_VER=v1.7.12.2
5
6 LF='
7 '