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: (49 commits)
  update-server-info: Shorten read_pack_info_file()
  git add: Add --ignore-missing to SYNOPSIS
  git submodule add: Remove old docs about implicit -f
  git submodule add: Require the new --force option to add ignored paths
  Documentation: Explain git-mergetool's use of temporary files
  git-svn: write memoized data explicitly to avoid Storable bug
  Only run aggregate-results over actual counts
  Add a sample user for the svndump library
  diff A...B: do not limit the syntax too narrowly
  Documentation: add submodule.* to the big configuration variable list
  gitmodules.5: url can be a relative path
  gitweb: fix esc_url
  git --paginate: paginate external commands again
  MERGE_RR is in .git, not .git/rr-cache
  merge-tree: fix where two branches share no changes
  add basic tests for merge-tree
  Git 1.7.2-rc3
  Use dev_t for device id (st_dev) from stat in setup_git_directory_gently()
  diff A...B: give one possible diff when there are more than one merge-base
  git fetch documentation: describe short '-p' synonym to '--prune' option
  ...