Merge branch 'master' into next
commit58730ff33033921ae56168a8558a1456e26db0a2
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 Jun 2010 05:15:36 +0000 (7 22:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Jun 2010 05:15:36 +0000 (7 22:15 -0700)
treeabc87d173526b932ecb814dcded95e6e0fbbdd1b
parentc54f1bf89699392a4cb6b6f6db9f42ae91fffb5c
parent92a75a391e66cfc278cf59741e484efd80c02176
Merge branch 'master' into next

* master:
  Change C99 comments to old-style C comments
  commit.txt: clarify how --author argument is used
  setup: document prefix
builtin/blame.c
remote.c