Merge branch 'master' of git://git.kernel.org/pub/scm/git/git
commit5bd686b6256c70b5f4f87fb21181ec34efd465be
authorJakub Narebski <jnareb@gmail.com>
Mon, 4 Sep 2006 23:00:38 +0000 (5 01:00 +0200)
committerJakub Narebski <jnareb@gmail.com>
Mon, 4 Sep 2006 23:00:38 +0000 (5 01:00 +0200)
tree2b91b9292fe61fd4e1b71d7da7844d64515915ef
parent6b4fd65cce00d4adb5dd3ed2960ba355057c5a97
parentf2e609473cb4aeb3884b7dd57a3a652df4e5edcf
Merge branch 'master' of git://git./git/git

* 'master' of git://git.kernel.org/pub/scm/git/git:
  gitweb: Change the name of diff to parent link in "commit" view to "diff
  Update GIT_TRACE documentation.
  Trace into open fd and refactor tracing code.