@ -8,7 +8,7 @@ When "git push [$there]" does not say what to push, we have used the
@@ -8,7 +8,7 @@ When "git push [$there]" does not say what to push, we have used the
traditional "matching" semantics so far (all your branches were sent
to the remote as long as there already are branches of the same name
over there). In Git 2.0, the default will change to the "simple"
semantics that pushes:
semantics, which pushes:
- only the current branch to the branch with the same name, and only
when the current branch is set to integrate with that remote
@ -53,9 +53,12 @@ Updates since v1.8.4
@@ -53,9 +53,12 @@ Updates since v1.8.4
Foreign interfaces, subsystems and ports.
* "git-svn" used with SVN 1.8.0 when talking over https:// connection
* "git-svn" has been taught to use the serf library, which is the
only option SVN 1.8.0 offers us when talking the HTTP protocol.
* "git-svn" talking over an https:// connection using the serf library
dumped core due to a bug in the serf library that SVN uses. Work
it around on our side, even though the SVN side is being fixed.
around it on our side, even though the SVN side is being fixed.
* On MacOS X, we detected if the filesystem needs the "pre-composed
unicode strings" workaround, but did not automatically enable it.
@ -65,10 +68,7 @@ Foreign interfaces, subsystems and ports.
@@ -65,10 +68,7 @@ Foreign interfaces, subsystems and ports.
repository relative to the home directory, e.g. "clone hg::~/there".
* imap-send ported to OS X uses Apple's security framework instead of
OpenSSL one.
* Subversion 1.8.0 that was recently released breaks older subversion
clients coming over http/https in various ways.
OpenSSL's.
* "git fast-import" treats an empty path given to "ls" as the root of
the tree.
@ -79,22 +79,22 @@ UI, Workflows & Features
@@ -79,22 +79,22 @@ UI, Workflows & Features
* xdg-open can be used as a browser backend for "git web-browse"
(hence to show "git help -w" output), when available.
* "git grep" and "git show" pays attention to "--textconv" option
* "git grep" and "git show" pay attention to the "--textconv" option
when these commands are told to operate on blob objects (e.g. "git
grep -e pattern HEAD:Makefile").
grep -e pattern --textconv HEAD:Makefile").
* "git replace" helper no longer allows an object to be replaced with
another object of a different type to avoid confusion (you can
still manually craft such replacement using "git update-ref", as an
still manually craft such a replacement using "git update-ref", as an
escape hatch).
* "git status" no longer prints dirty status information for
* "git status" no longer prints the dirty status information of
submodules for which submodule.$name.ignore is set to "all".
* "git rebase -i" honours core.abbrev when preparing the insn sheet
for editing.
* "git status" during a cherry-pick shows what original commit is
* "git status" during a cherry-pick shows which original commit is
being picked.
* Instead of typing four capital letters "HEAD", you can say "@" now,
@ -102,21 +102,21 @@ UI, Workflows & Features
@@ -102,21 +102,21 @@ UI, Workflows & Features
* "git check-ignore" follows the same rule as "git add" and "git
status" in that the ignore/exclude mechanism does not take effect
on paths that are already tracked. With "--no-index" option, it
on paths that are already tracked. With the "--no-index" option, it
can be used to diagnose which paths that should have been ignored
have been mistakenly added to the index.
* Some irrelevant "advice" messages that are shared with "git status"
output have been removed from the commit log template.
* "update-refs" learnt a "--stdin" option to read multiple update
* "update-refs" learned a "--stdin" option to read multiple update
requests and perform them in an all-or-none fashion.
* Just like "make -C <directory>", "git -C <directory> ..." tells Git
to go there before doing anything else.
* Just like "git checkout -" knows to check out and "git merge -"
knows to merge the branch you were previously on, "git cherry-pick"
* Just like "git checkout -" knows to check out, and "git merge -"
knows to merge, the branch you were previously on, "git cherry-pick"
now understands "git cherry-pick -" to pick from the previous
branch.
@ -126,56 +126,58 @@ UI, Workflows & Features
@@ -126,56 +126,58 @@ UI, Workflows & Features
"git status --porcelain" instead, as its format is stable and easier
to parse.
* Make "foo^{tag}" to peel a tag to itself, i.e. no-op., and fail if
"foo" is not a tag. "git rev-parse --verify v1.0^{tag}" would be
a more convenient way to say "test $(git cat-file -t v1.0) = tag".
* The ref syntax "foo^{tag}" (with the literal string "{tag}") peels a
tag ref to itself, i.e. it's a no-op., and fails if
"foo" is not a tag. "git rev-parse --verify v1.0^{tag}" is
a more convenient way than "test $(git cat-file -t v1.0) = tag" to
check if v1.0 is a tag.
* "git branch -v -v" (and "git status") did not distinguish among a
branch that does not build on any other branch, a branch that is in
sync with the branch it builds on, and a branch that is configured
to build on some other branch that no longer exists.
branch that is not based on any other branch, a branch that is in
sync with its upstream branch, and a branch that is configured with an
upstream branch that no longer exists.
* Earlier we started rejecting an attempt to add 0{40} object name to
* Earlier we started rejecting any attempt to add the 0{40} object name to
the index and to tree objects, but it sometimes is necessary to
allow so to be able to use tools like filter-branch to correct such
broken tree objects. "filter-branch" can again be used to to do
so.
allow this to be able to use tools like filter-branch to correct such
broken tree objects. "filter-branch" can again be used to do this.
* "git config" did not provide a way to set or access numbers larger
than a native "int" on the platform; it now provides 64-bit signed
integers on all platforms.
* "git pull --rebase" always chose to do the bog-standard flattening
rebase. You can tell it to run "rebase --preserve-merges" by
rebase. You can tell it to run "rebase --preserve-merges" with
"git pull --rebase=preserve" or by
setting "pull.rebase" configuration to "preserve".
* "git push --no-thin" actually disables the "thin pack transfer"
optimization.
* Magic pathspecs like ":(icase)makefile" that matches both Makefile
and makefile and ":(glob)foo/**/bar" that matches "bar" in "foo"
and any subdirectory of "foo" can be used in more places.
* Magic pathspecs like ":(icase)makefile" (matches both Makefile
and makefile) and ":(glob)foo/**/bar" (matches "bar" in "foo"
and any subdirectory of "foo") can be used in more places.
* The "http.*" variables can now be specified per URL that the
configuration applies. For example,
* The "http.*" variables can now be specified for individual URLs.
For example,
[http]
sslVerify = true
[http "https://weak.example.com/"]
sslVerify = false
would flip http.sslVerify off only when talking to that specified
would flip http.sslVerify off only when talking to that specific
site.
* "git mv A B" when moving a submodule A has been taught to
relocate its working tree and to adjust the paths in the
* "git mv A B" when moving a submodule has been taught to
relocate the submodule's working tree and to adjust the paths in the
.gitmodules file.
* "git blame" can now take more than one -L option to discover the
origin of multiple blocks of the lines.
origin of multiple blocks of lines.
* The http transport clients can optionally ask to save cookies
with http.savecookies configuration variable.
with the http.savecookies configuration variable.
* "git push" learned a more fine grained control over a blunt
"--force" when requesting a non-fast-forward update with the
@ -197,7 +199,7 @@ UI, Workflows & Features
@@ -197,7 +199,7 @@ UI, Workflows & Features
* "git whatchanged" may still be used by old timers, but mention of
it in documents meant for new users will only waste readers' time
wonderig what the difference is between it and "git log". Make it
wondering what the difference is between it and "git log". Make it
less prominent in the general part of the documentation and explain
that it is merely a "git log" with different default behaviour in
its own document.
@ -219,23 +221,23 @@ Performance, Internal Implementation, etc.
@@ -219,23 +221,23 @@ Performance, Internal Implementation, etc.
should apply the same "no subprocess or pipe" optimization as we
apply to user-supplied GIT_PAGER=cat.
* Many commands use --dashed-option as a operation mode selector
(e.g. "git tag --delete") that the user can use at most one
(e.g. "git tag --delete --verify" is a nonsense) and you cannot
negate (e.g. "git tag --no-delete" is a nonsense). parse-options
* Many commands use a --dashed-option as an operation mode selector
(e.g. "git tag --delete") that excludes other operation modes
(e.g. "git tag --delete --verify" is nonsense) and that cannot be
negated (e.g. "git tag --no-delete" is nonsense). The parse-options
API learned a new OPT_CMDMODE macro to make it easier to implement
such a set of options.
* OPT_BOOLEAN() in parse-options API was misdesigned to be "counting
* OPT_BOOLEAN() in the parse-options API was misdesigned to be "counting
up" but many subcommands expect it to behave as "on/off". Update
them to use OPT_BOOL() which is a proper boolean.
* "git gc" exits early without doing a double-work when it detects
* "git gc" exits early without doing any work when it detects
that another instance of itself is already running.
* Under memory pressure and/or file descriptor pressure, we used to
close pack windows that are not used and also closed filehandle to
an open but unused packfiles. These are now controlled separately
close pack windows that are not used and also closed filehandles to
open but unused packfiles. These are now controlled separately
to better cope with the load.
Also contains various documentation updates and code clean-ups.
@ -245,32 +247,32 @@ Fixes since v1.8.4
@@ -245,32 +247,32 @@ Fixes since v1.8.4
------------------
Unless otherwise noted, all the fixes since v1.8.4 in the maintenance
track are contained in this release (see release notes to them for
track are contained in this release (see the maintenance releases' notes for
details).
* An ancient How-To on serving Git repositories on an HTTP server
lacked a warning that it has been mostly superseded with more
lacked a warning that it has been mostly superseded with a more
modern way.
(merge 6d52bc3 sc/doc-howto-dumb-http later to maint).
* The interaction between use of Perl in our test suite and NO_PERL
* The interaction between the use of Perl in our test suite and NO_PERL
has been clarified a bit.
(merge f8fc0ee jn/test-prereq-perl-doc later to maint).
* The synopsis section of "git unpack-objects" documentation has been
* The synopsis section of the "git unpack-objects" documentation has been
clarified a bit.
(merge 61e2e22 vd/doc-unpack-objects later to maint).
* We did not generate HTML version of documentation to "git subtree"
* We did not generate the HTML version of the documentation to "git subtree"
in contrib/.
(merge 95c62fb jk/subtree-install-fix later to maint).
* A fast-import stream expresses a pathname with funny characters by
quoting them in C style; remote-hg remote helper forgot to unquote
quoting them in C style; the remote-hg remote helper forgot to unquote
such a path.
(merge 1136265 ap/remote-hg-unquote-cquote later to maint).
* "git reset -p HEAD" has a codepath to special case it to behave
* "git reset -p HEAD" has a codepath to special-case it to behave
differently from resetting to contents of other commits, but a
Junio C Hamano
11 years ago