diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-12-04 00:23:50 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-12-04 00:23:55 +0100 |
commit | b281796eeb925f5e91d27cd6c6c579c925577160 (patch) | |
tree | 81a2a185c76af961dfa5145a30779b5f59170202 /Documentation/RelNotes | |
parent | Update draft release notes to 1.7.4 (diff) | |
parent | Git 1.7.3.3 (diff) | |
download | git-b281796eeb925f5e91d27cd6c6c579c925577160.tar.xz git-b281796eeb925f5e91d27cd6c6c579c925577160.zip |
Merge branch 'maint' to sync with Git 1.7.3.3
* maint:
Git 1.7.3.3
CodingGuidelines: mention whitespace preferences for shell scripts
Documentation: do not misinterpret pull refspec as bold text
Conflicts:
Documentation/git-pull.txt
RelNotes
Diffstat (limited to 'Documentation/RelNotes')
-rw-r--r-- | Documentation/RelNotes/1.7.3.3.txt | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Documentation/RelNotes/1.7.3.3.txt b/Documentation/RelNotes/1.7.3.3.txt index 8d547efacf..9b2b2448df 100644 --- a/Documentation/RelNotes/1.7.3.3.txt +++ b/Documentation/RelNotes/1.7.3.3.txt @@ -1,6 +1,15 @@ Git v1.7.3.3 Release Notes ========================== +In addition to the usual fixes, this release also includes support for +the new "add.ignoreErrors" name given to the existing "add.ignore-errors" +configuration variable. + +The next version, Git 1.7.4, and future versions, will support both +old and incorrect name and the new corrected name, but without this +backport, users who want to use the new name "add.ignoreErrors" in +their repositories cannot use older versions of Git. + Fixes since v1.7.3.2 -------------------- @@ -42,5 +51,4 @@ Fixes since v1.7.3.2 * "git-p4" (in contrib/) did not correctly handle deleted files. - -Other minor fixes and documentation updates may be included. +Other minor fixes and documentation updates are also included. |