summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-10-28 10:51:53 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-10-28 10:51:53 -0700
commitcfd10568b0529c74a9ab1f5baa1c7e285f898105 (patch)
tree3729b5d08da53297c439b8c9d3ed1cd8a65e809e /Documentation
parentMerge branch 'sb/repack-in-c' (diff)
parentGit 1.8.4.2 (diff)
downloadtgif-cfd10568b0529c74a9ab1f5baa1c7e285f898105.tar.xz
Sync with v1.8.4.2
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/RelNotes/1.8.4.2.txt14
-rw-r--r--Documentation/git.txt3
2 files changed, 16 insertions, 1 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=<whom>" forgot to omit unnecessary in-body
+ from line, i.e. when <whom> 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 4f7e07f2e0..824a179a96 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].