summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-01-18 23:52:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-01-18 23:52:08 (GMT)
commit6e06367ab0586189940a7f08c394d13fce14e87f (patch)
tree01a13b862eff3cea78ddf35578761af9117386c2
parent32c94f97b01f220dbabaec1a986d9596f45e5da5 (diff)
parentc572f491e545f3fe76a966e418139fc9755a910f (diff)
downloadgit-6e06367ab0586189940a7f08c394d13fce14e87f.zip
git-6e06367ab0586189940a7f08c394d13fce14e87f.tar.gz
git-6e06367ab0586189940a7f08c394d13fce14e87f.tar.bz2
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
-rw-r--r--Documentation/RelNotes/1.7.7.6.txt4
-rw-r--r--Documentation/RelNotes/1.7.8.4.txt4
-rw-r--r--Documentation/git.txt6
3 files changed, 12 insertions, 2 deletions
diff --git a/Documentation/RelNotes/1.7.7.6.txt b/Documentation/RelNotes/1.7.7.6.txt
index b8b86eb..8df606d 100644
--- a/Documentation/RelNotes/1.7.7.6.txt
+++ b/Documentation/RelNotes/1.7.7.6.txt
@@ -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
diff --git a/Documentation/RelNotes/1.7.8.4.txt b/Documentation/RelNotes/1.7.8.4.txt
index c21fc99..9bebdbf 100644
--- a/Documentation/RelNotes/1.7.8.4.txt
+++ b/Documentation/RelNotes/1.7.8.4.txt
@@ -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
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 8a77fa4..db5d557 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -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],