From: Junio C Hamano <junkio@cox.net>
Date: Mon, 6 Mar 2006 06:38:22 +0000 (-0800)
Subject: Merge branch 'fd/asciidoc' into next
X-Git-Tag: v1.3.0-rc1~45
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=3bcd59a546333ae355c87577ba63f8dccd50a519;p=git.git

Merge branch 'fd/asciidoc' into next

* fd/asciidoc:
  Tweak asciidoc output to work with broken docbook-xsl
  annotate-blame test: add evil merge.
  annotate-blame test: don't "source", but say "."
  annotate/blame tests updates.
  annotate: Support annotation of files on other revisions.
  git/Documentation: fix SYNOPSIS style bugs
  blame: avoid "diff -u0".
  git-blame: Use the same tests for git-blame as for git-annotate
  blame and annotate: show localtime with timezone.
  blame: avoid -lm by not using log().
  git-blame: Make the output human readable
  get_revision(): do not dig deeper when we know we are at the end.
  documentation: add 'see also' sections to git-rm and git-add
  contrib/emacs/Makefile: Provide tool for byte-compiling files.
  gitignore: Ignore some more boring things.
---

3bcd59a546333ae355c87577ba63f8dccd50a519