Merge branch 'maint'
commit5e22e21769454857e00bc55be1f2eef8d873ba72
authorShawn O. Pearce <spearce@spearce.org>
Wed, 1 Oct 2008 15:56:36 +0000 (1 08:56 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Wed, 1 Oct 2008 15:56:36 +0000 (1 08:56 -0700)
tree687bc5971a302f01f6ef5f192ad18c59d590ad3f
parent8b745e3ffdabe6ef110dc064af46b0ba993941e0
parentb1524ee0f3a34d76639090c988523550026cc98b
Merge branch 'maint'

* maint:
  Improve git-log documentation wrt file filters
  Documentation: remove '\' in front of short options