![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Sat, 29 Apr 2006 02:30:41 +0000 (19:30 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sat, 29 Apr 2006 02:30:41 +0000 (19:30 -0700) | ||
| commit | 1d19b324fb2248802ad7fa306fae6b52e74619eb | |
| tree | 8991a96ad9e32b6c9232ef33317f6275985325c1 | tree | snapshot |
| parent | 1c57f53582a56257110a5cd14522ffdd8288b1a4 | commit | diff |
| parent | 89719209f48fe7d9694710795b1ec1d5fd7ebfc0 | commit | diff |
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.
* 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.