Merge git://git.kernel.org/pub/scm/gitk/gitk

[git.git] / Documentation / RelNotes-1.7.0.txt

diff --git a/Documentation/RelNotes-1.7.0.txt b/Documentation/RelNotes-1.7.0.txt
index e66945cb68f56e7b5d1686cadb9cb7e6cff5bbcc..08972879790cdf10ebf421499045b0209a716c8a 100644 (file)
--- a/Documentation/RelNotes-1.7.0.txt
+++ b/Documentation/RelNotes-1.7.0.txt
@@ -46,10 +46,10 @@ Notes on behaviour change
    environment, and diff.*.command and diff.*.textconv in the config
    file.
 
- * The --max-pack-size argument to 'git repack' and 'git pack-objects' was
-   assuming the provided size to be expressed in MiB, unlike the
-   corresponding config variable and other similar options accepting a size
-   value.  It is now expecting a size expressed in bytes, with a possible
+ * The --max-pack-size argument to 'git repack', 'git pack-objects', and
+   'git fast-import' was assuming the provided size to be expressed in MiB,
+   unlike the corresponding config variable and other similar options accepting
+   a size value.  It is now expecting a size expressed in bytes, with a possible
    unit suffix of 'k', 'm', or 'g'.
 
 Updates since v1.6.6
@@ -65,6 +65,8 @@ Updates since v1.6.6
 
  * "gitk" updates.
 
+ * "gitweb" updates (code clean-up, load checking etc.)
+
 (portability)
 
  * Some more MSVC portability patches for msysgit port.
@@ -133,9 +135,6 @@ Updates since v1.6.6
  * "git grep" does not rely on external grep anymore.  It can use more than
    one threads to accelerate the operation.
 
- * "git grep" learned "--no-index" option, to search inside contents that
-   are not managed by git.
-
  * "git grep" learned "--quiet" option.
 
  * "git log" and friends learned "--glob=heads/*" syntax that is a more
@@ -206,6 +205,9 @@ release, unless otherwise noted.
    from non-root dir, 2010-01-26) may be merged to older maintenance
    branches.
 
+ * "git fast-import" did not correctly handle large blobs that may
+   bust the pack size limit.
+
  * When using "git status" or asking "git diff" to compare the work tree
    with something, they used to consider that a checked-out submodule with
    uncommitted changes is not modified; this could cause people to forget
@@ -216,6 +218,6 @@ release, unless otherwise noted.
 
 --
 exec >/var/tmp/1
-O=v1.7.0-rc1-6-g2ee8c5b
+O=v1.7.0-rc1-42-g3bd8de5
 echo O=$(git describe master)
 git shortlog --no-merges $O..master ^maint