Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Mon, 12 Mar 2007 06:53:52 +0000 (23:53 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 12 Mar 2007 06:53:52 +0000 (23:53 -0700)
commit240c77c7146a58834cf7e425bde956b646c69024
tree19710f73b22c9962f6cb6979db5bf8bd413af323
parent2422f1ca3b94358e88f8508730a9d8ebcf020547
parentfc095242b16d57bad1bfe089f919b9d6e6deda1b
Merge branch 'maint'

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