Merge branch 'maint'
authorShawn O. Pearce <spearce@spearce.org>
Wed, 1 Oct 2008 15:56:36 +0000 (08:56 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Wed, 1 Oct 2008 15:56:36 +0000 (08:56 -0700)
* maint:
Improve git-log documentation wrt file filters
Documentation: remove '\' in front of short options

Trivial merge