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 7ed6a3af2e97c8884b9758408a46b2962d87e663..08972879790cdf10ebf421499045b0209a716c8a 100644 (file)
--- a/Documentation/RelNotes-1.7.0.txt
+++ b/Documentation/RelNotes-1.7.0.txt
@@ -25,7 +25,7 @@ Notes on behaviour change
    configured that variable.
 
  * "git status" is not "git commit --dry-run" anymore.  This change does
    configured that variable.
 
  * "git status" is not "git commit --dry-run" anymore.  This change does

-   not affect you if you run the command without pathspec.
+   not affect you if you run the command without argument.

 
  * "git diff" traditionally treated various "ignore whitespace" options
    only as a way to filter the patch output.  "git diff --exit-code -b"
 
  * "git diff" traditionally treated various "ignore whitespace" options
    only as a way to filter the patch output.  "git diff --exit-code -b"


@@ -38,7 +38,7 @@ Notes on behaviour change
    whitespaces is reported with zero exit status when run with
    --exit-code, and there is no "diff --git" header for such a change.
 
    whitespaces is reported with zero exit status when run with
    --exit-code, and there is no "diff --git" header for such a change.
 

- * external diff and textconv helpers are now executed using the shell.
+ * External diff and textconv helpers are now executed using the shell.

    This makes them consistent with other programs executed by git, and
    allows you to pass command-line parameters to the helpers. Any helper
    paths containing spaces or other metacharacters now need to be
    This makes them consistent with other programs executed by git, and
    allows you to pass command-line parameters to the helpers. Any helper
    paths containing spaces or other metacharacters now need to be


@@ -46,6 +46,12 @@ Notes on behaviour change
    environment, and diff.*.command and diff.*.textconv in the config
    file.
 
    environment, and diff.*.command and diff.*.textconv in the config
    file.
 

+ * 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
 --------------------
 
 Updates since v1.6.6
 --------------------
 


@@ -59,6 +65,8 @@ Updates since v1.6.6
 
  * "gitk" updates.
 
 
  * "gitk" updates.
 

+ * "gitweb" updates (code clean-up, load checking etc.)
+

 (portability)
 
  * Some more MSVC portability patches for msysgit port.
 (portability)
 
  * Some more MSVC portability patches for msysgit port.


@@ -127,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" 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
  * "git grep" learned "--quiet" option.
 
  * "git log" and friends learned "--glob=heads/*" syntax that is a more


@@ -200,15 +205,19 @@ release, unless otherwise noted.
    from non-root dir, 2010-01-26) may be merged to older maintenance
    branches.
 
    from non-root dir, 2010-01-26) may be merged to older maintenance
    branches.
 

- * When "git diff" is asked to compare the work tree with something,
-   it used to consider that a checked-out submodule with uncommitted
-   changes is not modified; this could cause people to forget committing
-   these changes in the submodule before committing in the superproject.
-   It now considers such a change as a modification.
+ * "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
+   committing these changes in the submodule before committing in the
+   superproject. They now consider such a change as a modification and
+   "git diff" will append a "-dirty" to the work tree side when generating
+   patch output or when used with the --submodule option.

 
 --
 exec >/var/tmp/1
 
 --
 exec >/var/tmp/1

-O=v1.7.0-rc0-48-gdace5dd
-O=v1.7.0-rc0-67-gb10b918
+O=v1.7.0-rc1-42-g3bd8de5

 echo O=$(git describe master)
 git shortlog --no-merges $O..master ^maint
 echo O=$(git describe master)
 git shortlog --no-merges $O..master ^maint