Skip to content

Commit 6e06367

Browse files
committed
Merge branch 'maint'
* maint: Git 1.7.8.4 Git 1.7.7.6 diff-index: enable recursive pathspec matching in unpack_trees Conflicts: GIT-VERSION-GEN
2 parents 32c94f9 + c572f49 commit 6e06367

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

Documentation/RelNotes/1.7.7.6.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ Fixes since v1.7.7.5
88
directory when two paths in question are in adjacent directories and
99
the name of the one directory is a prefix of the other.
1010

11+
* A wildcard that matches deeper hierarchy given to the "diff-index" command,
12+
e.g. "git diff-index HEAD -- '*.txt'", incorrectly reported additions of
13+
matching files even when there is no change.
14+
1115
* When producing a "thin pack" (primarily used in bundles and smart
1216
HTTP transfers) out of a fully packed repository, we unnecessarily
1317
avoided sending recent objects as a delta against objects we know

Documentation/RelNotes/1.7.8.4.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ Fixes since v1.7.8.3
88
directory when two paths in question are in adjacent directories and
99
the name of the one directory is a prefix of the other.
1010

11+
* A wildcard that matches deeper hierarchy given to the "diff-index" command,
12+
e.g. "git diff-index HEAD -- '*.txt'", incorrectly reported additions of
13+
matching files even when there is no change.
14+
1115
* When producing a "thin pack" (primarily used in bundles and smart
1216
HTTP transfers) out of a fully packed repository, we unnecessarily
1317
avoided sending recent objects as a delta against objects we know

Documentation/git.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,19 @@ unreleased) version of git, that is available from 'master'
4444
branch of the `git.git` repository.
4545
Documentation for older releases are available here:
4646

47-
* link:v1.7.8.3/git.html[documentation for release 1.7.8.3]
47+
* link:v1.7.8.4/git.html[documentation for release 1.7.8.4]
4848

4949
* release notes for
50+
link:RelNotes/1.7.8.4.txt[1.7.8.4],
5051
link:RelNotes/1.7.8.3.txt[1.7.8.3],
5152
link:RelNotes/1.7.8.2.txt[1.7.8.2],
5253
link:RelNotes/1.7.8.1.txt[1.7.8.1],
5354
link:RelNotes/1.7.8.txt[1.7.8].
5455

55-
* link:v1.7.7.5/git.html[documentation for release 1.7.7.5]
56+
* link:v1.7.7.6/git.html[documentation for release 1.7.7.6]
5657

5758
* release notes for
59+
link:RelNotes/1.7.7.6.txt[1.7.7.6],
5860
link:RelNotes/1.7.7.5.txt[1.7.7.5],
5961
link:RelNotes/1.7.7.4.txt[1.7.7.4],
6062
link:RelNotes/1.7.7.3.txt[1.7.7.3],

0 commit comments

Comments
 (0)