diff options
Diffstat (limited to 'Documentation/RelNotes-1.6.0.txt')
| -rw-r--r-- | Documentation/RelNotes-1.6.0.txt | 62 |
1 files changed, 51 insertions, 11 deletions
diff --git a/Documentation/RelNotes-1.6.0.txt b/Documentation/RelNotes-1.6.0.txt index 03e3a59ff5..e1f013bd3b 100644 --- a/Documentation/RelNotes-1.6.0.txt +++ b/Documentation/RelNotes-1.6.0.txt @@ -4,9 +4,6 @@ GIT v1.6.0 Release Notes User visible changes -------------------- -[[Note that none of these are not merged to 'master' as of this writing -but they will be before 1.6.0 happens]] - With the default Makefile settings, most of the programs are now installed outside your $PATH, except for "git", "gitk", "git-gui" and some server side programs that need to be accessible for technical @@ -21,6 +18,18 @@ scripts to use "git xyzzy" form, as we will stop installing Source changes needed for porting to MinGW environment are now all in the main git.git codebase. +By default, packfiles created with this version uses delta-base-offset +encoding introduced in v1.4.4. Pack idx files are using version 2 that +allows larger packs and added robustness thanks to its CRC checking, +introduced in v1.5.2. + +GIT_CONFIG, which was only documented as affecting "git config", but +actually affected all git commands, now only affects "git config". +GIT_LOCAL_CONFIG, also only documented as affecting "git config" and +not different from GIT_CONFIG in a useful way, is removed. + +An ancient merge strategy "stupid" has been removed. + Updates since v1.5.6 -------------------- @@ -30,8 +39,13 @@ Updates since v1.5.6 * git-p4 in contrib learned "allowSubmit" configuration to control on which branch to allow "submit" subcommand. +* git-gui learned to stage changes per-line. + (portability) +* Changes for MinGW port have been merged, thanks to Johannes Sixt and + gangs. + * Sample hook scripts shipped in templates/ are now suffixed with *.sample. We used to prevent them from triggering by default by relying on the fact that we install them as unexecutable, but on @@ -46,7 +60,8 @@ Updates since v1.5.6 * Updated howto/update-hook-example -* Got rid of usage of "git-foo" from the tutorial. +* Got rid of usage of "git-foo" from the tutorial and made typography + more consistent. * Disambiguating "--" between revs and paths is finally documented. @@ -77,17 +92,44 @@ Updates since v1.5.6 (usability, bells and whistles) +* A new environment variable GIT_CEILING_DIRECTORIES can be used to stop + the discovery process of the toplevel of working tree; this may be useful + when you are working in a slow network disk and are outside any working tree, + as bash-completion and "git help" may still need to run in these places. + +* git-apply can handle a patch that touches the same path more than once + much better than before. + +* git-apply can be told not to trust the line counts recorded in the input + patch but recount, with the new --recount option. + * git-archive can be told to omit certain paths from its output using export-ignore attributes. +* git-clone can clone from a remote whose URL would be rewritten by + configuration stored in $HOME/.gitconfig now. + +* git-diff --check now checks leftover merge conflict markers. + +* When remote side used to have branch 'foo' and git-fetch finds that now + it has branch 'foo/bar', it refuses to lose the existing remote tracking + branch and its reflog. The error message has been improved to suggest + pruning the remote if the user wants to proceed and get the latest set + of branches from the remote, including such 'foo/bar'. + * fast-export learned to export and import marks file; this can be used to interface with fast-import incrementally. -* Original SHA-1 value for "update-ref -d" is optional now. +* "git rerere" can be told to update the index with auto-reused resolution + with rerere.autoupdate configuration variable. + +* git-send-mail can talk not just over SSL but over TLS now. * You can tell "git status -u" to even more aggressively omit checking untracked files with --untracked-files=no. +* Original SHA-1 value for "update-ref -d" is optional now. + * Error codes from gitweb are made more descriptive where possible, rather than "403 forbidden" as we used to issue everywhere. @@ -100,14 +142,12 @@ Fixes since v1.5.6 All of the fixes in v1.5.6 maintenance series are included in this release, unless otherwise noted. - * diff -c/--cc showed unnecessary "deletion" lines at the context - boundary (needs backmerge to maint). - - * "git-clone <src> <dst>" did not create leading directories for <dst> - like the scripted version used to do (needs backport to maint). + * "git fetch" into an empty repository used to remind the fetch will + be huge by saying "no common commits", but it is already known by + the user anyway (need to backport 8cb560f to 'maint'). --- exec >/var/tmp/1 -O=v1.5.6.1-104-ga08b868 +O=v1.5.6.2-246-g86d7244 echo O=$(git describe refs/heads/master) git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint |