summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-03-12 22:54:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-03-12 22:54:21 (GMT)
commit3101a748dc23a9214db68cc2d0fc81064d54b9ea (patch)
treee9552cea3f541add4011c0fe893f80f9530d8e5d
parent4eeb1de1c3855968bcd2d58b223fd187ae510d73 (diff)
parenta46034819ecce6872bff099f3d75589f4d38c00c (diff)
downloadgit-3101a748dc23a9214db68cc2d0fc81064d54b9ea.zip
git-3101a748dc23a9214db68cc2d0fc81064d54b9ea.tar.gz
git-3101a748dc23a9214db68cc2d0fc81064d54b9ea.tar.bz2
Sync with 1.7.9.4
-rw-r--r--Documentation/RelNotes/1.7.9.4.txt24
-rw-r--r--Documentation/git.txt3
2 files changed, 26 insertions, 1 deletions
diff --git a/Documentation/RelNotes/1.7.9.4.txt b/Documentation/RelNotes/1.7.9.4.txt
new file mode 100644
index 0000000..e5217a1
--- /dev/null
+++ b/Documentation/RelNotes/1.7.9.4.txt
@@ -0,0 +1,24 @@
+Git v1.7.9.4 Release Notes
+==========================
+
+Fixes since v1.7.9.3
+--------------------
+
+ * The code to synthesize the fake ancestor tree used by 3-way merge
+ fallback in "git am" was not prepared to read a patch created with
+ a non-standard -p<num> value.
+
+ * "git bundle" did not record boundary commits correctly when there
+ are many of them.
+
+ * "git diff-index" and its friends at the plumbing level showed the
+ "diff --git" header and nothing else for a path whose cached stat
+ info is dirty without actual difference when asked to produce a
+ patch. This was a longstanding bug that we could have fixed long
+ time ago.
+
+ * "gitweb" did use quotemeta() to prepare search string when asked to
+ do a fixed-string project search, but did not use it by mistake and
+ used the user-supplied string instead.
+
+Also contains minor fixes and documentation updates.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index b257d80..d5b7667 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -44,9 +44,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.9.3/git.html[documentation for release 1.7.9.3]
+* link:v1.7.9.4/git.html[documentation for release 1.7.9.4]
* release notes for
+ link:RelNotes/1.7.9.4.txt[1.7.9.4],
link:RelNotes/1.7.9.3.txt[1.7.9.3],
link:RelNotes/1.7.9.2.txt[1.7.9.2],
link:RelNotes/1.7.9.1.txt[1.7.9.1],