diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-04-29 18:00:47 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-04-29 18:00:47 -0700 |
commit | 10d4332e007132a38dc61f03c760d355da5cd550 (patch) | |
tree | 7de6cfc4212e495b10f41ade9aa7de76b4117dff | |
parent | Merge branch 'js/daemon-test-race-fix' (diff) | |
download | tgif-10d4332e007132a38dc61f03c760d355da5cd550.tar.xz |
The seventh batch of topics graduated to 'master'
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | Documentation/RelNotes/1.7.11.txt | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/Documentation/RelNotes/1.7.11.txt b/Documentation/RelNotes/1.7.11.txt index af736591d2..429f304972 100644 --- a/Documentation/RelNotes/1.7.11.txt +++ b/Documentation/RelNotes/1.7.11.txt @@ -19,6 +19,9 @@ UI, Workflows & Features variables with REMOTE_USER and REMOTE_ADDR, but these variables are now preserved when set. + * "include.path" mechanism of the configuration files learned to + understand "~/path" and "~user/path". + * "git am" learned the "--include" option, which is an opposite of existing the "--exclude" option. @@ -47,12 +50,19 @@ Foreign Interface * "git svn" used to die with unwanted SIGPIPE when talking with HTTP server that uses keep-alive. + * "git svn" learned to use platform specific authentication + providers, e.g. gnome-keyring, kwallet, etc. + * "git p4" has been moved out of contrib/ area. Performance * "git apply" had some memory leaks plugged. + * "git repack" used to write out unreachable objects as loose objects + when repacking, even if such loose objects will immediately pruned + due to its age. + * Setting up a revision traversal with many starting points was inefficient as these were placed in a date-order priority queue one-by-one. Now they are collected in the queue unordered first, @@ -86,6 +96,12 @@ Unless otherwise noted, all the fixes since v1.7.10 in the maintenance releases are contained in this release (see release notes to them for details). + * The test scaffolding for git-daemon was flaky. + (merge 46e3581 js/daemon-test-race-fix later to maint). + + * The test scaffolding for fast-import was flaky. + (merge 7fb8e16 pw/t5800-import-race-fix later to maint). + * Octopus merge strategy did not reduce heads that are recorded in the final commit correctly. (merge 5802f81 jc/merge-reduce-parents-early later to maint). |