Git 1.7.12.2

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

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
 ---------------------
 
 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
  * 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.
 
    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
  * 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

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 6710cb0a418fef503f0a8419e9b3cd617a15c485..48bd04e22d3bef2c9a4bbeb5e776ece42cedff9a 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,9 +43,10 @@ unreleased) version of git, that is available from 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 

-* link:v1.7.12.1/git.html[documentation for release 1.7.12.1]
+* link:v1.7.12.2/git.html[documentation for release 1.7.12.2]

 
 * release notes for
 
 * release notes for

+  link:RelNotes/1.7.12.2.txt[1.7.12.2],

   link:RelNotes/1.7.12.1.txt[1.7.12.1],
   link:RelNotes/1.7.12.txt[1.7.12].
 
   link:RelNotes/1.7.12.1.txt[1.7.12.1],
   link:RelNotes/1.7.12.txt[1.7.12].
 

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index c4220a09de9d3365a7d36a0ee85964c40f2d2c37..d98481a10c2e202257225eb48aac14ae6224cbec 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE

-DEF_VER=v1.7.12.1
+DEF_VER=v1.7.12.2

 
 LF='
 '
 
 LF='
 '