From: Shawn O. Pearce <spearce@spearce.org>
Date: Wed, 1 Oct 2008 15:56:36 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.1-rc1~186
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5e22e21769454857e00bc55be1f2eef8d873ba72;p=git.git

Merge branch 'maint'

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

5e22e21769454857e00bc55be1f2eef8d873ba72