Skip to content

Commit

Permalink
Sync with 1.7.9.4
Browse files Browse the repository at this point in the history
  • Loading branch information
gitster committed Mar 12, 2012
2 parents 4eeb1de + a460348 commit 3101a74
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 1 deletion.
24 changes: 24 additions & 0 deletions 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.
3 changes: 2 additions & 1 deletion Documentation/git.txt
Expand Up @@ -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],
Expand Down

0 comments on commit 3101a74

Please sign in to comment.