Documentation / RelNotes / 2.15.2.txton commit merge-options.txt: clarify meaning of various ff-related options (27fd1e4)
   1Git v2.15.2 Release Notes
   2=========================
   3
   4Fixes since v2.15.1
   5-------------------
   6
   7 * Recent update to the refs infrastructure implementation started
   8   rewriting packed-refs file more often than before; this has been
   9   optimized again for most trivial cases.
  10
  11 * The SubmittingPatches document has been converted to produce an
  12   HTML version via AsciiDoc/Asciidoctor.
  13
  14 * Contrary to the documentation, "git pull -4/-6 other-args" did not
  15   ask the underlying "git fetch" to go over IPv4/IPv6, which has been
  16   corrected.
  17
  18 * When "git rebase" prepared an mailbox of changes and fed it to "git
  19   am" to replay them, it was confused when a stray "From " happened
  20   to be in the log message of one of the replayed changes.  This has
  21   been corrected.
  22
  23 * Command line completion (in contrib/) has been taught about the
  24   "--copy" option of "git branch".
  25
  26 * "git apply --inaccurate-eof" when used with "--ignore-space-change"
  27   triggered an internal sanity check, which has been fixed.
  28
  29 * The sequencer machinery (used by "git cherry-pick A..B", and "git
  30   rebase -i", among other things) would have lost a commit if stopped
  31   due to an unlockable index file, which has been fixed.
  32
  33 * The three-way merge performed by "git cherry-pick" was confused
  34   when a new submodule was added in the meantime, which has been
  35   fixed (or "papered over").
  36
  37 * "git notes" sent its error message to its standard output stream,
  38   which was corrected.
  39
  40 * A few scripts (both in production and tests) incorrectly redirected
  41   their error output.  These have been corrected.
  42
  43 * Clarify and enhance documentation for "merge-base --fork-point", as
  44   it was clear what it computed but not why/what for.
  45
  46 * This release also contains the fixes made in the v2.13.7 version of
  47   Git.  See its release notes for details.
  48
  49
  50Also contains various documentation updates and code clean-ups.