What's in git.git (stable frozen)

There are a good deal of bugfixes in 'master', the largest of which is Brandon Casey's fix to builtin-commit and others' misuse of lockfile API. A tentative fix for the issue was pushed out last night but the approach has known issues for our Windowsy friends, and this attempts to address them.

We've been taking pride that the tip of 'master' is always, without regression, more stable than any released version, but today's one might have uncovered glitches. Please help testing it so that we do not have to leave it broken for a long time if it indeed is.

I spent quite a lot of time trying to come up with a simple reproduction recipe for the builtin-commit breakage, but I couldn't. I also wanted to apply the patch to remove the use (but not implementation) of repo-config along with a removal notice in the release notes but haven't got around to.

Aside from obviously correct trivial fixes that may come from the list, what currently is not in 'master' but should be in the rc4 are very minimal. Brandon Casey's lockfile fix needs to be tested for some time, repo-config deprecation notice needs to be posted, and "\C-+" patch for gitk needs to be pulled from Paul. I see French translation for git-gui in Shawn's repository, but I do not know if it, along with other changes to git-gui, are meant for 1.5.4 or not. If they are, I'd like to include them all before tagging rc4.

----------------------------------------------------------------

* The 'master' branch has these since the last announcement
  in addition to the above.

Bill Lear (1):
  Correct spelling in diff.c comment

Brandon Casey (3):
  close_lock_file(): new function in the lockfile API
  Improve use of lockfile API
  refs.c: rework ref_locks by abstracting from underlying struct lock_file

Dan McGee (2):
  Remove usage of git- (dash) commands from email hook
  cvsimport: remove last use of repo-config from git standard tools

Dave Peticolas (1):
  Documentation: fix and clarify grammar in git-merge docs.

Dmitry Potapov (1):
  treat any file with NUL as binary

Jean-Luc Herren (1):
  Make default pre-commit hook less noisy

Junio C Hamano (4):
  Revert "builtin-commit.c: remove useless check added by faulty cut and
    paste"
  Fix git-rerere documentation
  Squelch bogus progress output from git-rebase--interactive
  Document lockfile API

Kristian Høgsberg (1):
  git-commit: fix double close(2) that can close a wrong file descriptor

Linus Torvalds (3):
  Make builtin-commit.c more careful about parenthood
  Make 'git fsck' complain about non-commit branches
  Be more careful about updating refs

Mark Drago (1):
  hg-to-git: improve popen calls

Miklos Vajna (2):
  Add using merge subtree How-To
  ls-remote: add -t and -h options.