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: (33 commits)
  GIT 1.5.6-rc3
  Simplify and rename find_sha1_file()
  Make loose object file reading more careful
  Avoid cross-directory renames and linking on object creation
  Use 'trash directory' thoroughly in t/test-lib.sh
  Don't allocate too much memory in quote_ref_url
  gitweb: Make it work with $GIT containing spaces
  completion: add more 'git add' options
  git add: add long equivalents of '-u' and '-f' options
  git-svn: test that extra blank lines aren't inserted in commit messages.
  git-svn: don't append extra newlines at the end of commit messages.
  git-submodule - Fix errors regarding resolve_relative_url
  documentation: bisect: remove bits talking about a bisection branch
  sha1_file.c: dead code removal
  git-instaweb: improve auto-discovery of httpd and call conventions.
  t4126: fix test that happened to work due to timing
  fast-export: Correctly generate initial commits with no parents
  t/.gitattributes: only ignore whitespace errors in test files
  document --pretty=tformat: option
  Improve sed portability
  ...