Andrew's git / gitweb.git / diff
?
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)
* maint:
git-send-email: Document configuration options
git-merge: warn when -m provided on a fast forward

Trivial merge