diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-09-29 23:22:53 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-09-29 23:22:53 -0700 |
commit | 28de297ffeb0d6357118e384f8d943f4a41e75ac (patch) | |
tree | cf9426f6eb316299bafad8f4538ee23be2688880 /Documentation | |
parent | Merge branch 'rr/maint-submodule-unknown-cmd' (diff) | |
parent | Git 1.7.12.2 (diff) | |
download | tgif-28de297ffeb0d6357118e384f8d943f4a41e75ac.tar.xz |
Sync with 1.7.12.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/RelNotes/1.7.12.2.txt | 8 | ||||
-rw-r--r-- | Documentation/git.txt | 3 |
2 files changed, 10 insertions, 1 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]. |