2011-04-19 22:51:00 +04:00
|
|
|
Git v1.7.5 Release Notes
|
2011-02-28 23:28:20 +03:00
|
|
|
========================
|
|
|
|
|
|
|
|
Updates since v1.7.4
|
|
|
|
--------------------
|
|
|
|
|
|
|
|
* Various MinGW portability fixes.
|
|
|
|
|
|
|
|
* Various git-p4 enhancements (in contrib).
|
|
|
|
|
2011-04-14 01:01:03 +04:00
|
|
|
* Various vcs-svn, git-svn and gitk enhancements and fixes.
|
2011-03-10 03:21:16 +03:00
|
|
|
|
2011-03-27 07:17:15 +04:00
|
|
|
* Various git-gui updates (0.14.0).
|
|
|
|
|
2011-03-16 01:17:54 +03:00
|
|
|
* Update to more modern HP-UX port.
|
|
|
|
|
2011-04-03 11:18:50 +04:00
|
|
|
* The codebase is getting prepared for i18n/l10n; no translated
|
|
|
|
strings nor translation mechanism in the code yet, but the strings
|
|
|
|
are being marked for l10n.
|
2011-03-21 08:24:24 +03:00
|
|
|
|
2011-03-23 08:02:24 +03:00
|
|
|
* The bash completion script can now complete symmetric difference
|
|
|
|
for "git diff" command, e.g. "git diff ...bra<TAB>".
|
|
|
|
|
2011-03-27 07:17:15 +04:00
|
|
|
* The default minimum length of abbreviated and unique object names
|
|
|
|
can now be configured by setting the core.abbrev configuration
|
|
|
|
variable.
|
|
|
|
|
2011-03-16 01:17:54 +03:00
|
|
|
* "git apply -v" reports offset lines when the patch does not apply at
|
|
|
|
the exact location recorded in the diff output.
|
|
|
|
|
2011-02-28 23:28:20 +03:00
|
|
|
* "git config" used to be also known as "git repo-config", but the old
|
|
|
|
name is now officially deprecated.
|
|
|
|
|
|
|
|
* "git checkout --detach <commit>" is a more user friendly synonym for
|
|
|
|
"git checkout <commit>^0".
|
|
|
|
|
2011-03-16 12:23:23 +03:00
|
|
|
* "git checkout" performed on detached HEAD gives a warning and
|
2011-03-16 01:17:54 +03:00
|
|
|
advice when the commit being left behind will become unreachable from
|
|
|
|
any branch or tag.
|
|
|
|
|
2011-03-16 12:23:23 +03:00
|
|
|
* "git cherry-pick" and "git revert" can be told to use a custom merge
|
2011-02-28 23:28:20 +03:00
|
|
|
strategy, similar to "git rebase".
|
|
|
|
|
2011-03-10 03:21:16 +03:00
|
|
|
* "git cherry-pick" remembers which commit failed to apply when it is
|
|
|
|
stopped by conflicts, making it unnecessary to use "commit -c $commit"
|
|
|
|
to conclude it.
|
|
|
|
|
2011-03-16 01:17:54 +03:00
|
|
|
* "git cvsimport" bails out immediately when the cvs server cannot be
|
|
|
|
reached, without spewing unnecessary error messages that complain about
|
|
|
|
the server response it never got.
|
|
|
|
|
2011-03-23 08:02:24 +03:00
|
|
|
* "git fetch" vs "git upload-pack" transfer learned 'no-done'
|
|
|
|
protocol extension to save one round-trip after the content
|
|
|
|
negotiation is done. This saves one HTTP RPC, reducing the overall
|
|
|
|
latency for a trivial fetch.
|
|
|
|
|
2011-04-06 21:57:32 +04:00
|
|
|
* "git fetch" can be told to recursively fetch submodules on-demand.
|
|
|
|
|
2011-03-21 08:24:24 +03:00
|
|
|
* "git grep -f <filename>" learned to treat "-" as "read from the
|
|
|
|
standard input stream".
|
|
|
|
|
2011-03-10 03:21:16 +03:00
|
|
|
* "git grep --no-index" did not honor pathspecs correctly, returning
|
|
|
|
paths outside the specified area.
|
|
|
|
|
2011-04-03 11:18:50 +04:00
|
|
|
* "git init" learned the --separate-git-dir option to allow the git
|
|
|
|
directory for a new repository created elsewhere and linked via the
|
|
|
|
gitdir mechanism. This is primarily to help submodule support later
|
|
|
|
to switch between a branch of superproject that has the submodule
|
|
|
|
and another that does not.
|
|
|
|
|
2011-03-16 12:23:23 +03:00
|
|
|
* "git log" type commands now understand globbing pathspecs. You
|
2011-03-16 01:17:54 +03:00
|
|
|
can say "git log -- '*.txt'" for example.
|
|
|
|
|
2011-03-23 08:02:24 +03:00
|
|
|
* "git log" family of commands learned --cherry and --cherry-mark
|
|
|
|
options that can be used to view two diverged branches while omitting
|
|
|
|
or highlighting equivalent changes that appear on both sides of a
|
|
|
|
symmetric difference (e.g. "log --cherry A...B").
|
|
|
|
|
2011-04-03 11:18:50 +04:00
|
|
|
* A lazy "git merge" that didn't say what to merge used to be an error.
|
|
|
|
When run on a branch that has an upstream defined, however, the command
|
|
|
|
now merges from the configured upstream.
|
|
|
|
|
2011-03-21 08:24:24 +03:00
|
|
|
* "git mergetool" learned how to drive "beyond compare 3" as well.
|
|
|
|
|
|
|
|
* "git rerere forget" without pathspec used to forget all the saved
|
|
|
|
conflicts that relate to the current merge; it now requires you to
|
|
|
|
give it pathspecs.
|
|
|
|
|
2011-03-16 12:23:23 +03:00
|
|
|
* "git rev-list --objects $revs -- $pathspec" now limits the objects listed
|
2011-02-28 23:28:20 +03:00
|
|
|
in its output properly with the pathspec, in preparation for narrow
|
|
|
|
clones.
|
|
|
|
|
2011-03-16 01:17:54 +03:00
|
|
|
* "git push" with no parameters gives better advice messages when
|
|
|
|
"tracking" is used as the push.default semantics or there is no remote
|
|
|
|
configured yet.
|
2011-02-28 23:28:20 +03:00
|
|
|
|
2011-04-06 21:57:32 +04:00
|
|
|
* A possible value to the "push.default" configuration variable,
|
|
|
|
'tracking', gained a synonym that more naturally describes what it
|
|
|
|
does, 'upstream'.
|
|
|
|
|
2011-03-16 12:23:23 +03:00
|
|
|
* "git rerere" learned a new subcommand "remaining" that is similar to
|
|
|
|
"status" and lists the paths that had conflicts which are known to
|
2011-02-28 23:28:20 +03:00
|
|
|
rerere, but excludes the paths that have already been marked as
|
|
|
|
resolved in the index from its output. "git mergetool" has been
|
|
|
|
updated to use this facility.
|
|
|
|
|
|
|
|
Also contains various documentation updates.
|
|
|
|
|
|
|
|
|
|
|
|
Fixes since v1.7.4
|
|
|
|
------------------
|
|
|
|
|
|
|
|
All of the fixes in the v1.7.4.X maintenance series are included in this
|
|
|
|
release, unless otherwise noted.
|
|
|
|
|
2011-03-23 08:02:24 +03:00
|
|
|
* "git fetch" from a client that is mostly following the remote
|
|
|
|
needlessly told all of its refs to the server for both sides to
|
|
|
|
compute the set of objects that need to be transferred efficiently,
|
|
|
|
instead of stopping when the server heard enough. In a project with
|
|
|
|
many tags, this turns out to be extremely wasteful, especially over
|
|
|
|
the smart HTTP transport (sp/maint-{upload,fetch}-pack-stop-early~1).
|
|
|
|
|
|
|
|
* "git fetch" run from a repository that uses the same repository as
|
|
|
|
its alternate object store as the repository it is fetching from
|
|
|
|
did not tell the server that it already has access to objects
|
|
|
|
reachable from the refs in their common alternate object store,
|
|
|
|
causing it to fetch unnecessary objects (jc/maint-fetch-alt).
|
|
|
|
|
2011-04-06 21:57:32 +04:00
|
|
|
* "git remote add --mirror" created a configuration that is suitable for
|
|
|
|
doing both a mirror fetch and a mirror push at the same time, which
|
|
|
|
made little sense. We now warn and require the command line to specify
|
|
|
|
either --mirror=fetch or --mirror=push.
|