diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-09-29 22:33:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-29 23:20:47 -0700 |
| commit | d8cf053dacb4f78920c112d10c7be21e4f5a5817 (patch) | |
| tree | 07b133b66dbfd99cd3410a2848b83f2cc7953232 | |
| parent | Merge branch 'maint' of git://github.com/git-l10n/git-po into maint (diff) | |
| download | tgif-d8cf053dacb4f78920c112d10c7be21e4f5a5817.tar.xz | |
Git 1.7.12.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/RelNotes/1.7.12.2.txt | 8 | ||||
| -rw-r--r-- | Documentation/git.txt | 3 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 2 |
3 files changed, 11 insertions, 2 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 diff --git a/Documentation/git.txt b/Documentation/git.txt index 6710cb0a41..48bd04e22d 100644 --- 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: -* 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 + 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]. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index c4220a09de..d98481a10c 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.12.1 +DEF_VER=v1.7.12.2 LF=' ' |