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.
Junio C Hamano committed
Apr 28, 2006 at 19:30 UTC
1d19b324fb2248802ad7fa306fae6b52e74619eb
No changes.