From: Junio C Hamano <junkio@cox.net>
Date: Mon, 12 Mar 2007 06:53:52 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.1-rc1~49
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=240c77c7146a58834cf7e425bde956b646c69024;p=git.git

Merge branch 'maint'

* maint:
  git-send-email: Document configuration options
  git-merge: warn when -m provided on a fast forward
---

240c77c7146a58834cf7e425bde956b646c69024