Andrew's git / gitweb.git / diff
?
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Mon, 15 Nov 2010 19:00:24 +0000 (11:00 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 15 Nov 2010 19:00:24 +0000 (11:00 -0800)
* maint:
rebase -X: do not clobber strategy

Trivial merge