From dcb11cca50992339af744e25ca5d0f94b478d3b9 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 28 Oct 2013 10:21:29 -0700 Subject: [PATCH] Git 1.8.4.2 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.8.4.2.txt | 14 ++++++++++++++ Documentation/git.txt | 3 ++- GIT-VERSION-GEN | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/Documentation/RelNotes/1.8.4.2.txt b/Documentation/RelNotes/1.8.4.2.txt index 867ae69070..9adccb1efb 100644 --- a/Documentation/RelNotes/1.8.4.2.txt +++ b/Documentation/RelNotes/1.8.4.2.txt @@ -4,6 +4,20 @@ Git v1.8.4.2 Release Notes Fixes since v1.8.4.1 -------------------- + * "git clone" gave some progress messages to the standard output, not + to the standard error, and did not allow suppressing them with the + "--no-progress" option. + + * "format-patch --from=" forgot to omit unnecessary in-body + from line, i.e. when is the same as the real author. + + * "git shortlog" used to choke and die when there is a malformed + commit (e.g. missing authors); it now simply ignore such a commit + and keeps going. + + * "git merge-recursive" did not parse its "--diff-algorithm=" command + line option correctly. + * "git branch --track" had a minor regression in v1.8.3.2 and later that made it impossible to base your local work on anything but a local branch of the upstream repository you are tracking from. diff --git a/Documentation/git.txt b/Documentation/git.txt index 5b83e0ab98..90c5f37ceb 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.8.4.1/git.html[documentation for release 1.8.4.1] +* link:v1.8.4.2/git.html[documentation for release 1.8.4.2] * release notes for + link:RelNotes/1.8.4.2.txt[1.8.4.2], link:RelNotes/1.8.4.1.txt[1.8.4.1], link:RelNotes/1.8.4.txt[1.8.4]. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index b4147d6db5..d801493b23 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.8.4.1 +DEF_VER=v1.8.4.2 LF=' ' -- 2.11.4.GIT