Merge branch 'fix'
authorJunio C Hamano <junkio@cox.net>
Fri, 28 Apr 2006 23:57:32 +0000 (16:57 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 28 Apr 2006 23:57:32 +0000 (16:57 -0700)
* fix:
Fix trivial typo in git-log man page.
Properly render asciidoc "callouts" in git man pages.
Fix up remaining man pages that use asciidoc "callouts".
Update the git-branch man page to include the "-r" option,
annotate: display usage information if no filename was given
annotate: fix warning about uninitialized scalar
git-am --resolved: more usable error message.

Trivial merge