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: (26 commits)
  Documentation: fix formatting in git-svn
  t7502-commit.sh: test_must_fail doesn't work with inline environment variables
  completion: add --graph to log command completion
  test-lib.sh: add --long-tests option
  git-merge.sh: fix typo in usage message: sucesses --> succeeds
  GIT 1.5.6
  clean up error conventions of remote.c:match_explicit
  Fix approxidate("never") to always return 0
  git-am: head -1 is obsolete and doesn't work on some new systems
  builtin-rerere: fix a small leak
  gitweb: remove unused parse_ref method
  gitweb: quote commands properly when calling the shell
  sha1_file.c: simplify parse_pack_index()
  create_tempfile: make sure that leading directories can be accessible by peers
  write_loose_object: don't bother trying to read an old object
  path-list documentation: document all functions and data structures
  run-command documentation: fix "memset()" parameter
  diff.c: fix emit_line() again not to add extra line
  diff: reset color before printing newline
  Make git reflog expire honour core.sharedRepository.
  ...