Merge branch 'master' of git://git.kernel.org/pub/scm/git/git

Merge branch 'master' of git://git./git/git

* 'master' of git://git.kernel.org/pub/scm/git/git: (40 commits)
  git-reflog: gc.* configuration and documentation.
  rerere gc: honor configuration and document it
  count-objects -v: show number of packs as well.
  everyday: update for v1.5.0
  git-svn: dcommit should diff against the current HEAD after committing
  git-svn: quiet down tests and fix some unportable shell constructs
  hooks/commit-msg: add example to add Signed-off-by line to message
  move git-blame to its place in .gitignore
  Add git-reflog to .gitignore
  Document git-reset <commit> -- <paths>...
  Document --numstat in git-apply and git-diff
  show-branch --reflog: add documentation.
  add .mailmap for git-shortlog output with the git repository
  GIT v1.5.0 preview
  git-add -f: allow adding otherwise ignored files.
  gitweb: Use rev-list --skip option.
  gitweb: Change history action to use parse_commits.
  gitweb: Change atom, rss actions to use parse_commits.
  gitweb: Change header search action to use parse_commits.
  gitweb: Change log action to use parse_commits.
  ...