diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-04-28 19:30:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-28 19:30:41 -0700 |
| commit | 1d19b324fb2248802ad7fa306fae6b52e74619eb (patch) | |
| tree | 8991a96ad9e32b6c9232ef33317f6275985325c1 /diff.c | |
| parent | Merge branch 'jc/cache-tree' into next (diff) | |
| parent | Merge branch 'fix' (diff) | |
| download | tgif-1d19b324fb2248802ad7fa306fae6b52e74619eb.tar.xz | |
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.
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions