From: Junio C Hamano <junkio@cox.net>
Date: Fri, 28 Apr 2006 23:57:32 +0000 (-0700)
Subject: Merge branch 'fix'
X-Git-Tag: v1.4.0-rc1~205
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=89719209;p=git.git

Merge branch 'fix'

* 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.
---

89719209f48fe7d9694710795b1ec1d5fd7ebfc0