![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Mon, 12 Mar 2007 06:53:52 +0000 (23:53 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Mon, 12 Mar 2007 06:53:52 +0000 (23:53 -0700) | ||
| commit | 240c77c7146a58834cf7e425bde956b646c69024 | |
| tree | 19710f73b22c9962f6cb6979db5bf8bd413af323 | tree | snapshot |
| parent | 2422f1ca3b94358e88f8508730a9d8ebcf020547 | commit | diff |
| parent | fc095242b16d57bad1bfe089f919b9d6e6deda1b | commit | diff |
Merge branch 'maint'
* maint:
git-send-email: Document configuration options
git-merge: warn when -m provided on a fast forward
* maint:
git-send-email: Document configuration options
git-merge: warn when -m provided on a fast forward