Documentation / RelNotes / 2.5.1.txton commit Merge branch 'en/merge-options-ff-and-friends' (9bc67b6)
   1Git v2.5.1 Release Notes
   2========================
   3
   4Fixes since v2.5
   5----------------
   6
   7 * Running an aliased command from a subdirectory when the .git thing
   8   in the working tree is a gitfile pointing elsewhere did not work.
   9
  10 * Often a fast-import stream builds a new commit on top of the
  11   previous commit it built, and it often unconditionally emits a
  12   "from" command to specify the first parent, which can be omitted in
  13   such a case.  This caused fast-import to forget the tree of the
  14   previous commit and then re-read it from scratch, which was
  15   inefficient.  Optimize for this common case.
  16
  17 * The "rev-parse --parseopt" mode parsed the option specification
  18   and the argument hint in a strange way to allow '=' and other
  19   special characters in the option name while forbidding them from
  20   the argument hint.  This made it impossible to define an option
  21   like "--pair <key>=<value>" with "pair=key=value" specification,
  22   which instead would have defined a "--pair=key <value>" option.
  23
  24 * A "rebase" replays changes of the local branch on top of something
  25   else, as such they are placed in stage #3 and referred to as
  26   "theirs", while the changes in the new base, typically a foreign
  27   work, are placed in stage #2 and referred to as "ours".  Clarify
  28   the "checkout --ours/--theirs".
  29
  30 * An experimental "untracked cache" feature used uname(2) in a
  31   slightly unportable way.
  32
  33 * "sparse checkout" misbehaved for a path that is excluded from the
  34   checkout when switching between branches that differ at the path.
  35
  36 * The low-level "git send-pack" did not honor 'user.signingkey'
  37   configuration variable when sending a signed-push.
  38
  39 * An attempt to delete a ref by pushing into a repository whose HEAD
  40   symbolic reference points at an unborn branch that cannot be
  41   created due to ref D/F conflict (e.g. refs/heads/a/b exists, HEAD
  42   points at refs/heads/a) failed.
  43
  44 * "git subtree" (in contrib/) depended on "git log" output to be
  45   stable, which was a no-no.  Apply a workaround to force a
  46   particular date format.
  47
  48 * "git clone $URL" in recent releases of Git contains a regression in
  49   the code that invents a new repository name incorrectly based on
  50   the $URL.  This has been corrected.
  51   (merge db2e220 jk/guess-repo-name-regression-fix later to maint).
  52
  53 * Running tests with the "-x" option to make them verbose had some
  54   unpleasant interactions with other features of the test suite.
  55   (merge 9b5fe78 jk/test-with-x later to maint).
  56
  57 * "git pull" in recent releases of Git has a regression in the code
  58   that allows custom path to the --upload-pack=<program>.  This has
  59   been corrected.
  60
  61 * pipe() emulation used in Git for Windows looked at a wrong variable
  62   when checking for an error from an _open_osfhandle() call.
  63
  64Also contains typofixes, documentation updates and trivial code
  65clean-ups.