diff options
Diffstat (limited to 'Documentation/RelNotes')
| -rw-r--r-- | Documentation/RelNotes/2.15.1.txt | 23 | ||||
| -rw-r--r-- | Documentation/RelNotes/2.16.0.txt | 90 |
2 files changed, 92 insertions, 21 deletions
diff --git a/Documentation/RelNotes/2.15.1.txt b/Documentation/RelNotes/2.15.1.txt index 15b24a0b76..a6ae4c1aeb 100644 --- a/Documentation/RelNotes/2.15.1.txt +++ b/Documentation/RelNotes/2.15.1.txt @@ -13,7 +13,7 @@ Fixes since v2.15 latter, which has been fixed. * The experimental "color moved lines differently in diff output" - feature was buggy around "ignore whitespace changes" edges, whihch + feature was buggy around "ignore whitespace changes" edges, which has been corrected. * Instead of using custom line comparison and hashing functions to @@ -24,7 +24,7 @@ Fixes since v2.15 HEAD points at, which have been fixed. * "git commit", after making a commit, did not check for errors when - asking on what branch it made the commit, which has been correted. + asking on what branch it made the commit, which has been corrected. * "git status --ignored -u" did not stop at a working tree of a separate project that is embedded in an ignored directory and @@ -35,7 +35,7 @@ Fixes since v2.15 --recurse-submodules" has been fixed. * A recent regression in "git rebase -i" that broke execution of git - commands from subdirectories via "exec" insn has been fixed. + commands from subdirectories via "exec" instruction has been fixed. * "git check-ref-format --branch @{-1}" bit a "BUG()" when run outside a repository for obvious reasons; clarify the documentation @@ -64,5 +64,22 @@ Fixes since v2.15 * Updates from GfW project. + * "git rebase -i" recently started misbehaving when a submodule that + is configured with 'submodule.<name>.ignore' is dirty; this has + been corrected. + + * Some error messages did not quote filenames shown in it, which have + been fixed. + + * Building with NO_LIBPCRE1_JIT did not disable it, which has been fixed. + + * We used to add an empty alternate object database to the system + that does not help anything; it has been corrected. + + * Error checking in "git imap-send" for empty response has been + improved. + + * An ancient bug in "git apply --ignore-space-change" codepath has + been fixed. Also contains various documentation updates and code clean-ups. diff --git a/Documentation/RelNotes/2.16.0.txt b/Documentation/RelNotes/2.16.0.txt index 12b86ebb4a..3f2909498f 100644 --- a/Documentation/RelNotes/2.16.0.txt +++ b/Documentation/RelNotes/2.16.0.txt @@ -63,6 +63,20 @@ UI, Workflows & Features HTML version via AsciiDoc/Asciidoctor. (merge 049e64aa50 bc/submitting-patches-in-asciidoc later to maint). + * We learned to talk to watchman to speed up "git status" and other + operations that need to see which paths have been modified. + + * The "diff" family of commands learned to ignore differences in + carriage return at the end of line. + + * Places that know about "sendemail.to", like documentation and shell + completion (in contrib/) have been taught about "sendemail.tocmd", + too. + + * "git add --renormalize ." is a new and safer way to record the fact + that you are correcting the end-of-line convention and other + "convert_to_git()" glitches in the in-repository data. + Performance, Internal Implementation, Development Support etc. @@ -90,18 +104,15 @@ Performance, Internal Implementation, Development Support etc. * Conversion from uchar[20] to struct object_id continues. * Code cleanup. - (merge 62a24c8923 rs/hex-to-bytes-cleanup later to maint). * A single-word "unsigned flags" in the diff options is being split into a structure with many bitfields. - (merge 0d1e0e7801 bw/diff-opt-impl-to-bitfields later to maint). * TravisCI build updates. * Parts of a test to drive the long-running content filter interface has been split into its own module, hopefully to eventually become reusable. - (merge 0fe8d516bb cc/git-packet-pm later to maint). * Drop (perhaps overly cautious) sanity check before using the index read from the filesystem at runtime. @@ -119,7 +130,7 @@ Fixes since v2.15 latter, which has been fixed. * The experimental "color moved lines differently in diff output" - feature was buggy around "ignore whitespace changes" edges, whihch + feature was buggy around "ignore whitespace changes" edges, which has been corrected. * Instead of using custom line comparison and hashing functions to @@ -130,7 +141,7 @@ Fixes since v2.15 HEAD points at, which have been fixed. * "git commit", after making a commit, did not check for errors when - asking on what branch it made the commit, which has been correted. + asking on what branch it made the commit, which has been corrected. * "git status --ignored -u" did not stop at a working tree of a separate project that is embedded in an ignored directory and @@ -141,7 +152,7 @@ Fixes since v2.15 --recurse-submodules" has been fixed. * A recent regression in "git rebase -i" that broke execution of git - commands from subdirectories via "exec" insn has been fixed. + commands from subdirectories via "exec" instruction has been fixed. * A (possibly flakey) test fix. @@ -178,7 +189,6 @@ Fixes since v2.15 * Error checking in "git imap-send" for empty response has been improved. - (merge 618ec81abb rs/imap-send-next-arg-fix later to maint). * Recent update to the refs infrastructure implementation started rewriting packed-refs file more often than before; this has been @@ -187,25 +197,69 @@ Fixes since v2.15 * Some error messages did not quote filenames shown in it, which have been fixed. - (merge 0a288d1ee9 sr/wrapper-quote-filenames later to maint). * "git rebase -i" recently started misbehaving when a submodule that is configured with 'submodule.<name>.ignore' is dirty; this has been corrected. - (merge c6d8ccf3a2 bw/rebase-i-ignored-submodule-fix later to maint). * Building with NO_LIBPCRE1_JIT did not disable it, which has been fixed. - (merge 2fff1e196d ab/pcre-v2 later to maint). * We used to add an empty alternate object database to the system that does not help anything; it has been corrected. - (merge f28e36686a jk/info-alternates-fix later to maint). + + * Doc update around use of "format-patch --subject-prefix" etc. + + * A fix for an ancient bug in "git apply --ignore-space-change" codepath. + + * Clarify and enhance documentation for "merge-base --fork-point", as + it was clear what it computed but not why/what for. + (merge 6d1700b8af jc/merge-base-fork-point-doc later to maint). + + * A few scripts (both in production and tests) incorrectly redirected + their error output. These have been corrected. + (merge eadf1c8f45 tz/redirect-fix later to maint). + + * "git notes" sent its error message to its standard output stream, + which was corrected. + (merge 89b9e31dd5 tz/notes-error-to-stderr later to maint). + + * The three-way merge performed by "git cherry-pick" was confused + when a new submodule was added in the meantime, which has been + fixed (or "papered over"). + (merge c641ca6707 sb/test-cherry-pick-submodule-getting-in-a-way later to maint). + + * The sequencer machinery (used by "git cherry-pick A..B", and "git + rebase -i", among other things) would have lost a commit if stopped + due to an unlockable index file, which has been fixed. + (merge bd58886775 pw/sequencer-recover-from-unlockable-index later to maint). + + * "git apply --inaccurate-eof" when used with "--ignore-space-change" + triggered an internal sanity check, which has been fixed. + (merge 4855de1233 rs/apply-inaccurate-eof-with-incomplete-line later to maint). + + * Command line completion (in contrib/) has been taught about the + "--copy" option of "git branch". + (merge 41ca0f773e tz/complete-branch-copy later to maint). + + * When "git rebase" prepared an mailbox of changes and fed it to "git + am" to replay them, it was confused when a stray "From " happened + to be in the log message of one of the replayed changes. This has + been corrected. + (merge ae3b2b04bb ew/rebase-mboxrd later to maint). + + * There was a recent semantic mismerge in the codepath to write out a + section of a configuration section, which has been corrected. + (merge 782c030ea2 rs/config-write-section-fix later to maint). + + * Mentions of "git-rebase" and "git-am" (dashed form) still remained + in end-user visible strings emitted by the "git rebase" command; + they have been corrected. + (merge 82cb775c06 ks/rebase-no-git-foo later to maint). + + * Contrary to the documentation, "git pull -4/-6 other-args" did not + ask the underlying "git fetch" to go over IPv4/IPv6, which has been + corrected. + (merge ffb4568afe sw/pull-ipv46-passthru later to maint). * Other minor doc, test and build updates and code cleanups. - (merge 804862209b ao/merge-verbosity-getenv-just-once later to maint). - (merge 9360ec0002 rs/sequencer-rewrite-file-cleanup later to maint). - (merge f4e45cb3eb ma/bisect-leakfix later to maint). - (merge 4da72644b7 ma/reduce-heads-leakfix later to maint). - (merge 3dc5433fd5 ad/rebase-i-serie-typofix later to maint). - (merge 5313bee032 tz/fsf-address-update later to maint). - (merge 5555a2aa4b cb/t4201-robustify later to maint). + (merge c5e3bc6ec4 sd/branch-copy later to maint). |