Revert 30816237 and 7e62265

[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 a3d0395f54dea7ab8044ca463ffd8c1ddc9a1f99..f632662612ea0a68777a4f51cd711b20545b185e 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,6 +38,19 @@ 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.
+   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
+   shell-quoted.  The affected helpers are GIT_EXTERNAL_DIFF in the
+   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
 --------------------


@@ -48,6 +61,10 @@ Updates since v1.6.6
    mismatch between fast-import and the frontends that produce the input
    stream.
 
    mismatch between fast-import and the frontends that produce the input
    stream.
 

+ * "git svn" support of subversion "merge tickets" and miscellaneous fixes.
+
+ * "gitk" updates.
+

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


@@ -82,6 +99,14 @@ Updates since v1.6.6
    contents (e.g. git-merge documentation) have strings that resemble the
    conflict markers.
 
    contents (e.g. git-merge documentation) have strings that resemble the
    conflict markers.
 

+ * A new syntax "<branch>@{upstream}" can be used on the command line to
+   substitute the name of the "upstream" of the branch.  Missing branch
+   defaults to the current branch, so "git fetch && git merge @{upstream}"
+   will be equivalent to "git pull".
+
+ * "git branch --set-upstream" can be used to update the (surprise!) upstream
+   i.e. where the branch is supposed to pull and merge from (or rebase onto).
+

  * "git checkout A...B" is a way to detach HEAD at the merge base between
    A and B.
 
  * "git checkout A...B" is a way to detach HEAD at the merge base between
    A and B.
 


@@ -105,10 +130,13 @@ Updates since v1.6.6
 
  * "git fetch --all" can now be used in place of "git remote update".
 
 
  * "git fetch --all" can now be used in place of "git remote update".
 

- * "git grep" does not rely on external grep anymore.
+ * "git grep" does not rely on external grep anymore.  It can use more than
+   one threads to accelerate the operation.
+
+ * "git grep" learned "--quiet" option.

 
 

- * "git grep" learned "--no-index" option, to search inside contents that
-   are not managed by git.
+ * "git log" and friends learned "--glob=heads/*" syntax that is a more
+   flexible way to complement "--branches/--tags/--remotes".

 
  * "git merge" learned to pass options specific to strategy-backends.  E.g.
 
 
  * "git merge" learned to pass options specific to strategy-backends.  E.g.
 


@@ -135,6 +163,9 @@ Updates since v1.6.6
  * "git rebase -i" also learned --autosquash option, that is useful
    together with the new "fixup" action.
 
  * "git rebase -i" also learned --autosquash option, that is useful
    together with the new "fixup" action.
 

+ * "git remote" learned set-url subcommand, to update (surprise!) url
+   for an existing remote nickname.
+

  * "git rerere" learned "forget path" subcommand.  Together with "git
    checkout -m path" it will be useful when you recorded a wrong
    resolution.
  * "git rerere" learned "forget path" subcommand.  Together with "git
    checkout -m path" it will be useful when you recorded a wrong
    resolution.


@@ -152,6 +183,10 @@ Updates since v1.6.6
 
  * The infrastructure to build foreign SCM interface has been updated.
 
 
  * The infrastructure to build foreign SCM interface has been updated.
 

+ * Many more commands are now built-in.
+
+ * THREADED_DELTA_SEARCH is no more.  If you build with threads, delta
+   compression will always take advantage of it.

 
 Fixes since v1.6.6
 ------------------
 
 Fixes since v1.6.6
 ------------------


@@ -159,8 +194,25 @@ Fixes since v1.6.6
 All of the fixes in v1.6.6.X maintenance series are included in this
 release, unless otherwise noted.
 
 All of the fixes in v1.6.6.X maintenance series are included in this
 release, unless otherwise noted.
 

+ * "git branch -d branch" used to refuse deleting the branch even when
+   the branch is fully merged to its upstream branch if it is not merged
+   to the current branch.  It now deletes it in such a case.
+
+ * "git config -f <relative path>" run from a subdirectory misbehaved.
+   65807ee (builtin-config: Fix crash when using "-f <relative path>"
+   from non-root dir, 2010-01-26) may be merged to older maintenance
+   branches.
+
+ * 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.6.6.1-379-gd4556c4
+O=v1.7.0-rc1-6-g2ee8c5b

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