Documentation / RelNotes / 1.6.5.6.txton commit Merge branch 'en/merge-options-ff-and-friends' (9bc67b6)
   1Git v1.6.5.6 Release Notes
   2==========================
   3
   4Fixes since v1.6.5.5
   5--------------------
   6
   7 * "git add -p" had a regression since v1.6.5.3 that broke deletion of
   8   non-empty files.
   9
  10 * "git archive -o o.zip -- Makefile" produced an archive in o.zip
  11   but in POSIX tar format.
  12
  13 * Error message given to "git pull --rebase" when the user didn't give
  14   enough clue as to what branch to integrate with still talked about
  15   "merging with" the branch.
  16
  17 * Error messages given by "git merge" when the merge resulted in a
  18   fast-forward still were in plumbing lingo, even though in v1.6.5
  19   we reworded messages in other cases.
  20
  21 * The post-upload-hook run by upload-pack in response to "git fetch" has
  22   been removed, due to security concerns (the hook first appeared in
  23   1.6.5).