Merge branch 'master' into next
commit123e3b15abeebb9d7630d4a2f2966506e319c14c
authorJunio C Hamano <gitster@pobox.com>
Sat, 17 May 2008 05:10:19 +0000 (16 22:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 17 May 2008 05:10:19 +0000 (16 22:10 -0700)
tree4f12c279707fa3fc6266bee286af1d623debad13
parent4989bbadfa3081bbf3da104bea5c21f53cff67e2
parent6d2c1c2dc064c40f6c723e0a25b5f813732fdaff
Merge branch 'master' into next

* master:
  Replace in-place sed in t7502-commit
  git-filter-branch: Clarify file removal example.
  submodule update: add convenience option --init
  git-fast-import: rename cmd_*() functions to parse_*()
  Documentation/git-web--browse.txt: fix small typo
  Use '-f' option to point to the .gitmodules file