Skip to content

Commit

Permalink
Merge branch 'maint'
Browse files Browse the repository at this point in the history
* maint:
  Git 1.7.8.4
  Git 1.7.7.6
  diff-index: enable recursive pathspec matching in unpack_trees

Conflicts:
	GIT-VERSION-GEN
  • Loading branch information
Junio C Hamano committed Jan 18, 2012
2 parents 32c94f9 + c572f49 commit 6e06367
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
4 changes: 4 additions & 0 deletions Documentation/RelNotes/1.7.7.6.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ Fixes since v1.7.7.5
directory when two paths in question are in adjacent directories and
the name of the one directory is a prefix of the other.

* A wildcard that matches deeper hierarchy given to the "diff-index" command,
e.g. "git diff-index HEAD -- '*.txt'", incorrectly reported additions of
matching files even when there is no change.

* When producing a "thin pack" (primarily used in bundles and smart
HTTP transfers) out of a fully packed repository, we unnecessarily
avoided sending recent objects as a delta against objects we know
Expand Down
4 changes: 4 additions & 0 deletions Documentation/RelNotes/1.7.8.4.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ Fixes since v1.7.8.3
directory when two paths in question are in adjacent directories and
the name of the one directory is a prefix of the other.

* A wildcard that matches deeper hierarchy given to the "diff-index" command,
e.g. "git diff-index HEAD -- '*.txt'", incorrectly reported additions of
matching files even when there is no change.

* When producing a "thin pack" (primarily used in bundles and smart
HTTP transfers) out of a fully packed repository, we unnecessarily
avoided sending recent objects as a delta against objects we know
Expand Down
6 changes: 4 additions & 2 deletions Documentation/git.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,19 @@ 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.8.3/git.html[documentation for release 1.7.8.3]
* link:v1.7.8.4/git.html[documentation for release 1.7.8.4]

* release notes for
link:RelNotes/1.7.8.4.txt[1.7.8.4],
link:RelNotes/1.7.8.3.txt[1.7.8.3],
link:RelNotes/1.7.8.2.txt[1.7.8.2],
link:RelNotes/1.7.8.1.txt[1.7.8.1],
link:RelNotes/1.7.8.txt[1.7.8].

* link:v1.7.7.5/git.html[documentation for release 1.7.7.5]
* link:v1.7.7.6/git.html[documentation for release 1.7.7.6]

* release notes for
link:RelNotes/1.7.7.6.txt[1.7.7.6],
link:RelNotes/1.7.7.5.txt[1.7.7.5],
link:RelNotes/1.7.7.4.txt[1.7.7.4],
link:RelNotes/1.7.7.3.txt[1.7.7.3],
Expand Down

0 comments on commit 6e06367

Please sign in to comment.