![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 323ae54007c78c9946f6b76013f8fff75eed8d11..43e3f336150e1869bdae01823471d7ab216584a8 100644 (file)
Notes on behaviour change
-------------------------
Notes on behaviour change
-------------------------
- * "git push" into a branch that is currently checked out (i.e. pointed by
+ * "git push" into a branch that is currently checked out (i.e. pointed at by
HEAD in a repository that is not bare) is refused by default.
Similarly, "git push $there :$killed" to delete the branch $killed
HEAD in a repository that is not bare) is refused by default.
Similarly, "git push $there :$killed" to delete the branch $killed
patch series with more than two messages. All messages will be sent
as a reply to the first message, i.e. cover letter.
patch series with more than two messages. All messages will be sent
as a reply to the first message, i.e. cover letter.
- It has been possible to configure send-email to send "shallow thread"
+ It has been possible already to configure send-email to send "shallow thread"
by setting sendemail.chainreplyto configuration variable to false. The
only thing this release does is to change the default when you haven't
configured that variable.
by setting sendemail.chainreplyto configuration variable to false. The
only thing this release does is to change the default when you haven't
configured that variable.
* "git diff" traditionally treated various "ignore whitespace" options
only as a way to filter the patch output. "git diff --exit-code -b"
exited with non-zero status even if all changes were about changing the
* "git diff" traditionally treated various "ignore whitespace" options
only as a way to filter the patch output. "git diff --exit-code -b"
exited with non-zero status even if all changes were about changing the
- ammount of whitespace and nothing else. and "git diff -b" showed the
+ amount of whitespace and nothing else; and "git diff -b" showed the
"diff --git" header line for such a change without patch text.
In this release, the "ignore whitespaces" options affect the semantics
"diff --git" header line for such a change without patch text.
In this release, the "ignore whitespaces" options affect the semantics
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
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
--------------------
* "git svn" support of subversion "merge tickets" and miscellaneous fixes.
* "git svn" support of subversion "merge tickets" and miscellaneous fixes.
- * "gitk" updates.
+ * "gitk" and "git gui" translation updates.
+
+ * "gitweb" updates (code clean-up, load checking etc.)
(portability)
(portability)
defaults to the current branch, so "git fetch && git merge @{upstream}"
will be equivalent to "git pull".
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
+ * "git am --resolved" has a synonym "git am --continue".
+
+ * "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
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
* "git fetch --all" can now be used in place of "git remote update".
* "git grep" does not rely on external grep anymore. It can use more than
* "git fetch --all" can now be used in place of "git remote update".
* "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.
+ one thread to accelerate the operation.
* "git grep" learned "--quiet" option.
* "git grep" learned "--quiet" option.
* "git rebase --onto A...B" means the history is replayed on top of the
merge base between A and B.
* "git rebase --onto A...B" means the history is replayed on top of the
merge base between A and B.
- * "git rebase -i" learned new action "fixup", that squashes the change
+ * "git rebase -i" learned new action "fixup" that squashes the change
but does not affect existing log message.
but does not affect existing log message.
- * "git rebase -i" also learned --autosquash option, that is useful
+ * "git rebase -i" also learned --autosquash option that is useful
together with the new "fixup" action.
together with the new "fixup" action.
- * "git remote" learned set-url subcommand, to update (surprise!) url
+ * "git remote" learned set-url subcommand that updates (surprise!) url
for an existing remote nickname.
* "git rerere" learned "forget path" subcommand. Together with "git
for an existing remote nickname.
* "git rerere" learned "forget path" subcommand. Together with "git
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.
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.
+ * "fiter-branch" command incorrectly said --prune-empty and --filter-commit
+ were incompatible; the latter should be read as --commit-filter.
* 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
* 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
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.
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
-O=v1.7.0-rc1-6-g2ee8c5b
-echo O=$(git describe master)
-git shortlog --no-merges $O..master ^maint