diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-10-21 22:08:10 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-10-21 22:24:34 +0400 |
commit | 8963314c77af9a4eda5dcbdbab3d4001af83ad81 (patch) | |
tree | c53534fd3c350894ef00371f96c276330e75173a /Documentation | |
parent | 6cf53d7df689257816370294d46f819e6e8497e8 (diff) | |
parent | 8742218f21e1e87cf9fceb11b9c14927af5ff33f (diff) |
Sync with maint
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/RelNotes/1.7.7.1.txt | 20 | ||||
-rw-r--r-- | Documentation/RelNotes/1.7.8.txt | 24 |
2 files changed, 20 insertions, 24 deletions
diff --git a/Documentation/RelNotes/1.7.7.1.txt b/Documentation/RelNotes/1.7.7.1.txt index 02d7c02a00..fecfac8a16 100644 --- a/Documentation/RelNotes/1.7.7.1.txt +++ b/Documentation/RelNotes/1.7.7.1.txt @@ -4,6 +4,26 @@ Git v1.7.7.1 Release Notes Fixes since v1.7.7 ------------------ + * On some BSD systems, adding +s bit on directories is detrimental + (it is not necessary on BSD to begin with). The installation + procedure has been updated to take this into account. + + * After incorrectly written third-party tools store a tag object in + HEAD, git diagnosed it as a repository corruption and refused to + proceed in order to avoid spreading the damage. We now gracefully + recover from such a situation by pretending as if the commit that + is pointed at by the tag were in HEAD. + + * "git apply --whitespace=error" did not bother to report the exact + line number in the patch that introduced new blank lines at the end + of the file. + + * "git apply --index" did not check corrupted patch. + + * "git checkout $tree $directory/" resurrected paths locally removed or + modified only in the working tree in $directory/ that did not appear + in $directory of the given $tree. They should have been kept intact. + * "git diff $tree $path" used to apply the pathspec at the output stage, reading the whole tree, wasting resources. diff --git a/Documentation/RelNotes/1.7.8.txt b/Documentation/RelNotes/1.7.8.txt index c8eb0eb5ab..886dfbfaa5 100644 --- a/Documentation/RelNotes/1.7.8.txt +++ b/Documentation/RelNotes/1.7.8.txt @@ -14,10 +14,6 @@ Updates since v1.7.7 * The date parser now accepts timezone designators that lack minutes part and also has a colon between "hh:mm". - * On some BSD systems, adding +s bit on directories is detrimental - (it is not necessary on BSD to begin with). The installation - procedure has been updated to take this into account. - * The contents of the /etc/mailname file, if exists, is used as the default value of the hostname part of the committer/author e-mail. @@ -135,13 +131,6 @@ included in this release. with too many refs were unnecessarily slow. (merge 17d68a54d jp/get-ref-dir-unsorted later to maint). - * After incorrectly written third-party tools store a tag object in - HEAD, git diagnosed it as a repository corruption and refused to - proceed in order to avoid spreading the damage. We now gracefully - recover from such a situation by pretending as if the commit that - is pointed at by the tag were in HEAD. - (merge baf18fc nd/maint-autofix-tag-in-head later to maint). - * Report from "git commit" on untracked files was confused under core.ignorecase option. (merge 2548183b jk/name-hash-dirent later to maint). @@ -150,23 +139,10 @@ included in this release. core.ignorecase was set. (merge 6eba621 bc/attr-ignore-case later to maint). - * "git apply --whitespace=error" did not bother to report the exact - line number in the patch that introduced new blank lines at the end - of the file. - (merge 8557263 jc/apply-blank-at-eof-fix later to maint). - - * "git apply --index" did not check corrupted patch. - (merge 2c93286 jm/maint-apply-detects-corrupt-patch-header later to maint). - * "git bisect" did not notice when it failed to update the working tree to the next commit to be tested. (merge 1acf11717 js/bisect-no-checkout later to maint). - * "git checkout $tree $directory/" resurrected paths locally removed or - modified only in the working tree in $directory/ that did not appear - in $directory of the given $tree. They should have been kept intact. - (merge 0a1283b jc/checkout-from-tree-keep-local-changes later to maint). - * "git config --bool --get-regexp" failed to separate the variable name and its value "true" when the variable is defined without "= true". (merge 880e3cc mm/maint-config-explicit-bool-display later to maint). |