From: Junio C Hamano <junkio@cox.net>
Date: Sat, 29 Apr 2006 02:30:41 +0000 (-0700)
Subject: Merge branch 'master' into next
X-Git-Tag: v1.4.1-rc1~166
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1d19b324fb2248802ad7fa306fae6b52e74619eb;p=git.git

Merge branch 'master' into next

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

1d19b324fb2248802ad7fa306fae6b52e74619eb